diff --git a/.github/workflows/check-maintainers-sorted.yml b/.github/workflows/check-maintainers-sorted.yml index 07cd525e8542..c7a39a66b5b6 100644 --- a/.github/workflows/check-maintainers-sorted.yml +++ b/.github/workflows/check-maintainers-sorted.yml @@ -20,7 +20,7 @@ jobs: lib maintainers - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 96727ee994e6..0eb9d99a7aa5 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -44,7 +44,7 @@ jobs: rev=$(jq -r .rev ci/pinned-nixpkgs.json) echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true nix_path: nixpkgs=${{ env.url }} diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index 8b148ba33bc4..e7b366439442 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.github/workflows/check-nixf-tidy.yml @@ -34,7 +34,7 @@ jobs: rev=$(jq -r .rev ci/pinned-nixpkgs.json) echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true nix_path: nixpkgs=${{ env.url }} diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index e1f079619dc3..6de72f9b8bda 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -27,7 +27,7 @@ jobs: with: ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 - name: Build shell run: nix-build shell.nix diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index ac6fbac74b90..a1e78609f8c8 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -45,7 +45,7 @@ jobs: needs: get-merge-commit if: github.repository_owner == 'NixOS' && needs.get-merge-commit.outputs.mergedSha steps: - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: @@ -90,7 +90,7 @@ jobs: runs-on: ubuntu-24.04 if: github.repository_owner == 'NixOS' steps: - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head. # This is intentional, because we need to request the review of owners as declared in the base branch. diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml index bd48be1650f1..f3f6f3b56077 100644 --- a/.github/workflows/editorconfig-v2.yml +++ b/.github/workflows/editorconfig-v2.yml @@ -32,7 +32,7 @@ jobs: with: ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml index f0f5fbf376c2..1199ad8edeb9 100644 --- a/.github/workflows/eval-lib-tests.yml +++ b/.github/workflows/eval-lib-tests.yml @@ -22,7 +22,7 @@ jobs: with: ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 4e6735f3b48e..99a0ec40dedf 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -43,7 +43,7 @@ jobs: echo "targetSha=$targetSha" >> "$GITHUB_OUTPUT" - name: Install Nix - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true @@ -71,7 +71,7 @@ jobs: path: nixpkgs - name: Install Nix - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true @@ -108,7 +108,7 @@ jobs: path: nixpkgs - name: Install Nix - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true @@ -149,7 +149,7 @@ jobs: path: nixpkgs - name: Install Nix - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true @@ -254,7 +254,7 @@ jobs: path: comparison - name: Install Nix - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 # Important: This workflow job runs with extra permissions, # so we need to make sure to not run untrusted code from PRs diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index 362a73e4bb57..38c32e280075 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.github/workflows/manual-nixos-v2.yml @@ -19,13 +19,21 @@ permissions: {} jobs: nixos: name: nixos-manual-build - runs-on: ubuntu-24.04 + strategy: + fail-fast: false + matrix: + system: + - x86_64-linux + - aarch64-linux + runs-on: >- + ${{ (matrix.system == 'x86_64-linux' && 'ubuntu-24.04') + || (matrix.system == 'aarch64-linux' && 'ubuntu-24.04-arm') }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true @@ -34,7 +42,15 @@ jobs: with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - name: Building NixOS manual - run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux + - name: Build NixOS manual + id: build-manual + run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.${{ matrix.system }} + + - name: Upload NixOS manual + uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 + with: + name: nixos-manual-${{ matrix.system }} + path: result/ + if-no-files-found: error diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml index d8516fb8de4f..326360748ca8 100644 --- a/.github/workflows/manual-nixpkgs-v2.yml +++ b/.github/workflows/manual-nixpkgs-v2.yml @@ -20,7 +20,7 @@ jobs: with: ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml index 2f8e97d3a8a0..cd59d0607062 100644 --- a/.github/workflows/nix-parse-v2.yml +++ b/.github/workflows/nix-parse-v2.yml @@ -32,7 +32,7 @@ jobs: ref: ${{ needs.get-merge-commit.outputs.mergedSha }} if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }} - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 with: extra_nix_config: sandbox = true nix_path: nixpkgs=channel:nixpkgs-unstable diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index 0b2f4e1c96d3..756c7ed11767 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -43,7 +43,7 @@ jobs: git worktree add "$target" "$(git rev-parse HEAD^1)" echo "target=$target" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31 - name: Fetching the pinned tool # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh diff --git a/ci/OWNERS b/ci/OWNERS index ace82519d0d1..4c9fe35f738a 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -149,10 +149,13 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /nixos/modules/services/monitoring/amazon-cloudwatch-agent.nix @philipmw /nixos/tests/amazon-cloudwatch-agent.nix @philipmw +# Monitoring +/nixos/modules/services/monitoring/fluent-bit.nix @arianvp +/nixos/tests/fluent-bit.nix @arianvp + # nixos-rebuild-ng /pkgs/by-name/ni/nixos-rebuild-ng @thiagokokada - # Updaters ## update.nix /maintainers/scripts/update.nix @jtojnar @@ -399,6 +402,11 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange /pkgs/development/compilers/ocaml @ulrikstrid /pkgs/development/ocaml-modules @ulrikstrid +# ZFS +/nixos/modules/tasks/filesystems/zfs.nix @adamcstephens @amarshall +/nixos/tests/zfs.nix @adamcstephens @amarshall +/pkgs/os-specific/linux/zfs @adamcstephens @amarshall + # Zig /pkgs/development/compilers/zig @figsoda @RossComputerGuy /doc/hooks/zig.section.md @figsoda @RossComputerGuy diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index b844d45f5902..9b71c6656914 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -71,7 +71,15 @@ let getLabels ; - getAttrs = dir: builtins.fromJSON (builtins.readFile "${dir}/outpaths.json"); + getAttrs = + dir: + let + raw = builtins.readFile "${dir}/outpaths.json"; + # The file contains Nix paths; we need to ignore them for evaluation purposes, + # else there will be a "is not allowed to refer to a store path" error. + data = builtins.unsafeDiscardStringContext raw; + in + builtins.fromJSON data; beforeAttrs = getAttrs beforeResultDir; afterAttrs = getAttrs afterResultDir; diff --git a/doc/README.md b/doc/README.md index 09a38d9dabbe..531c38acdfa5 100644 --- a/doc/README.md +++ b/doc/README.md @@ -108,6 +108,7 @@ A few markups for other kinds of literals are also available: These literal kinds are used mostly in NixOS option documentation. This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point). Though, the feature originates from [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage) with slightly different syntax. +They are handled by `myst_role` defined per renderer. #### Admonitions diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md index edaea5895a3b..f33545477c6d 100644 --- a/doc/hooks/installShellFiles.section.md +++ b/doc/hooks/installShellFiles.section.md @@ -99,12 +99,17 @@ failure. To prevent this, guard the completion generation commands. ```nix { nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - # using named fd - installShellCompletion --cmd foobar \ - --bash <($out/bin/foobar --bash-completion) \ - --fish <($out/bin/foobar --fish-completion) \ - --zsh <($out/bin/foobar --zsh-completion) - ''; + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + # using named fd + installShellCompletion --cmd foobar \ + --bash <(${emulator} $out/bin/foobar --bash-completion) \ + --fish <(${emulator} $out/bin/foobar --fish-completion) \ + --zsh <(${emulator} $out/bin/foobar --zsh-completion) + '' + ); } ``` diff --git a/doc/packages/index.md b/doc/packages/index.md index 89d7e477e76f..35bb6c1fe4ff 100644 --- a/doc/packages/index.md +++ b/doc/packages/index.md @@ -14,6 +14,7 @@ fish.section.md fuse.section.md geant4.section.md ibus.section.md +inkscape.section.md kakoune.section.md krita.section.md linux.section.md diff --git a/doc/packages/inkscape.section.md b/doc/packages/inkscape.section.md new file mode 100644 index 000000000000..192c059cd2a0 --- /dev/null +++ b/doc/packages/inkscape.section.md @@ -0,0 +1,29 @@ +# Inkscape {#sec-inkscape} + +[Inkscape](https://inkscape.org) is a powerful vector graphics editor. + +## Plugins {#inkscape-plugins} +Inkscape plugins are collected in the [`inkscape-extensions`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. +To enable them, use an override on `inkscape-with-extensions`: + +```nix +inkscape-with-extensions.override { + inkscapeExtensions = with inkscape-extensions; [ + inkstitch + ]; +} +``` + +Similarly, this works in the shell: + +```bash +$ nix-shell -p 'inkscape-with-extensions.override { inkscapeExtensions = with inkscape-extensions; [inkstitch]; }' +[nix-shell:~]$ # Ink/Stitch is now available via the extension menu +[nix-shell:~]$ inkscape +``` + +All available extension can be enabled by passing `inkscapeExtensions = null;`. + +::: {.note} +Loading the Inkscape extensions stand-alone (without using `override`) does not affect Inkscape at all. +::: diff --git a/doc/redirects.json b/doc/redirects.json index a229e00a1ec7..934c49877b97 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -17,6 +17,9 @@ "ex-testEqualArrayOrMap-test-function-add-cowbell": [ "index.html#ex-testEqualArrayOrMap-test-function-add-cowbell" ], + "inkscape-plugins": [ + "index.html#inkscape-plugins" + ], "neovim": [ "index.html#neovim" ], @@ -62,6 +65,9 @@ "sec-build-helper-extendMkDerivation": [ "index.html#sec-build-helper-extendMkDerivation" ], + "sec-inkscape": [ + "index.html#sec-inkscape" + ], "sec-language-cosmic": [ "index.html#sec-language-cosmic" ], diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 92b6314448d2..e386ead66797 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -75,6 +75,11 @@ - `functor.wrapped` is now deprecated for some types and using it will give a warning with migration instructions. It is deprecated for these types: - `lib.types.attrsWith` - `lib.types.listOf` + - `lib.types.unique` and `lib.types.uniq` + - `lib.types.nullOr` + - `lib.types.functionTo` + - `lib.types.coercedTo` + - `lib.types.either` - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6. diff --git a/lib/default.nix b/lib/default.nix index e69a1cc3860c..f1822307d2ee 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -156,6 +156,7 @@ let makeScope makeScopeWithSplicing makeScopeWithSplicing' extendMkDerivation; inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate; + inherit (self.generators) mkLuaInline; inherit (self.meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio hiPrioSet licensesSpdx getLicenseFromSpdxId getLicenseFromSpdxIdOr diff --git a/lib/generators.nix b/lib/generators.nix index 352644df0431..eb8d76626e71 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -743,6 +743,8 @@ in rec { "nil" else if isInt v || isFloat v || isString v || isBool v then toJSON v + else if isPath v || isDerivation v then + toJSON "${v}" else if isList v then (if v == [ ] then "{}" else "{${introSpace}${concatItems (map (value: "${toLua innerArgs value}") v)}${outroSpace}}") @@ -752,8 +754,6 @@ in rec { "(${v.expr})" else if v == { } then "{}" - else if isDerivation v then - ''"${toString v}"'' else "{${introSpace}${concatItems ( mapAttrsToList (key: value: "[${toJSON key}] = ${toLua innerArgs value}") v diff --git a/lib/licenses.nix b/lib/licenses.nix index 44fca61afbbd..97ed489bd1ab 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -140,11 +140,6 @@ lib.mapAttrs mkLicense ({ fullName = "Apache License 2.0"; }; - asl20-llvm = { - spdxId = "Apache-2.0 WITH LLVM-exception"; - fullName = "Apache License 2.0 with LLVM Exceptions"; - }; - bitstreamVera = { spdxId = "Bitstream-Vera"; fullName = "Bitstream Vera Font License"; @@ -859,6 +854,11 @@ lib.mapAttrs mkLicense ({ url = "https://opensource.franz.com/preamble.html"; }; + llvm-exception = { + spdxId = "LLVM-exception"; + fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License + }; + lppl1 = { spdxId = "LPPL-1.0"; fullName = "LaTeX Project Public License v1.0"; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 1505782547f5..e623c0fb55b8 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -415,6 +415,38 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +# unique / uniq +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.functor.wrapped ./deprecated-wrapped.nix + +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +# nullOr +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.functor.wrapped ./deprecated-wrapped.nix + +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +# functionTo +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.functor.wrapped ./deprecated-wrapped.nix + +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix + +# coercedTo +# Note: test 'nestedTypes.finalType' and 'nestedTypes.coercedType' +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.finalType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.coercedType.functor.wrapped ./deprecated-wrapped.nix +# either +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.functor.wrapped ./deprecated-wrapped.nix + +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix index 8d363a2ad344..c50a7d79f59f 100644 --- a/lib/tests/modules/deprecated-wrapped.nix +++ b/lib/tests/modules/deprecated-wrapped.nix @@ -6,6 +6,11 @@ let # attrsOf uses attrsWith internally attrsOf listOf + unique + nullOr + functionTo + coercedTo + either ; in { @@ -26,6 +31,38 @@ in options.mergedListOf = mkOption { type = listOf (listOf types.str); }; + # unique + options.unique = mkOption { + type = unique { message = ""; } (listOf types.str); + }; + options.mergedUnique = mkOption { + type = unique { message = ""; } (listOf types.str); + }; + # nullOr + options.nullOr = mkOption { + type = nullOr (listOf types.str); + }; + options.mergedNullOr = mkOption { + type = nullOr (listOf types.str); + }; + # functionTo + options.functionTo = mkOption { + type = functionTo (listOf types.str); + }; + options.mergedFunctionTo = mkOption { + type = functionTo (listOf types.str); + }; + # coercedTo + # Note: coercedTo is a non-mergeable option-type + options.coercedTo = mkOption { + type = coercedTo (listOf types.str) lib.id (listOf types.str); + }; + options.either = mkOption { + type = either (listOf types.str) (listOf types.str); + }; + options.mergedEither = mkOption { + type = either (listOf types.str) (listOf types.str); + }; } ) # Module B @@ -38,6 +75,18 @@ in options.mergedListOf = mkOption { type = listOf (listOf types.str); }; + options.mergedUnique = mkOption { + type = unique { message = ""; } (listOf types.str); + }; + options.mergedNullOr = mkOption { + type = nullOr (listOf types.str); + }; + options.mergedFunctionTo = mkOption { + type = functionTo (listOf types.str); + }; + options.mergedEither = mkOption { + type = either (listOf types.str) (listOf types.str); + }; } ) ]; diff --git a/lib/types.nix b/lib/types.nix index cdba500ae07f..ee1410127b1a 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -75,6 +75,7 @@ let # Note that individual attributes can be overriden if needed. elemTypeFunctor = name: { elemType, ... }@payload: { inherit name payload; + wrappedDeprecationMessage = makeWrappedDeprecationMessage payload; type = outer_types.types.${name}; binOp = a: b: let @@ -85,10 +86,10 @@ let null else { elemType = merged; }; - wrappedDeprecationMessage = { loc }: lib.warn '' - The deprecated `${lib.optionalString (loc != null) "type."}functor.wrapped` attribute ${lib.optionalString (loc != null) "of the option `${showOption loc}` "}is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead. - '' payload.elemType; }; + makeWrappedDeprecationMessage = payload: { loc }: lib.warn '' + The deprecated `${lib.optionalString (loc != null) "type."}functor.wrapped` attribute ${lib.optionalString (loc != null) "of the option `${showOption loc}` "}is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead. + '' payload.elemType; outer_types = @@ -834,6 +835,15 @@ rec { }; }; + # A value produced by `lib.mkLuaInline` + luaInline = mkOptionType { + name = "luaInline"; + description = "inline lua"; + descriptionClass = "noun"; + check = x: x._type or null == "lua-inline"; + merge = mergeEqualOption; + }; + uniq = unique { message = ""; }; unique = { message }: type: mkOptionType rec { @@ -844,7 +854,9 @@ rec { getSubOptions = type.getSubOptions; getSubModules = type.getSubModules; substSubModules = m: uniq (type.substSubModules m); - functor = (defaultFunctor name) // { wrapped = type; }; + functor = elemTypeFunctor name { elemType = type; } // { + type = payload: types.unique { inherit message; } payload.elemType; + }; nestedTypes.elemType = type; }; @@ -864,7 +876,9 @@ rec { getSubOptions = elemType.getSubOptions; getSubModules = elemType.getSubModules; substSubModules = m: nullOr (elemType.substSubModules m); - functor = (defaultFunctor name) // { wrapped = elemType; }; + functor = (elemTypeFunctor name { inherit elemType; }) // { + type = payload: types.nullOr payload.elemType; + }; nestedTypes.elemType = elemType; }; @@ -883,7 +897,9 @@ rec { getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "" ]); getSubModules = elemType.getSubModules; substSubModules = m: functionTo (elemType.substSubModules m); - functor = (defaultFunctor "functionTo") // { wrapped = elemType; }; + functor = (elemTypeFunctor "functionTo" { inherit elemType; }) // { + type = payload: types.functionTo payload.elemType; + }; nestedTypes.elemType = elemType; }; @@ -1118,13 +1134,13 @@ rec { then t2.merge loc defs else mergeOneOption loc defs; typeMerge = f': - let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor; - mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor; + let mt1 = t1.typeMerge (elemAt f'.payload.elemType 0).functor; + mt2 = t2.typeMerge (elemAt f'.payload.elemType 1).functor; in if (name == f'.name) && (mt1 != null) && (mt2 != null) then functor.type mt1 mt2 else null; - functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; + functor = elemTypeFunctor name { elemType = [ t1 t2 ]; }; nestedTypes.left = t1; nestedTypes.right = t2; }; @@ -1157,7 +1173,9 @@ rec { getSubModules = finalType.getSubModules; substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m); typeMerge = t: null; - functor = (defaultFunctor name) // { wrapped = finalType; }; + functor = (defaultFunctor name) // { + wrappedDeprecationMessage = makeWrappedDeprecationMessage { elemType = finalType; }; + }; nestedTypes.coercedType = coercedType; nestedTypes.finalType = finalType; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ac3341e5c508..bd93a8e274e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -579,6 +579,17 @@ githubId = 50264672; name = "Adam Freeth"; }; + adamperkowski = { + name = "Adam Perkowski"; + email = "adas1per@protonmail.com"; + matrix = "@xx0a_q:matrix.org"; + github = "adamperkowski"; + githubId = 75480869; + keys = [ + { fingerprint = "00F6 1623 FB56 BC5B B709 4E63 4CE6 C117 2DF6 BE79"; } + { fingerprint = "5A53 0832 DA91 20B0 CA57 DDB6 7CBD B58E CF1D 3478"; } + ]; + }; adamt = { email = "mail@adamtulinius.dk"; github = "adamtulinius"; @@ -1081,6 +1092,12 @@ githubId = 45104896; name = "Alexandru Nechita"; }; + alexandrutocar = { + email = "at@myquiet.place"; + github = "alexandrutocar"; + githubId = 65486851; + name = "Alexandru Tocar"; + }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; @@ -1185,6 +1202,18 @@ githubId = 30437811; name = "Alex Andrews"; }; + alikindsys = { + email = "alice@blocovermelho.org"; + github = "alikindsys"; + githubId = 36565196; + name = "Alikind System"; + + keys = [ + { + fingerprint = "7D31 15DC D912 C15A 2781 F7BB 511C B44B C752 2A89"; + } + ]; + }; alirezameskin = { email = "alireza.meskin@gmail.com"; github = "alirezameskin"; @@ -6387,7 +6416,7 @@ name = "Sebastian Krohn"; }; drawbu = { - email = "clement2104.boillot@gmail.com"; + email = "nixpkgs@drawbu.dev"; github = "drawbu"; githubId = 69208565; name = "Clément Boillot"; @@ -9103,6 +9132,12 @@ githubId = 39066502; name = "Guekka"; }; + guelakais = { + email = "koroyeldiores@gmail.com"; + github = "Guelakais"; + githubId = 76840985; + name = "GueLaKais"; + }; guibert = { email = "david.guibert@gmail.com"; github = "dguibert"; @@ -9176,6 +9211,11 @@ github = "gytis-ivaskevicius"; githubId = 23264966; }; + GZGavinZhao = { + name = "Gavin Zhao"; + github = "GZGavinZhao"; + githubId = 74938940; + }; h3cth0r = { name = "Hector Miranda"; email = "hector.miranda@tec.mx"; @@ -10514,6 +10554,12 @@ githubId = 94313; name = "Xianyi Lin"; }; + izelnakri = { + email = "contact@izelnakri.com"; + github = "izelnakri"; + githubId = 1190931; + name = "Izel Nakri"; + }; izorkin = { email = "Izorkin@gmail.com"; github = "Izorkin"; @@ -11415,6 +11461,13 @@ githubId = 22916782; name = "Joan Massachs"; }; + joaomoreira = { + matrix = "@joaomoreira:matrix.org"; + github = "joaoymoreira"; + githubId = 151087767; + name = "João Moreira"; + keys = [ { fingerprint = "F457 0A3A 5F89 22F8 F572 E075 EF8B F2C8 C5F4 097D"; } ]; + }; joaquintrinanes = { email = "hi@joaquint.io"; github = "JoaquinTrinanes"; @@ -13647,6 +13700,13 @@ githubId = 10554636; name = "Braian A. Diez"; }; + linuxwhata = { + email = "linuxwhata@qq.com"; + matrix = "@lwa:envs.net"; + github = "linuxwhata"; + githubId = 68576488; + name = "Zhou Ke"; + }; lionello = { email = "lio@lunesu.com"; github = "lionello"; @@ -14202,6 +14262,17 @@ githubId = 7910815; name = "Alex McGrath"; }; + lykos153 = { + email = "silvio.ankermann@cloudandheat.com"; + github = "Lykos153"; + githubId = 6453662; + name = "Silvio Ankermann"; + keys = [ + { + fingerprint = "8D47 6294 7205 541C 62A4 9C88 F422 6CA3 971C 4E97"; + } + ]; + }; lyn = { name = "Lyn"; matrix = "@lynatic:catgirl.cloud"; @@ -15098,6 +15169,13 @@ githubId = 158568; name = "Matthias C. M. Troffaes"; }; + mcparland = { + email = "john@mcpar.land"; + github = "mcpar-land"; + githubId = 55669980; + name = "John McParland"; + keys = [ { fingerprint = "39D2 171D D733 C718 DD21 285E B326 E14B 05D8 7A4E"; } ]; + }; McSinyx = { email = "cnx@loang.net"; github = "McSinyx"; @@ -18610,6 +18688,12 @@ githubId = 88469; name = "Jaime Breva"; }; + phodina = { + email = "phodina@protonmail.com"; + github = "phodina"; + githubId = 2997905; + name = "Petr Hodina"; + }; photex = { email = "photex@gmail.com"; github = "photex"; @@ -20651,6 +20735,13 @@ keys = [ { fingerprint = "7DCA 5615 8AB2 621F 2F32 9FF4 1C7C E491 479F A273"; } ]; name = "Rahul Butani"; }; + rseichter = { + email = "nixos.org@seichter.de"; + github = "rseichter"; + githubId = 30873939; + keys = [ { fingerprint = "6AE2 A847 23D5 6D98 5B34 0BC0 8E5F A470 9F69 E911"; } ]; + name = "Ralph Seichter"; + }; rski = { name = "rski"; email = "rom.skiad+nix@gmail.com"; @@ -20927,6 +21018,13 @@ githubId = 7309170; name = "Ryota Kameoka"; }; + rypervenche = { + email = "git@ryper.org"; + github = "rypervenche"; + githubId = 1411504; + name = "rypervenche"; + keys = [ { fingerprint = "1198 7A9F 03AE 47F0 4919 E334 6A41 2C4A ECE1 66EF"; } ]; + }; rytone = { email = "max@ryt.one"; github = "rastertail"; @@ -21399,6 +21497,11 @@ githubId = 19472270; name = "Sebastian"; }; + sebaguardian = { + name = "Sebaguardian"; + github = "Sebaguardian"; + githubId = 68247013; + }; sebastianblunt = { name = "Sebastian Blunt"; email = "nix@sebastianblunt.com"; @@ -21532,6 +21635,12 @@ githubId = 529649; name = "Raffael Mancini"; }; + sepiabrown = { + email = "bboxone@gmail.com"; + github = "sepiabrown"; + githubId = 35622998; + name = "Suwon Park"; + }; seppeljordan = { email = "sebastian.jordan.mail@googlemail.com"; github = "seppeljordan"; @@ -21986,6 +22095,11 @@ githubId = 91412114; keys = [ { fingerprint = "C1DA A551 B422 7A6F 3FD9 6B3A 467B 7D12 9EA7 3AC9"; } ]; }; + silvanshade = { + github = "silvanshade"; + githubId = 11022302; + name = "silvanshade"; + }; Silver-Golden = { name = "Brendan Golden"; email = "github+nixpkgs@brendan.ie"; @@ -22510,6 +22624,13 @@ githubId = 47164123; name = "Spoonbaker"; }; + sportshead = { + email = "me@sportshead.dev"; + github = "sportshead"; + githubId = 32637656; + name = "sportshead"; + keys = [ { fingerprint = "A6B6 D031 782E BDF7 631A 8E7E A874 DB2C BFD3 CFD0"; } ]; + }; sprock = { email = "rmason@mun.ca"; github = "sprock"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 65fc6ca54edd..199e2ff4f751 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -1018,8 +1018,9 @@ with lib.maintainers; rocm = { members = [ - Madouura Flakebi + GZGavinZhao + LunNova mschwaig ]; githubTeams = [ "rocm-maintainers" ]; diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index dc16e5113fd1..f39472e2ba61 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -232,6 +232,13 @@ merging is handled. definitions cannot be merged. The regular expression is processed using `builtins.match`. +### Specialised types {#sec-option-types-specialised} + +`types.luaInline` + +: A string wrapped using `lib.mkLuaInline`. Allows embedding lua expressions + inline within generated lua. Multiple definitions cannot be merged. + ## Submodule types {#sec-option-types-submodule} Submodules are detailed in [Submodule](#section-option-types-submodule). diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 28d0716cb0ed..4b49a1e82090 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -402,6 +402,31 @@ have a predefined type and string generator already declared under : Outputs the given attribute set as an Elixir map, instead of the default Elixir keyword list +`pkgs.formats.lua { asBindings ? false, multiline ? true, columnWidth ? 100, indentWidth ? 2, indentUsingTabs ? false }` + +: A function taking an attribute set with values + + `asBindings` (default `false`) + + : Whether to treat attributes as variable bindings + + `multiline` (default `true`) + + : Whether to procude a multiline output. The output may still wrap across + multiple lines if it would otherwise exceed `columnWidth`. + + `columnWidth` (default `100`) + + : The column width to use to attempt to wrap lines. + + `indentWidth` (default `2`) + + : The width of a single indentation level. + + `indentUsingTabs` (default `false`) + + : Whether the indentation should use tabs instead of spaces. + `pkgs.formats.php { finalVariable }` []{#pkgs-formats-php} : A function taking an attribute set with values diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 950266de4e35..29f7f9d51996 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -1592,6 +1592,9 @@ "sec-option-types-string": [ "index.html#sec-option-types-string" ], + "sec-option-types-specialised": [ + "index.html#sec-option-types-specialised" + ], "sec-option-types-submodule": [ "index.html#sec-option-types-submodule" ], diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index dacb855e8cf1..f9cc4337af7e 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -38,7 +38,7 @@ - The `nixos-generate-config` command now supports a optional `--flake` option, which will generate a flake.nix file alongside the `configuration.nix` and `hardware-configuration.nix`, providing an easy instroduction into flake-based system configurations. - A `nixos-rebuild build-image` sub-command has been added. - It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`. + It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the NixOS manual](https://nixos.org/manual/nixos/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`. - `nixos-option` has been rewritten to a Nix expression called by a simple bash script. This lowers our maintenance threshold, makes eval errors less verbose, adds support for flake-based configurations, descending into `attrsOf` and `listOf` submodule options, and `--show-trace`. @@ -108,12 +108,16 @@ - [Schroot](https://codeberg.org/shelter/reschroot), a lightweight virtualisation tool. Securely enter a chroot and run a command or login shell. Available as [programs.schroot](#opt-programs.schroot.enable). +- [Firezone](https://firezone.dev), an enterprise-ready zero-trust access platform built on WireGuard. This includes the server stack as [services.firezone.server.enable](#opt-services.firezone.server.enable), a TURN/STUN relay service as [services.firezone.relay.enable](#opt-services.firezone.relay.enable), a gateway service as [services.firezone.gateway.enable](#opt-services.firezone.gateway.enable), a headless client as [services.firezone.headless-client.enable](#opt-services.firezone.headless-client.enable) and a GUI client as [services.firezone.gui-client.enable](#opt-services.firezone.gui-client.enable). + - [crab-hole](https://github.com/LuckyTurtleDev/crab-hole), a cross platform Pi-hole clone written in Rust using hickory-dns/trust-dns. Available as [services.crab-hole](#opt-services.crab-hole.enable). - [zwave-js-ui](https://zwave-js.github.io/zwave-js-ui/), a full featured Z-Wave Control Panel and MQTT Gateway. Available as [services.zwave-js-ui](#opt-services.zwave-js-ui.enable). - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](options.html#opt-services.amazon-cloudwatch-agent.enable). +- [Fluent Bit](https://github.com/fluent/fluent-bit), a fast Log, Metrics and Traces Processor and Forwarder. Available as [services.fluent-bit](#opt-services.fluent-bit.enable). + - [Bat](https://github.com/sharkdp/bat), a {manpage}`cat(1)` clone with wings. Available as [programs.bat](options.html#opt-programs.bat). - [Autotier](https://github.com/45Drives/autotier), a passthrough FUSE filesystem. Available as [services.autotierfs](options.html#opt-services.autotierfs.enable). @@ -214,6 +218,8 @@ - `python3Packages.beancount` was updated to 3.1.0. Previous major version remains available as `python3Packages.beancount_2`. +- `wastebin` has been updated to 3.0.0. See the [Changelog](https://github.com/matze/wastebin/blob/master/CHANGELOG.md#300) for breaking changes to the configuration. + - `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available. See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information. @@ -225,6 +231,11 @@ - `pkgs.nextcloud28` has been removed since it's out of support upstream. +- `services.cloudflare-dyndns.apiTokenFile` now must be just your Cloudflare api token. Previously it was supposed to be a file of the form `CLOUDFLARE_API_TOKEN=...`. + +- Emacs lisp build helpers, such as `emacs.pkgs.melpaBuild`, now enables `__structuredAttrs` by default. + Environment variables have to be passed via the `env` attribute. + - `buildGoModule` now passes environment variables via the `env` attribute. `CGO_ENABLED` should now be specified with `env.CGO_ENABLED` when passing to buildGoModule. Direct specification of `CGO_ENABLED` is now redirected by a compatibility layer with a warning, but will become an error in future releases. Go-related environment variables previously shadowed by `buildGoModule` now results in errors when specified directly. Such variables include `GOOS` and `GOARCH`. @@ -603,6 +614,8 @@ - `services.soft-serve` now restarts upon config change. +- `services.keycloak` now provides a `realmFiles` option that allows to import realms during startup. See https://www.keycloak.org/server/importExport + - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. - [`services.mongodb.enableAuth`](#opt-services.mongodb.enableAuth) now uses the newer [mongosh](https://github.com/mongodb-js/mongosh) shell instead of the legacy shell to configure the initial superuser. You can configure the mongosh package to use through the [`services.mongodb.mongoshPackage`](#opt-services.mongodb.mongoshPackage) option. diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 984daec20431..89c537ff3868 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -58,7 +58,7 @@ let ${lib.concatStringsSep "\n" (map (font: "${font}") config.fonts.packages)} - ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' + ${lib.optionalString (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages) '' ${cache} ${lib.optionalString (pkgs.stdenv.hostPlatform.isx86_64 && cfg.cache32Bit) '' diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index f0b692a759d1..a2be448d625b 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -376,4 +376,4 @@ foreach my $u (values %usersOut) { updateFile("/etc/subuid", join("\n", @subUids) . "\n"); updateFile("/etc/subgid", join("\n", @subGids) . "\n"); -updateFile($subUidMapFile, encode_json($subUidMap) . "\n"); +updateFile($subUidMapFile, to_json($subUidMap) . "\n"); diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index e4b547b3b289..34d5dd802115 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -951,6 +951,21 @@ in { } ] ++ flatten (flip mapAttrsToList cfg.users (name: user: [ + ( + let + # Things fail in various ways with especially non-ascii usernames. + # This regex mirrors the one from shadow's is_valid_name: + # https://github.com/shadow-maint/shadow/blob/bee77ffc291dfed2a133496db465eaa55e2b0fec/lib/chkname.c#L68 + # though without the trailing $, because Samba 3 got its last release + # over 10 years ago and is not in Nixpkgs anymore, + # while later versions don't appear to require anything like that. + nameRegex = "[a-zA-Z0-9_.][a-zA-Z0-9_.-]*"; + in + { + assertion = builtins.match nameRegex user.name != null; + message = "The username \"${user.name}\" is not valid, it does not match the regex \"${nameRegex}\"."; + } + ) { assertion = (user.hashedPassword != null) -> (match ".*:.*" user.hashedPassword == null); diff --git a/nixos/modules/image/images.nix b/nixos/modules/image/images.nix index 3f57b2dcf606..f3cdde327d36 100644 --- a/nixos/modules/image/images.nix +++ b/nixos/modules/image/images.nix @@ -47,7 +47,10 @@ let let module = ../. + "/installer/sd-card/sd-image-${pkgs.targetPlatform.qemuArch}.nix"; in - if builtins.pathExists module then [ module ] else throw "The module ${module} does not exist."; + if builtins.pathExists module then + [ module ] + else + throw "The module ${toString module} does not exist."; }; kexec = ../installer/netboot/netboot-minimal.nix; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4c7bed90e69d..133ca8ef8d98 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -560,6 +560,7 @@ ./services/desktops/system76-scheduler.nix ./services/desktops/telepathy.nix ./services/desktops/tumbler.nix + ./services/desktops/wlock.nix ./services/desktops/zeitgeist.nix ./services/development/athens.nix ./services/development/blackfire.nix @@ -934,6 +935,7 @@ ./services/monitoring/das_watchdog.nix ./services/monitoring/datadog-agent.nix ./services/monitoring/do-agent.nix + ./services/monitoring/fluent-bit.nix ./services/monitoring/fusion-inventory.nix ./services/monitoring/gatus.nix ./services/monitoring/gitwatch.nix @@ -1101,6 +1103,11 @@ ./services/networking/firewall.nix ./services/networking/firewall-iptables.nix ./services/networking/firewall-nftables.nix + ./services/networking/firezone/gateway.nix + ./services/networking/firezone/gui-client.nix + ./services/networking/firezone/headless-client.nix + ./services/networking/firezone/relay.nix + ./services/networking/firezone/server.nix ./services/networking/flannel.nix ./services/networking/freenet.nix ./services/networking/freeradius.nix @@ -1364,6 +1371,7 @@ ./services/scheduling/atd.nix ./services/scheduling/cron.nix ./services/scheduling/fcron.nix + ./services/scheduling/prefect.nix ./services/scheduling/scx.nix ./services/search/elasticsearch-curator.nix ./services/search/elasticsearch.nix diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index a4e5a4aac790..7fcd525263b1 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -102,10 +102,10 @@ with lib; stdenv stdenvNoCC # for runCommand busybox - jq # for closureInfo # For boot.initrd.systemd makeInitrdNGTool - ]; + ] + ++ jq.all; # for closureInfo boot.swraid.enable = true; # remove warning about unset mail diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index 8229affb1ad9..b041e1d072b0 100644 --- a/nixos/modules/programs/firefox.nix +++ b/nixos/modules/programs/firefox.nix @@ -118,8 +118,15 @@ in Some of these might be able to be configured more ergonomically using policies. + See [here](https://mozilla.github.io/policy-templates/#preferences) for allowed preferences. + ${organisationInfo} ''; + example = lib.literalExpression '' + { + "browser.tabs.tabmanager.enabled" = false; + } + ''; }; preferencesStatus = lib.mkOption { diff --git a/nixos/modules/programs/streamcontroller.nix b/nixos/modules/programs/streamcontroller.nix index 2f85d37625c8..10298e491ff7 100644 --- a/nixos/modules/programs/streamcontroller.nix +++ b/nixos/modules/programs/streamcontroller.nix @@ -10,7 +10,14 @@ in { options.programs.streamcontroller = { enable = lib.mkEnableOption "StreamController"; - package = lib.mkPackageOption pkgs "streamcontroller" { default = [ "streamcontroller" ]; }; + package = lib.mkOption { + default = pkgs.streamcontroller.override { isKde = config.services.desktopManager.plasma6.enable; }; + defaultText = lib.literalExpression "pkgs.streamcontroller"; + type = lib.types.package; + description = '' + The StreamController package to use + ''; + }; }; config = lib.mkIf cfg.enable { diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix index c9275889927b..08d7036a3e39 100644 --- a/nixos/modules/programs/yabar.nix +++ b/nixos/modules/programs/yabar.nix @@ -79,8 +79,7 @@ in description = '' The package which contains the `yabar` binary. - Nixpkgs provides the `yabar` and `yabar-unstable`, - so it's possible to choose. + Nixpkgs offers both a stable (`yabar`) and unstable (`yabar-unstable`) version of Yabar. ''; }; diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 016b1a95691b..187b14b71b57 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -202,8 +202,9 @@ in systemd.user.services = let + lomiriService = "lomiri.service"; lomiriServiceNames = [ - "lomiri.service" + lomiriService "lomiri-full-greeter.service" "lomiri-full-shell.service" "lomiri-greeter.service" @@ -225,9 +226,9 @@ in "lomiri-polkit-agent" = { description = "Lomiri Polkit agent"; - wantedBy = lomiriServiceNames; - after = [ "graphical-session.target" ]; - partOf = lomiriServiceNames; + wantedBy = [ lomiriService ]; + after = [ lomiriService ]; + partOf = [ lomiriService ]; serviceConfig = { Type = "simple"; Restart = "always"; diff --git a/nixos/modules/services/desktops/wlock.nix b/nixos/modules/services/desktops/wlock.nix new file mode 100644 index 000000000000..3ec766f5422c --- /dev/null +++ b/nixos/modules/services/desktops/wlock.nix @@ -0,0 +1,31 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.wlock; +in +{ + options = { + services.wlock = { + enable = lib.mkEnableOption "wlock, a Wayland sessionlocker using the ext-session-lock-v1 protocol"; + + package = lib.mkPackageOption pkgs "wlock" { }; + }; + }; + + config = lib.mkIf cfg.enable { + security.wrappers.wlock = { + owner = "root"; + group = "root"; + # mirror upstream chmod of 4755 + setuid = true; + setgid = false; + source = lib.getExe cfg.package; + }; + }; + + meta.maintainers = [ lib.maintainers.fliegendewurst ]; +} diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index a489c9c72485..f3adbc26ab58 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -9,7 +9,8 @@ let registrationFile = "${dataDir}/telegram-registration.yaml"; cfg = config.services.mautrix-telegram; settingsFormat = pkgs.formats.json { }; - settingsFile = settingsFormat.generate "mautrix-telegram-config.json" cfg.settings; + settingsFileUnsubstituted = settingsFormat.generate "mautrix-telegram-config.json" cfg.settings; + settingsFile = "${dataDir}/config.json"; in { @@ -132,10 +133,37 @@ in List of Systemd services to require and wait for when starting the application service. ''; }; + + registerToSynapse = lib.mkOption { + type = lib.types.bool; + default = config.services.matrix-synapse.enable; + defaultText = lib.literalExpression "config.services.matrix-synapse.enable"; + description = '' + Whether to add the bridge's app service registration file to + `services.matrix-synapse.settings.app_service_config_files`. + ''; + }; }; }; config = lib.mkIf cfg.enable { + + users.users.mautrix-telegram = { + isSystemUser = true; + group = "mautrix-telegram"; + home = dataDir; + description = "Mautrix-Telegram bridge user"; + }; + + users.groups.mautrix-telegram = { }; + + services.matrix-synapse = lib.mkIf cfg.registerToSynapse { + settings.app_service_config_files = [ registrationFile ]; + }; + systemd.services.matrix-synapse = lib.mkIf cfg.registerToSynapse { + serviceConfig.SupplementaryGroups = [ "mautrix-telegram" ]; + }; + systemd.services.mautrix-telegram = { description = "Mautrix-Telegram, a Matrix-Telegram hybrid puppeting/relaybot bridge."; @@ -161,6 +189,16 @@ in preStart = '' + # substitute the settings file by environment variables + # in this case read from EnvironmentFile + test -f '${settingsFile}' && rm -f '${settingsFile}' + old_umask=$(umask) + umask 0177 + ${pkgs.envsubst}/bin/envsubst \ + -o '${settingsFile}' \ + -i '${settingsFileUnsubstituted}' + umask $old_umask + # generate the appservice's registration file if absent if [ ! -f '${registrationFile}' ]; then ${pkgs.mautrix-telegram}/bin/mautrix-telegram \ @@ -168,6 +206,19 @@ in --config='${settingsFile}' \ --registration='${registrationFile}' fi + + old_umask=$(umask) + umask 0177 + # 1. Overwrite registration tokens in config + # is set, set it as the login shared secret value for the configured + # homeserver domain. + ${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token + | .[0].appservice.hs_token = .[1].hs_token + | .[0]' \ + '${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp' + mv '${settingsFile}.tmp' '${settingsFile}' + + umask $old_umask '' + lib.optionalString (pkgs.mautrix-telegram ? alembic) '' # run automatic database init and migration scripts @@ -175,6 +226,8 @@ in ''; serviceConfig = { + User = "mautrix-telegram"; + Group = "mautrix-telegram"; Type = "simple"; Restart = "always"; @@ -184,7 +237,6 @@ in ProtectKernelModules = true; ProtectControlGroups = true; - DynamicUser = true; PrivateTmp = true; WorkingDirectory = pkgs.mautrix-telegram; # necessary for the database migration scripts to be found StateDirectory = baseNameOf dataDir; diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix index db21a57989ad..72861fdbbe87 100644 --- a/nixos/modules/services/misc/homepage-dashboard.nix +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -192,80 +192,54 @@ in }; }; - config = - let - # If homepage-dashboard is enabled, but none of the configuration values have been updated, - # then default to "unmanaged" configuration which is manually updated in - # var/lib/homepage-dashboard. This is to maintain backwards compatibility, and should be - # deprecated in a future release. - managedConfig = - !( - cfg.bookmarks == [ ] - && cfg.customCSS == "" - && cfg.customJS == "" - && cfg.docker == { } - && cfg.kubernetes == { } - && cfg.services == [ ] - && cfg.settings == { } - && cfg.widgets == [ ] - ); - - configDir = if managedConfig then "/etc/homepage-dashboard" else "/var/lib/homepage-dashboard"; - - msg = - "using unmanaged configuration for homepage-dashboard is deprecated and will be removed" - + " in 24.05. please see the NixOS documentation for `services.homepage-dashboard' and add" - + " your bookmarks, services, widgets, and other configuration using the options provided."; - in - lib.mkIf cfg.enable { - warnings = lib.optional (!managedConfig) msg; - - environment.etc = lib.mkIf managedConfig { - "homepage-dashboard/custom.css".text = cfg.customCSS; - "homepage-dashboard/custom.js".text = cfg.customJS; - - "homepage-dashboard/bookmarks.yaml".source = settingsFormat.generate "bookmarks.yaml" cfg.bookmarks; - "homepage-dashboard/docker.yaml".source = settingsFormat.generate "docker.yaml" cfg.docker; - "homepage-dashboard/kubernetes.yaml".source = - settingsFormat.generate "kubernetes.yaml" cfg.kubernetes; - "homepage-dashboard/services.yaml".source = settingsFormat.generate "services.yaml" cfg.services; - "homepage-dashboard/settings.yaml".source = settingsFormat.generate "settings.yaml" cfg.settings; - "homepage-dashboard/widgets.yaml".source = settingsFormat.generate "widgets.yaml" cfg.widgets; - }; - - systemd.services.homepage-dashboard = { - description = "Homepage Dashboard"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - environment = { - HOMEPAGE_CONFIG_DIR = configDir; - NIXPKGS_HOMEPAGE_CACHE_DIR = "/var/cache/homepage-dashboard"; - PORT = toString cfg.listenPort; - LOG_TARGETS = lib.mkIf managedConfig "stdout"; - }; - - serviceConfig = { - Type = "simple"; - DynamicUser = true; - EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; - StateDirectory = lib.mkIf (!managedConfig) "homepage-dashboard"; - CacheDirectory = "homepage-dashboard"; - ExecStart = lib.getExe cfg.package; - Restart = "on-failure"; - }; - - preStart = '' - # Related: - # * https://github.com/NixOS/nixpkgs/issues/346016 ("homepage-dashboard: cache dir is not cleared upon version upgrade") - # * https://github.com/gethomepage/homepage/discussions/4560 ("homepage NixOS package does not clear cache on upgrade leaving broken state") - # * https://github.com/vercel/next.js/discussions/58864 ("Feature Request: Allow configuration of cache dir") - rm -rf "$NIXPKGS_HOMEPAGE_CACHE_DIR"/* - ''; - }; - - networking.firewall = lib.mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.listenPort ]; - }; + config = lib.mkIf cfg.enable { + environment.etc = { + "homepage-dashboard/custom.css".text = cfg.customCSS; + "homepage-dashboard/custom.js".text = cfg.customJS; + "homepage-dashboard/bookmarks.yaml".source = settingsFormat.generate "bookmarks.yaml" cfg.bookmarks; + "homepage-dashboard/docker.yaml".source = settingsFormat.generate "docker.yaml" cfg.docker; + "homepage-dashboard/kubernetes.yaml".source = + settingsFormat.generate "kubernetes.yaml" cfg.kubernetes; + "homepage-dashboard/services.yaml".source = settingsFormat.generate "services.yaml" cfg.services; + "homepage-dashboard/settings.yaml".source = settingsFormat.generate "settings.yaml" cfg.settings; + "homepage-dashboard/widgets.yaml".source = settingsFormat.generate "widgets.yaml" cfg.widgets; }; + + systemd.services.homepage-dashboard = { + description = "Homepage Dashboard"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + HOMEPAGE_CONFIG_DIR = "/etc/homepage-dashboard"; + NIXPKGS_HOMEPAGE_CACHE_DIR = "/var/cache/homepage-dashboard"; + PORT = toString cfg.listenPort; + LOG_TARGETS = "stdout"; + }; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; + StateDirectory = "homepage-dashboard"; + CacheDirectory = "homepage-dashboard"; + ExecStart = lib.getExe cfg.package; + Restart = "on-failure"; + }; + + enableStrictShellChecks = true; + + # Related: + # * https://github.com/NixOS/nixpkgs/issues/346016 ("homepage-dashboard: cache dir is not cleared upon version upgrade") + # * https://github.com/gethomepage/homepage/discussions/4560 ("homepage NixOS package does not clear cache on upgrade leaving broken state") + # * https://github.com/vercel/next.js/discussions/58864 ("Feature Request: Allow configuration of cache dir") + preStart = '' + rm -rf "''${NIXPKGS_HOMEPAGE_CACHE_DIR:?}"/* + ''; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listenPort ]; + }; + }; } diff --git a/nixos/modules/services/misc/orthanc.nix b/nixos/modules/services/misc/orthanc.nix index 4a5d3876494e..d1a8f97ac006 100644 --- a/nixos/modules/services/misc/orthanc.nix +++ b/nixos/modules/services/misc/orthanc.nix @@ -83,7 +83,7 @@ in }; config = lib.mkIf cfg.enable { - services.orthanc.settings = options.services.orthanc.settings.default; + services.orthanc.settings = opt.settings.default; systemd.services.orthanc = { description = "Orthanc is a lightweight, RESTful DICOM server for healthcare and medical research"; diff --git a/nixos/modules/services/monitoring/fluent-bit.nix b/nixos/modules/services/monitoring/fluent-bit.nix new file mode 100644 index 000000000000..1766825e3fa6 --- /dev/null +++ b/nixos/modules/services/monitoring/fluent-bit.nix @@ -0,0 +1,103 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: +let + cfg = config.services.fluent-bit; + + yamlFormat = pkgs.formats.yaml { }; +in +{ + options.services.fluent-bit = { + enable = lib.mkEnableOption "Fluent Bit"; + package = lib.mkPackageOption pkgs "fluent-bit" { }; + configurationFile = lib.mkOption { + type = lib.types.path; + default = yamlFormat.generate "fluent-bit.yaml" cfg.settings; + defaultText = lib.literalExpression ''yamlFormat.generate "fluent-bit.yaml" cfg.settings''; + description = '' + Fluent Bit configuration. See + + for supported values. + + {option}`configurationFile` takes precedence over {option}`settings`. + + Note: Restricted evaluation blocks access to paths outside the Nix store. + This means detecting content changes for mutable paths (i.e. not input or content-addressed) can't be done. + As a result, `nixos-rebuild` won't reload/restart the systemd unit when mutable path contents change. + `systemctl restart fluent-bit.service` must be used instead. + ''; + example = "/etc/fluent-bit/fluent-bit.yaml"; + }; + settings = lib.mkOption { + type = yamlFormat.type; + default = { }; + description = '' + See {option}`configurationFile`. + + {option}`configurationFile` takes precedence over {option}`settings`. + ''; + example = { + service = { + grace = 30; + }; + pipeline = { + inputs = [ + { + name = "systemd"; + systemd_filter = "_SYSTEMD_UNIT=fluent-bit.service"; + } + ]; + outputs = [ + { + name = "file"; + path = "/var/log/fluent-bit"; + file = "fluent-bit.out"; + } + ]; + }; + }; + }; + # See https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/yaml/service-section. + graceLimit = lib.mkOption { + type = lib.types.nullOr ( + lib.types.oneOf [ + lib.types.ints.positive + lib.types.str + ] + ); + default = null; + description = '' + The grace time limit. Sets the systemd unit's `TimeoutStopSec`. + + The `service.grace` option in the Fluent Bit configuration should be ≤ this option. + ''; + example = 30; + }; + }; + + config = lib.mkIf cfg.enable { + # See https://github.com/fluent/fluent-bit/blob/v3.2.6/init/systemd.in. + systemd.services.fluent-bit = { + description = "Fluent Bit"; + after = [ "network.target" ]; + requires = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + # See https://nixos.org/manual/nixos/stable#sec-logging. + SupplementaryGroups = "systemd-journal"; + ExecStart = utils.escapeSystemdExecArgs [ + (lib.getExe cfg.package) + "--config" + cfg.configurationFile + ]; + Restart = "always"; + TimeoutStopSec = lib.mkIf (cfg.graceLimit != null) cfg.graceLimit; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix index 3265d94f6cd3..121dfc0668ad 100644 --- a/nixos/modules/services/monitoring/scrutiny.nix +++ b/nixos/modules/services/monitoring/scrutiny.nix @@ -1,10 +1,11 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: let inherit (lib) maintainers; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.options) literalExpression mkEnableOption mkOption mkPackageOption; inherit (lib.types) bool enum nullOr port str submodule; + inherit (utils) genJqSecretsReplacementSnippet; cfg = config.services.scrutiny; # Define the settings format used for this program @@ -36,6 +37,11 @@ in Scrutiny settings to be rendered into the configuration file. See . + + Options containing secret data should be set to an attribute set + containing the attribute `_secret`. This attribute should be a string + or structured JSON with `quote = false;`, pointing to a file that + contains the value the option should be set to. ''; default = { }; type = submodule { @@ -130,6 +136,11 @@ in Collector settings to be rendered into the collector configuration file. See . + + Options containing secret data should be set to an attribute set + containing the attribute `_secret`. This attribute should be a string + or structured JSON with `quote = false;`, pointing to a file that + contains the value the option should be set to. ''; default = { }; type = submodule { @@ -177,6 +188,9 @@ in SCRUTINY_WEB_DATABASE_LOCATION = "/var/lib/scrutiny/scrutiny.db"; SCRUTINY_WEB_SRC_FRONTEND_PATH = "${cfg.package}/share/scrutiny"; }; + preStart = '' + ${genJqSecretsReplacementSnippet cfg.settings "/run/scrutiny/config.yaml"} + ''; postStart = '' for i in $(seq 300); do if "${lib.getExe pkgs.curl}" --fail --silent --head "http://${cfg.settings.web.listen.host}:${toString cfg.settings.web.listen.port}" >/dev/null; then @@ -191,8 +205,10 @@ in ''; serviceConfig = { DynamicUser = true; - ExecStart = "${getExe cfg.package} start --config ${settingsFormat.generate "scrutiny.yaml" cfg.settings}"; + ExecStart = "${getExe cfg.package} start --config /run/scrutiny/config.yaml"; Restart = "always"; + RuntimeDirectory = "scrutiny"; + RuntimeDirectoryMode = "0700"; StateDirectory = "scrutiny"; StateDirectoryMode = "0750"; }; @@ -216,9 +232,14 @@ in COLLECTOR_VERSION = "1"; COLLECTOR_API_ENDPOINT = cfg.collector.settings.api.endpoint; }; + preStart = '' + ${genJqSecretsReplacementSnippet cfg.collector.settings "/run/scrutiny-collector/config.yaml"} + ''; serviceConfig = { Type = "oneshot"; - ExecStart = "${getExe cfg.collector.package} run --config ${settingsFormat.generate "scrutiny-collector.yaml" cfg.collector.settings}"; + ExecStart = "${getExe cfg.collector.package} run --config /run/scrutiny-collector/config.yaml"; + RuntimeDirectory = "scrutiny-collector"; + RuntimeDirectoryMode = "0700"; }; startAt = cfg.collector.schedule; }; diff --git a/nixos/modules/services/networking/clatd.nix b/nixos/modules/services/networking/clatd.nix index 8ddeb51479e4..573d77e71d71 100644 --- a/nixos/modules/services/networking/clatd.nix +++ b/nixos/modules/services/networking/clatd.nix @@ -75,6 +75,7 @@ in "AF_INET" "AF_INET6" "AF_NETLINK" + "AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; diff --git a/nixos/modules/services/networking/cloudflare-dyndns.nix b/nixos/modules/services/networking/cloudflare-dyndns.nix index 4e2684b39d43..f99935210b06 100644 --- a/nixos/modules/services/networking/cloudflare-dyndns.nix +++ b/nixos/modules/services/networking/cloudflare-dyndns.nix @@ -15,12 +15,13 @@ in package = lib.mkPackageOption pkgs "cloudflare-dyndns" { }; apiTokenFile = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = null; + type = lib.types.pathWith { + absolute = true; + inStore = false; + }; + description = '' The path to a file containing the CloudFlare API token. - - The file must have the form `CLOUDFLARE_API_TOKEN=...` ''; }; @@ -91,19 +92,35 @@ in Type = "simple"; DynamicUser = true; StateDirectory = "cloudflare-dyndns"; - EnvironmentFile = cfg.apiTokenFile; Environment = [ "XDG_CACHE_HOME=%S/cloudflare-dyndns/.cache" ]; - ExecStart = - let - args = - [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ] - ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ]) - ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ]) - ++ lib.optional cfg.deleteMissing "--delete-missing" - ++ lib.optional cfg.proxied "--proxied"; - in - "${lib.getExe cfg.package} ${toString args}"; + LoadCredential = [ + "apiToken:${cfg.apiTokenFile}" + ]; }; + + script = + let + args = + [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ] + ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ]) + ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ]) + ++ lib.optional cfg.deleteMissing "--delete-missing" + ++ lib.optional cfg.proxied "--proxied"; + in + '' + export CLOUDFLARE_API_TOKEN=$(< "''${CREDENTIALS_DIRECTORY}/apiToken") + + # Added 2025-03-10: `cfg.apiTokenFile` used to be passed as an + # `EnvironmentFile` to the service, which required it to be of + # the form "CLOUDFLARE_API_TOKEN=" rather than just the secret. + # If we detect this legacy usage, error out. + if [[ $CLOUDFLARE_API_TOKEN == CLOUDFLARE_API_TOKEN* ]]; then + echo "Error: your api token starts with 'CLOUDFLARE_API_TOKEN='. Remove that, and instead specify just the token." >&2 + exit 1 + fi + + exec ${lib.getExe cfg.package} ${toString args} + ''; } // lib.optionalAttrs (cfg.frequency != null) { startAt = cfg.frequency; diff --git a/nixos/modules/services/networking/firezone/gateway.nix b/nixos/modules/services/networking/firezone/gateway.nix new file mode 100644 index 000000000000..915478000edb --- /dev/null +++ b/nixos/modules/services/networking/firezone/gateway.nix @@ -0,0 +1,159 @@ +{ + lib, + pkgs, + config, + ... +}: +let + inherit (lib) + boolToString + getExe + mkEnableOption + mkIf + mkOption + mkPackageOption + types + ; + + cfg = config.services.firezone.gateway; +in +{ + options = { + services.firezone.gateway = { + enable = mkOption { + default = false; + example = true; + description = '' + Whether to enable the firezone gateway. + + You have to manually masquerade and forward traffic from the + tun-firezone interface to your resource! Refer to the + [upstream setup script](https://github.com/firezone/firezone/blob/8c7c0a9e8e33ae790aeb75fdb5a15432c2870b79/scripts/gateway-systemd-install.sh#L154-L168) + for a list of iptable commands. + + See the firezone nixos test in this repository for an nftables based example. + ''; + type = lib.types.bool; + }; + package = mkPackageOption pkgs "firezone-gateway" { }; + + name = mkOption { + type = types.str; + description = "The name of this gateway as shown in firezone"; + }; + + apiUrl = mkOption { + type = types.strMatching "^wss://.+/$"; + example = "wss://firezone.example.com/api/"; + description = '' + The URL of your firezone server's API. This should be the same + as your server's setting for {option}`services.firezone.server.settings.api.externalUrl`, + but with `wss://` instead of `https://`. + ''; + }; + + tokenFile = mkOption { + type = types.path; + example = "/run/secrets/firezone-gateway-token"; + description = '' + A file containing the firezone gateway token. Do not use a nix-store path here + as it will make the token publicly readable! + + This file will be passed via systemd credentials, it should only be accessible + by the root user. + ''; + }; + + logLevel = mkOption { + type = types.str; + default = "info"; + description = '' + The log level for the firezone application. See + [RUST_LOG](https://docs.rs/env_logger/latest/env_logger/#enabling-logging) + for the format. + ''; + }; + + enableTelemetry = mkEnableOption "telemetry"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.firezone-gateway = { + description = "Gateway service for the Firezone zero-trust access platform"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = [ pkgs.util-linux ]; + script = '' + # If FIREZONE_ID is not given by the user, use a persisted (or newly generated) uuid. + if [[ -z "''${FIREZONE_ID:-}" ]]; then + if [[ ! -e gateway_id ]]; then + uuidgen -r > gateway_id + fi + export FIREZONE_ID=$(< gateway_id) + fi + + export FIREZONE_TOKEN=$(< "$CREDENTIALS_DIRECTORY/firezone-token") + exec ${getExe cfg.package} + ''; + + environment = { + FIREZONE_API_URL = cfg.apiUrl; + FIREZONE_NAME = cfg.name; + FIREZONE_NO_TELEMETRY = boolToString (!cfg.enableTelemetry); + RUST_LOG = cfg.logLevel; + }; + + serviceConfig = { + Type = "exec"; + DynamicUser = true; + User = "firezone-gateway"; + LoadCredential = [ "firezone-token:${cfg.tokenFile}" ]; + + DeviceAllow = "/dev/net/tun"; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + CapabilityBoundingSet = [ "CAP_NET_ADMIN" ]; + + StateDirectory = "firezone-gateway"; + WorkingDirectory = "/var/lib/firezone-gateway"; + + Restart = "on-failure"; + RestartSec = 10; + + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = false; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service"; + UMask = "077"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ + oddlama + patrickdag + ]; +} diff --git a/nixos/modules/services/networking/firezone/gui-client.nix b/nixos/modules/services/networking/firezone/gui-client.nix new file mode 100644 index 000000000000..8ddb4223111f --- /dev/null +++ b/nixos/modules/services/networking/firezone/gui-client.nix @@ -0,0 +1,138 @@ +{ + lib, + pkgs, + config, + ... +}: +let + inherit (lib) + boolToString + getExe' + mkEnableOption + mkIf + mkOption + mkPackageOption + types + ; + + cfg = config.services.firezone.gui-client; +in +{ + options = { + services.firezone.gui-client = { + enable = mkEnableOption "the firezone gui client"; + package = mkPackageOption pkgs "firezone-gui-client" { }; + + allowedUsers = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + All listed users will become part of the `firezone-client` group so + they can control the IPC service. This is a convenience option. + ''; + }; + + name = mkOption { + type = types.str; + description = "The name of this client as shown in firezone"; + }; + + logLevel = mkOption { + type = types.str; + default = "info"; + description = '' + The log level for the firezone application. See + [RUST_LOG](https://docs.rs/env_logger/latest/env_logger/#enabling-logging) + for the format. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users.groups.firezone-client.members = cfg.allowedUsers; + + # Required for deep-link mimetype registration + environment.systemPackages = [ cfg.package ]; + + # Required for the token store in the gui application + services.gnome.gnome-keyring.enable = true; + + systemd.services.firezone-ipc-service = { + description = "GUI IPC service for the Firezone zero-trust access platform"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = [ pkgs.util-linux ]; + script = '' + # If FIREZONE_ID is not given by the user, use a persisted (or newly generated) uuid. + if [[ -z "''${FIREZONE_ID:-}" ]]; then + if [[ ! -e client_id ]]; then + uuidgen -r > client_id + fi + export FIREZONE_ID=$(< client_id) + fi + + exec ${getExe' cfg.package "firezone-client-ipc"} run + ''; + + environment = { + FIREZONE_NAME = cfg.name; + LOG_DIR = "%L/dev.firezone.client"; + RUST_LOG = cfg.logLevel; + }; + + serviceConfig = { + Type = "notify"; + + DeviceAllow = "/dev/net/tun"; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + CapabilityBoundingSet = [ "CAP_NET_ADMIN" ]; + + # This block contains hardcoded values in the client, we cannot change these :( + Group = "firezone-client"; + RuntimeDirectory = "dev.firezone.client"; + StateDirectory = "dev.firezone.client"; + WorkingDirectory = "/var/lib/dev.firezone.client"; + LogsDirectory = "dev.firezone.client"; + + Restart = "on-failure"; + RestartSec = 10; + + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = false; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service"; + UMask = "077"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ + oddlama + patrickdag + ]; +} diff --git a/nixos/modules/services/networking/firezone/headless-client.nix b/nixos/modules/services/networking/firezone/headless-client.nix new file mode 100644 index 000000000000..c369fe5220b1 --- /dev/null +++ b/nixos/modules/services/networking/firezone/headless-client.nix @@ -0,0 +1,148 @@ +{ + lib, + pkgs, + config, + ... +}: +let + inherit (lib) + boolToString + getExe + mkEnableOption + mkIf + mkOption + mkPackageOption + types + ; + + cfg = config.services.firezone.headless-client; +in +{ + options = { + services.firezone.headless-client = { + enable = mkEnableOption "the firezone headless client"; + package = mkPackageOption pkgs "firezone-headless-client" { }; + + name = mkOption { + type = types.str; + description = "The name of this client as shown in firezone"; + }; + + apiUrl = mkOption { + type = types.strMatching "^wss://.+/$"; + example = "wss://firezone.example.com/api/"; + description = '' + The URL of your firezone server's API. This should be the same + as your server's setting for {option}`services.firezone.server.settings.api.externalUrl`, + but with `wss://` instead of `https://`. + ''; + }; + + tokenFile = mkOption { + type = types.path; + example = "/run/secrets/firezone-client-token"; + description = '' + A file containing the firezone client token. Do not use a nix-store path here + as it will make the token publicly readable! + + This file will be passed via systemd credentials, it should only be accessible + by the root user. + ''; + }; + + logLevel = mkOption { + type = types.str; + default = "info"; + description = '' + The log level for the firezone application. See + [RUST_LOG](https://docs.rs/env_logger/latest/env_logger/#enabling-logging) + for the format. + ''; + }; + + enableTelemetry = mkEnableOption "telemetry"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.firezone-headless-client = { + description = "headless client service for the Firezone zero-trust access platform"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = [ pkgs.util-linux ]; + script = '' + # If FIREZONE_ID is not given by the user, use a persisted (or newly generated) uuid. + if [[ -z "''${FIREZONE_ID:-}" ]]; then + if [[ ! -e client_id ]]; then + uuidgen -r > client_id + fi + export FIREZONE_ID=$(< client_id) + fi + + exec ${getExe cfg.package} + ''; + + environment = { + FIREZONE_API_URL = cfg.apiUrl; + FIREZONE_NAME = cfg.name; + FIREZONE_NO_TELEMETRY = boolToString (!cfg.enableTelemetry); + FIREZONE_TOKEN_PATH = "%d/firezone-token"; + LOG_DIR = "%L/dev.firezone.client"; + RUST_LOG = cfg.logLevel; + }; + + serviceConfig = { + Type = "exec"; + LoadCredential = [ "firezone-token:${cfg.tokenFile}" ]; + + DeviceAllow = "/dev/net/tun"; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + CapabilityBoundingSet = [ "CAP_NET_ADMIN" ]; + + # Hardcoded values in the client :( + RuntimeDirectory = "dev.firezone.client"; + StateDirectory = "dev.firezone.client"; + WorkingDirectory = "/var/lib/dev.firezone.client"; + LogsDirectory = "dev.firezone.client"; + + Restart = "on-failure"; + RestartSec = 10; + + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = false; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service"; + UMask = "077"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ + oddlama + patrickdag + ]; +} diff --git a/nixos/modules/services/networking/firezone/provision.exs b/nixos/modules/services/networking/firezone/provision.exs new file mode 100644 index 000000000000..d8e60d32cf32 --- /dev/null +++ b/nixos/modules/services/networking/firezone/provision.exs @@ -0,0 +1,709 @@ +defmodule Provision do + alias Domain.{Repo, Accounts, Auth, Actors, Resources, Tokens, Gateways, Relays, Policies} + require Logger + + # UUID Mapping handling + defmodule UuidMapping do + @mapping_file "provision-uuids.json" + + # Loads the mapping from file + def load do + mappings = case File.read(@mapping_file) do + {:ok, content} -> + case Jason.decode(content) do + {:ok, mapping} -> mapping + _ -> %{"accounts" => %{}} + end + + _ -> %{"accounts" => %{}} + end + Process.put(:uuid_mappings, mappings) + mappings + end + + # Saves the current mapping (defaulting to the one in the process dictionary) + def save(mapping \\ Process.get(:uuid_mappings)) do + File.write!(@mapping_file, Jason.encode!(mapping)) + end + + # Retrieves the account-level mapping from a given mapping (or from Process) + def get_account(mapping \\ Process.get(:uuid_mappings), account_slug) do + get_in(mapping, ["accounts", account_slug]) || %{} + end + + # Retrieves the entity mapping for a specific account and type + def get_entities(mapping \\ Process.get(:uuid_mappings), account_slug, type) do + get_in(mapping, ["accounts", account_slug, type]) || %{} + end + + # Retrieves an entity mapping for a specific account, type and external_id + def get_entity(mapping \\ Process.get(:uuid_mappings), account_slug, type, external_id) do + get_in(mapping, ["accounts", account_slug, type, external_id]) + end + + # Updates (or creates) the account UUID mapping and stores it in the process dictionary. + def update_account(account_slug, uuid) do + mapping = Process.get(:uuid_mappings) || load() + mapping = ensure_account_exists(mapping, account_slug) + mapping = put_in(mapping, ["accounts", account_slug, "id"], uuid) + Process.put(:uuid_mappings, mapping) + mapping + end + + # Ensures that the given account exists in the mapping. + def ensure_account_exists(mapping, account_slug) do + if not Map.has_key?(mapping["accounts"], account_slug) do + put_in(mapping, ["accounts", account_slug], %{}) + else + mapping + end + end + + # Updates (or creates) the mapping for entities of a given type for the account. + def update_entities(account_slug, type, new_entries) do + mapping = Process.get(:uuid_mappings) || load() + mapping = ensure_account_exists(mapping, account_slug) + current = get_entities(mapping, account_slug, type) + mapping = put_in(mapping, ["accounts", account_slug, type], Map.merge(current, new_entries)) + Process.put(:uuid_mappings, mapping) + mapping + end + + # Removes an entire account from the mapping. + def remove_account(account_slug) do + mapping = Process.get(:uuid_mappings) || load() + mapping = update_in(mapping, ["accounts"], fn accounts -> + Map.delete(accounts, account_slug) + end) + Process.put(:uuid_mappings, mapping) + mapping + end + + # Removes a specific entity mapping for the account. + def remove_entity(account_slug, type, key) do + mapping = Process.get(:uuid_mappings) || load() + mapping = update_in(mapping, ["accounts", account_slug, type], fn entities -> + Map.delete(entities || %{}, key) + end) + Process.put(:uuid_mappings, mapping) + mapping + end + end + + defp resolve_references(value) when is_map(value) do + Enum.into(value, %{}, fn {k, v} -> {k, resolve_references(v)} end) + end + + defp resolve_references(value) when is_list(value) do + Enum.map(value, &resolve_references/1) + end + + defp resolve_references(value) when is_binary(value) do + Regex.replace(~r/\{env:([^}]+)\}/, value, fn _, var -> + System.get_env(var) || raise "Environment variable #{var} not set" + end) + end + + defp resolve_references(value), do: value + + defp atomize_keys(map) when is_map(map) do + Enum.into(map, %{}, fn {k, v} -> + { + if(is_binary(k), do: String.to_atom(k), else: k), + if(is_map(v), do: atomize_keys(v), else: v) + } + end) + end + + defp cleanup_account(uuid) do + case Accounts.fetch_account_by_id_or_slug(uuid) do + {:ok, value} when value.deleted_at == nil -> + Logger.info("Deleting removed account #{value.slug}") + value |> Ecto.Changeset.change(%{ deleted_at: DateTime.utc_now() }) |> Repo.update!() + _ -> :ok + end + end + + defp cleanup_actor(uuid, subject) do + case Actors.fetch_actor_by_id(uuid, subject) do + {:ok, value} -> + Logger.info("Deleting removed actor #{value.name}") + {:ok, _} = Actors.delete_actor(value, subject) + _ -> :ok + end + end + + defp cleanup_provider(uuid, subject) do + case Auth.fetch_provider_by_id(uuid, subject) do + {:ok, value} -> + Logger.info("Deleting removed provider #{value.name}") + {:ok, _} = Auth.delete_provider(value, subject) + _ -> :ok + end + end + + defp cleanup_gateway_group(uuid, subject) do + case Gateways.fetch_group_by_id(uuid, subject) do + {:ok, value} -> + Logger.info("Deleting removed gateway group #{value.name}") + {:ok, _} = Gateways.delete_group(value, subject) + _ -> :ok + end + end + + defp cleanup_relay_group(uuid, subject) do + case Relays.fetch_group_by_id(uuid, subject) do + {:ok, value} -> + Logger.info("Deleting removed relay group #{value.name}") + {:ok, _} = Relays.delete_group(value, subject) + _ -> :ok + end + end + + defp cleanup_actor_group(uuid, subject) do + case Actors.fetch_group_by_id(uuid, subject) do + {:ok, value} -> + Logger.info("Deleting removed actor group #{value.name}") + {:ok, _} = Actors.delete_group(value, subject) + _ -> :ok + end + end + + # Fetch resource by uuid, but follow the chain of replacements if any + defp fetch_resource(uuid, subject) do + case Resources.fetch_resource_by_id(uuid, subject) do + {:ok, resource} when resource.replaced_by_resource_id != nil -> fetch_resource(resource.replaced_by_resource_id, subject) + v -> v + end + end + + defp cleanup_resource(uuid, subject) do + case fetch_resource(uuid, subject) do + {:ok, value} when value.deleted_at == nil -> + Logger.info("Deleting removed resource #{value.name}") + {:ok, _} = Resources.delete_resource(value, subject) + _ -> :ok + end + end + + # Fetch policy by uuid, but follow the chain of replacements if any + defp fetch_policy(uuid, subject) do + case Policies.fetch_policy_by_id(uuid, subject) do + {:ok, policy} when policy.replaced_by_policy_id != nil -> fetch_policy(policy.replaced_by_policy_id, subject) + v -> v + end + end + + defp cleanup_policy(uuid, subject) do + case fetch_policy(uuid, subject) do + {:ok, value} when value.deleted_at == nil -> + Logger.info("Deleting removed policy #{value.description}") + {:ok, _} = Policies.delete_policy(value, subject) + _ -> :ok + end + end + + defp cleanup_entity_type(account_slug, entity_type, cleanup_fn, temp_admin_subject) do + # Get mapping for this entity type + existing_entities = UuidMapping.get_entities(account_slug, entity_type) + # Get current entities from account data + current_entities = Process.get(:current_entities) + # Determine which ones to remove + removed_entity_ids = Map.keys(existing_entities) -- (current_entities[entity_type] || []) + + # Process each entity to remove + Enum.each(removed_entity_ids, fn entity_id -> + case existing_entities[entity_id] do + nil -> :ok + uuid -> + cleanup_fn.(uuid, temp_admin_subject) + UuidMapping.remove_entity(account_slug, entity_type, entity_id) + end + end) + end + + defp collect_current_entities(account_data) do + %{ + "actors" => Map.keys(account_data["actors"] || %{}), + "providers" => Map.keys(account_data["auth"] || %{}), + "gateway_groups" => Map.keys(account_data["gatewayGroups"] || %{}), + "relay_groups" => Map.keys(account_data["relayGroups"] || %{}), + "actor_groups" => Map.keys(account_data["groups"] || %{}) ++ ["everyone"], + "resources" => Map.keys(account_data["resources"] || %{}), + "policies" => Map.keys(account_data["policies"] || %{}) + } + end + + defp nil_if_deleted_or_not_found(value) do + case value do + nil -> nil + {:error, :not_found} -> nil + {:ok, value} when value.deleted_at != nil -> nil + v -> v + end + end + + defp create_temp_admin(account, email_provider) do + temp_admin_actor_email = "firezone-provision@localhost.local" + temp_admin_actor_context = %Auth.Context{ + type: :browser, + user_agent: "Unspecified/0.0", + remote_ip: {127, 0, 0, 1}, + remote_ip_location_region: "N/A", + remote_ip_location_city: "N/A", + remote_ip_location_lat: 0.0, + remote_ip_location_lon: 0.0 + } + + {:ok, temp_admin_actor} = + Actors.create_actor(account, %{ + type: :account_admin_user, + name: "Provisioning" + }) + + {:ok, temp_admin_actor_email_identity} = + Auth.create_identity(temp_admin_actor, email_provider, %{ + provider_identifier: temp_admin_actor_email, + provider_identifier_confirmation: temp_admin_actor_email + }) + + {:ok, temp_admin_actor_token} = + Auth.create_token(temp_admin_actor_email_identity, temp_admin_actor_context, "temporarynonce", DateTime.utc_now() |> DateTime.add(1, :hour)) + + {:ok, temp_admin_subject} = + Auth.build_subject(temp_admin_actor_token, temp_admin_actor_context) + + {temp_admin_subject, temp_admin_actor, temp_admin_actor_email_identity, temp_admin_actor_token} + end + + defp cleanup_temp_admin(temp_admin_actor, temp_admin_actor_email_identity, temp_admin_actor_token, subject) do + Logger.info("Cleaning up temporary admin actor") + {:ok, _} = Tokens.delete_token(temp_admin_actor_token, subject) + {:ok, _} = Auth.delete_identity(temp_admin_actor_email_identity, subject) + {:ok, _} = Actors.delete_actor(temp_admin_actor, subject) + end + + def provision() do + Logger.info("Starting provisioning") + + # Load desired state + json_file = "provision-state.json" + {:ok, raw_json} = File.read(json_file) + {:ok, %{"accounts" => accounts}} = Jason.decode(raw_json) + accounts = resolve_references(accounts) + + # Load existing UUID mappings into the process dictionary. + UuidMapping.load() + + # Clean up removed accounts first + current_account_slugs = Map.keys(accounts) + existing_accounts = Map.keys(Process.get(:uuid_mappings)["accounts"]) + removed_accounts = existing_accounts -- current_account_slugs + + Enum.each(removed_accounts, fn slug -> + if uuid = get_in(Process.get(:uuid_mappings), ["accounts", slug, "id"]) do + cleanup_account(uuid) + # Remove the account from the UUID mapping. + UuidMapping.remove_account(slug) + end + end) + + multi = Enum.reduce(accounts, Ecto.Multi.new(), fn {slug, account_data}, multi -> + account_attrs = atomize_keys(%{ + name: account_data["name"], + slug: slug, + features: Map.get(account_data, "features", %{}), + metadata: Map.get(account_data, "metadata", %{}), + limits: Map.get(account_data, "limits", %{}) + }) + + multi = multi + |> Ecto.Multi.run({:account, slug}, fn repo, _changes -> + case Accounts.fetch_account_by_id_or_slug(slug) do + {:ok, acc} -> + Logger.info("Updating existing account #{slug}") + updated_acc = acc |> Ecto.Changeset.change(account_attrs) |> repo.update!() + {:ok, {:existing, updated_acc}} + _ -> + Logger.info("Creating new account #{slug}") + {:ok, account} = Accounts.create_account(account_attrs) + + Logger.info("Creating internet gateway group") + {:ok, internet_site} = Gateways.create_internet_group(account) + + Logger.info("Creating internet resource") + {:ok, _internet_resource} = Resources.create_internet_resource(account, internet_site) + + # Store mapping of slug to UUID + UuidMapping.update_account(slug, account.id) + {:ok, {:new, account}} + end + end) + |> Ecto.Multi.run({:everyone_group, slug}, fn _repo, changes -> + case Map.get(changes, {:account, slug}) do + {:new, account} -> + Logger.info("Creating everyone group for new account") + {:ok, actor_group} = Actors.create_managed_group(account, %{name: "Everyone", membership_rules: [%{operator: true}]}) + UuidMapping.update_entities(slug, "actor_groups", %{"everyone" => actor_group.id}) + {:ok, actor_group} + {:existing, _account} -> + {:ok, :skipped} + end + end) + |> Ecto.Multi.run({:email_provider, slug}, fn _repo, changes -> + case Map.get(changes, {:account, slug}) do + {:new, account} -> + Logger.info("Creating default email provider for new account") + Auth.create_provider(account, %{name: "Email", adapter: :email, adapter_config: %{}}) + {:existing, account} -> + Auth.Provider.Query.not_disabled() + |> Auth.Provider.Query.by_adapter(:email) + |> Auth.Provider.Query.by_account_id(account.id) + |> Repo.fetch(Auth.Provider.Query, []) + end + end) + |> Ecto.Multi.run({:temp_admin, slug}, fn _repo, changes -> + {_, account} = changes[{:account, slug}] + email_provider = changes[{:email_provider, slug}] + {:ok, create_temp_admin(account, email_provider)} + end) + + # Clean up removed entities for this account after we have an admin subject + multi = multi + |> Ecto.Multi.run({:cleanup_entities, slug}, fn _repo, changes -> + {temp_admin_subject, _, _, _} = changes[{:temp_admin, slug}] + + # Store current entities in process dictionary for our helper function + current_entities = collect_current_entities(account_data) + Process.put(:current_entities, current_entities) + + # Define entity types and their cleanup functions + entity_types = [ + {"actors", &cleanup_actor/2}, + {"providers", &cleanup_provider/2}, + {"gateway_groups", &cleanup_gateway_group/2}, + {"relay_groups", &cleanup_relay_group/2}, + {"actor_groups", &cleanup_actor_group/2}, + {"resources", &cleanup_resource/2}, + {"policies", &cleanup_policy/2} + ] + + # Clean up each entity type + Enum.each(entity_types, fn {entity_type, cleanup_fn} -> + cleanup_entity_type(slug, entity_type, cleanup_fn, temp_admin_subject) + end) + + {:ok, :cleaned} + end) + + # Create or update actors + multi = Enum.reduce(account_data["actors"] || %{}, multi, fn {external_id, actor_data}, multi -> + actor_attrs = atomize_keys(%{ + name: actor_data["name"], + type: String.to_atom(actor_data["type"]) + }) + + Ecto.Multi.run(multi, {:actor, slug, external_id}, fn _repo, changes -> + {_, account} = changes[{:account, slug}] + {temp_admin_subject, _, _, _} = changes[{:temp_admin, slug}] + uuid = UuidMapping.get_entity(slug, "actors", external_id) + case uuid && Actors.fetch_actor_by_id(uuid, temp_admin_subject) |> nil_if_deleted_or_not_found() do + nil -> + Logger.info("Creating new actor #{actor_data["name"]}") + {:ok, actor} = Actors.create_actor(account, actor_attrs) + # Update the mapping without manually handling Process.get/put. + UuidMapping.update_entities(slug, "actors", %{external_id => actor.id}) + {:ok, {:new, actor}} + {:ok, existing_actor} -> + Logger.info("Updating existing actor #{actor_data["name"]}") + {:ok, updated_act} = Actors.update_actor(existing_actor, actor_attrs, temp_admin_subject) + {:ok, {:existing, updated_act}} + end + end) + |> Ecto.Multi.run({:actor_identity, slug, external_id}, fn repo, changes -> + email_provider = changes[{:email_provider, slug}] + case Map.get(changes, {:actor, slug, external_id}) do + {:new, actor} -> + Logger.info("Creating actor email identity") + Auth.create_identity(actor, email_provider, %{ + provider_identifier: actor_data["email"], + provider_identifier_confirmation: actor_data["email"] + }) + {:existing, actor} -> + Logger.info("Updating actor email identity") + {:ok, identity} = Auth.Identity.Query.not_deleted() + |> Auth.Identity.Query.by_actor_id(actor.id) + |> Auth.Identity.Query.by_provider_id(email_provider.id) + |> Repo.fetch(Auth.Identity.Query, []) + + {:ok, identity |> Ecto.Changeset.change(%{ + provider_identifier: actor_data["email"] + }) |> repo.update!()} + end + end) + end) + + # Create or update providers + multi = Enum.reduce(account_data["auth"] || %{}, multi, fn {external_id, provider_data}, multi -> + Ecto.Multi.run(multi, {:provider, slug, external_id}, fn repo, changes -> + provider_attrs = %{ + name: provider_data["name"], + adapter: String.to_atom(provider_data["adapter"]), + adapter_config: provider_data["adapter_config"] + } + + {_, account} = changes[{:account, slug}] + {temp_admin_subject, _, _, _} = changes[{:temp_admin, slug}] + uuid = UuidMapping.get_entity(slug, "providers", external_id) + case uuid && Auth.fetch_provider_by_id(uuid, temp_admin_subject) |> nil_if_deleted_or_not_found() do + nil -> + Logger.info("Creating new provider #{provider_data["name"]}") + {:ok, provider} = Auth.create_provider(account, provider_attrs) + UuidMapping.update_entities(slug, "providers", %{external_id => provider.id}) + {:ok, provider} + {:ok, existing} -> + Logger.info("Updating existing provider #{provider_data["name"]}") + {:ok, existing |> Ecto.Changeset.change(provider_attrs) |> repo.update!()} + end + end) + end) + + # Create or update gateway_groups + multi = Enum.reduce(account_data["gatewayGroups"] || %{}, multi, fn {external_id, gateway_group_data}, multi -> + Ecto.Multi.run(multi, {:gateway_group, slug, external_id}, fn _repo, changes -> + gateway_group_attrs = %{ + name: gateway_group_data["name"], + tokens: [%{}] + } + + {_, account} = changes[{:account, slug}] + {temp_admin_subject, _, _, _} = changes[{:temp_admin, slug}] + uuid = UuidMapping.get_entity(slug, "gateway_groups", external_id) + case uuid && Gateways.fetch_group_by_id(uuid, temp_admin_subject) |> nil_if_deleted_or_not_found() do + nil -> + Logger.info("Creating new gateway group #{gateway_group_data["name"]}") + gateway_group = account + |> Gateways.Group.Changeset.create(gateway_group_attrs, temp_admin_subject) + |> Repo.insert!() + UuidMapping.update_entities(slug, "gateway_groups", %{external_id => gateway_group.id}) + {:ok, gateway_group} + {:ok, existing} -> + # Nothing to update + {:ok, existing} + end + end) + end) + + # Create or update relay_groups + multi = Enum.reduce(account_data["relayGroups"] || %{}, multi, fn {external_id, relay_group_data}, multi -> + Ecto.Multi.run(multi, {:relay_group, slug, external_id}, fn _repo, changes -> + relay_group_attrs = %{ + name: relay_group_data["name"] + } + + {temp_admin_subject, _, _, _} = changes[{:temp_admin, slug}] + uuid = UuidMapping.get_entity(slug, "relay_groups", external_id) + existing_relay_group = uuid && Relays.fetch_group_by_id(uuid, temp_admin_subject) + case existing_relay_group do + v when v in [nil, {:error, :not_found}] -> + Logger.info("Creating new relay group #{relay_group_data["name"]}") + {:ok, relay_group} = Relays.create_group(relay_group_attrs, temp_admin_subject) + UuidMapping.update_entities(slug, "relay_groups", %{external_id => relay_group.id}) + {:ok, relay_group} + {:ok, existing} -> + # Nothing to update + {:ok, existing} + end + end) + end) + + # Create or update actor_groups + multi = Enum.reduce(account_data["groups"] || %{}, multi, fn {external_id, actor_group_data}, multi -> + Ecto.Multi.run(multi, {:actor_group, slug, external_id}, fn _repo, changes -> + actor_group_attrs = %{ + name: actor_group_data["name"], + type: :static + } + + {temp_admin_subject, _, _, _} = changes[{:temp_admin, slug}] + uuid = UuidMapping.get_entity(slug, "actor_groups", external_id) + case uuid && Actors.fetch_group_by_id(uuid, temp_admin_subject) |> nil_if_deleted_or_not_found() do + nil -> + Logger.info("Creating new actor group #{actor_group_data["name"]}") + {:ok, actor_group} = Actors.create_group(actor_group_attrs, temp_admin_subject) + UuidMapping.update_entities(slug, "actor_groups", %{external_id => actor_group.id}) + {:ok, actor_group} + {:ok, existing} -> + # Nothing to update + {:ok, existing} + end + end) + |> Ecto.Multi.run({:actor_group_members, slug, external_id}, fn repo, changes -> + {_, account} = changes[{:account, slug}] + group_uuid = UuidMapping.get_entity(slug, "actor_groups", external_id) + + memberships = + Actors.Membership.Query.all() + |> Actors.Membership.Query.by_group_id(group_uuid) + |> Actors.Membership.Query.returning_all() + |> Repo.all() + + existing_members = Enum.map(memberships, fn membership -> membership.actor_id end) + desired_members = Enum.map(actor_group_data["members"] || [], fn member -> + uuid = UuidMapping.get_entity(slug, "actors", member) + if uuid == nil do + raise "Cannot find provisioned actor #{member} to add to group" + end + uuid + end) + + missing_members = desired_members -- existing_members + untracked_members = existing_members -- desired_members + + Logger.info("Updating members for actor group #{external_id}") + Enum.each(missing_members || [], fn actor_uuid -> + Logger.info("Adding member #{external_id}") + Actors.Membership.Changeset.upsert(account.id, %Actors.Membership{}, %{ + group_id: group_uuid, + actor_id: actor_uuid + }) + |> repo.insert!() + end) + + if actor_group_data["forceMembers"] == true do + # Remove untracked members + to_delete = Enum.map(untracked_members, fn actor_uuid -> {group_uuid, actor_uuid} end) + if to_delete != [] do + Actors.Membership.Query.by_group_id_and_actor_id({:in, to_delete}) + |> repo.delete_all() + end + end + + {:ok, nil} + end) + end) + + # Create or update resources + multi = Enum.reduce(account_data["resources"] || %{}, multi, fn {external_id, resource_data}, multi -> + Ecto.Multi.run(multi, {:resource, slug, external_id}, fn _repo, changes -> + resource_attrs = %{ + type: String.to_atom(resource_data["type"]), + name: resource_data["name"], + address: resource_data["address"], + address_description: resource_data["address_description"], + connections: Enum.map(resource_data["gatewayGroups"] || [], fn group -> + %{gateway_group_id: UuidMapping.get_entity(slug, "gateway_groups", group)} + end), + filters: Enum.map(resource_data["filters"] || [], fn filter -> + %{ + ports: filter["ports"] || [], + protocol: String.to_atom(filter["protocol"]) + } + end) + } + + {temp_admin_subject, _, _, _} = changes[{:temp_admin, slug}] + uuid = UuidMapping.get_entity(slug, "resources", external_id) + case uuid && fetch_resource(uuid, temp_admin_subject) |> nil_if_deleted_or_not_found() do + nil -> + Logger.info("Creating new resource #{resource_data["name"]}") + {:ok, resource} = Resources.create_resource(resource_attrs, temp_admin_subject) + UuidMapping.update_entities(slug, "resources", %{external_id => resource.id}) + {:ok, resource} + {:ok, existing} -> + existing = Repo.preload(existing, :connections) + Logger.info("Updating existing resource #{resource_data["name"]}") + only_updated_attrs = resource_attrs + |> Enum.reject(fn {key, value} -> + case key do + # Compare connections by gateway_group_id only + :connections -> value == Enum.map(existing.connections || [], fn conn -> Map.take(conn, [:gateway_group_id]) end) + # Compare filters by ports and protocol only + :filters -> value == Enum.map(existing.filters || [], fn filter -> Map.take(filter, [:ports, :protocol]) end) + _ -> Map.get(existing, key) == value + end + end) + |> Enum.into(%{}) + + if only_updated_attrs == %{} do + {:ok, existing} + else + resource = case existing |> Resources.update_resource(resource_attrs, temp_admin_subject) do + {:replaced, _old, new} -> + UuidMapping.update_entities(slug, "resources", %{external_id => new.id}) + new + {:updated, value} -> value + x -> x + end + + {:ok, resource} + end + end + end) + end) + + # Create or update policies + multi = Enum.reduce(account_data["policies"] || %{}, multi, fn {external_id, policy_data}, multi -> + Ecto.Multi.run(multi, {:policy, slug, external_id}, fn _repo, changes -> + policy_attrs = %{ + description: policy_data["description"], + actor_group_id: UuidMapping.get_entity(slug, "actor_groups", policy_data["group"]), + resource_id: UuidMapping.get_entity(slug, "resources", policy_data["resource"]) + } + + {temp_admin_subject, _, _, _} = changes[{:temp_admin, slug}] + uuid = UuidMapping.get_entity(slug, "policies", external_id) + case uuid && fetch_policy(uuid, temp_admin_subject) |> nil_if_deleted_or_not_found() do + nil -> + Logger.info("Creating new policy #{policy_data["name"]}") + {:ok, policy} = Policies.create_policy(policy_attrs, temp_admin_subject) + UuidMapping.update_entities(slug, "policies", %{external_id => policy.id}) + {:ok, policy} + {:ok, existing} -> + Logger.info("Updating existing policy #{policy_data["name"]}") + only_updated_attrs = policy_attrs + |> Enum.reject(fn {key, value} -> Map.get(existing, key) == value end) + |> Enum.into(%{}) + + if only_updated_attrs == %{} do + {:ok, existing} + else + policy = case existing |> Policies.update_policy(policy_attrs, temp_admin_subject) do + {:replaced, _old, new} -> + UuidMapping.update_entities(slug, "policies", %{external_id => new.id}) + new + {:updated, value} -> value + x -> x + end + + {:ok, policy} + end + end + end) + end) + + # Clean up temporary admin after all operations + multi |> Ecto.Multi.run({:cleanup_temp_admin, slug}, fn _repo, changes -> + {temp_admin_subject, temp_admin_actor, temp_admin_actor_email_identity, temp_admin_actor_token} = + changes[{:temp_admin, slug}] + + cleanup_temp_admin(temp_admin_actor, temp_admin_actor_email_identity, temp_admin_actor_token, temp_admin_subject) + {:ok, :cleaned} + end) + end) + |> Ecto.Multi.run({:save_state}, fn _repo, _changes -> + # Save all UUID mappings to disk. + UuidMapping.save() + {:ok, :saved} + end) + + case Repo.transaction(multi) do + {:ok, _result} -> + Logger.info("Provisioning completed successfully") + {:error, step, reason, _changes} -> + Logger.error("Provisioning failed at step #{inspect(step)}, no changes were applied: #{inspect(reason)}") + end + end +end + +Provision.provision() diff --git a/nixos/modules/services/networking/firezone/relay.nix b/nixos/modules/services/networking/firezone/relay.nix new file mode 100644 index 000000000000..b5bc86abae5b --- /dev/null +++ b/nixos/modules/services/networking/firezone/relay.nix @@ -0,0 +1,202 @@ +{ + lib, + pkgs, + config, + ... +}: +let + inherit (lib) + boolToString + getExe + mkEnableOption + mkIf + mkOption + mkPackageOption + types + ; + + cfg = config.services.firezone.relay; +in +{ + options = { + services.firezone.relay = { + enable = mkEnableOption "the firezone relay server"; + package = mkPackageOption pkgs "firezone-relay" { }; + + name = mkOption { + type = types.str; + example = "My relay"; + description = "The name of this gateway as shown in firezone"; + }; + + publicIpv4 = mkOption { + type = types.nullOr types.str; + default = null; + description = "The public ipv4 address of this relay"; + }; + + publicIpv6 = mkOption { + type = types.nullOr types.str; + default = null; + description = "The public ipv6 address of this relay"; + }; + + openFirewall = mkOption { + type = types.bool; + default = true; + description = "Opens up the main STUN port and the TURN allocation range."; + }; + + port = mkOption { + type = types.port; + default = 3478; + description = "The port to listen on for STUN messages"; + }; + + lowestPort = mkOption { + type = types.port; + default = 49152; + description = "The lowest port to use in TURN allocation"; + }; + + highestPort = mkOption { + type = types.port; + default = 65535; + description = "The highest port to use in TURN allocation"; + }; + + apiUrl = mkOption { + type = types.strMatching "^wss://.+/$"; + example = "wss://firezone.example.com/api/"; + description = '' + The URL of your firezone server's API. This should be the same + as your server's setting for {option}`services.firezone.server.settings.api.externalUrl`, + but with `wss://` instead of `https://`. + ''; + }; + + tokenFile = mkOption { + type = types.path; + example = "/run/secrets/firezone-relay-token"; + description = '' + A file containing the firezone relay token. Do not use a nix-store path here + as it will make the token publicly readable! + + This file will be passed via systemd credentials, it should only be accessible + by the root user. + ''; + }; + + logLevel = mkOption { + type = types.str; + default = "info"; + description = '' + The log level for the firezone application. See + [RUST_LOG](https://docs.rs/env_logger/latest/env_logger/#enabling-logging) + for the format. + ''; + }; + + enableTelemetry = mkEnableOption "telemetry"; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.publicIpv4 != null || cfg.publicIpv6 != null; + message = "At least one of `services.firezone.relay.publicIpv4` and `services.firezone.relay.publicIpv6` must be set"; + } + ]; + + networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ cfg.port ]; + networking.firewall.allowedUDPPortRanges = mkIf cfg.openFirewall [ + { + from = cfg.lowestPort; + to = cfg.highestPort; + } + ]; + + systemd.services.firezone-relay = { + description = "relay service for the Firezone zero-trust access platform"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = [ pkgs.util-linux ]; + script = '' + # If FIREZONE_ID is not given by the user, use a persisted (or newly generated) uuid. + if [[ -z "''${FIREZONE_ID:-}" ]]; then + if [[ ! -e relay_id ]]; then + uuidgen -r > relay_id + fi + export FIREZONE_ID=$(< relay_id) + fi + + export FIREZONE_TOKEN=$(< "$CREDENTIALS_DIRECTORY/firezone-token") + exec ${getExe cfg.package} + ''; + + environment = { + FIREZONE_API_URL = cfg.apiUrl; + FIREZONE_NAME = cfg.name; + FIREZONE_TELEMETRY = boolToString cfg.enableTelemetry; + + PUBLIC_IP4_ADDR = cfg.publicIpv4; + PUBLIC_IP6_ADDR = cfg.publicIpv6; + + LISTEN_PORT = toString cfg.port; + LOWEST_PORT = toString cfg.lowestPort; + HIGHEST_PORT = toString cfg.highestPort; + + RUST_LOG = cfg.logLevel; + LOG_FORMAT = "human"; + }; + + serviceConfig = { + Type = "exec"; + DynamicUser = true; + User = "firezone-relay"; + LoadCredential = [ "firezone-token:${cfg.tokenFile}" ]; + + StateDirectory = "firezone-relay"; + WorkingDirectory = "/var/lib/firezone-relay"; + + Restart = "on-failure"; + RestartSec = 10; + + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = false; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service"; + UMask = "077"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ + oddlama + patrickdag + ]; +} diff --git a/nixos/modules/services/networking/firezone/server.nix b/nixos/modules/services/networking/firezone/server.nix new file mode 100644 index 000000000000..04ffa1b7d64c --- /dev/null +++ b/nixos/modules/services/networking/firezone/server.nix @@ -0,0 +1,1210 @@ +{ + lib, + pkgs, + config, + ... +}: +let + inherit (lib) + attrNames + boolToString + concatLines + concatLists + concatMapAttrs + concatStringsSep + filterAttrs + filterAttrsRecursive + flip + forEach + getExe + isBool + mapAttrs + mapAttrsToList + mkDefault + mkEnableOption + mkIf + mkMerge + mkOption + mkPackageOption + optionalAttrs + optionalString + recursiveUpdate + subtractLists + toUpper + types + ; + + cfg = config.services.firezone.server; + jsonFormat = pkgs.formats.json { }; + availableAuthAdapters = [ + "email" + "openid_connect" + "userpass" + "token" + "google_workspace" + "microsoft_entra" + "okta" + "jumpcloud" + ]; + + typePortRange = + types.coercedTo types.port + (x: { + from = x; + to = x; + }) + ( + types.submodule { + options = { + from = mkOption { + type = types.port; + description = "The start of the port range, inclusive."; + }; + + to = mkOption { + type = types.port; + description = "The end of the port range, inclusive."; + }; + }; + } + ); + + # All non-secret environment variables or the given component + collectEnvironment = + component: + mapAttrs (_: v: if isBool v then boolToString v else toString v) ( + cfg.settings // cfg.${component}.settings + ); + + # All mandatory secrets which were not explicitly provided by the user will + # have to be generated, if they do not yet exist. + generateSecrets = + let + requiredSecrets = filterAttrs (_: v: v == null) cfg.settingsSecret; + in + '' + mkdir -p secrets + chmod 700 secrets + '' + + concatLines ( + forEach (attrNames requiredSecrets) (secret: '' + if [[ ! -e secrets/${secret} ]]; then + echo "Generating ${secret}" + # Some secrets like TOKENS_KEY_BASE require a value >=64 bytes. + head -c 64 /dev/urandom | base64 -w 0 > secrets/${secret} + chmod 600 secrets/${secret} + fi + '') + ); + + # All secrets given in `cfg.settingsSecret` must be loaded from a file and + # exported into the environment. Also exclude any variables that were + # overwritten by the local component settings. + loadSecretEnvironment = + component: + let + relevantSecrets = subtractLists (attrNames cfg.${component}.settings) ( + attrNames cfg.settingsSecret + ); + in + concatLines ( + forEach relevantSecrets ( + secret: + ''export ${secret}=$(< ${ + if cfg.settingsSecret.${secret} == null then + "secrets/${secret}" + else + "\"$CREDENTIALS_DIRECTORY/${secret}\"" + })'' + ) + ); + + provisionStateJson = + let + # Convert clientSecretFile options into the real counterpart + augmentedAccounts = flip mapAttrs cfg.provision.accounts ( + accountName: account: + account + // { + auth = flip mapAttrs account.auth ( + authName: auth: + recursiveUpdate auth ( + optionalAttrs (auth.adapter_config.clientSecretFile != null) { + adapter_config.client_secret = "{env:AUTH_CLIENT_SECRET_${toUpper accountName}_${toUpper authName}}"; + } + ) + ); + } + ); + in + jsonFormat.generate "provision-state.json" { + # Do not include any clientSecretFile attributes in the resulting json + accounts = filterAttrsRecursive (k: _: k != "clientSecretFile") augmentedAccounts; + }; + + commonServiceConfig = { + AmbientCapablities = [ ]; + CapabilityBoundingSet = [ ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = false; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service"; + UMask = "077"; + + DynamicUser = true; + User = "firezone"; + + Slice = "system-firezone.slice"; + StateDirectory = "firezone"; + WorkingDirectory = "/var/lib/firezone"; + + LoadCredential = mapAttrsToList (secretName: secretFile: "${secretName}:${secretFile}") ( + filterAttrs (_: v: v != null) cfg.settingsSecret + ); + Type = "exec"; + Restart = "on-failure"; + RestartSec = 10; + }; + + componentOptions = component: { + enable = mkEnableOption "the Firezone ${component} server"; + package = mkPackageOption pkgs "firezone-server-${component}" { }; + + settings = mkOption { + description = '' + Environment variables for this component of the Firezone server. For a + list of available variables, please refer to the [upstream definitions](https://github.com/firezone/firezone/blob/main/elixir/apps/domain/lib/domain/config/definitions.ex). + Some variables like `OUTBOUND_EMAIL_ADAPTER_OPTS` require json values + for which you can use `VAR = builtins.toJSON { /* ... */ }`. + + This component will automatically inherit all variables defined via + {option}`services.firezone.server.settings` and + {option}`services.firezone.server.settingsSecret`, but which can be + overwritten by this option. + ''; + default = { }; + type = types.submodule { + freeformType = types.attrsOf ( + types.oneOf [ + types.bool + types.float + types.int + types.str + types.path + types.package + ] + ); + }; + }; + }; +in +{ + options.services.firezone.server = { + enable = mkEnableOption "all Firezone components"; + enableLocalDB = mkEnableOption "a local postgresql database for Firezone"; + nginx.enable = mkEnableOption "nginx virtualhost definition"; + + openClusterFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Opens up the erlang distribution port of all enabled components to + allow reaching the server cluster from the internet. You only need to + set this if you are actually distributing your cluster across multiple + machines. + ''; + }; + + clusterHosts = mkOption { + type = types.listOf types.str; + default = [ + "api@localhost.localdomain" + "web@localhost.localdomain" + "domain@localhost.localdomain" + ]; + description = '' + A list of components and their hosts that are part of this cluster. For + a single-machine setup, the default value will be sufficient. This + value will automatically set `ERLANG_CLUSTER_ADAPTER_CONFIG`. + + The format is `@`. + ''; + }; + + settingsSecret = mkOption { + default = { }; + description = '' + This is a convenience option which allows you to set secret values for + environment variables by specifying a file which will contain the value + at runtime. Before starting the server, the content of each file will + be loaded into the respective environment variable. + + Otherwise, this option is equivalent to + {option}`services.firezone.server.settings`. Refer to the settings + option for more information regarding the actual variables and how + filtering rules are applied for each component. + ''; + type = types.submodule { + freeformType = types.attrsOf types.path; + options = { + RELEASE_COOKIE = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + A file containing a unique secret identifier for the Erlang + cluster. All Firezone components in your cluster must use the + same value. + + If this is `null`, a shared value will automatically be generated + on startup and used for all components on this machine. You do + not need to set this except when you spread your cluster over + multiple hosts. + ''; + }; + + TOKENS_KEY_BASE = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + A file containing a unique base64 encoded secret for the + `TOKENS_KEY_BASE`. All Firezone components in your cluster must + use the same value. + + If this is `null`, a shared value will automatically be generated + on startup and used for all components on this machine. You do + not need to set this except when you spread your cluster over + multiple hosts. + ''; + }; + + SECRET_KEY_BASE = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + A file containing a unique base64 encoded secret for the + `SECRET_KEY_BASE`. All Firezone components in your cluster must + use the same value. + + If this is `null`, a shared value will automatically be generated + on startup and used for all components on this machine. You do + not need to set this except when you spread your cluster over + multiple hosts. + ''; + }; + + TOKENS_SALT = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + A file containing a unique base64 encoded secret for the + `TOKENS_SALT`. All Firezone components in your cluster must + use the same value. + + If this is `null`, a shared value will automatically be generated + on startup and used for all components on this machine. You do + not need to set this except when you spread your cluster over + multiple hosts. + ''; + }; + + LIVE_VIEW_SIGNING_SALT = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + A file containing a unique base64 encoded secret for the + `LIVE_VIEW_SIGNING_SALT`. All Firezone components in your cluster must + use the same value. + + If this is `null`, a shared value will automatically be generated + on startup and used for all components on this machine. You do + not need to set this except when you spread your cluster over + multiple hosts. + ''; + }; + + COOKIE_SIGNING_SALT = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + A file containing a unique base64 encoded secret for the + `COOKIE_SIGNING_SALT`. All Firezone components in your cluster must + use the same value. + + If this is `null`, a shared value will automatically be generated + on startup and used for all components on this machine. You do + not need to set this except when you spread your cluster over + multiple hosts. + ''; + }; + + COOKIE_ENCRYPTION_SALT = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + A file containing a unique base64 encoded secret for the + `COOKIE_ENCRYPTION_SALT`. All Firezone components in your cluster must + use the same value. + + If this is `null`, a shared value will automatically be generated + on startup and used for all components on this machine. You do + not need to set this except when you spread your cluster over + multiple hosts. + ''; + }; + }; + }; + }; + + settings = mkOption { + description = '' + Environment variables for the Firezone server. For a list of available + variables, please refer to the [upstream definitions](https://github.com/firezone/firezone/blob/main/elixir/apps/domain/lib/domain/config/definitions.ex). + Some variables like `OUTBOUND_EMAIL_ADAPTER_OPTS` require json values + for which you can use `VAR = builtins.toJSON { /* ... */ }`. + + Each component has an additional `settings` option which allows you to + override specific variables passed to that component. + ''; + default = { }; + type = types.submodule { + freeformType = types.attrsOf ( + types.oneOf [ + types.bool + types.float + types.int + types.str + types.path + types.package + ] + ); + }; + }; + + smtp = { + configureManually = mkOption { + type = types.bool; + default = false; + description = '' + Outbound email configuration is mandatory for Firezone and supports + many different delivery adapters. Yet, most users will only need an + SMTP relay to send emails, so this configuration enforced by default. + + If you want to utilize an alternative way to send emails (e.g. via a + supportd API-based service), enable this option and define + `OUTBOUND_EMAIL_FROM`, `OUTBOUND_EMAIL_ADAPTER` and + `OUTBOUND_EMAIL_ADAPTER_OPTS` manually via + {option}`services.firezone.server.settings` and/or + {option}`services.firezone.server.settingsSecret`. + + The Firezone documentation holds [a list of supported Swoosh adapters](https://github.com/firezone/firezone/blob/main/website/src/app/docs/reference/env-vars/readme.mdx#outbound-emails). + ''; + }; + + from = mkOption { + type = types.str; + example = "firezone@example.com"; + description = "Outbound SMTP FROM address"; + }; + + host = mkOption { + type = types.str; + example = "mail.example.com"; + description = "Outbound SMTP host"; + }; + + port = mkOption { + type = types.port; + example = 465; + description = "Outbound SMTP port"; + }; + + implicitTls = mkOption { + type = types.bool; + default = false; + description = "Whether to use implicit TLS instead of STARTTLS (usually port 465)"; + }; + + username = mkOption { + type = types.str; + example = "firezone@example.com"; + description = "Username to authenticate against the SMTP relay"; + }; + + passwordFile = mkOption { + type = types.path; + example = "/run/secrets/smtp-password"; + description = "File containing the password for the given username. Beware that a file in the nix store will be world readable."; + }; + }; + + domain = componentOptions "domain"; + + web = componentOptions "web" // { + externalUrl = mkOption { + type = types.strMatching "^https://.+/$"; + example = "https://firezone.example.com/"; + description = '' + The external URL under which you will serve the web interface. You + need to setup a reverse proxy for TLS termination, either with + {option}`services.firezone.server.nginx.enable` or manually. + ''; + }; + + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "The address to listen on"; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = "The port under which the web interface will be served locally"; + }; + + trustedProxies = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "A list of trusted proxies"; + }; + }; + + api = componentOptions "api" // { + externalUrl = mkOption { + type = types.strMatching "^https://.+/$"; + example = "https://firezone.example.com/api/"; + description = '' + The external URL under which you will serve the api. You need to + setup a reverse proxy for TLS termination, either with + {option}`services.firezone.server.nginx.enable` or manually. + ''; + }; + + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "The address to listen on"; + }; + + port = mkOption { + type = types.port; + default = 8081; + description = "The port under which the api will be served locally"; + }; + + trustedProxies = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "A list of trusted proxies"; + }; + }; + + provision = { + enable = mkEnableOption "provisioning of the Firezone domain server"; + accounts = mkOption { + type = types.attrsOf ( + types.submodule { + freeformType = jsonFormat.type; + options = { + name = mkOption { + type = types.str; + description = "The account name"; + example = "My Organization"; + }; + + features = + let + mkFeatureOption = + name: default: + mkOption { + type = types.bool; + inherit default; + description = "Whether to enable the `${name}` feature for this account."; + }; + in + { + flow_activities = mkFeatureOption "flow_activities" true; + policy_conditions = mkFeatureOption "policy_conditions" true; + multi_site_resources = mkFeatureOption "multi_site_resources" true; + traffic_filters = mkFeatureOption "traffic_filters" true; + self_hosted_relays = mkFeatureOption "self_hosted_relays" true; + idp_sync = mkFeatureOption "idp_sync" true; + rest_api = mkFeatureOption "rest_api" true; + internet_resource = mkFeatureOption "internet_resource" true; + }; + + actors = mkOption { + type = types.attrsOf ( + types.submodule { + options = { + type = mkOption { + type = types.enum [ + "account_admin_user" + "account_user" + "service_account" + "api_client" + ]; + description = "The account type"; + }; + + name = mkOption { + type = types.str; + description = "The name of this actor"; + }; + + email = mkOption { + type = types.str; + description = "The email address used to authenticate as this account"; + }; + }; + } + ); + default = { }; + example = { + admin = { + type = "account_admin_user"; + name = "Admin"; + email = "admin@myorg.example.com"; + }; + }; + description = '' + All actors (users) to provision. The attribute name will only + be used to track the actor and does not have any significance + for Firezone. + ''; + }; + + auth = mkOption { + type = types.attrsOf ( + types.submodule { + freeformType = jsonFormat.type; + options = { + name = mkOption { + type = types.str; + description = "The name of this authentication provider"; + }; + + adapter = mkOption { + type = types.enum availableAuthAdapters; + description = "The auth adapter type"; + }; + + adapter_config.clientSecretFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + A file containing a the client secret for an openid_connect adapter. + You only need to set this if this is an openid_connect provider. + ''; + }; + }; + } + ); + default = { }; + example = { + myoidcprovider = { + adapter = "openid_connect"; + adapter_config = { + client_id = "clientid"; + clientSecretFile = "/run/secrets/oidc-client-secret"; + response_type = "code"; + scope = "openid email name"; + discovery_document_uri = "https://auth.example.com/.well-known/openid-configuration"; + }; + }; + }; + description = '' + All authentication providers to provision. The attribute name + will only be used to track the provider and does not have any + significance for Firezone. + ''; + }; + + resources = mkOption { + type = types.attrsOf ( + types.submodule { + options = { + type = mkOption { + type = types.enum [ + "dns" + "cidr" + "ip" + ]; + description = "The resource type"; + }; + + name = mkOption { + type = types.str; + description = "The name of this resource"; + }; + + address = mkOption { + type = types.str; + description = "The address of this resource. Depending on the resource type, this should be an ip, ip with cidr mask or a domain."; + }; + + addressDescription = mkOption { + type = types.nullOr types.str; + default = null; + description = "An optional description for resource address, usually a full link to the resource including a schema."; + }; + + gatewayGroups = mkOption { + type = types.nonEmptyListOf types.str; + description = "A list of gateway groups (sites) which can reach the resource and may be used to connect to it."; + }; + + filters = mkOption { + type = types.listOf ( + types.submodule { + options = { + protocol = mkOption { + type = types.enum [ + "icmp" + "tcp" + "udp" + ]; + description = "The protocol to allow"; + }; + + ports = mkOption { + type = types.listOf typePortRange; + example = [ + 443 + { + from = 8080; + to = 8100; + } + ]; + default = [ ]; + apply = + xs: map (x: if x.from == x.to then toString x.from else "${toString x.from} - ${toString x.to}") xs; + description = "Either a single port or port range to allow. Both bounds are inclusive."; + }; + }; + } + ); + default = [ ]; + description = "A list of filter to restrict traffic. If no filters are given, all traffic is allowed."; + }; + }; + } + ); + default = { }; + example = { + vaultwarden = { + type = "dns"; + name = "Vaultwarden"; + address = "vault.example.com"; + address_description = "https://vault.example.com"; + gatewayGroups = [ "my-site" ]; + filters = [ + { protocol = "icmp"; } + { + protocol = "tcp"; + ports = [ + 80 + 443 + ]; + } + ]; + }; + }; + description = '' + All resources to provision. The attribute name will only be used to + track the resource and does not have any significance for Firezone. + ''; + }; + + policies = mkOption { + type = types.attrsOf ( + types.submodule { + options = { + description = mkOption { + type = types.nullOr types.str; + description = "The description of this policy"; + }; + + group = mkOption { + type = types.str; + description = "The group which should be allowed access to the given resource."; + }; + + resource = mkOption { + type = types.str; + description = "The resource to which access should be allowed."; + }; + }; + } + ); + default = { }; + example = { + access_vaultwarden = { + name = "Allow anyone to access vaultwarden"; + group = "everyone"; + resource = "vaultwarden"; + }; + }; + description = '' + All policies to provision. The attribute name will only be used to + track the policy and does not have any significance for Firezone. + ''; + }; + + groups = mkOption { + type = types.attrsOf ( + types.submodule { + options = { + name = mkOption { + type = types.str; + description = "The name of this group"; + }; + + members = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "The members of this group"; + }; + + forceMembers = mkOption { + type = types.bool; + default = false; + description = "Ensure that only the given members are part of this group at every server start."; + }; + }; + } + ); + default = { }; + example = { + users = { + name = "Users"; + }; + }; + description = '' + All groups to provision. The attribute name will only be used + to track the group and does not have any significance for + Firezone. + + A group named `everyone` will automatically be managed by Firezone. + ''; + }; + + relayGroups = mkOption { + type = types.attrsOf ( + types.submodule { + options = { + name = mkOption { + type = types.str; + description = "The name of this relay group"; + }; + }; + } + ); + default = { }; + example = { + my-relays = { + name = "My Relays"; + }; + }; + description = '' + All relay groups to provision. The attribute name + will only be used to track the relay group and does not have any + significance for Firezone. + ''; + }; + + gatewayGroups = mkOption { + type = types.attrsOf ( + types.submodule { + options = { + name = mkOption { + type = types.str; + description = "The name of this gateway group"; + }; + }; + } + ); + default = { }; + example = { + my-gateways = { + name = "My Gateways"; + }; + }; + description = '' + All gateway groups (sites) to provision. The attribute name + will only be used to track the gateway group and does not have any + significance for Firezone. + ''; + }; + }; + } + ); + default = { }; + example = { + main = { + name = "My Account / Organization"; + metadata.stripe.billing_email = "org@myorg.example.com"; + features.rest_api = false; + }; + }; + description = '' + All accounts to provision. The attribute name specified here will + become the account slug. By using `"{file:/path/to/file}"` as a + string value anywhere in these settings, the provisioning script will + replace that value with the content of the given file at runtime. + + Please refer to the [Firezone source code](https://github.com/firezone/firezone/blob/main/elixir/apps/domain/lib/domain/accounts/account.ex) + for all available properties. + ''; + }; + }; + }; + + config = mkMerge [ + { + assertions = + [ + { + assertion = cfg.provision.enable -> cfg.domain.enable; + message = "Provisioning must be done on a machine running the firezone domain server"; + } + ] + ++ concatLists ( + flip mapAttrsToList cfg.provision.accounts ( + accountName: accountCfg: + [ + { + assertion = (builtins.match "^[[:lower:]_-]+$" accountName) != null; + message = "An account name must contain only lowercase characters and underscores, as it will be used as the URL slug for this account."; + } + ] + ++ flip mapAttrsToList accountCfg.auth ( + authName: _: { + assertion = (builtins.match "^[[:alnum:]_-]+$" authName) != null; + message = "The authentication provider attribute key must contain only letters, numbers, underscores or dashes."; + } + ) + ) + ); + } + # Enable all components if the main server is enabled + (mkIf cfg.enable { + services.firezone.server.domain.enable = true; + services.firezone.server.web.enable = true; + services.firezone.server.api.enable = true; + }) + # Create (and configure) a local database if desired + (mkIf cfg.enableLocalDB { + services.postgresql = { + enable = true; + ensureUsers = [ + { + name = "firezone"; + ensureDBOwnership = true; + } + ]; + ensureDatabases = [ "firezone" ]; + }; + + services.firezone.server.settings = { + DATABASE_SOCKET_DIR = "/run/postgresql"; + DATABASE_PORT = "5432"; + DATABASE_NAME = "firezone"; + DATABASE_USER = "firezone"; + DATABASE_PASSWORD = "firezone"; + }; + }) + # Create a local nginx reverse proxy + (mkIf cfg.nginx.enable { + services.nginx = mkMerge [ + { + enable = true; + } + ( + let + urlComponents = builtins.elemAt (builtins.split "https://([^/]*)(/?.*)" cfg.web.externalUrl) 1; + domain = builtins.elemAt urlComponents 0; + location = builtins.elemAt urlComponents 1; + in + { + virtualHosts.${domain} = { + forceSSL = mkDefault true; + locations.${location} = { + # The trailing slash is important to strip the location prefix from the request + proxyPass = "http://${cfg.web.address}:${toString cfg.web.port}/"; + proxyWebsockets = true; + }; + }; + } + ) + ( + let + urlComponents = builtins.elemAt (builtins.split "https://([^/]*)(/?.*)" cfg.api.externalUrl) 1; + domain = builtins.elemAt urlComponents 0; + location = builtins.elemAt urlComponents 1; + in + { + virtualHosts.${domain} = { + forceSSL = mkDefault true; + locations.${location} = { + # The trailing slash is important to strip the location prefix from the request + proxyPass = "http://${cfg.api.address}:${toString cfg.api.port}/"; + proxyWebsockets = true; + }; + }; + } + ) + ]; + }) + # Specify sensible defaults + { + services.firezone.server = { + settings = { + LOG_LEVEL = mkDefault "info"; + RELEASE_HOSTNAME = mkDefault "localhost.localdomain"; + + ERLANG_CLUSTER_ADAPTER = mkDefault "Elixir.Cluster.Strategy.Epmd"; + ERLANG_CLUSTER_ADAPTER_CONFIG = mkDefault ( + builtins.toJSON { + hosts = cfg.clusterHosts; + } + ); + + TZDATA_DIR = mkDefault "/var/lib/firezone/tzdata"; + TELEMETRY_ENABLED = mkDefault false; + + # By default this will open nproc * 2 connections for each component, + # which can exceeds the (default) maximum of 100 connections for + # postgresql on a 12 core +SMT machine. 16 connections will be + # sufficient for small to medium deployments + DATABASE_POOL_SIZE = "16"; + + AUTH_PROVIDER_ADAPTERS = mkDefault (concatStringsSep "," availableAuthAdapters); + + FEATURE_FLOW_ACTIVITIES_ENABLED = mkDefault true; + FEATURE_POLICY_CONDITIONS_ENABLED = mkDefault true; + FEATURE_MULTI_SITE_RESOURCES_ENABLED = mkDefault true; + FEATURE_SELF_HOSTED_RELAYS_ENABLED = mkDefault true; + FEATURE_IDP_SYNC_ENABLED = mkDefault true; + FEATURE_REST_API_ENABLED = mkDefault true; + FEATURE_INTERNET_RESOURCE_ENABLED = mkDefault true; + FEATURE_TRAFFIC_FILTERS_ENABLED = mkDefault true; + + FEATURE_SIGN_UP_ENABLED = mkDefault (!cfg.provision.enable); + + WEB_EXTERNAL_URL = mkDefault cfg.web.externalUrl; + API_EXTERNAL_URL = mkDefault cfg.api.externalUrl; + }; + + domain.settings = { + ERLANG_DISTRIBUTION_PORT = mkDefault 9000; + HEALTHZ_PORT = mkDefault 4000; + BACKGROUND_JOBS_ENABLED = mkDefault true; + }; + + web.settings = { + ERLANG_DISTRIBUTION_PORT = mkDefault 9001; + HEALTHZ_PORT = mkDefault 4001; + BACKGROUND_JOBS_ENABLED = mkDefault false; + + PHOENIX_LISTEN_ADDRESS = mkDefault cfg.web.address; + PHOENIX_EXTERNAL_TRUSTED_PROXIES = mkDefault (builtins.toJSON cfg.web.trustedProxies); + PHOENIX_HTTP_WEB_PORT = mkDefault cfg.web.port; + PHOENIX_HTTP_API_PORT = mkDefault cfg.api.port; + PHOENIX_SECURE_COOKIES = mkDefault true; # enforce HTTPS on cookies + }; + + api.settings = { + ERLANG_DISTRIBUTION_PORT = mkDefault 9002; + HEALTHZ_PORT = mkDefault 4002; + BACKGROUND_JOBS_ENABLED = mkDefault false; + + PHOENIX_LISTEN_ADDRESS = mkDefault cfg.api.address; + PHOENIX_EXTERNAL_TRUSTED_PROXIES = mkDefault (builtins.toJSON cfg.api.trustedProxies); + PHOENIX_HTTP_WEB_PORT = mkDefault cfg.web.port; + PHOENIX_HTTP_API_PORT = mkDefault cfg.api.port; + PHOENIX_SECURE_COOKIES = mkDefault true; # enforce HTTPS on cookies + }; + }; + } + (mkIf (!cfg.smtp.configureManually) { + services.firezone.server.settings = { + OUTBOUND_EMAIL_ADAPTER = "Elixir.Swoosh.Adapters.Mua"; + OUTBOUND_EMAIL_ADAPTER_OPTS = builtins.toJSON { }; + OUTBOUND_EMAIL_FROM = cfg.smtp.from; + OUTBOUND_EMAIL_SMTP_HOST = cfg.smtp.host; + OUTBOUND_EMAIL_SMTP_PORT = toString cfg.smtp.port; + OUTBOUND_EMAIL_SMTP_PROTOCOL = if cfg.smtp.implicitTls then "ssl" else "tcp"; + OUTBOUND_EMAIL_SMTP_USERNAME = cfg.smtp.username; + }; + services.firezone.server.settingsSecret = { + OUTBOUND_EMAIL_SMTP_PASSWORD = cfg.smtp.passwordFile; + }; + }) + (mkIf cfg.provision.enable { + # Load client secrets from authentication providers + services.firezone.server.settingsSecret = flip concatMapAttrs cfg.provision.accounts ( + accountName: accountCfg: + flip concatMapAttrs accountCfg.auth ( + authName: authCfg: + optionalAttrs (authCfg.adapter_config.clientSecretFile != null) { + "AUTH_CLIENT_SECRET_${toUpper accountName}_${toUpper authName}" = + authCfg.adapter_config.clientSecretFile; + } + ) + ); + }) + (mkIf (cfg.openClusterFirewall && cfg.domain.enable) { + networking.firewall.allowedTCPPorts = [ + cfg.domain.settings.ERLANG_DISTRIBUTION_PORT + ]; + }) + (mkIf (cfg.openClusterFirewall && cfg.web.enable) { + networking.firewall.allowedTCPPorts = [ + cfg.web.settings.ERLANG_DISTRIBUTION_PORT + ]; + }) + (mkIf (cfg.openClusterFirewall && cfg.api.enable) { + networking.firewall.allowedTCPPorts = [ + cfg.api.settings.ERLANG_DISTRIBUTION_PORT + ]; + }) + (mkIf (cfg.domain.enable || cfg.web.enable || cfg.api.enable) { + systemd.slices.system-firezone = { + description = "Firezone Slice"; + }; + + systemd.targets.firezone = { + description = "Common target for all Firezone services."; + wantedBy = [ "multi-user.target" ]; + }; + + systemd.services.firezone-initialize = { + description = "Backend initialization service for the Firezone zero-trust access platform"; + + after = mkIf cfg.enableLocalDB [ "postgresql.service" ]; + requires = mkIf cfg.enableLocalDB [ "postgresql.service" ]; + wantedBy = [ "firezone.target" ]; + partOf = [ "firezone.target" ]; + + script = '' + mkdir -p "$TZDATA_DIR" + + # Generate and load secrets + ${generateSecrets} + ${loadSecretEnvironment "domain"} + + echo "Running migrations" + ${getExe cfg.domain.package} eval Domain.Release.migrate + ''; + + # We use the domain environment to be able to run migrations + environment = collectEnvironment "domain"; + serviceConfig = commonServiceConfig // { + Type = "oneshot"; + RemainAfterExit = true; + }; + }; + + systemd.services.firezone-server-domain = mkIf cfg.domain.enable { + description = "Backend domain server for the Firezone zero-trust access platform"; + after = [ "firezone-initialize.service" ]; + bindsTo = [ "firezone-initialize.service" ]; + wantedBy = [ "firezone.target" ]; + partOf = [ "firezone.target" ]; + + script = '' + ${loadSecretEnvironment "domain"} + exec ${getExe cfg.domain.package} start; + ''; + + path = [ pkgs.curl ]; + postStart = + '' + # Wait for the firezone server to come online + count=0 + while [[ "$(curl -s "http://localhost:${toString cfg.domain.settings.HEALTHZ_PORT}" 2>/dev/null || echo)" != '{"status":"ok"}' ]] + do + sleep 1 + if [[ "$count" -eq 30 ]]; then + echo "Tried for at least 30 seconds, giving up..." + exit 1 + fi + count=$((count++)) + done + '' + + optionalString cfg.provision.enable '' + # Wait for server to fully come up. Not ideal to use sleep, but at least it works. + sleep 1 + + ${loadSecretEnvironment "domain"} + ln -sTf ${provisionStateJson} provision-state.json + ${getExe cfg.domain.package} rpc 'Code.eval_file("${./provision.exs}")' + ''; + + environment = collectEnvironment "domain"; + serviceConfig = commonServiceConfig; + }; + + systemd.services.firezone-server-web = mkIf cfg.web.enable { + description = "Backend web server for the Firezone zero-trust access platform"; + after = [ "firezone-initialize.service" ]; + bindsTo = [ "firezone-initialize.service" ]; + wantedBy = [ "firezone.target" ]; + partOf = [ "firezone.target" ]; + + script = '' + ${loadSecretEnvironment "web"} + exec ${getExe cfg.web.package} start; + ''; + + environment = collectEnvironment "web"; + serviceConfig = commonServiceConfig; + }; + + systemd.services.firezone-server-api = mkIf cfg.api.enable { + description = "Backend api server for the Firezone zero-trust access platform"; + after = [ "firezone-initialize.service" ]; + bindsTo = [ "firezone-initialize.service" ]; + wantedBy = [ "firezone.target" ]; + partOf = [ "firezone.target" ]; + + script = '' + ${loadSecretEnvironment "api"} + exec ${getExe cfg.api.package} start; + ''; + + environment = collectEnvironment "api"; + serviceConfig = commonServiceConfig; + }; + }) + ]; + + meta.maintainers = with lib.maintainers; [ + oddlama + patrickdag + ]; +} diff --git a/nixos/modules/services/networking/hickory-dns.nix b/nixos/modules/services/networking/hickory-dns.nix index 6a6570e58017..3d4edfbae74c 100644 --- a/nixos/modules/services/networking/hickory-dns.nix +++ b/nixos/modules/services/networking/hickory-dns.nix @@ -13,14 +13,13 @@ let ''; }; zone_type = mkOption { - type = types.enum [ "Primary" "Secondary" "Hint" "Forward" ]; + type = types.enum [ "Primary" "Secondary" "External" ]; default = "Primary"; description = '' One of: - "Primary" (the master, authority for the zone). - "Secondary" (the slave, replicated from the primary). - - "Hint" (a cached zone with recursive resolver abilities). - - "Forward" (a cached zone where all requests are forwarded to another resolver). + - "External" (a cached zone that queries other nameservers). For more details about these zone types, consult the documentation for BIND, though note that hickory-dns supports only a subset of BIND's zone types: @@ -28,13 +27,13 @@ let ''; }; file = mkOption { - type = types.either types.path types.str; - default = "${config.zone}.zone"; - defaultText = literalExpression ''"''${config.zone}.zone"''; + type = types.nullOr (types.either types.path types.str); + default = if config.zone_type != "External" then "${config.zone}.zone" else null; + defaultText = literalExpression ''if config.zone_type != "External" then "''${config.zone}.zone" else null''; description = '' Path to the .zone file. If not fully-qualified, this path will be interpreted relative to the `directory` option. - If omitted, defaults to the value of the `zone` option suffixed with ".zone". + If omitted, defaults to the value of the `zone` option suffixed with ".zone" when `zone_type` isn't External; otherwise, defaults to `null`. ''; }; }; @@ -82,7 +81,7 @@ in configFile = mkOption { type = types.path; default = toml.generate "hickory-dns.toml" ( - lib.filterAttrsRecursive (_: v: v != null) cfg.settings + lib.mapAttrs (_: v: if builtins.isList v then map (v: if builtins.isAttrs v then lib.filterAttrs (_: v: v != null) v else v) v else v) (lib.filterAttrsRecursive (_: v: v != null) cfg.settings) ); defaultText = lib.literalExpression '' let toml = pkgs.formats.toml { }; in toml.generate "hickory-dns.toml" cfg.settings diff --git a/nixos/modules/services/networking/iscsi/target.nix b/nixos/modules/services/networking/iscsi/target.nix index bfc229376895..3154271b4dd6 100644 --- a/nixos/modules/services/networking/iscsi/target.nix +++ b/nixos/modules/services/networking/iscsi/target.nix @@ -34,7 +34,7 @@ in mode = "0600"; }; - environment.systemPackages = with pkgs; [ targetcli ]; + environment.systemPackages = with pkgs; [ targetcli-fb ]; boot.kernelModules = [ "configfs" @@ -52,8 +52,8 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.python3.pkgs.rtslib}/bin/targetctl restore"; - ExecStop = "${pkgs.python3.pkgs.rtslib}/bin/targetctl clear"; + ExecStart = "${lib.getExe pkgs.python3Packages.rtslib-fb} restore"; + ExecStop = "${lib.getExe pkgs.python3Packages.rtslib-fb} clear"; RemainAfterExit = "yes"; }; }; diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 76e74e07a4e5..fd0a63212d49 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -119,6 +119,14 @@ in are mutually exclusive. ''; } + { + assertion = cfg.config != "" || (cfg.settings ? auth && cfg.settings.auth ? type); + message = '' + Radicale 3.5.0 changed the default value for `auth.type` from `none` to `denyall`. + You probably don't want `denyall`, so please set this explicitly. + https://github.com/Kozea/Radicale/blob/v3.5.0/CHANGELOG.md + ''; + } ]; warnings = diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index aeb5ba6d8160..01b36ee6ac0e 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -5,7 +5,8 @@ with lib; let cfg = config.services.shairport-sync; - + configFormat = pkgs.formats.libconfig {}; + configFile = configFormat.generate "shairport-sync.conf" cfg.settings; in { @@ -29,9 +30,44 @@ in package = lib.options.mkPackageOption pkgs "shairport-sync" { }; + settings = mkOption { + type = configFormat.type; + default = { + general.output_backend = "pa"; + diagnostics.log_verbosity = 1; + }; + example = { + general = { + name = "NixOS Shairport"; + output_backend = "pw"; + }; + metadata = { + enabled = "yes"; + include_cover_art = "yes"; + cover_art_cache_directory = "/tmp/shairport-sync/.cache/coverart"; + pipe_name = "/tmp/shairport-sync-metadata"; + pipe_timeout = 5000; + }; + mqtt = { + enabled = "yes"; + hostname = "mqtt.server.domain.example"; + port = 1883; + publish_parsed = "yes"; + publish_cover = "yes"; + }; + }; + description = '' + Configuration options for Shairport-Sync. + + See the example [shairport-sync.conf][example-file] for possible options. + + [example-file]: https://github.com/mikebrady/shairport-sync/blob/master/scripts/shairport-sync.conf + ''; + }; + arguments = mkOption { type = types.str; - default = "-v -o pa"; + default = ""; description = '' Arguments to pass to the daemon. Defaults to a local pulseaudio server. @@ -77,6 +113,11 @@ in services.avahi.publish.enable = true; services.avahi.publish.userServices = true; + services.shairport-sync.settings = { + general.output_backend = lib.mkDefault "pa"; + diagnostics.log_verbosity = lib.mkDefault 1; + }; + users = { users.${cfg.user} = { description = "Shairport user"; @@ -108,8 +149,10 @@ in }; }; - environment.systemPackages = [ cfg.package ]; - + environment = { + systemPackages = [ cfg.package ]; + etc."shairport-sync.conf".source = configFile; + }; }; } diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index fdf38ac75539..1f1720d9a382 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -62,7 +62,7 @@ let >"$RUNTIME_DIRECTORY/api_key" do sleep 1; done (printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers" - ${pkgs.curl}/bin/curl --fail -sSLk -H "@$RUNTIME_DIRECTORY/headers" \ + ${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \ --retry 1000 --retry-delay 1 --retry-all-errors \ "$@" } diff --git a/nixos/modules/services/networking/vdirsyncer.nix b/nixos/modules/services/networking/vdirsyncer.nix index 692ce12c7a6c..325c7e60a11d 100644 --- a/nixos/modules/services/networking/vdirsyncer.nix +++ b/nixos/modules/services/networking/vdirsyncer.nix @@ -45,6 +45,7 @@ let } // (optionalAttrs (cfg'.user == null) { DynamicUser = true; + ProtectHome = true; }) // (optionalAttrs (cfg'.additionalGroups != [ ]) { SupplementaryGroups = cfg'.additionalGroups; @@ -63,7 +64,6 @@ let PrivateTmp = true; NoNewPrivileges = true; ProtectSystem = "strict"; - ProtectHome = true; ProtectKernelTunables = true; ProtectKernelModules = true; ProtectControlGroups = true; diff --git a/nixos/modules/services/scheduling/prefect.nix b/nixos/modules/services/scheduling/prefect.nix new file mode 100644 index 000000000000..409279edd692 --- /dev/null +++ b/nixos/modules/services/scheduling/prefect.nix @@ -0,0 +1,232 @@ +{ + lib, + pkgs, + config, + ... +}: + +let + cfg = config.services.prefect; + inherit (lib.types) + bool + str + enum + path + attrsOf + nullOr + submodule + port + ; + +in +{ + options.services.prefect = { + enable = lib.mkOption { + type = bool; + default = false; + description = "enable prefect server and worker services"; + }; + + package = lib.mkPackageOption pkgs "prefect" { }; + + host = lib.mkOption { + type = str; + default = "127.0.0.1"; + example = "0.0.0.0"; + description = "Prefect server host"; + }; + + port = lib.mkOption { + type = port; + default = 4200; + description = "Prefect server port"; + }; + + dataDir = lib.mkOption { + type = path; + default = "/var/lib/prefect-server"; + description = '' + Specify the directory for Prefect. + ''; + }; + + database = lib.mkOption { + type = enum [ + "sqlite" + "postgres" + ]; + default = "sqlite"; + description = "which database to use for prefect server: sqlite or postgres"; + }; + + databaseHost = lib.mkOption { + type = str; + default = "localhost"; + description = "database host for postgres only"; + }; + + databasePort = lib.mkOption { + type = str; + default = "5432"; + description = "database port for postgres only"; + }; + + databaseName = lib.mkOption { + type = str; + default = "prefect"; + description = "database name for postgres only"; + }; + + databaseUser = lib.mkOption { + type = str; + default = "postgres"; + description = "database user for postgres only"; + }; + + databasePasswordFile = lib.mkOption { + type = nullOr str; + default = null; + description = '' + path to a file containing e.g.: + DBPASSWORD=supersecret + + stored outside the nix store, read by systemd as EnvironmentFile. + ''; + }; + + # now define workerPools as an attribute set of submodules, + # each key is the pool name, and the submodule has an installPolicy + workerPools = lib.mkOption { + type = attrsOf (submodule { + options = { + installPolicy = lib.mkOption { + type = enum [ + "always" + "if-not-present" + "never" + "prompt" + ]; + default = "always"; + description = "install policy for the worker (always, if-not-present, never, prompt)"; + }; + }; + }); + default = { }; + description = '' + define a set of worker pools with submodule config. example: + workerPools.my-pool = { + installPolicy = "never"; + }; + ''; + }; + + baseUrl = lib.mkOption { + type = nullOr str; + default = null; + description = "external url when served by a reverse proxy, e.g. https://example.com/prefect"; + }; + }; + + config = lib.mkIf cfg.enable { + # define systemd.services as the server plus any worker definitions + systemd.services = + { + "prefect-server" = { + description = "prefect server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + DynamicUser = true; + StateDirectory = "prefect-server"; + # TODO all my efforts to setup the database url + # have failed with some unable to open file + Environment = [ + "PREFECT_HOME=%S/prefect-server" + "PREFECT_UI_STATIC_DIRECTORY=%S/prefect-server" + "PREFECT_SERVER_ANALYTICS_ENABLED=off" + "PREFECT_UI_API_URL=${cfg.baseUrl}/api" + "PREFECT_UI_URL=${cfg.baseUrl}" + ]; + EnvironmentFile = + if cfg.database == "postgres" && cfg.databasePasswordFile != null then + [ cfg.databasePasswordFile ] + else + [ ]; + + # ReadWritePaths = [ cfg.dataDir ]; + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + NoNewPrivileges = true; + MemoryDenyWriteExecute = true; + LockPersonality = true; + CapabilityBoundingSet = [ ]; + AmbientCapabilities = [ ]; + RestrictSUIDSGID = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + MemoryAccounting = true; + CPUAccounting = true; + + ExecStart = "${pkgs.prefect}/bin/prefect server start --host ${cfg.host} --port ${toString cfg.port}"; + Restart = "always"; + WorkingDirectory = cfg.dataDir; + }; + }; + } + // lib.concatMapAttrs (poolName: poolCfg: { + # return a partial attr set with one key: "prefect-worker-..." + "prefect-worker-${poolName}" = { + description = "prefect worker for pool '${poolName}'"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + environment.systemPackages = cfg.package; + + serviceConfig = { + DynamicUser = true; + StateDirectory = "prefect-worker-${poolName}"; + Environment = [ + "PREFECT_HOME=%S/prefect-worker-${poolName}" + "PREFECT_API_URL=${cfg.baseUrl}/api" + ]; + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + NoNewPrivileges = true; + MemoryDenyWriteExecute = true; + LockPersonality = true; + CapabilityBoundingSet = [ ]; + AmbientCapabilities = [ ]; + RestrictSUIDSGID = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + MemoryAccounting = true; + CPUAccounting = true; + ExecStart = '' + ${pkgs.prefect}/bin/prefect worker start \ + --pool ${poolName} \ + --type process \ + --install-policy ${poolCfg.installPolicy} + ''; + Restart = "always"; + }; + }; + }) cfg.workerPools; + }; +} diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 5853940e6758..3adc7f0bb0be 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -51,6 +51,7 @@ let cfg.provision.idmAdminPasswordFile cfg.provision.adminPasswordFile ] + ++ optional (cfg.provision.extraJsonFile != null) cfg.provision.extraJsonFile ++ mapAttrsToList (_: x: x.basicSecretFile) cfg.provision.systems.oauth2 ); secretDirectories = unique ( diff --git a/nixos/modules/services/security/paretosecurity.nix b/nixos/modules/services/security/paretosecurity.nix index 66d5258b3880..cfcb89fb8f62 100644 --- a/nixos/modules/services/security/paretosecurity.nix +++ b/nixos/modules/services/security/paretosecurity.nix @@ -9,6 +9,7 @@ options.services.paretosecurity = { enable = lib.mkEnableOption "[ParetoSecurity](https://paretosecurity.com) [agent](https://github.com/ParetoSecurity/agent) and its root helper"; package = lib.mkPackageOption pkgs "paretosecurity" { }; + trayIcon = lib.mkEnableOption "tray icon for ParetoSecurity"; }; config = lib.mkIf config.services.paretosecurity.enable { @@ -39,5 +40,12 @@ }; }; + systemd.user.services."paretosecurity-trayicon" = lib.mkIf config.services.paretosecurity.trayIcon { + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = "${config.services.paretosecurity.package}/bin/paretosecurity trayicon"; + }; + }; + }; } diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index b63f38d6c7b2..0c69871f0d32 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -128,10 +128,29 @@ let siteOpts = { options, config, lib, name, ... }: { + # TODO: Remove in time for 25.11 and/or simplify once https://github.com/NixOS/nixpkgs/issues/96006 is fixed + imports = [ + ({config, options, ... }: let + removalNote = "The option has had no effect for 3+ years. There is no replacement available."; + optPath = lib.options.showOption [ "services" "dokuwiki" "sites" name "enable" ]; + in { + options.enable = mkOption { + visible = false; + apply = x: throw "The option `${optPath}' can no longer be used since it's been removed. ${removalNote}"; + }; + config.assertions = [ + { + assertion = !options.enable.isDefined; + message = '' + The option definition `${optPath}' in ${showFiles options.enable.files} no longer has any effect; please remove it. + ${removalNote} + ''; + } + ]; + }) + ]; options = { - enable = mkEnableOption "DokuWiki web application"; - package = mkPackageOption pkgs "dokuwiki" { }; stateDir = mkOption { @@ -342,6 +361,13 @@ let ''; }; + # TODO: Remove when no submodule-level assertions are needed anymore + assertions = mkOption { + type = types.listOf types.unspecified; + default = [ ]; + visible = false; + internal = true; + }; }; }; in @@ -374,6 +400,8 @@ in # implementation config = mkIf (eachSite != {}) (mkMerge [{ + # TODO: Remove when no submodule-level assertions are needed anymore + assertions = flatten (mapAttrsToList (_: cfg: cfg.assertions) eachSite); services.phpfpm.pools = mapAttrs' (hostName: cfg: ( nameValuePair "dokuwiki-${hostName}" { diff --git a/nixos/modules/services/web-apps/echoip.nix b/nixos/modules/services/web-apps/echoip.nix index 4bfba2ae138a..369ff35f4978 100644 --- a/nixos/modules/services/web-apps/echoip.nix +++ b/nixos/modules/services/web-apps/echoip.nix @@ -75,9 +75,12 @@ in ); # Hardening + AmbientCapabilities = ""; CapabilityBoundingSet = [ "" ]; - DeviceAllow = [ "" ]; + DevicePolicy = "closed"; LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; PrivateDevices = true; PrivateTmp = true; PrivateUsers = true; @@ -91,15 +94,19 @@ in ProtectKernelTunables = true; ProtectProc = "invisible"; ProtectSystem = "strict"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET AF_INET6 AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + "setrlimit" + ]; + UMask = "0077"; }; }; diff --git a/nixos/modules/services/web-apps/grav.nix b/nixos/modules/services/web-apps/grav.nix index 6549002c47ac..ea2c8ed46271 100644 --- a/nixos/modules/services/web-apps/grav.nix +++ b/nixos/modules/services/web-apps/grav.nix @@ -102,24 +102,12 @@ in phpPackage = cfg.phpPackage.buildEnv { extensions = { all, enabled }: - with all; - [ + enabled + ++ (with all; [ apcu - ctype - curl - dom - exif - filter - gd - mbstring - opcache - openssl - session - simplexml xml yaml - zip - ]; + ]); extraConfig = generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault { } " = "; } { output_buffering = "0"; diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index 406b978d6704..867006f8c65f 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -90,6 +90,7 @@ in enum package port + listOf ; assertStringPath = @@ -288,6 +289,25 @@ in ''; }; + realmFiles = mkOption { + type = listOf path; + example = lib.literalExpression '' + [ + ./some/realm.json + ./another/realm.json + ] + ''; + default = [ ]; + description = '' + Realm files that the server is going to import during startup. + If a realm already exists in the server, the import operation is + skipped. Importing the master realm is not supported. All files are + expected to be in `json` format. See the + [documentation](https://www.keycloak.org/server/importExport) for + further information. + ''; + }; + settings = mkOption { type = lib.types.submodule { freeformType = attrsOf ( @@ -644,6 +664,24 @@ in ''; }; + systemd.tmpfiles.settings."10-keycloak" = + let + mkTarget = + file: + let + baseName = builtins.baseNameOf file; + name = if lib.hasSuffix ".json" baseName then baseName else "${baseName}.json"; + in + "/run/keycloak/data/import/${name}"; + settingsList = map (f: { + name = mkTarget f; + value = { + "L+".argument = "${f}"; + }; + }) cfg.realmFiles; + in + builtins.listToAttrs settingsList; + systemd.services.keycloak = let databaseServices = @@ -725,7 +763,7 @@ in cp $CREDENTIALS_DIRECTORY/ssl_{cert,key} /run/keycloak/ssl/ '' + '' - kc.sh --verbose start --optimized + kc.sh --verbose start --optimized ${lib.optionalString (cfg.realmFiles != [ ]) "--import-realm"} ''; }; diff --git a/nixos/modules/services/web-apps/kimai.nix b/nixos/modules/services/web-apps/kimai.nix index 7db1cdaa538d..47e1dfc20981 100644 --- a/nixos/modules/services/web-apps/kimai.nix +++ b/nixos/modules/services/web-apps/kimai.nix @@ -320,9 +320,17 @@ in umask $oldUmask + # Ensure that our local.yaml is valid (see kimai:reload command). + ${pkg hostName cfg}/bin/console lint:yaml --parse-tags \ + ${pkg hostName cfg}/share/php/kimai/config + # Run kimai:install to ensure database is created or updated. # Note that kimai:update is an alias to kimai:install. - ${pkg hostName cfg}/bin/console kimai:install + ${pkg hostName cfg}/bin/console kimai:install --no-cache + # Clear cache and warmup cache separately, to avoid "Cannot declare + # class App\Entity\Timesheet" error on first init after upgrade. + ${pkg hostName cfg}/bin/console cache:clear --env=prod + ${pkg hostName cfg}/bin/console cache:warmup --env=prod ''; serviceConfig = { diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index 539f64ba94c6..584f6c7a04b0 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -398,6 +398,7 @@ in }; systemd.tmpfiles.rules = [ + "d /var/lib/mobilizon/sitemap 700 mobilizon mobilizon - -" "d /var/lib/mobilizon/uploads/exports/csv 700 mobilizon mobilizon - -" "Z /var/lib/mobilizon 700 mobilizon mobilizon - -" ]; diff --git a/nixos/modules/services/web-apps/wakapi.nix b/nixos/modules/services/web-apps/wakapi.nix index 6067fd35b790..f833c0c0e45f 100644 --- a/nixos/modules/services/web-apps/wakapi.nix +++ b/nixos/modules/services/web-apps/wakapi.nix @@ -159,18 +159,25 @@ in Group = config.users.users.wakapi.group; DynamicUser = true; + PrivateTmp = true; + PrivateUsers = true; + PrivateDevices = true; ProtectHome = true; ProtectHostname = true; + ProtectClock = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; + ProtectControlGroups = true; + NoNewPrivileges = true; ProtectProc = "invisible"; - ProtectSystem = "strict"; + ProtectSystem = "full"; RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/web-apps/zipline.nix b/nixos/modules/services/web-apps/zipline.nix index b8c80b273ec8..86cb3a1d7e81 100644 --- a/nixos/modules/services/web-apps/zipline.nix +++ b/nixos/modules/services/web-apps/zipline.nix @@ -107,9 +107,11 @@ in ExecStart = lib.getExe cfg.package; # Hardening + AmbientCapabilities = ""; CapabilityBoundingSet = [ "" ]; - DeviceAllow = [ "" ]; + DevicePolicy = "closed"; LockPersonality = true; + NoNewPrivileges = true; PrivateDevices = true; PrivateTmp = true; PrivateUsers = true; @@ -123,15 +125,18 @@ in ProtectKernelTunables = true; ProtectProc = "invisible"; ProtectSystem = "strict"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET AF_INET6 AF_UNIX AF_NETLINK" ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + UMask = "0077"; }; }; }; diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 1db63aa271aa..44dee4645e05 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -29,10 +29,12 @@ def config(*path: List[str]) -> Optional[Any]: def get_system_path(profile: str = 'system', gen: Optional[str] = None, spec: Optional[str] = None) -> str: + basename = f'{profile}-{gen}-link' if gen is not None else profile + profiles_dir = '/nix/var/nix/profiles' if profile == 'system': - result = os.path.join('/nix', 'var', 'nix', 'profiles', 'system') + result = os.path.join(profiles_dir, basename) else: - result = os.path.join('/nix', 'var', 'nix', 'profiles', 'system-profiles', profile + f'-{gen}-link' if gen is not None else '') + result = os.path.join(profiles_dir, 'system-profiles', basename) if spec is not None: result = os.path.join(result, 'specialisation', spec) @@ -169,8 +171,8 @@ def generate_config_entry(profile: str, gen: str) -> str: boot_spec = bootjson_to_bootspec(boot_json) entry = config_entry(2, boot_spec, f'Generation {gen}', time) - for spec in boot_spec.specialisations: - entry += config_entry(2, boot_spec, f'Generation {gen}, Specialisation {spec}', str(time)) + for spec, spec_boot_spec in boot_spec.specialisations.items(): + entry += config_entry(2, spec_boot_spec, f'Generation {gen}, Specialisation {spec}', str(time)) return entry diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index ff7cf4777ddf..1aab9548a595 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -19,6 +19,7 @@ let kernel = config.system.modulesTree; firmware = config.hardware.firmware; allowMissing = false; + inherit (config.boot.initrd) extraFirmwarePaths; }; @@ -484,6 +485,14 @@ in ''; }; + boot.initrd.extraFirmwarePaths = mkOption { + default = [ ]; + type = types.listOf types.str; + description = '' + Other firmware files (relative to `"''${config.hardware.firmware}/lib/firmware"`) to include in the final initrd we are building. + ''; + }; + boot.initrd.checkJournalingFS = mkOption { default = true; type = types.bool; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 3096517c0b08..3b4bdaae071e 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -104,7 +104,7 @@ let "sleep.target" "hybrid-sleep.target" "systemd-hibernate.service" - "systemd-hibernate-clear.service" + ] ++ (lib.optional cfg.package.withEfi "systemd-hibernate-clear.service") ++ [ "systemd-hybrid-sleep.service" "systemd-suspend.service" "systemd-suspend-then-hibernate.service" @@ -130,11 +130,13 @@ let "systemd-ask-password-wall.service" # Varlink APIs + ] ++ lib.optionals cfg.package.withBootloader [ "systemd-bootctl@.service" "systemd-bootctl.socket" + ] ++ [ "systemd-creds@.service" "systemd-creds.socket" - ] ++ lib.optional cfg.package.withTpm2Tss [ + ] ++ lib.optional cfg.package.withTpm2Units [ "systemd-pcrlock@.service" "systemd-pcrlock.socket" ] ++ [ diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 472c72fb3889..23b9e232c64d 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -105,6 +105,7 @@ let kernel = config.system.modulesTree; firmware = config.hardware.firmware; allowMissing = false; + inherit (config.boot.initrd) extraFirmwarePaths; }; initrdBinEnv = pkgs.buildEnv { @@ -703,10 +704,11 @@ in "|stage1panic" ]; }; - script = '' - echo c > /proc/sysrq-trigger - ''; - serviceConfig.Type = "oneshot"; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.coreutils}/bin/echo c"; + StandardOutput = "file:/proc/sysrq-trigger"; + }; }; }; }; diff --git a/nixos/modules/system/boot/systemd/sysusers.nix b/nixos/modules/system/boot/systemd/sysusers.nix index d7b700f5748c..083b14d6e701 100644 --- a/nixos/modules/system/boot/systemd/sysusers.nix +++ b/nixos/modules/system/boot/systemd/sysusers.nix @@ -11,7 +11,7 @@ let cfg = config.systemd.sysusers; userCfg = config.users; - systemUsers = lib.filterAttrs (_username: opts: !opts.isNormalUser) userCfg.users; + systemUsers = lib.filterAttrs (_username: opts: opts.enable && !opts.isNormalUser) userCfg.users; sysusersConfig = pkgs.writeTextDir "00-nixos.conf" '' # Type Name ID GECOS Home directory Shell @@ -89,7 +89,7 @@ in } ] ++ (lib.mapAttrsToList (username: opts: { - assertion = !opts.isNormalUser; + assertion = opts.enable -> !opts.isNormalUser; message = "${username} is a normal user. systemd-sysusers doesn't create normal users, only system users."; }) userCfg.users) ++ lib.mapAttrsToList (username: opts: { diff --git a/nixos/modules/system/boot/systemd/tpm2.nix b/nixos/modules/system/boot/systemd/tpm2.nix index 6b6c9fb23f24..8bf3b8413574 100644 --- a/nixos/modules/system/boot/systemd/tpm2.nix +++ b/nixos/modules/system/boot/systemd/tpm2.nix @@ -27,13 +27,13 @@ options = { systemd.tpm2.enable = lib.mkEnableOption "systemd TPM2 support" // { - default = config.systemd.package.withTpm2Tss; - defaultText = "systemd.package.withTpm2Tss"; + default = config.systemd.package.withTpm2Units; + defaultText = "systemd.package.withTpm2Units"; }; boot.initrd.systemd.tpm2.enable = lib.mkEnableOption "systemd initrd TPM2 support" // { - default = config.boot.initrd.systemd.package.withTpm2Tss; - defaultText = "boot.initrd.systemd.package.withTpm2Tss"; + default = config.boot.initrd.systemd.package.withTpm2Units; + defaultText = "boot.initrd.systemd.package.withTpm2Units"; }; }; diff --git a/nixos/modules/virtualisation/build-vm.nix b/nixos/modules/virtualisation/build-vm.nix index b9db26b78c23..76b9c1b6227a 100644 --- a/nixos/modules/virtualisation/build-vm.nix +++ b/nixos/modules/virtualisation/build-vm.nix @@ -58,6 +58,18 @@ in vmWithBootLoader = lib.mkDefault config.virtualisation.vmVariantWithBootLoader.system.build.vm; }; + virtualisation.vmVariant = { + options = { + virtualisation.vmVariant = lib.mkOption { + apply = _: throw "virtualisation.vmVariant*.virtualisation.vmVariant is not supported"; + }; + virtualisation.vmVariantWithBootLoader = lib.mkOption { + apply = + _: throw "virtualisation.vmVariant*.virtualisation.vmVariantWithBootloader is not supported"; + }; + }; + }; + }; # uses extendModules diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 00a99b6fcd7d..511c377ca984 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -1,6 +1,6 @@ # Systemd services for docker. -{ config, lib, pkgs, ... }: +{ config, lib, utils, pkgs, ... }: with lib; @@ -271,11 +271,15 @@ in restartIfChanged = false; unitConfig.X-StopOnRemoval = false; - serviceConfig.Type = "oneshot"; - - script = '' - ${cfg.package}/bin/docker system prune -f ${toString cfg.autoPrune.flags} - ''; + serviceConfig = { + Type = "oneshot"; + ExecStart = utils.escapeSystemdExecArgs ([ + (lib.getExe cfg.package) + "system" + "prune" + "-f" + ] ++ cfg.autoPrune.flags); + }; startAt = optional cfg.autoPrune.enable cfg.autoPrune.dates; after = [ "docker.service" ]; diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 76378ed90438..c29c3215b722 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -306,6 +306,7 @@ in }; boot.kernelModules = [ + "br_netfilter" "veth" "xt_comment" "xt_CHECKSUM" diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 9e999e479638..acb5d1ce8384 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -178,7 +178,6 @@ let exec ${config.systemd.package}/bin/systemd-nspawn \ --keep-unit \ -M "$INSTANCE" -D "$root" "''${extraFlags[@]}" \ - $EXTRA_NSPAWN_FLAGS \ --notify-ready=yes \ --kill-signal=SIGRTMIN+3 \ --bind-ro=/nix/store:/nix/store$NIX_BIND_OPT \ @@ -203,6 +202,7 @@ let ${optionalString (cfg.tmpfs != null && cfg.tmpfs != []) ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' } \ + $EXTRA_NSPAWN_FLAGS \ ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" ''; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index bfaefb0eecf6..51a9dee6efa6 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, utils, pkgs, ... }: let cfg = config.virtualisation.podman; json = pkgs.formats.json { }; @@ -202,11 +202,15 @@ in restartIfChanged = false; unitConfig.X-StopOnRemoval = false; - serviceConfig.Type = "oneshot"; - - script = '' - ${cfg.package}/bin/podman system prune -f ${toString cfg.autoPrune.flags} - ''; + serviceConfig = { + Type = "oneshot"; + ExecStart = utils.escapeSystemdExecArgs ([ + (lib.getExe cfg.package) + "system" + "prune" + "-f" + ] ++ cfg.autoPrune.flags); + }; startAt = lib.optional cfg.autoPrune.enable cfg.autoPrune.dates; after = [ "podman.service" ]; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index c118b4c9884a..79b2abdc17af 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -85,7 +85,6 @@ rec { (onFullSupported "nixos.tests.containers-imperative") (onFullSupported "nixos.tests.containers-ip") (onSystems [ "x86_64-linux" ] "nixos.tests.docker") - (onFullSupported "nixos.tests.ecryptfs") (onFullSupported "nixos.tests.env") # Way too many manual retries required on Hydra. diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 83bd0c45c6f7..9d329f42124c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -264,7 +264,7 @@ in { cinnamon = handleTest ./cinnamon.nix {}; cinnamon-wayland = handleTest ./cinnamon-wayland.nix {}; cjdns = handleTest ./cjdns.nix {}; - clatd = handleTest ./clatd.nix {}; + clatd = runTest ./clatd.nix; clickhouse = handleTest ./clickhouse.nix {}; cloud-init = handleTest ./cloud-init.nix {}; cloud-init-hostname = handleTest ./cloud-init-hostname.nix {}; @@ -353,7 +353,7 @@ in { early-mount-options = handleTest ./early-mount-options.nix {}; ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; - echoip = handleTest ./echoip.nix {}; + echoip = runTest ./echoip.nix; ecryptfs = handleTest ./ecryptfs.nix {}; fscrypt = handleTest ./fscrypt.nix {}; fastnetmon-advanced = runTest ./fastnetmon-advanced.nix; @@ -425,6 +425,7 @@ in { firewall = handleTest ./firewall.nix { nftables = false; }; firewall-nftables = handleTest ./firewall.nix { nftables = true; }; fish = runTest ./fish.nix; + firezone = handleTest ./firezone/firezone.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; flaresolverr = handleTest ./flaresolverr.nix {}; flood = handleTest ./flood.nix {}; @@ -432,6 +433,7 @@ in { imports = [ ./firefox.nix ] ; _module.args.firefoxPackage = pkgs.floorp; }; + fluent-bit = handleTest ./fluent-bit.nix {}; fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; @@ -969,6 +971,7 @@ in { pppd = handleTest ./pppd.nix {}; predictable-interface-names = handleTest ./predictable-interface-names.nix {}; pretalx = runTest ./web-apps/pretalx.nix; + prefect = runTest ./prefect.nix; pretix = runTest ./web-apps/pretix.nix; printing-socket = handleTest ./printing.nix { socket = true; listenTcp = true; }; printing-service = handleTest ./printing.nix { socket = false; listenTcp = true; }; @@ -996,7 +999,7 @@ in { qgis = handleTest ./qgis.nix { package = pkgs.qgis; }; qgis-ltr = handleTest ./qgis.nix { package = pkgs.qgis-ltr; }; qownnotes = handleTest ./qownnotes.nix {}; - qtile = handleTestOn ["x86_64-linux" "aarch64-linux"] ./qtile/default.nix {}; + qtile = runTestOn ["x86_64-linux" "aarch64-linux"] ./qtile/default.nix; quake3 = handleTest ./quake3.nix {}; quicktun = handleTest ./quicktun.nix {}; quickwit = handleTest ./quickwit.nix {}; @@ -1005,7 +1008,7 @@ in { radarr = handleTest ./radarr.nix {}; radicale = handleTest ./radicale.nix {}; radicle = runTest ./radicle.nix; - ragnarwm = handleTest ./ragnarwm.nix {}; + ragnarwm = runTestOn ["x86_64-linux" "aarch64-linux"] ./ragnarwm.nix; rasdaemon = handleTest ./rasdaemon.nix {}; rathole = runTest ./rathole.nix; readarr = handleTest ./readarr.nix {}; @@ -1049,7 +1052,7 @@ in { scaphandre = handleTest ./scaphandre.nix {}; schleuder = handleTest ./schleuder.nix {}; scion-freestanding-deployment = handleTest ./scion/freestanding-deployment {}; - scrutiny = handleTest ./scrutiny.nix {}; + scrutiny = runTest ./scrutiny.nix; sddm = handleTest ./sddm.nix {}; sdl3 = handleTest ./sdl3.nix { }; seafile = handleTest ./seafile.nix {}; @@ -1273,12 +1276,14 @@ in { vault-dev = handleTest ./vault-dev.nix {}; vault-postgresql = handleTest ./vault-postgresql.nix {}; vaultwarden = discoverTests (import ./vaultwarden.nix); + vdirsyncer = handleTest ./vdirsyncer.nix {}; vector = handleTest ./vector {}; velocity = runTest ./velocity.nix; vengi-tools = handleTest ./vengi-tools.nix {}; victoriametrics = handleTest ./victoriametrics {}; vikunja = handleTest ./vikunja.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; + vm-variant = handleTest ./vm-variant.nix {}; vscode-remote-ssh = handleTestOn ["x86_64-linux"] ./vscode-remote-ssh.nix {}; vscodium = discoverTests (import ./vscodium.nix); vsftpd = handleTest ./vsftpd.nix {}; diff --git a/nixos/tests/clatd.nix b/nixos/tests/clatd.nix index d6aff7c09595..d5241eb646ab 100644 --- a/nixos/tests/clatd.nix +++ b/nixos/tests/clatd.nix @@ -26,160 +26,160 @@ # | Route: 192.0.2.0/24 via 100.64.0.1 # +------ -import ./make-test-python.nix ( - { pkgs, lib, ... }: +{ lib, ... }: - { - name = "clatd"; - meta = with pkgs.lib.maintainers; { - maintainers = [ - hax404 - jmbaur +{ + name = "clatd"; + + meta.maintainers = with lib.maintainers; [ + hax404 + jmbaur + ]; + + nodes = { + # The server is configured with static IPv4 addresses. RFC 6052 Section 3.1 + # disallows the mapping of non-global IPv4 addresses like RFC 1918 into the + # Well-Known Prefix 64:ff9b::/96. TAYGA also does not allow the mapping of + # documentation space (RFC 5737). To circumvent this, 100.64.0.2/24 from + # RFC 6589 (Carrier Grade NAT) is used here. + # To reach the IPv4 address pool of the NAT64 gateway, there is a static + # route configured. In normal cases, where the router would also source NAT + # the pool addresses to one IPv4 addresses, this would not be needed. + server = { + virtualisation.vlans = [ + 2 # towards router ]; + networking = { + useDHCP = false; + interfaces.eth1 = lib.mkForce { }; + }; + systemd.network = { + enable = true; + networks."vlan1" = { + matchConfig.Name = "eth1"; + address = [ + "100.64.0.2/24" + ]; + routes = [ + { + Destination = "192.0.2.0/24"; + Gateway = "100.64.0.1"; + } + ]; + }; + }; }; - nodes = { - # The server is configured with static IPv4 addresses. RFC 6052 Section 3.1 - # disallows the mapping of non-global IPv4 addresses like RFC 1918 into the - # Well-Known Prefix 64:ff9b::/96. TAYGA also does not allow the mapping of - # documentation space (RFC 5737). To circumvent this, 100.64.0.2/24 from - # RFC 6589 (Carrier Grade NAT) is used here. - # To reach the IPv4 address pool of the NAT64 gateway, there is a static - # route configured. In normal cases, where the router would also source NAT - # the pool addresses to one IPv4 addresses, this would not be needed. - server = { - virtualisation.vlans = [ - 2 # towards router - ]; - networking = { - useDHCP = false; - interfaces.eth1 = lib.mkForce { }; - }; - systemd.network = { - enable = true; - networks."vlan1" = { - matchConfig.Name = "eth1"; - address = [ - "100.64.0.2/24" - ]; - routes = [ + # The router is configured with static IPv4 addresses towards the server + # and IPv6 addresses towards the client. DNS64 is exposed towards the + # client so clatd is able to auto-discover the PLAT prefix. For NAT64, the + # Well-Known prefix 64:ff9b::/96 is used. NAT64 is done with TAYGA which + # provides the tun-interface nat64 and does the translation over it. The + # IPv6 packets are sent to this interfaces and received as IPv4 packets and + # vice versa. As TAYGA only translates IPv6 addresses to dedicated IPv4 + # addresses, it needs a pool of IPv4 addresses which must be at least as + # big as the expected amount of clients. In this test, the packets from the + # pool are directly routed towards the client. In normal cases, there would + # be a second source NAT44 to map all clients behind one IPv4 address. + router = { + boot.kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; + + virtualisation.vlans = [ + 2 # towards server + 3 # towards client + ]; + + networking = { + useDHCP = false; + useNetworkd = true; + firewall.enable = false; + interfaces.eth1 = lib.mkForce { + ipv4 = { + addresses = [ { - Destination = "192.0.2.0/24"; - Gateway = "100.64.0.1"; + address = "100.64.0.1"; + prefixLength = 24; + } + ]; + }; + }; + interfaces.eth2 = lib.mkForce { + ipv6 = { + addresses = [ + { + address = "2001:db8::1"; + prefixLength = 64; } ]; }; }; }; - # The router is configured with static IPv4 addresses towards the server - # and IPv6 addresses towards the client. DNS64 is exposed towards the - # client so clatd is able to auto-discover the PLAT prefix. For NAT64, the - # Well-Known prefix 64:ff9b::/96 is used. NAT64 is done with TAYGA which - # provides the tun-interface nat64 and does the translation over it. The - # IPv6 packets are sent to this interfaces and received as IPv4 packets and - # vice versa. As TAYGA only translates IPv6 addresses to dedicated IPv4 - # addresses, it needs a pool of IPv4 addresses which must be at least as - # big as the expected amount of clients. In this test, the packets from the - # pool are directly routed towards the client. In normal cases, there would - # be a second source NAT44 to map all clients behind one IPv4 address. - router = { - boot.kernel.sysctl = { - "net.ipv4.conf.all.forwarding" = 1; - "net.ipv6.conf.all.forwarding" = 1; - }; - - virtualisation.vlans = [ - 2 # towards server - 3 # towards client - ]; - - networking = { - useDHCP = false; - useNetworkd = true; - firewall.enable = false; - interfaces.eth1 = lib.mkForce { - ipv4 = { - addresses = [ - { - address = "100.64.0.1"; - prefixLength = 24; - } - ]; - }; - }; - interfaces.eth2 = lib.mkForce { - ipv6 = { - addresses = [ - { - address = "2001:db8::1"; - prefixLength = 64; - } - ]; - }; - }; - }; - - systemd.network.networks."40-eth2" = { - networkConfig.IPv6SendRA = true; - ipv6Prefixes = [ { Prefix = "2001:db8::/64"; } ]; - ipv6PREF64Prefixes = [ { Prefix = "64:ff9b::/96"; } ]; - ipv6SendRAConfig = { - EmitDNS = true; - DNS = "_link_local"; - }; - }; - - services.resolved.extraConfig = '' - DNSStubListener=no - ''; - - networking.extraHosts = '' - 192.0.0.171 ipv4only.arpa - 192.0.0.170 ipv4only.arpa - ''; - - services.coredns = { - enable = true; - config = '' - .:53 { - bind :: - hosts /etc/hosts - dns64 64:ff9b::/96 - } - ''; - }; - - services.tayga = { - enable = true; - ipv4 = { - address = "192.0.2.0"; - router = { - address = "192.0.2.1"; - }; - pool = { - address = "192.0.2.0"; - prefixLength = 24; - }; - }; - ipv6 = { - address = "2001:db8::1"; - router = { - address = "64:ff9b::1"; - }; - pool = { - address = "64:ff9b::"; - prefixLength = 96; - }; - }; + systemd.network.networks."40-eth2" = { + networkConfig.IPv6SendRA = true; + ipv6Prefixes = [ { Prefix = "2001:db8::/64"; } ]; + ipv6PREF64Prefixes = [ { Prefix = "64:ff9b::/96"; } ]; + ipv6SendRAConfig = { + EmitDNS = true; + DNS = "_link_local"; }; }; - # The client uses SLAAC to assign IPv6 addresses. To reach the IPv4-only - # server, the client starts the clat daemon which starts and configures the - # local IPv4 -> IPv6 translation via Tayga after discovering the PLAT - # prefix via DNS64. - client = { + services.resolved.extraConfig = '' + DNSStubListener=no + ''; + + networking.extraHosts = '' + 192.0.0.171 ipv4only.arpa + 192.0.0.170 ipv4only.arpa + ''; + + services.coredns = { + enable = true; + config = '' + .:53 { + bind :: + hosts /etc/hosts + dns64 64:ff9b::/96 + } + ''; + }; + + services.tayga = { + enable = true; + ipv4 = { + address = "192.0.2.0"; + router = { + address = "192.0.2.1"; + }; + pool = { + address = "192.0.2.0"; + prefixLength = 24; + }; + }; + ipv6 = { + address = "2001:db8::1"; + router = { + address = "64:ff9b::1"; + }; + pool = { + address = "64:ff9b::"; + prefixLength = 96; + }; + }; + }; + }; + + # The client uses SLAAC to assign IPv6 addresses. To reach the IPv4-only + # server, the client starts the clat daemon which starts and configures the + # local IPv4 -> IPv6 translation via Tayga after discovering the PLAT + # prefix via DNS64. + client = + { pkgs, ... }: + { virtualisation.vlans = [ 3 # towards router ]; @@ -193,62 +193,44 @@ import ./make-test-python.nix ( enable = true; networks."vlan1" = { matchConfig.Name = "eth1"; - - # NOTE: clatd does not actually use the PREF64 prefix discovered by - # systemd-networkd (nor does systemd-networkd do anything with it, - # yet), but we set this to confirm it works. See the test script - # below. ipv6AcceptRAConfig.UsePREF64 = true; }; }; - services.clatd = { - enable = true; - # NOTE: Perl's Net::DNS resolver does not seem to work well querying - # for AAAA records to systemd-resolved's default IPv4 bind address - # (127.0.0.53), so we add an IPv6 listener address to systemd-resolved - # and tell clatd to use that instead. - settings.dns64-servers = "::1"; - }; - - # Allow clatd to find dns server. See comment above. - services.resolved.extraConfig = '' - DNSStubListenerExtra=::1 - ''; + services.clatd.enable = true; environment.systemPackages = [ pkgs.mtr ]; }; - }; + }; - testScript = '' - import json + testScript = '' + import json - start_all() + start_all() - # wait for all machines to start up - for machine in client, router, server: - machine.wait_for_unit("network-online.target") + # wait for all machines to start up + for machine in client, router, server: + machine.wait_for_unit("network.target") - with subtest("Wait for tayga and clatd"): - router.wait_for_unit("tayga.service") - client.wait_for_unit("clatd.service") - # clatd checks if this system has IPv4 connectivity for 10 seconds - client.wait_until_succeeds( - 'journalctl -u clatd -e | grep -q "Starting up TAYGA, using config file"' - ) + with subtest("Wait for tayga and clatd"): + router.wait_for_unit("tayga.service") + client.wait_for_unit("clatd.service") + # clatd checks if this system has IPv4 connectivity for 10 seconds + client.wait_until_succeeds( + 'journalctl -u clatd -e | grep -q "Starting up TAYGA, using config file"' + ) - with subtest("networkd exports PREF64 prefix"): - assert json.loads(client.succeed("networkctl status eth1 --json=short"))[ - "NDisc" - ]["PREF64"][0]["Prefix"] == [0x0, 0x64, 0xFF, 0x9B] + ([0] * 12) + with subtest("networkd exports PREF64 prefix"): + assert json.loads(client.succeed("networkctl status eth1 --json=short"))[ + "NDisc" + ]["PREF64"][0]["Prefix"] == [0x0, 0x64, 0xFF, 0x9B] + ([0] * 12) - with subtest("Test ICMP"): - client.wait_until_succeeds("ping -c 3 100.64.0.2 >&2") + with subtest("Test ICMP"): + client.wait_until_succeeds("ping -c3 100.64.0.2 >&2") - with subtest("Test ICMP and show a traceroute"): - client.wait_until_succeeds("mtr --show-ips --report-wide 100.64.0.2 >&2") + with subtest("Test ICMP and show a traceroute"): + client.wait_until_succeeds("mtr --show-ips --report-wide 100.64.0.2 >&2") - client.log(client.execute("systemd-analyze security clatd.service")[1]) - ''; - } -) + client.log(client.execute("systemd-analyze security clatd.service")[1]) + ''; +} diff --git a/nixos/tests/echoip.nix b/nixos/tests/echoip.nix index 036018b26438..0e7747d713c1 100644 --- a/nixos/tests/echoip.nix +++ b/nixos/tests/echoip.nix @@ -1,29 +1,28 @@ -import ./make-test-python.nix ( - { lib, ... }: - { - name = "echoip"; - meta.maintainers = with lib.maintainers; [ defelo ]; +{ lib, ... }: - nodes.machine = { - services.echoip = { - enable = true; - virtualHost = "echoip.local"; - }; +{ + name = "echoip"; + meta.maintainers = with lib.maintainers; [ defelo ]; - networking.hosts = { - "127.0.0.1" = [ "echoip.local" ]; - "::1" = [ "echoip.local" ]; - }; + nodes.machine = { + services.echoip = { + enable = true; + virtualHost = "echoip.local"; }; - testScript = '' - machine.wait_for_unit("echoip.service") - machine.wait_for_open_port(8080) + networking.hosts = { + "127.0.0.1" = [ "echoip.local" ]; + "::1" = [ "echoip.local" ]; + }; + }; - resp = machine.succeed("curl -4 http://echoip.local/ip") - assert resp.strip() == "127.0.0.1" - resp = machine.succeed("curl -6 http://echoip.local/ip") - assert resp.strip() == "::1" - ''; - } -) + testScript = '' + machine.wait_for_unit("echoip.service") + machine.wait_for_open_port(8080) + + resp = machine.succeed("curl -4 http://echoip.local/ip") + assert resp.strip() == "127.0.0.1" + resp = machine.succeed("curl -6 http://echoip.local/ip") + assert resp.strip() == "::1" + ''; +} diff --git a/nixos/tests/firezone/create-tokens.exs b/nixos/tests/firezone/create-tokens.exs new file mode 100644 index 000000000000..35f977036cb5 --- /dev/null +++ b/nixos/tests/firezone/create-tokens.exs @@ -0,0 +1,86 @@ +alias Domain.{Repo, Accounts, Auth, Actors, Tokens} + +mappings = case File.read("provision-uuids.json") do +{:ok, content} -> + case Jason.decode(content) do + {:ok, mapping} -> mapping + _ -> %{"accounts" => %{}} + end +_ -> %{"accounts" => %{}} +end + +IO.puts("INFO: Fetching account") +{:ok, account} = Accounts.fetch_account_by_id_or_slug("main") + +IO.puts("INFO: Fetching email provider") +{:ok, email_provider} = Auth.Provider.Query.not_disabled() + |> Auth.Provider.Query.by_adapter(:email) + |> Auth.Provider.Query.by_account_id(account.id) + |> Repo.fetch(Auth.Provider.Query, []) + +temp_admin_actor_email = "firezone-provision@localhost.local" +temp_admin_actor_context = %Auth.Context{ + type: :browser, + user_agent: "Unspecified/0.0", + remote_ip: {127, 0, 0, 1}, + remote_ip_location_region: "N/A", + remote_ip_location_city: "N/A", + remote_ip_location_lat: 0.0, + remote_ip_location_lon: 0.0 +} + +{:ok, temp_admin_actor} = + Actors.create_actor(account, %{ + type: :account_admin_user, + name: "Token Provisioning" + }) + +{:ok, temp_admin_actor_email_identity} = + Auth.create_identity(temp_admin_actor, email_provider, %{ + provider_identifier: temp_admin_actor_email, + provider_identifier_confirmation: temp_admin_actor_email + }) + +{:ok, temp_admin_actor_token} = + Auth.create_token(temp_admin_actor_email_identity, temp_admin_actor_context, "temporarynonce", DateTime.utc_now() |> DateTime.add(1, :hour)) + +{:ok, temp_admin_subject} = + Auth.build_subject(temp_admin_actor_token, temp_admin_actor_context) + +{:ok, relay_group_token} = + Tokens.create_token(%{ + "type" => :relay_group, + "expires_at" => DateTime.utc_now() |> DateTime.add(1, :hour), + "secret_fragment" => Domain.Crypto.random_token(32, encoder: :hex32), + "relay_group_id" => get_in(mappings, ["accounts", "main", "relay_groups", "my-relays"]) + }) + +relay_group_encoded_token = Tokens.encode_fragment!(relay_group_token) +IO.puts("Created relay token: #{relay_group_encoded_token}") +File.write("relay_token.txt", relay_group_encoded_token) + +{:ok, gateway_group_token} = + Tokens.create_token(%{ + "type" => :gateway_group, + "expires_at" => DateTime.utc_now() |> DateTime.add(1, :hour), + "secret_fragment" => Domain.Crypto.random_token(32, encoder: :hex32), + "account_id" => get_in(mappings, ["accounts", "main", "id"]), + "gateway_group_id" => get_in(mappings, ["accounts", "main", "gateway_groups", "site"]) + }, temp_admin_subject) + +gateway_group_encoded_token = Tokens.encode_fragment!(gateway_group_token) +IO.puts("Created gateway group token: #{gateway_group_encoded_token}") +File.write("gateway_token.txt", gateway_group_encoded_token) + +{:ok, service_account_actor_token} = + Tokens.create_token(%{ + "type" => :client, + "expires_at" => DateTime.utc_now() |> DateTime.add(1, :hour), + "secret_fragment" => Domain.Crypto.random_token(32, encoder: :hex32), + "account_id" => get_in(mappings, ["accounts", "main", "id"]), + "actor_id" => get_in(mappings, ["accounts", "main", "actors", "client"]) + }) + +service_account_actor_encoded_token = Tokens.encode_fragment!(service_account_actor_token) +IO.puts("Created service actor token: #{service_account_actor_encoded_token}") +File.write("client_token.txt", service_account_actor_encoded_token) diff --git a/nixos/tests/firezone/firezone.nix b/nixos/tests/firezone/firezone.nix new file mode 100644 index 000000000000..10d89778a4c6 --- /dev/null +++ b/nixos/tests/firezone/firezone.nix @@ -0,0 +1,349 @@ +import ../make-test-python.nix ( + { pkgs, ... }: + let + certs = import ../common/acme/server/snakeoil-certs.nix; + domain = certs.domain; + in + { + name = "firezone"; + meta.maintainers = with pkgs.lib.maintainers; [ oddlama ]; + + nodes = { + server = + { + config, + lib, + pkgs, + ... + }: + { + security.pki.certificateFiles = [ certs.ca.cert ]; + + networking.extraHosts = '' + ${config.networking.primaryIPAddress} ${domain} + ${config.networking.primaryIPv6Address} ${domain} + ''; + + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; + + services.nginx = { + enable = true; + virtualHosts.${domain} = { + sslCertificate = certs.${domain}.cert; + sslCertificateKey = certs.${domain}.key; + }; + }; + + services.firezone.server = { + enable = true; + enableLocalDB = true; + nginx.enable = true; + + # Doesn't need to work for this test, but needs to be configured + # otherwise the server will not start. + smtp = { + from = "firezone@example.com"; + host = "mail.localhost"; + port = 465; + implicitTls = true; + username = "firezone@example.com"; + passwordFile = pkgs.writeText "tmpmailpasswd" "supermailpassword"; + }; + + provision = { + enable = true; + accounts.main = { + name = "My Account"; + relayGroups.my-relays.name = "Relays"; + gatewayGroups.site.name = "Site"; + actors = { + admin = { + type = "account_admin_user"; + name = "Admin"; + email = "admin@example.com"; + }; + client = { + type = "service_account"; + name = "A client"; + email = "client@example.com"; + }; + }; + resources.res1 = { + type = "dns"; + name = "Dns Resource"; + address = "resource.example.com"; + gatewayGroups = [ "site" ]; + filters = [ + { protocol = "icmp"; } + { + protocol = "tcp"; + ports = [ 80 ]; + } + ]; + }; + resources.res2 = { + type = "ip"; + name = "Ip Resource"; + address = "172.20.2.1"; + gatewayGroups = [ "site" ]; + }; + resources.res3 = { + type = "cidr"; + name = "Cidr Resource"; + address = "172.20.1.0/24"; + gatewayGroups = [ "site" ]; + }; + policies.pol1 = { + description = "Allow anyone res1 access"; + group = "everyone"; + resource = "res1"; + }; + policies.pol2 = { + description = "Allow anyone res2 access"; + group = "everyone"; + resource = "res2"; + }; + policies.pol3 = { + description = "Allow anyone res3 access"; + group = "everyone"; + resource = "res3"; + }; + }; + }; + + api.externalUrl = "https://${domain}/api/"; + web.externalUrl = "https://${domain}/"; + }; + + systemd.services.firezone-server-domain.postStart = lib.mkAfter '' + ${lib.getExe config.services.firezone.server.domain.package} rpc 'Code.eval_file("${./create-tokens.exs}")' + ''; + }; + + relay = + { + nodes, + config, + lib, + ... + }: + { + security.pki.certificateFiles = [ certs.ca.cert ]; + networking.extraHosts = '' + ${nodes.server.networking.primaryIPAddress} ${domain} + ${nodes.server.networking.primaryIPv6Address} ${domain} + ''; + + services.firezone.relay = { + enable = true; + logLevel = "debug"; + name = "test-relay"; + apiUrl = "wss://${domain}/api/"; + tokenFile = "/tmp/shared/relay_token.txt"; + publicIpv4 = config.networking.primaryIPAddress; + publicIpv6 = config.networking.primaryIPv6Address; + openFirewall = true; + }; + + # Don't auto-start so we can wait until the token was provisioned + systemd.services.firezone-relay.wantedBy = lib.mkForce [ ]; + }; + + # A resource that is only connected to the gateway, + # allowing us to confirm the VPN works + resource = { + virtualisation.vlans = [ + 1 + 2 + ]; + + networking.interfaces.eth1.ipv4.addresses = [ + { + address = "172.20.1.1"; + prefixLength = 24; + } + ]; + + networking.interfaces.eth2.ipv4.addresses = [ + { + address = "172.20.2.1"; + prefixLength = 24; + } + ]; + + networking.firewall.allowedTCPPorts = [ + 80 + ]; + + services.nginx = { + enable = true; + virtualHosts = { + "localhost" = { + default = true; + locations."/".extraConfig = '' + return 200 'greetings from the resource'; + add_header Content-Type text/plain; + ''; + }; + }; + }; + }; + + gateway = + { + nodes, + lib, + ... + }: + { + virtualisation.vlans = [ + 1 + 2 + ]; + + networking = { + interfaces.eth1.ipv4.addresses = [ + { + address = "172.20.1.2"; + prefixLength = 24; + } + ]; + + interfaces.eth2.ipv4.addresses = [ + { + address = "172.20.2.2"; + prefixLength = 24; + } + ]; + + firewall.enable = false; + nftables.enable = true; + nftables.tables."filter".family = "inet"; + nftables.tables."filter".content = '' + chain incoming { + type filter hook input priority 0; policy accept; + } + + chain postrouting { + type nat hook postrouting priority srcnat; policy accept; + meta protocol ip iifname "tun-firezone" oifname { "eth1", "eth2" } masquerade random + } + + chain forward { + type filter hook forward priority 0; policy drop; + iifname "tun-firezone" accept + oifname "tun-firezone" accept + } + + chain output { + type filter hook output priority 0; policy accept; + } + ''; + }; + + boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + # boot.kernel.sysctl."net.ipv4.conf.all.src_valid_mark" = "1"; + boot.kernel.sysctl."net.ipv6.conf.default.forwarding" = "1"; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = "1"; + + security.pki.certificateFiles = [ certs.ca.cert ]; + networking.extraHosts = '' + ${nodes.server.networking.primaryIPAddress} ${domain} + ${nodes.server.networking.primaryIPv6Address} ${domain} + 172.20.1.1 resource.example.com + ''; + + services.firezone.gateway = { + enable = true; + logLevel = "debug"; + name = "test-gateway"; + apiUrl = "wss://${domain}/api/"; + tokenFile = "/tmp/shared/gateway_token.txt"; + }; + + # Don't auto-start so we can wait until the token was provisioned + systemd.services.firezone-gateway.wantedBy = lib.mkForce [ ]; + }; + + client = + { + nodes, + lib, + ... + }: + { + security.pki.certificateFiles = [ certs.ca.cert ]; + networking.useNetworkd = true; + networking.extraHosts = '' + ${nodes.server.networking.primaryIPAddress} ${domain} + ${nodes.server.networking.primaryIPv6Address} ${domain} + ''; + + services.firezone.headless-client = { + enable = true; + logLevel = "debug"; + name = "test-client-somebody"; + apiUrl = "wss://${domain}/api/"; + tokenFile = "/tmp/shared/client_token.txt"; + }; + + # Don't auto-start so we can wait until the token was provisioned + systemd.services.firezone-headless-client.wantedBy = lib.mkForce [ ]; + }; + }; + + testScript = + { ... }: + '' + start_all() + + with subtest("Start server"): + server.wait_for_unit("firezone.target") + server.wait_until_succeeds("curl -Lsf https://${domain} | grep 'Welcome to Firezone'") + server.wait_until_succeeds("curl -Ls https://${domain}/api | grep 'Not Found'") + + # Wait for tokens and copy them to shared folder + server.wait_for_file("/var/lib/private/firezone/relay_token.txt") + server.wait_for_file("/var/lib/private/firezone/gateway_token.txt") + server.wait_for_file("/var/lib/private/firezone/client_token.txt") + server.succeed("cp /var/lib/private/firezone/*_token.txt /tmp/shared") + + with subtest("Connect relay"): + relay.succeed("systemctl start firezone-relay") + relay.wait_for_unit("firezone-relay.service") + relay.wait_until_succeeds("journalctl --since -2m --unit firezone-relay.service --grep 'Connected to portal.*${domain}'", timeout=30) + + with subtest("Connect gateway"): + gateway.succeed("systemctl start firezone-gateway") + gateway.wait_for_unit("firezone-gateway.service") + gateway.wait_until_succeeds("journalctl --since -2m --unit firezone-gateway.service --grep 'Connected to portal.*${domain}'", timeout=30) + relay.wait_until_succeeds("journalctl --since -2m --unit firezone-relay.service --grep 'Created allocation.*IPv4'", timeout=30) + relay.wait_until_succeeds("journalctl --since -2m --unit firezone-relay.service --grep 'Created allocation.*IPv6'", timeout=30) + + # Assert both relay ips are known + gateway.wait_until_succeeds("journalctl --since -2m --unit firezone-gateway.service --grep 'Updated allocation.*relay_ip4.*Some.*relay_ip6.*Some'", timeout=30) + + with subtest("Connect headless-client"): + client.succeed("systemctl start firezone-headless-client") + client.wait_for_unit("firezone-headless-client.service") + client.wait_until_succeeds("journalctl --since -2m --unit firezone-headless-client.service --grep 'Connected to portal.*${domain}'", timeout=30) + client.wait_until_succeeds("journalctl --since -2m --unit firezone-headless-client.service --grep 'Tunnel ready'", timeout=30) + + with subtest("Check DNS based access"): + # Check that we can access the resource through the VPN via DNS + client.wait_until_succeeds("curl -4 -Lsf http://resource.example.com | grep 'greetings from the resource'") + client.wait_until_succeeds("curl -6 -Lsf http://resource.example.com | grep 'greetings from the resource'") + + with subtest("Check CIDR based access"): + # Check that we can access the resource through the VPN via CIDR + client.wait_until_succeeds("ping -c1 -W1 172.20.1.1") + + with subtest("Check IP based access"): + # Check that we can access the resource through the VPN via IP + client.wait_until_succeeds("ping -c1 -W1 172.20.2.1") + ''; + } +) diff --git a/nixos/tests/fluent-bit.nix b/nixos/tests/fluent-bit.nix new file mode 100644 index 000000000000..9dc68011ea85 --- /dev/null +++ b/nixos/tests/fluent-bit.nix @@ -0,0 +1,40 @@ +import ./make-test-python.nix ( + { lib, pkgs, ... }: + { + name = "fluent-bit"; + + nodes.machine = + { config, pkgs, ... }: + { + services.fluent-bit = { + enable = true; + settings = { + pipeline = { + inputs = [ + { + name = "systemd"; + systemd_filter = "_SYSTEMD_UNIT=fluent-bit.service"; + } + ]; + outputs = [ + { + name = "file"; + path = "/var/log/fluent-bit"; + file = "fluent-bit.out"; + } + ]; + }; + }; + }; + + systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit"; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("fluent-bit.service") + machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out") + ''; + } +) diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix index 83cc5fc5bd1d..455ef0868513 100644 --- a/nixos/tests/glance.nix +++ b/nixos/tests/glance.nix @@ -40,7 +40,7 @@ machine_custom_port.wait_for_open_port(5678) soup = BeautifulSoup(machine_default.succeed("curl http://localhost:8080")) - expected_version = "${config.nodes.machine_default.services.glance.package.version}" + expected_version = "v${config.nodes.machine_default.services.glance.package.version}" assert any(a.text == expected_version for a in soup.select(".footer a")) ''; diff --git a/nixos/tests/grocy.nix b/nixos/tests/grocy.nix index 0cfaf1e7fc58..3031ed15c743 100644 --- a/nixos/tests/grocy.nix +++ b/nixos/tests/grocy.nix @@ -25,7 +25,10 @@ import ./make-test-python.nix ( machine.wait_for_open_port(80) machine.wait_for_unit("multi-user.target") + # This establishes _something_ machine.succeed("curl -sSf http://localhost") + # The second request creates the database, unsure why both are required + machine.succeed("curl -sSf http://localhost/") machine.succeed( "curl -c cookies -sSf -X POST http://localhost/login -d 'username=admin&password=admin'" diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix index 7fb30d473e00..ed70ead01820 100644 --- a/nixos/tests/homepage-dashboard.nix +++ b/nixos/tests/homepage-dashboard.nix @@ -4,46 +4,25 @@ import ./make-test-python.nix ( name = "homepage-dashboard"; meta.maintainers = with lib.maintainers; [ jnsgruk ]; - nodes.unmanaged_conf = - { pkgs, ... }: - { - services.homepage-dashboard.enable = true; - }; - - nodes.managed_conf = - { pkgs, ... }: - { - services.homepage-dashboard = { - enable = true; - settings.title = "test title rodUsEagid"; # something random/unique - }; + nodes.machine = _: { + services.homepage-dashboard = { + enable = true; + settings.title = "test title rodUsEagid"; # something random/unique }; + }; testScript = '' - # Ensure the services are started on unmanaged machine - unmanaged_conf.wait_for_unit("homepage-dashboard.service") - unmanaged_conf.wait_for_open_port(8082) - unmanaged_conf.succeed("curl --fail http://localhost:8082/") - - # Ensure that /etc/homepage-dashboard doesn't exist, and boilerplate - # configs are copied into place. - unmanaged_conf.fail("test -d /etc/homepage-dashboard") - unmanaged_conf.succeed("test -f /var/lib/private/homepage-dashboard/settings.yaml") - # Ensure the services are started on managed machine - managed_conf.wait_for_unit("homepage-dashboard.service") - managed_conf.wait_for_open_port(8082) - managed_conf.succeed("curl --fail http://localhost:8082/") + machine.wait_for_unit("homepage-dashboard.service") + machine.wait_for_open_port(8082) + machine.succeed("curl --fail http://localhost:8082/") - # Ensure /etc/homepage-dashboard is created and unmanaged conf location isn't. - managed_conf.succeed("test -d /etc/homepage-dashboard") - managed_conf.fail("test -f /var/lib/private/homepage-dashboard/settings.yaml") + # Ensure /etc/homepage-dashboard is created. + machine.succeed("test -d /etc/homepage-dashboard") # Ensure that we see the custom title *only in the managed config* - page = managed_conf.succeed("curl --fail http://localhost:8082/") + page = machine.succeed("curl --fail http://localhost:8082/") assert "test title rodUsEagid" in page, "Custom title not found" - page = unmanaged_conf.succeed("curl --fail http://localhost:8082/") - assert "test title rodUsEagid" not in page, "Custom title found where it shouldn't be" ''; } ) diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix index b45b972fe449..16e39dba729c 100644 --- a/nixos/tests/kanidm-provisioning.nix +++ b/nixos/tests/kanidm-provisioning.nix @@ -306,6 +306,10 @@ import ./make-test-python.nix ( provision.succeed('${specialisations}/credentialProvision/bin/switch-to-configuration test') provision_login("${provisionIdmAdminPassword}") + # Make sure neither password is logged + provision.fail("journalctl --since -10m --unit kanidm.service --grep '${provisionAdminPassword}'") + provision.fail("journalctl --since -10m --unit kanidm.service --grep '${provisionIdmAdminPassword}'") + # Test provisioned admin pw out = provision.succeed("KANIDM_PASSWORD=${provisionAdminPassword} kanidm login -D admin") assert_contains(out, "Login Success for admin") diff --git a/nixos/tests/paretosecurity.nix b/nixos/tests/paretosecurity.nix index 239ec1eff86d..176b6768270b 100644 --- a/nixos/tests/paretosecurity.nix +++ b/nixos/tests/paretosecurity.nix @@ -3,14 +3,58 @@ name = "paretosecurity"; meta.maintainers = [ lib.maintainers.zupo ]; - nodes.machine = + nodes.terminal = { config, pkgs, ... }: { + imports = [ ./common/user-account.nix ]; + services.paretosecurity.enable = true; }; - # very basic test for now, need to add output asserts + nodes.xfce = + { config, pkgs, ... }: + { + imports = [ ./common/user-account.nix ]; + + services.paretosecurity = { + enable = true; + trayIcon = true; + }; + + services.xserver.enable = true; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.desktopManager.xfce.enable = true; + + services.displayManager.autoLogin = { + enable = true; + user = "alice"; + }; + + environment.systemPackages = [ pkgs.xdotool ]; + environment.variables.XAUTHORITY = "/home/alice/.Xauthority"; + + }; + + enableOCR = true; + testScript = '' - machine.wait_until_succeeds("paretosecurity check") + terminal.succeed( + "su -- alice -c 'paretosecurity check" + # Disable some checks that need intricate test setup so that this test + # remains simple and fast. Tests for all checks and edge cases available + # at https://github.com/ParetoSecurity/agent/tree/main/test/integration + + " --skip c96524f2-850b-4bb9-abc7-517051b6c14e" # SecureBoot + + " --skip 37dee029-605b-4aab-96b9-5438e5aa44d8" # Screen lock + + " --skip 21830a4e-84f1-48fe-9c5b-beab436b2cdb" # Disk encryption + + " --skip 44e4754a-0b42-4964-9cc2-b88b2023cb1e" # Pareto Security is up to date + + " --skip f962c423-fdf5-428a-a57a-827abc9b253e" # Password manager installed + + "'" + ) + + xfce.wait_for_x() + xfce.succeed("xdotool mousemove 850 10") + xfce.wait_for_text("Pareto Security") + xfce.succeed("xdotool click 1") + xfce.wait_for_text("Run Checks") ''; } diff --git a/nixos/tests/prefect.nix b/nixos/tests/prefect.nix new file mode 100644 index 000000000000..0e2f1a36c687 --- /dev/null +++ b/nixos/tests/prefect.nix @@ -0,0 +1,27 @@ +{ lib, ... }: +let + mainPort = "4200"; +in +{ + name = "prefect"; + + nodes = { + machine = + { ... }: + { + services.prefect = { + enable = true; + }; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("prefect-server.service") + machine.wait_for_open_port("${mainPort}") + ''; + + meta = with lib.maintainers; { + maintainers = [ happysalada ]; + }; +} diff --git a/nixos/tests/qtile/default.nix b/nixos/tests/qtile/default.nix index 547a53dcf123..edd2cb3409da 100644 --- a/nixos/tests/qtile/default.nix +++ b/nixos/tests/qtile/default.nix @@ -1,54 +1,52 @@ -import ../make-test-python.nix ( - { lib, ... }: - { - name = "qtile"; +{ lib, ... }: +{ + name = "qtile"; - meta = { - maintainers = with lib.maintainers; [ sigmanificient ]; - }; + meta = { + maintainers = with lib.maintainers; [ sigmanificient ]; + }; - nodes.machine = - { pkgs, lib, ... }: - let - # We create a custom Qtile configuration file that adds a widget from - # qtile-extras to the bar. This ensure that the qtile-extras package - # also works, and that extraPackages behave as expected. + nodes.machine = + { pkgs, lib, ... }: + let + # We create a custom Qtile configuration file that adds a widget from + # qtile-extras to the bar. This ensure that the qtile-extras package + # also works, and that extraPackages behave as expected. - config-deriv = pkgs.callPackage ./config.nix { }; - in - { - imports = [ - ../common/x11.nix - ../common/user-account.nix - ]; - test-support.displayManager.auto.user = "alice"; + config-deriv = pkgs.callPackage ./config.nix { }; + in + { + imports = [ + ../common/x11.nix + ../common/user-account.nix + ]; + test-support.displayManager.auto.user = "alice"; - services.xserver.windowManager.qtile = { - enable = true; - configFile = "${config-deriv}/config.py"; - extraPackages = ps: [ ps.qtile-extras ]; - }; - - services.displayManager.defaultSession = lib.mkForce "qtile"; - - environment.systemPackages = [ pkgs.kitty ]; + services.xserver.windowManager.qtile = { + enable = true; + configFile = "${config-deriv}/config.py"; + extraPackages = ps: [ ps.qtile-extras ]; }; - testScript = '' - with subtest("ensure x starts"): - machine.wait_for_x() - machine.wait_for_file("/home/alice/.Xauthority") - machine.succeed("xauth merge ~alice/.Xauthority") + services.displayManager.defaultSession = lib.mkForce "qtile"; - with subtest("ensure client is available"): - machine.succeed("qtile --version") + environment.systemPackages = [ pkgs.kitty ]; + }; - with subtest("ensure we can open a new terminal"): - machine.sleep(2) - machine.send_key("meta_l-ret") - machine.wait_for_window(r"alice.*?machine") - machine.sleep(2) - machine.screenshot("terminal") - ''; - } -) + testScript = '' + with subtest("ensure x starts"): + machine.wait_for_x() + machine.wait_for_file("/home/alice/.Xauthority") + machine.succeed("xauth merge ~alice/.Xauthority") + + with subtest("ensure client is available"): + machine.succeed("qtile --version") + + with subtest("ensure we can open a new terminal"): + machine.sleep(2) + machine.send_key("meta_l-ret") + machine.wait_for_window(r"alice.*?machine") + machine.sleep(2) + machine.screenshot("terminal") + ''; +} diff --git a/nixos/tests/ragnarwm.nix b/nixos/tests/ragnarwm.nix index d944fac4b910..f951f4aff389 100644 --- a/nixos/tests/ragnarwm.nix +++ b/nixos/tests/ragnarwm.nix @@ -1,40 +1,38 @@ -import ./make-test-python.nix ( - { lib, ... }: - { - name = "ragnarwm"; +{ lib, ... }: +{ + name = "ragnarwm"; - meta = { - maintainers = with lib.maintainers; [ sigmanificient ]; + meta = { + maintainers = with lib.maintainers; [ sigmanificient ]; + }; + + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + test-support.displayManager.auto.user = "alice"; + services.displayManager.defaultSession = lib.mkForce "ragnar"; + services.xserver.windowManager.ragnarwm.enable = true; + + # Setup the default terminal of Ragnar + environment.systemPackages = [ pkgs.alacritty ]; }; - nodes.machine = - { pkgs, lib, ... }: - { - imports = [ - ./common/x11.nix - ./common/user-account.nix - ]; - test-support.displayManager.auto.user = "alice"; - services.displayManager.defaultSession = lib.mkForce "ragnar"; - services.xserver.windowManager.ragnarwm.enable = true; + testScript = '' + with subtest("ensure x starts"): + machine.wait_for_x() + machine.wait_for_file("/home/alice/.Xauthority") + machine.succeed("xauth merge ~alice/.Xauthority") - # Setup the default terminal of Ragnar - environment.systemPackages = [ pkgs.alacritty ]; - }; - - testScript = '' - with subtest("ensure x starts"): - machine.wait_for_x() - machine.wait_for_file("/home/alice/.Xauthority") - machine.succeed("xauth merge ~alice/.Xauthority") - - with subtest("ensure we can open a new terminal"): - # Sleeping a bit before the test, as it may help for sending keys - machine.sleep(2) - machine.send_key("meta_l-ret") - machine.wait_for_window(r"alice.*?machine") - machine.sleep(2) - machine.screenshot("terminal") - ''; - } -) + with subtest("ensure we can open a new terminal"): + # Sleeping a bit before the test, as it may help for sending keys + machine.sleep(2) + machine.send_key("meta_l-ret") + machine.wait_for_window(r"alice.*?machine") + machine.sleep(2) + machine.screenshot("terminal") + ''; +} diff --git a/nixos/tests/scrutiny.nix b/nixos/tests/scrutiny.nix index a81dd60d8518..17d984f4c1ff 100644 --- a/nixos/tests/scrutiny.nix +++ b/nixos/tests/scrutiny.nix @@ -1,83 +1,98 @@ -import ./make-test-python.nix ( - { lib, ... }: +{ lib, ... }: - { - name = "scrutiny"; - meta.maintainers = with lib.maintainers; [ jnsgruk ]; +{ + name = "scrutiny"; + meta.maintainers = with lib.maintainers; [ jnsgruk ]; - nodes = { - machine = - { - self, - pkgs, - lib, - ... - }: - { - services = { - scrutiny.enable = true; - scrutiny.collector.enable = true; + nodes = { + machine = + { + self, + pkgs, + lib, + ... + }: + { + services = { + scrutiny = { + enable = true; + settings = { + notify.urls = [ + { + _secret = pkgs.writeText "notify-script" "script://${pkgs.writeShellScript "touch-test-file" '' + echo "HelloWorld" > /run/scrutiny/hello + ''}"; + } + ]; + }; }; - - environment.systemPackages = - let - seleniumScript = - pkgs.writers.writePython3Bin "selenium-script" - { - libraries = with pkgs.python3Packages; [ selenium ]; - } - '' - from selenium import webdriver - from selenium.webdriver.common.by import By - from selenium.webdriver.firefox.options import Options - from selenium.webdriver.support.ui import WebDriverWait - from selenium.webdriver.support import expected_conditions as EC - - options = Options() - options.add_argument("--headless") - service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 - - driver = webdriver.Firefox(options=options, service=service) - driver.implicitly_wait(10) - driver.get("http://localhost:8080/web/dashboard") - - wait = WebDriverWait(driver, 10).until( - EC.text_to_be_present_in_element( - (By.TAG_NAME, "body"), "Drive health at a glance") - ) - - body_text = driver.find_element(By.TAG_NAME, "body").text - assert "Temperature history for each device" in body_text - - driver.close() - ''; - in - with pkgs; - [ - curl - firefox-unwrapped - geckodriver - seleniumScript - ]; + scrutiny.collector.enable = true; }; - }; - # This is the test code that will check if our service is running correctly: - testScript = '' - start_all() - # Wait for Scrutiny to be available - machine.wait_for_unit("scrutiny") - machine.wait_for_open_port(8080) + environment.systemPackages = + let + seleniumScript = + pkgs.writers.writePython3Bin "selenium-script" + { + libraries = with pkgs.python3Packages; [ selenium ]; + } + '' + from selenium import webdriver + from selenium.webdriver.common.by import By + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions as EC - # Ensure the API responds as we expect - output = machine.succeed("curl localhost:8080/api/health") - assert output == '{"success":true}' + options = Options() + options.add_argument("--headless") + service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 - # Start the collector service to send some metrics - collect = machine.succeed("systemctl start scrutiny-collector.service") + driver = webdriver.Firefox(options=options, service=service) + driver.implicitly_wait(10) + driver.get("http://localhost:8080/web/dashboard") - # Ensure the application is actually rendered by the Javascript - machine.succeed("PYTHONUNBUFFERED=1 selenium-script") - ''; - } -) + wait = WebDriverWait(driver, 10).until( + EC.text_to_be_present_in_element( + (By.TAG_NAME, "body"), "Drive health at a glance") + ) + + body_text = driver.find_element(By.TAG_NAME, "body").text + assert "Temperature history for each device" in body_text + + driver.close() + ''; + in + with pkgs; + [ + curl + firefox-unwrapped + geckodriver + seleniumScript + ]; + }; + }; + # This is the test code that will check if our service is running correctly: + testScript = '' + start_all() + + # Wait for Scrutiny to be available + machine.wait_for_unit("scrutiny") + machine.wait_for_open_port(8080) + + # Ensure the API responds as we expect + output = machine.succeed("curl localhost:8080/api/health") + assert output == '{"success":true}' + + # Start the collector service to send some metrics + collect = machine.succeed("systemctl start scrutiny-collector.service") + + # Ensure the application is actually rendered by the Javascript + machine.succeed("PYTHONUNBUFFERED=1 selenium-script") + + # Test notification and genJqSecretsReplacementSnippet + machine.succeed("curl -X POST http://localhost:8080/api/health/notify") + machine.wait_for_file("/run/scrutiny/hello") + output = machine.succeed("cat /run/scrutiny/hello") + assert "HelloWorld" in output + ''; +} diff --git a/nixos/tests/vdirsyncer.nix b/nixos/tests/vdirsyncer.nix new file mode 100644 index 000000000000..1267967dac97 --- /dev/null +++ b/nixos/tests/vdirsyncer.nix @@ -0,0 +1,300 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + + let + + radicale_calendars = { + type = "caldav"; + url = "http://localhost:5232/"; + # Radicale needs username/password. + username = "alice"; + password = "password"; + }; + + radicale_contacts = { + type = "carddav"; + url = "http://localhost:5232/"; + # Radicale needs username/password. + username = "alice"; + password = "password"; + }; + + xandikos_calendars = { + type = "caldav"; + url = "http://localhost:8080/user/calendars"; + # Xandikos warns + # > No current-user-principal returned, re-using URL http://localhost:8080/user/calendars/ + # but we do not need username/password. + }; + + xandikos_contacts = { + type = "carddav"; + url = "http://localhost:8080/user/contacts"; + }; + + local_calendars = { + type = "filesystem"; + path = "~/calendars"; + fileext = ".ics"; + }; + + local_contacts = { + type = "filesystem"; + path = "~/contacts"; + fileext = ".vcf"; + }; + + mkPairs = a: b: { + calendars = { + a = "${a}_calendars"; + b = "${b}_calendars"; + collections = [ + "from a" + "from b" + ]; + }; + contacts = { + a = "${a}_contacts"; + b = "${b}_contacts"; + collections = [ + "from a" + "from b" + ]; + }; + }; + + mkRadicaleProps = + tag: + pkgs.writeText "Radicale.props" ( + builtins.toJSON { + inherit tag; + } + ); + + writeLines = + name: eol: lines: + pkgs.writeText name (lib.concatMapStrings (l: "${l}${eol}") lines); + + prodid = "-//NixOS test//EN"; + dtstamp = "20231129T194743Z"; + + writeICS = + { + uid, + summary, + dtstart, + dtend, + }: + writeLines "${uid}.ics" "\r\n" [ + "BEGIN:VCALENDAR" + "VERSION:2.0" + "PRODID:${prodid}" + "BEGIN:VEVENT" + "UID:${uid}" + "SUMMARY:${summary}" + "DTSTART:${dtstart}" + "DTEND:${dtend}" + "DTSTAMP:${dtstamp}" + "END:VEVENT" + "END:VCALENDAR" + ]; + + foo_ics = writeICS { + uid = "foo"; + summary = "Epochalypse"; + dtstart = "19700101T000000Z"; + dtend = "20380119T031407Z"; + }; + + bar_ics = writeICS { + uid = "bar"; + summary = "One Billion Seconds"; + dtstart = "19700101T000000Z"; + dtend = "20010909T014640Z"; + }; + + writeVCF = + { + uid, + name, + displayName, + email, + }: + writeLines "${uid}.vcf" "\r\n" [ + # One of the tools enforces this order of fields. + "BEGIN:VCARD" + "VERSION:4.0" + "UID:${uid}" + "EMAIL;TYPE=INTERNET:${email}" + "FN:${displayName}" + "N:${name}" + "END:VCARD" + ]; + + foo_vcf = writeVCF { + uid = "foo"; + name = "Doe;John;;;"; + displayName = "John Doe"; + email = "john.doe@example.org"; + }; + + bar_vcf = writeVCF { + uid = "bar"; + name = "Doe;Jane;;;"; + displayName = "Jane Doe"; + email = "jane.doe@example.org"; + }; + + in + { + name = "vdirsyncer"; + + meta.maintainers = with lib.maintainers; [ schnusch ]; + + nodes = { + machine = { + services.radicale = { + enable = true; + settings.auth.type = "none"; + }; + + services.xandikos = { + enable = true; + extraOptions = [ "--autocreate" ]; + }; + + services.vdirsyncer = { + enable = true; + jobs = { + + alice = { + user = "alice"; + group = "users"; + config = { + statusPath = "/home/alice/.vdirsyncer"; + storages = { + inherit + local_calendars + local_contacts + radicale_calendars + radicale_contacts + ; + }; + pairs = mkPairs "local" "radicale"; + }; + forceDiscover = true; + }; + + bob = { + user = "bob"; + group = "users"; + config = { + statusPath = "/home/bob/.vdirsyncer"; + storages = { + inherit + local_calendars + local_contacts + xandikos_calendars + xandikos_contacts + ; + }; + pairs = mkPairs "local" "xandikos"; + }; + forceDiscover = true; + }; + + remote = { + config = { + storages = { + inherit + radicale_calendars + radicale_contacts + xandikos_calendars + xandikos_contacts + ; + }; + pairs = mkPairs "radicale" "xandikos"; + }; + forceDiscover = true; + }; + + }; + }; + + users.users = { + alice.isNormalUser = true; + bob.isNormalUser = true; + }; + }; + }; + + testScript = '' + def run_unit(name): + machine.systemctl(f"start {name}") + # The service is Type=oneshot without RemainAfterExit=yes. Once it + # is finished it is no longer active and wait_for_unit will fail. + # When that happens we check if it actually failed. + try: + machine.wait_for_unit(name) + except: + machine.fail(f"systemctl is-failed {name}") + + start_all() + + machine.wait_for_open_port(5232) + machine.wait_for_open_port(8080) + machine.wait_for_unit("multi-user.target") + + with subtest("alice -> radicale"): + # vdirsyncer cannot create create collections on Radicale, + # see https://vdirsyncer.pimutils.org/en/stable/tutorials/radicale.html + machine.succeed("runuser -u radicale -- install -Dm 644 ${mkRadicaleProps "VCALENDAR"} /var/lib/radicale/collections/collection-root/alice/foocal/.Radicale.props") + machine.succeed("runuser -u radicale -- install -Dm 644 ${mkRadicaleProps "VADDRESSBOOK"} /var/lib/radicale/collections/collection-root/alice/foocard/.Radicale.props") + + machine.succeed("runuser -u alice -- install -Dm 644 ${foo_ics} /home/alice/calendars/foocal/foo.ics") + machine.succeed("runuser -u alice -- install -Dm 644 ${foo_vcf} /home/alice/contacts/foocard/foo.vcf") + run_unit("vdirsyncer@alice.service") + + # test statusPath + machine.succeed("test -d /home/alice/.vdirsyncer") + machine.fail("test -e /var/lib/private/vdirsyncer/alice") + + with subtest("bob -> xandikos"): + # I suspect Radicale shares the namespace for calendars and + # contacts, but Xandikos separates them. We just use `barcal` and + # `barcard` with Xandikos as well to avoid conflicts. + machine.succeed("runuser -u bob -- install -Dm 644 ${bar_ics} /home/bob/calendars/barcal/bar.ics") + machine.succeed("runuser -u bob -- install -Dm 644 ${bar_vcf} /home/bob/contacts/barcard/bar.vcf") + run_unit("vdirsyncer@bob.service") + + # test statusPath + machine.succeed("test -d /home/bob/.vdirsyncer") + machine.fail("test -e /var/lib/private/vdirsyncer/bob") + + with subtest("radicale <-> xandikos"): + # vdirsyncer cannot create create collections on Radicale, + # see https://vdirsyncer.pimutils.org/en/stable/tutorials/radicale.html + machine.succeed("runuser -u radicale -- install -Dm 644 ${mkRadicaleProps "VCALENDAR"} /var/lib/radicale/collections/collection-root/alice/barcal/.Radicale.props") + machine.succeed("runuser -u radicale -- install -Dm 644 ${mkRadicaleProps "VADDRESSBOOK"} /var/lib/radicale/collections/collection-root/alice/barcard/.Radicale.props") + + run_unit("vdirsyncer@remote.service") + + # test statusPath + machine.succeed("test -d /var/lib/private/vdirsyncer/remote") + + with subtest("radicale -> alice"): + run_unit("vdirsyncer@alice.service") + + with subtest("xandikos -> bob"): + run_unit("vdirsyncer@bob.service") + + with subtest("compare synced files"): + # iCalendar files get reordered + machine.succeed("diff -u --strip-trailing-cr <(sort /home/alice/calendars/foocal/foo.ics) <(sort /home/bob/calendars/foocal/foo.ics) >&2") + machine.succeed("diff -u --strip-trailing-cr <(sort /home/bob/calendars/barcal/bar.ics) <(sort /home/alice/calendars/barcal/bar.ics) >&2") + + machine.succeed("diff -u --strip-trailing-cr /home/alice/contacts/foocard/foo.vcf /home/bob/contacts/foocard/foo.vcf >&2") + machine.succeed("diff -u --strip-trailing-cr /home/bob/contacts/barcard/bar.vcf /home/alice/contacts/barcard/bar.vcf >&2") + ''; + } +) diff --git a/nixos/tests/vm-variant.nix b/nixos/tests/vm-variant.nix new file mode 100644 index 000000000000..cc95a3e6ed69 --- /dev/null +++ b/nixos/tests/vm-variant.nix @@ -0,0 +1,31 @@ +{ + pkgs, + ... +}: +let + evalConfig = import ../lib/eval-config.nix; + + nixos = evalConfig { + modules = [ + { + system.stateVersion = "25.05"; + fileSystems."/".device = "/dev/null"; + boot.loader.grub.device = "nodev"; + nixpkgs.hostPlatform = pkgs.system; + virtualisation.vmVariant.networking.hostName = "vm"; + virtualisation.vmVariantWithBootLoader.networking.hostName = "vm-w-bl"; + } + ]; + }; +in +assert nixos.config.virtualisation.vmVariant.networking.hostName == "vm"; +assert nixos.config.virtualisation.vmVariantWithBootLoader.networking.hostName == "vm-w-bl"; +assert nixos.config.networking.hostName == "nixos"; +pkgs.symlinkJoin { + name = "nixos-test-vm-variant-drvs"; + paths = with nixos.config.system.build; [ + toplevel + vm + vmWithBootLoader + ]; +} diff --git a/nixos/tests/zipline.nix b/nixos/tests/zipline.nix index dfda9230ea7c..023c4484a810 100644 --- a/nixos/tests/zipline.nix +++ b/nixos/tests/zipline.nix @@ -1,4 +1,5 @@ { lib, ... }: + { name = "zipline"; meta.maintainers = with lib.maintainers; [ defelo ]; @@ -20,6 +21,18 @@ networking.hosts."127.0.0.1" = [ "zipline.local" ]; }; + interactive.nodes.machine = { + services.zipline.settings.CORE_HOSTNAME = lib.mkForce "0.0.0.0"; + networking.firewall.allowedTCPPorts = [ 8000 ]; + virtualisation.forwardPorts = [ + { + from = "host"; + host.port = 8000; + guest.port = 8000; + } + ]; + }; + testScript = '' import json import re diff --git a/pkgs/README.md b/pkgs/README.md index 59cc84468546..e6a05c19f834 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -36,7 +36,7 @@ Before adding a new package, please consider the following questions: If any of these questions' answer is no, then you should probably not add the package. -This is section describes a general framework of understanding and exceptions might apply. +This section describes a general framework of understanding and exceptions might apply. Luckily it's pretty easy to maintain your own package set with Nix, which can then be added to the [Nix User Repository](https://github.com/nix-community/nur) project. diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index e3760c9e2012..b0c143d21537 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -5,6 +5,7 @@ fetchpatch, updateAutotoolsGnuConfigScriptsHook, autoreconfHook, + freebsd, }: stdenv.mkDerivation rec { @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { }) ] ++ [ - # Has to come after darwin patches + # Has to come after darwin patches and before freebsd patches ./fix_private_keyword.patch # Order does not matter ./configure.patch @@ -62,13 +63,98 @@ stdenv.mkDerivation rec { hash = "sha256-krfprwls0L3hsNfoj2j69J5k1RTKEQtzE0fLYG9EJKo="; }) ] - ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch; + ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch + ++ [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_low__interface.h"; + hash = "sha256-bXrcRFCbU7/7/N+J8VGKGSxIB1m8XwoAlc/KTnt9wN0="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_scan__devices.c"; + hash = "sha256-UD7SXeypF3bAqT7Y24UOrGZNaD8ZmpS2V7XQU+3VKXk="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/private_data/g' $out + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_cdda__interface.h"; + hash = "sha256-JL4qe4LwmNp2jQFqTvyRjc6bixGqYr6BZmqsYIY9xhw="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_common__interface.c"; + hash = "sha256-vw0oFM6w15YBaAK01FwVcSN+oztSfo5jL6OlGy0iWBg="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_cooked__interface.c"; + hash = "sha256-g39dhxb8+K9BIb2/5cmkQ9GYjg4gDjj6sv+dXx93kQ4="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_interface.c"; + hash = "sha256-LMWfbqLjbQM3L4H3orAxyyAHf1hVtFwfmZY8NmBLKzs="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/private_data/g' $out + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_scsi__interface.c"; + hash = "sha256-dx6YCWW8J0e455phaYDUMiOCvp4DsfINjSEiEfnHaNI="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/private_data/g' $out + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-Makefile.in"; + hash = "sha256-Wje2d58xrSWHJNktQRHcNSbh5yh6vMtpgc/3G4D1vrI="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook autoreconfHook ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isFreeBSD [ + # cdparanoia shipped headers have #include + # (it is part of the freebsd base system so this is reasonable + # but we want to keep the default freebsd libs, freebsd.libc, small) + freebsd.libcam + ]; + + env = + lib.optionalAttrs stdenv.hostPlatform.isFreeBSD { + NIX_LDFLAGS = "-lcam"; + } + // { + BSD_INSTALL_PROGRAM = "install"; + BSD_INSTALL_LIB = "install"; + }; + # Build system reuses the same object file names for shared and static # library. Occasionally fails in the middle: # gcc -O2 -fsigned-char -g -O2 -c scan_devices.c diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 823d11b55caa..f98bdae72975 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -1,6 +1,7 @@ { copyDesktopItems, fetchFromGitHub, + fetchpatch, glibmm, gst_all_1, lib, @@ -42,6 +43,14 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; + patches = [ + (fetchpatch { + url = "https://github.com/Audio4Linux/JDSP4Linux/pull/241.patch"; + hash = "sha256-RtVKlw2ca8An4FodeD0RN95z9yHDHBgAxsEwLAmW7co="; + name = "fix-build-with-new-pipewire.patch"; + }) + ]; + buildInputs = [ glibmm diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index b737e70d2a12..fa51200dc9c9 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-/1kAgzmSbnuCqd6YxbaYW2+gE0Gvy373y5VfUK4OVzI="; + sha256 = "sha256-7sD9AAuuDT0+VycKLL19DYdmuSLmt0Uy2NmoKQ1+c3A="; }; cmakeFlags = [ @@ -127,17 +127,12 @@ stdenv.mkDerivation (finalAttrs: { qtwayland ]; - postInstall = - '' - # Remove unneeded bundled libraries and headers - rm -r $out/{include,lib} - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p "$out/Applications" - mv "$out/mscore.app" "$out/Applications/mscore.app" - mkdir -p $out/bin - ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore - ''; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + mv "$out/mscore.app" "$out/Applications/mscore.app" + mkdir -p $out/bin + ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore + ''; # muse-sounds-manager installs Muse Sounds sampler libMuseSamplerCoreLib.so. # It requires that argv0 of the calling process ends with "/mscore" or "/MuseScore-4". diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix index 63b8160868f8..120ae1bb80bb 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pipecontrol"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitHub { owner = "portaloffreedom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jMP8hPv0Rv/OIVIzR/5R8LmEcyzwtcof9Ire86WtISc="; + sha256 = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/applications/audio/raysession/default.nix index cc7c0e0d5a74..38c6b78d72d7 100644 --- a/pkgs/applications/audio/raysession/default.nix +++ b/pkgs/applications/audio/raysession/default.nix @@ -12,11 +12,11 @@ buildPythonApplication rec { pname = "raysession"; - version = "0.14.3"; + version = "0.14.4"; src = fetchurl { url = "https://github.com/Houston4444/RaySession/releases/download/v${version}/RaySession-${version}-source.tar.gz"; - sha256 = "sha256-3+g1zdjGkxNEpyuKuxzhr2p9gkEFjYAso4fPedbjmlY="; + sha256 = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A="; }; postPatch = '' @@ -24,6 +24,7 @@ buildPythonApplication rec { substituteInPlace Makefile --replace '$(DESTDIR)/' '$(DESTDIR)$(PREFIX)/' # Do not wrap an importable module with a shell script. chmod -x src/daemon/desktops_memory.py + chmod -x src/clients/jackpatch/main_loop.py ''; format = "other"; diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix index 299bc5c627c0..791f4c948e7f 100644 --- a/pkgs/applications/editors/android-studio-for-platform/common.nix +++ b/pkgs/applications/editors/android-studio-for-platform/common.nix @@ -2,6 +2,7 @@ channel, pname, version, + versionPrefix, sha256Hash, }: @@ -51,7 +52,7 @@ let drvName = "${pname}-${version}"; - filename = "asfp-${version}-linux.deb"; + filename = "asfp-${versionPrefix}-${version}-linux.deb"; androidStudioForPlatform = stdenv.mkDerivation { name = "${drvName}-unwrapped"; @@ -67,7 +68,7 @@ let ]; installPhase = '' - cp -r "./opt/${pname}/" $out + cp -r ./tmp/*/ $out wrapProgram $out/bin/studio.sh \ --set-default JAVA_HOME "$out/jbr" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ diff --git a/pkgs/applications/editors/android-studio-for-platform/default.nix b/pkgs/applications/editors/android-studio-for-platform/default.nix index 444368bb9f9e..aafc1a9b0201 100644 --- a/pkgs/applications/editors/android-studio-for-platform/default.nix +++ b/pkgs/applications/editors/android-studio-for-platform/default.nix @@ -16,12 +16,15 @@ let inherit tiling_wm; }; stableVersion = { - version = "2023.2.1.20"; # Android Studio Iguana | 2023.2.1 Beta 2 - sha256Hash = "sha256-cM/pkSghqLUUvJVF/OVLDOxVBJlJLH8ge1bfZtDUegY="; + version = "2024.2.2.13"; + # this seems to be a fuckup on google's side + versionPrefix = "Ladybug%20Feature%20Drop"; + sha256Hash = "sha256-yMUTWOpYHa/Aizrgvs/mbofrDqrbL5bJYjuklIdyU/0="; }; canaryVersion = { - version = "2023.3.2.1"; # Android Studio Jellyfish | 2023.3.2 Canary 1 - sha256Hash = "sha256-XOsbMyNentklfEp1k49H3uFeiRNMCV/Seisw9K1ganM="; + version = "2024.3.1.9"; + versionPrefix = "canary-meerkat"; + sha256Hash = "sha256-j5KEwHbc+0eFi3GZlD5PMuM/RWw2MJ1PaXZrPMvhCik="; }; in { diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index ddab4bc70a00..b4e96f6490fb 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -61,6 +61,7 @@ lib.extendMkDerivation { propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; strictDeps = args.strictDeps or true; + __structuredAttrs = args.__structuredAttrs or true; inherit turnCompilationWarningToError ignoreCompilationError; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 3a5cf163e57e..d607453276db 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1061,6 +1061,13 @@ let # missing optional dependencies ekg = addPackageRequires super.ekg [ self.denote ]; + elfeed = super.elfeed.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace elfeed-curl.el \ + --replace-fail 'elfeed-curl-program-name "curl"' 'elfeed-curl-program-name "${lib.getExe pkgs.curl}"' + ''; + }); + elisp-sandbox = ignoreCompilationError super.elisp-sandbox; # elisp error elnode = ignoreCompilationError super.elnode; # elisp error @@ -1093,7 +1100,7 @@ let enotify = ignoreCompilationError super.enotify; # elisp error # https://github.com/leathekd/ercn/issues/6 - ercn = addPackageRequires super.ercn [ self.dash ]; + ercn = addPackageRequiresIfOlder super.ercn [ self.dash ] "20250317.2338"; # missing optional dependencies eval-in-repl = addPackageRequires super.eval-in-repl ( @@ -1295,6 +1302,15 @@ let # https://github.com/fred-o/jekyll-modes/issues/6 jekyll-modes = addPackageRequires super.jekyll-modes [ self.poly-markdown ]; + jq-mode = super.jq-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace jq-mode.el \ + --replace-fail 'jq-interactive-command "jq"' 'jq-interactive-command "${lib.getExe pkgs.jq}"' + substituteInPlace ob-jq.el \ + --replace-fail 'org-babel-jq-command "jq"' 'org-babel-jq-command "${lib.getExe pkgs.jq}"' + ''; + }); + jss = ignoreCompilationError super.jss; # elisp error # missing optional dependencies: vterm or eat diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index fbe4b8cf44c8..9afcb4807d6d 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -43,26 +43,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.3.4", - "sha256": "f474f1f19fb04f7de73596c51b49f2675b3fc11df6a7aaba325c3ad98477d1df", - "url": "https://download.jetbrains.com/go/goland-2024.3.4.tar.gz", - "build_number": "243.25659.52" + "version": "2024.3.5", + "sha256": "d59f537fb8d9c741a704605ec00c4b4230211301cd0609c73c66d5edb4eb9340", + "url": "https://download.jetbrains.com/go/goland-2024.3.5.tar.gz", + "build_number": "243.26053.20" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.3.4.1", - "sha256": "3eefea10391fdeaaf19ba6d00ee8c7f174a4feb5261394c4d3454d1cf0f5826b", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.4.1.tar.gz", - "build_number": "243.25659.59" + "version": "2024.3.5", + "sha256": "8a287528d830e6cdec2ded13c974c39a35b7555243c22d8b83113c96c26630aa", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5.tar.gz", + "build_number": "243.26053.27" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.3.4.1", - "sha256": "e9b5b868e425aa1255d75f85028e7ba6275bb8aab88781e960c2c7c34f2173e8", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.4.1.tar.gz", - "build_number": "243.25659.59" + "version": "2024.3.5", + "sha256": "f8e8e864f4fedddf1d366a7db23fc4132192c3a6029c614a382186ff564a78a1", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5.tar.gz", + "build_number": "243.26053.27" }, "mps": { "update-channel": "MPS RELEASE", @@ -75,27 +75,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.3.4", - "sha256": "9344d68dda2c0062d9f6f03e27e959346f2f2bba2bce9f1c108653090d2dfb85", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.4.tar.gz", - "build_number": "243.25659.45", + "version": "2024.3.5", + "sha256": "e12efb584eb9b632703d1bee9986d95ac09aceaf76ca40e9188d82b713ff0fc1", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5.tar.gz", + "build_number": "243.26053.13", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.3.4", - "sha256": "c61dd7aa1b5f9c6f7a0943aeec79c56d0aa0f5ed29591b7eb3007169e2545621", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.4.tar.gz", - "build_number": "243.25659.43" + "version": "2024.3.5", + "sha256": "e8d5aa2a05d35e3cb3cd186d446242c191d03b3d0556b160b6875a830c91cc2b", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5.tar.gz", + "build_number": "243.26053.29" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.3.4", - "sha256": "793bfdcbe38251678bc2fe07a026a594efa5af459137fb70dd786edb340c6430", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.4.tar.gz", - "build_number": "243.25659.43" + "version": "2024.3.5", + "sha256": "dbfbdbd2627bcf5de85673151f3d3b79b12fa373d8c0d7942f40bba3aa397ea3", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5.tar.gz", + "build_number": "243.26053.29" }, "rider": { "update-channel": "Rider RELEASE", @@ -108,26 +108,26 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.3.4", - "sha256": "9454aaf0877516b2047bc21517b5459860bdb4cbc797d66612760a336c011ee3", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.4.tar.gz", - "build_number": "243.25659.41" + "version": "2024.3.5", + "sha256": "e5fb7daa24307927cfd329340956b4cae1e0f3bb011841834519c4342428d38b", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5.tar.gz", + "build_number": "243.26053.19" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.3.6", - "sha256": "c4373d591eabcfdca4e8e5f635d9007855ac8a32baf4aac26e189d6415f6df9f", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.6.tar.gz", - "build_number": "243.25659.54" + "version": "2024.3.7", + "sha256": "aec79e12c16082d364617dab83ec63980fddbd66c5734573499b000733c508ad", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7.tar.gz", + "build_number": "243.26053.17" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.3.4", - "sha256": "206a5e6b6fd3e603d62a7bbb26b0bf3b7ff7939b3e0cd136d360cdb80ec455f8", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.4.tar.gz", - "build_number": "243.25659.40" + "version": "2024.3.5", + "sha256": "da587d7ca3ebb08f067143e4a6b35f1aa133aa10af7fc365496838006fcd1aed", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5.tar.gz", + "build_number": "243.26053.12" }, "writerside": { "update-channel": "Writerside EAP", @@ -182,26 +182,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.3.4", - "sha256": "9e1a8921c92e3cd396d81f9a8011ed279d303565fe69b8c2322dedf9a6164643", - "url": "https://download.jetbrains.com/go/goland-2024.3.4-aarch64.tar.gz", - "build_number": "243.25659.52" + "version": "2024.3.5", + "sha256": "12236e5b82e99ce27925567afe049e3ce298b083b764b75ffb67b5b7b8072e61", + "url": "https://download.jetbrains.com/go/goland-2024.3.5-aarch64.tar.gz", + "build_number": "243.26053.20" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.3.4.1", - "sha256": "8b6a175a671295fe5095904e4aab5e9b91ff699cb691c5d6f3faadb8b9fd1037", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.4.1-aarch64.tar.gz", - "build_number": "243.25659.59" + "version": "2024.3.5", + "sha256": "43b3ac68c07b611baa12bd70adc188b7be81d79b0b3a232aad582df2ffeb2598", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5-aarch64.tar.gz", + "build_number": "243.26053.27" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.3.4.1", - "sha256": "a6245e6e1bef3062be5b06cf61bd2eb489e64c6c26f86040cb9c28e4c65e780b", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.4.1-aarch64.tar.gz", - "build_number": "243.25659.59" + "version": "2024.3.5", + "sha256": "0f072350137540672fd4de19768175164a2497290098321dfefaaaff0097f524", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5-aarch64.tar.gz", + "build_number": "243.26053.27" }, "mps": { "update-channel": "MPS RELEASE", @@ -214,27 +214,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.3.4", - "sha256": "061dcd7f2972d4d9efc74cce29950929e1fdd02531e1f6365551649c8a254b1a", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.4-aarch64.tar.gz", - "build_number": "243.25659.45", + "version": "2024.3.5", + "sha256": "a55b112177db464081139f6b9aec2a7c22b0f069dd70fdb1bfe56fa1a7f33aa4", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5-aarch64.tar.gz", + "build_number": "243.26053.13", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.3.4", - "sha256": "6cd540a586692f8784e0889ad83ce497eaf3052a3a319b9d53fa9594572409ee", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.4-aarch64.tar.gz", - "build_number": "243.25659.43" + "version": "2024.3.5", + "sha256": "08fbe137d0153b92a639351e866c2218744517b6cfcf412abedfe1d6c9ad1bc4", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5-aarch64.tar.gz", + "build_number": "243.26053.29" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.3.4", - "sha256": "d4755118db79ff68be149619a2e0b8d480dd56694de131228a7d5ebbd0f82240", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.4-aarch64.tar.gz", - "build_number": "243.25659.43" + "version": "2024.3.5", + "sha256": "53ce650a41fefb260a13cb96462857fc5abd98d7a02adf794cde7248e3cefbbb", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5-aarch64.tar.gz", + "build_number": "243.26053.29" }, "rider": { "update-channel": "Rider RELEASE", @@ -247,26 +247,26 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.3.4", - "sha256": "c63ca3230cecd887e9810500f466c51ee9d7430193f4feda315a6fdfc60c0447", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.4-aarch64.tar.gz", - "build_number": "243.25659.41" + "version": "2024.3.5", + "sha256": "72a331a3c04a3d9f8bf30ad0b5009d4634f0fdcf5becd6a9a5cd00a5728cd9d1", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5-aarch64.tar.gz", + "build_number": "243.26053.19" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.3.6", - "sha256": "e6ad574015ffc7f6392434634a5f3172e1ce94d96f10e8e94e9012f2ee770933", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.6-aarch64.tar.gz", - "build_number": "243.25659.54" + "version": "2024.3.7", + "sha256": "537cb7c23cf03a467d311ae00c07b9830f8a7e09807366488d75f84c573ac460", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7-aarch64.tar.gz", + "build_number": "243.26053.17" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.3.4", - "sha256": "498efb5b3e79a0f71dc7f44f54a2155a17b5d53d8b7a71ae6aaef87abc59bfce", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.4-aarch64.tar.gz", - "build_number": "243.25659.40" + "version": "2024.3.5", + "sha256": "fce5d5c2b8c5aacfabac60ff93b93d7c9a3239adcf8347b3deabd472ac1c1288", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5-aarch64.tar.gz", + "build_number": "243.26053.12" }, "writerside": { "update-channel": "Writerside EAP", @@ -321,26 +321,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.3.4", - "sha256": "d621d2130f2f4b602c69a1d62c68112fcea189405ce1d7f6cbd75c7584ccf96c", - "url": "https://download.jetbrains.com/go/goland-2024.3.4.dmg", - "build_number": "243.25659.52" + "version": "2024.3.5", + "sha256": "08739696b428ee2964f314884edbabd6614e5b4ce1ec9021e9d336ee947bb944", + "url": "https://download.jetbrains.com/go/goland-2024.3.5.dmg", + "build_number": "243.26053.20" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.3.4.1", - "sha256": "bf4d88befcd445db19732d9c02d2db864196bbd6554fe4b54f80f8e1936e3993", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.4.1.dmg", - "build_number": "243.25659.59" + "version": "2024.3.5", + "sha256": "94640287fb84238d766a52681083807a087ef28b5c9b66d31f4a7ae06f2bcb8a", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5.dmg", + "build_number": "243.26053.27" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.3.4.1", - "sha256": "f4bf75679314b88aa6fe1c892175178498e3bc13583cb1380fa2cc12fab8acf1", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.4.1.dmg", - "build_number": "243.25659.59" + "version": "2024.3.5", + "sha256": "8b50dd9783c6f8dde229606a4e2d1d0e4ce95f0db33502053ed957fd532bcc35", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5.dmg", + "build_number": "243.26053.27" }, "mps": { "update-channel": "MPS RELEASE", @@ -353,27 +353,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.3.4", - "sha256": "32c0e7faaeb6c90c25192688d9f03c888f7bb957c91796713783b41805c65956", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.4.dmg", - "build_number": "243.25659.45", + "version": "2024.3.5", + "sha256": "edb7d1ff3aa653f6f73ea2e6f907b026de8613cea3bdc2cb90c79257f387c2a6", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5.dmg", + "build_number": "243.26053.13", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.3.4", - "sha256": "468914b3f03f8df651a9ac48df163b1fdee2b7f33ab64a71bed899da5427feab", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.4.dmg", - "build_number": "243.25659.43" + "version": "2024.3.5", + "sha256": "25d01d39d7e5f1d658548dadee4cd4972f25d60a8c10da3cb482a99c8e3181d3", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5.dmg", + "build_number": "243.26053.29" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.3.4", - "sha256": "7441c8878953c6e46177d9a99d09b328f7c2d493b4f1967ea67276f2f8f9f025", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.4.dmg", - "build_number": "243.25659.43" + "version": "2024.3.5", + "sha256": "d98e90eccec085c467a547a7ee31ab6611479ea991fe7b99e41e81f491cfeeff", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5.dmg", + "build_number": "243.26053.29" }, "rider": { "update-channel": "Rider RELEASE", @@ -386,26 +386,26 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.3.4", - "sha256": "8cb255a6b66f77c5233cb2dd4c47cd4c8564c48cee3b1bb40128677a93cc39c8", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.4.dmg", - "build_number": "243.25659.41" + "version": "2024.3.5", + "sha256": "fb9f10ef6c0e5741bcd35abf148133002d92865899e4a98a276be64ff88b9688", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5.dmg", + "build_number": "243.26053.19" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.3.6", - "sha256": "ebcec89bbb05a3c6d2626bd5692bd1a45732f28108c9a0eaad0a19bbf463acc6", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.6.dmg", - "build_number": "243.25659.54" + "version": "2024.3.7", + "sha256": "1326cfb150170e69c2fe62c4f7ff131d90117da3ee07b5e6134e46d44822fba0", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7.dmg", + "build_number": "243.26053.17" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.3.4", - "sha256": "337f80f0a5a9179b64ac4552a89ffc93a1e3f1b5c8a1b94a04a9cad9d0d18808", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.4.dmg", - "build_number": "243.25659.40" + "version": "2024.3.5", + "sha256": "6d7d3c7883f1344a08d39c4060dcd32c28039d7217549c88d703e65517be7898", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5.dmg", + "build_number": "243.26053.12" }, "writerside": { "update-channel": "Writerside EAP", @@ -460,26 +460,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.3.4", - "sha256": "4c5e5f50b9209f673ed165c4c1fcb1bc88f4fd3ab2f4ad9740bc8855bb6f4e22", - "url": "https://download.jetbrains.com/go/goland-2024.3.4-aarch64.dmg", - "build_number": "243.25659.52" + "version": "2024.3.5", + "sha256": "7f3503352d47551c68818b288938fdb01ebd35d56153f6ed560058b19397796c", + "url": "https://download.jetbrains.com/go/goland-2024.3.5-aarch64.dmg", + "build_number": "243.26053.20" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.3.4.1", - "sha256": "5b8681be2c39c2bbbff143aea27161a5f69c72daf6e88d6f320867bbf7c51659", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.4.1-aarch64.dmg", - "build_number": "243.25659.59" + "version": "2024.3.5", + "sha256": "b96b9fa3de829f0d5e98aa73766b3da4909186a464e3f8e7b8b3c975f1b0978b", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5-aarch64.dmg", + "build_number": "243.26053.27" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.3.4.1", - "sha256": "ac323f3d011e826cc37d88d99585d28092703abfc464cabc3c033bb85ae86c65", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.4.1-aarch64.dmg", - "build_number": "243.25659.59" + "version": "2024.3.5", + "sha256": "8cf632fbb89e6dfbd2a536643450e6ae6671001348461260fe0132ed14ef3d0c", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5-aarch64.dmg", + "build_number": "243.26053.27" }, "mps": { "update-channel": "MPS RELEASE", @@ -492,27 +492,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.3.4", - "sha256": "9f5586b202165002f8ecbb6b6ffa332d6116c605eb487e49d50ba4d6b68b8785", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.4-aarch64.dmg", - "build_number": "243.25659.45", + "version": "2024.3.5", + "sha256": "439aea4e8f919701b058f619dc545ac5207bd2b340b9f1925281a7fe0747fbd6", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5-aarch64.dmg", + "build_number": "243.26053.13", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.3.4", - "sha256": "b8f585ff95cfa31a97db3ba98ff84843455b0a89790ea4abbcc8da05c6fa6f4d", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.4-aarch64.dmg", - "build_number": "243.25659.43" + "version": "2024.3.5", + "sha256": "444edd06334a6b35964995b9af8ba998514eb1355f6035b905ec57e1a0ff7320", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5-aarch64.dmg", + "build_number": "243.26053.29" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.3.4", - "sha256": "243d94467cfaeccbfcb21976d2bcf262beb31a9d52bb2cf8c6ab998987e4e49c", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.4-aarch64.dmg", - "build_number": "243.25659.43" + "version": "2024.3.5", + "sha256": "d92332e6b120669f7f9aded84b82b6c7a64c2512537faf623122e7f2505bbab1", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5-aarch64.dmg", + "build_number": "243.26053.29" }, "rider": { "update-channel": "Rider RELEASE", @@ -525,26 +525,26 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.3.4", - "sha256": "7d93ff5df263a1526c0cb901e6df2abee547f9e9116f355cfc13a93a20b8ea4a", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.4-aarch64.dmg", - "build_number": "243.25659.41" + "version": "2024.3.5", + "sha256": "e7f12eeb72b3421108b8aafb03c4603b74e6ac8922dc192f2a2d5bb5811d4d48", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5-aarch64.dmg", + "build_number": "243.26053.19" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.3.6", - "sha256": "f45da1a104b972697808d93508645269229c52fe7561ef79f2865459c259ebf8", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.6-aarch64.dmg", - "build_number": "243.25659.54" + "version": "2024.3.7", + "sha256": "e7d1f13d54637202dcf7a54a2f273b7d9fdc251ae6573df6316fc23dcc8611f2", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7-aarch64.dmg", + "build_number": "243.26053.17" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.3.4", - "sha256": "7e7745429e3541bd6cfaffda84aba4bcfe252db5cf93c7b2e2c75205217af57a", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.4-aarch64.dmg", - "build_number": "243.25659.40" + "version": "2024.3.5", + "sha256": "67f1898fcf936f22842a669ebe1cc746d8ae9069086dcf66efa2d86d73e78d5c", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5-aarch64.dmg", + "build_number": "243.26053.12" }, "writerside": { "update-channel": "Writerside EAP", diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index a70a0689fbbc..97b2c5d70b99 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -22,14 +22,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", "243.24978.79": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", "243.25659.34": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", "243.25659.42": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip" }, "name": "ideavim" }, @@ -38,7 +38,7 @@ "idea-ultimate" ], "builds": { - "243.25659.59": "https://plugins.jetbrains.com/files/631/692278/python-243.25659.59.zip" + "243.26053.27": "https://plugins.jetbrains.com/files/631/700118/python-243.26053.27.zip" }, "name": "python" }, @@ -49,7 +49,7 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/1347/696516/scala-intellij-bin-2024.3.42.zip" + "243.26053.27": "https://plugins.jetbrains.com/files/1347/696516/scala-intellij-bin-2024.3.42.zip" }, "name": "scala" }, @@ -75,14 +75,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.24978.79": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.25659.34": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", "243.25659.42": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip" }, "name": "string-manipulation" }, @@ -108,14 +108,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", "243.24978.79": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", "243.25659.34": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", "243.25659.42": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip" }, "name": "handlebars-mustache" }, @@ -141,14 +141,14 @@ "243.24978.546": null, "243.24978.79": null, "243.25659.34": null, - "243.25659.40": null, - "243.25659.41": null, "243.25659.42": null, - "243.25659.43": null, - "243.25659.45": null, - "243.25659.52": null, - "243.25659.54": null, - "243.25659.59": null + "243.26053.12": null, + "243.26053.13": null, + "243.26053.17": null, + "243.26053.19": null, + "243.26053.20": null, + "243.26053.27": null, + "243.26053.29": null }, "name": "kotlin" }, @@ -174,14 +174,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", "243.24978.79": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", "243.25659.34": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", "243.25659.42": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip" }, "name": "ini" }, @@ -207,14 +207,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.24978.79": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.25659.34": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "243.25659.42": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -240,14 +240,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", "243.24978.79": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", "243.25659.34": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", "243.25659.42": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip" }, "name": "grep-console" }, @@ -273,14 +273,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", "243.24978.79": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", "243.25659.34": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", "243.25659.42": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip" }, "name": "file-watchers" }, @@ -290,8 +290,8 @@ "phpstorm" ], "builds": { - "243.25659.45": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" + "243.26053.13": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" }, "name": "symfony-support" }, @@ -301,8 +301,8 @@ "phpstorm" ], "builds": { - "243.25659.45": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip" + "243.26053.13": "https://plugins.jetbrains.com/files/7320/701175/PHP_Annotations-11.2.0.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/7320/701175/PHP_Annotations-11.2.0.zip" }, "name": "php-annotations" }, @@ -323,12 +323,12 @@ "243.22562.220": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip", "243.24978.79": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", "243.25659.34": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", "243.25659.42": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip" }, "name": "python-community-edition" }, @@ -354,14 +354,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.24978.79": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.25659.34": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", "243.25659.42": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip" }, "name": "asciidoc" }, @@ -387,14 +387,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", "243.24978.79": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", "243.25659.34": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.40": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.41": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", "243.25659.42": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.43": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.45": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.52": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.54": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.59": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar" + "243.26053.12": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.26053.13": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.26053.17": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.26053.19": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.26053.20": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.26053.27": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "243.26053.29": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar" }, "name": "wakatime" }, @@ -420,14 +420,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", "243.24978.79": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", "243.25659.34": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", "243.25659.42": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip" }, "name": "gittoolbox" }, @@ -448,19 +448,19 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/7724/654910/clouds-docker-impl-243.22562.236.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7724/654910/clouds-docker-impl-243.22562.236.zip", + "243.22562.218": null, + "243.22562.220": null, "243.24978.546": "https://plugins.jetbrains.com/files/7724/680796/clouds-docker-impl-243.24978.54.zip", "243.24978.79": "https://plugins.jetbrains.com/files/7724/680796/clouds-docker-impl-243.24978.54.zip", "243.25659.34": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", "243.25659.42": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip" }, "name": "docker" }, @@ -486,14 +486,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/8097/680200/graphql-243.24978.46.zip", "243.24978.79": "https://plugins.jetbrains.com/files/8097/680200/graphql-243.24978.46.zip", "243.25659.34": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", "243.25659.42": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip" }, "name": "graphql" }, @@ -518,13 +518,13 @@ "243.24978.546": null, "243.24978.79": null, "243.25659.34": null, - "243.25659.40": null, - "243.25659.41": null, "243.25659.42": null, - "243.25659.43": null, - "243.25659.45": null, - "243.25659.52": null, - "243.25659.59": null + "243.26053.12": null, + "243.26053.13": null, + "243.26053.19": null, + "243.26053.20": null, + "243.26053.27": null, + "243.26053.29": null }, "name": "-deprecated-rust" }, @@ -549,13 +549,13 @@ "243.24978.546": null, "243.24978.79": null, "243.25659.34": null, - "243.25659.40": null, - "243.25659.41": null, "243.25659.42": null, - "243.25659.43": null, - "243.25659.45": null, - "243.25659.52": null, - "243.25659.59": null + "243.26053.12": null, + "243.26053.13": null, + "243.26053.19": null, + "243.26053.20": null, + "243.26053.27": null, + "243.26053.29": null }, "name": "-deprecated-rust-beta" }, @@ -581,14 +581,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", "243.24978.79": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", "243.25659.34": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", "243.25659.42": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip" }, "name": "toml" }, @@ -599,7 +599,7 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip" + "243.26053.27": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip" }, "name": "minecraft-development" }, @@ -625,14 +625,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/8554/684425/featuresTrainer-243.24978.79.zip", "243.24978.79": "https://plugins.jetbrains.com/files/8554/684425/featuresTrainer-243.24978.79.zip", "243.25659.34": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", "243.25659.42": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip" }, "name": "ide-features-trainer" }, @@ -658,14 +658,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", "243.24978.79": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", "243.25659.34": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", "243.25659.42": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip" }, "name": "nixidea" }, @@ -691,14 +691,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", "243.24978.79": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", "243.25659.34": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", "243.25659.42": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip" }, "name": "-env-files" }, @@ -708,8 +708,8 @@ "idea-ultimate" ], "builds": { - "243.25659.52": "https://plugins.jetbrains.com/files/9568/680198/go-plugin-243.24978.46.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/9568/680198/go-plugin-243.24978.46.zip" + "243.26053.20": "https://plugins.jetbrains.com/files/9568/700127/go-plugin-243.26053.27.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/9568/700127/go-plugin-243.26053.27.zip" }, "name": "go" }, @@ -730,19 +730,19 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.25659.40": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.25659.41": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.25659.43": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.25659.45": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.25659.52": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.25659.54": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar", - "243.25659.59": "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar" + "243.22562.218": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.22562.220": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.24978.546": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.24978.79": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.25659.34": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.25659.42": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.26053.12": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.26053.13": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.26053.17": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.26053.19": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.26053.20": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.26053.27": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", + "243.26053.29": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar" }, "name": "ansi-highlighter-premium" }, @@ -768,14 +768,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", "243.24978.79": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", "243.25659.34": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", "243.25659.42": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip" }, "name": "key-promoter-x" }, @@ -801,14 +801,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", "243.24978.79": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", "243.25659.34": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", "243.25659.42": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip" }, "name": "randomness" }, @@ -834,14 +834,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.24978.79": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.25659.34": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", "243.25659.42": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip" }, "name": "csv-editor" }, @@ -867,14 +867,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", "243.24978.79": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", "243.25659.34": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", "243.25659.42": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip" }, "name": "rainbow-brackets" }, @@ -900,14 +900,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", "243.24978.79": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", "243.25659.34": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", "243.25659.42": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip" }, "name": "dot-language" }, @@ -933,14 +933,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", "243.24978.79": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", "243.25659.34": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", "243.25659.42": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip" }, "name": "hocon" }, @@ -961,19 +961,19 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.24978.546": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.24978.79": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.25659.34": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.25659.42": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.26053.12": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip" }, "name": "extra-icons" }, @@ -994,19 +994,19 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.24978.546": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.24978.79": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.25659.34": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.25659.42": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.26053.12": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip" }, "name": "aws-toolkit" }, @@ -1041,14 +1041,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.24978.79": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.25659.34": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", "243.25659.42": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip" }, "name": "vscode-keymap" }, @@ -1074,14 +1074,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.24978.79": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.25659.34": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", "243.25659.42": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip" }, "name": "eclipse-keymap" }, @@ -1107,14 +1107,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", "243.24978.79": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", "243.25659.34": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", "243.25659.42": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip" }, "name": "rainbow-csv" }, @@ -1140,14 +1140,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.24978.79": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.25659.34": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", "243.25659.42": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip" }, "name": "visual-studio-keymap" }, @@ -1173,14 +1173,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", "243.24978.79": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", "243.25659.34": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", "243.25659.42": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip" }, "name": "indent-rainbow" }, @@ -1206,14 +1206,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", "243.24978.79": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", "243.25659.34": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", "243.25659.42": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip" }, "name": "protocol-buffers" }, @@ -1239,14 +1239,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.24978.79": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.25659.34": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.40": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.41": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "243.25659.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.43": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.45": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.52": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.54": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.59": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "243.26053.12": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.26053.13": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.26053.17": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.26053.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.26053.20": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.26053.27": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "243.26053.29": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -1272,14 +1272,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", "243.24978.79": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", "243.25659.34": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.40": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.41": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", "243.25659.42": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.43": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.45": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.52": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.54": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.59": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar" + "243.26053.12": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.26053.13": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.26053.17": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.26053.19": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.26053.20": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.26053.27": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "243.26053.29": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar" }, "name": "mario-progress-bar" }, @@ -1305,14 +1305,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", "243.24978.79": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", "243.25659.34": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.40": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.41": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", "243.25659.42": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.43": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.45": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.52": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.54": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.59": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar" + "243.26053.12": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "243.26053.13": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "243.26053.17": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "243.26053.19": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "243.26053.20": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "243.26053.27": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "243.26053.29": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar" }, "name": "which-key" }, @@ -1333,19 +1333,19 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.24978.546": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.24978.79": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.25659.34": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.25659.42": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.26053.12": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip" }, "name": "extra-toolwindow-colorful-icons" }, @@ -1371,14 +1371,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", "243.24978.79": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", "243.25659.34": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", "243.25659.42": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip" }, "name": "github-copilot" }, @@ -1404,14 +1404,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.24978.79": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.25659.34": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "243.25659.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -1437,14 +1437,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", "243.24978.79": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", "243.25659.34": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", "243.25659.42": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip" }, "name": "catppuccin-theme" }, @@ -1470,14 +1470,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", "243.24978.79": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", "243.25659.34": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", "243.25659.42": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip" }, "name": "codeglance-pro" }, @@ -1503,14 +1503,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", "243.24978.79": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", "243.25659.34": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.40": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.41": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", "243.25659.42": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.43": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.45": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.52": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.54": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.59": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar" + "243.26053.12": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", + "243.26053.13": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", + "243.26053.17": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", + "243.26053.19": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", + "243.26053.20": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", + "243.26053.27": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", + "243.26053.29": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar" }, "name": "gerry-themes" }, @@ -1536,14 +1536,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", "243.24978.79": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", "243.25659.34": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", "243.25659.42": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip" }, "name": "better-direnv" }, @@ -1569,14 +1569,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.24978.79": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.25659.34": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", "243.25659.42": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip" }, "name": "mermaid" }, @@ -1602,14 +1602,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", "243.24978.79": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", "243.25659.34": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", "243.25659.42": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip" }, "name": "ferris" }, @@ -1635,14 +1635,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", "243.24978.79": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", "243.25659.34": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", "243.25659.42": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip" }, "name": "code-complexity" }, @@ -1668,14 +1668,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", "243.24978.79": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", "243.25659.34": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", "243.25659.42": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip" }, "name": "developer-tools" }, @@ -1693,14 +1693,14 @@ ], "builds": { "243.25659.34": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", "243.25659.42": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip" }, "name": "dev-containers" }, @@ -1712,8 +1712,8 @@ ], "builds": { "243.25659.42": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip" + "243.26053.17": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip" }, "name": "rust" }, @@ -1739,14 +1739,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", "243.24978.79": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", "243.25659.34": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", "243.25659.42": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip" }, "name": "continue" }, @@ -1772,14 +1772,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", "243.24978.79": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", "243.25659.34": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", "243.25659.42": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip" }, "name": "gitlab" }, @@ -1805,14 +1805,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", "243.24978.79": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", "243.25659.34": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", "243.25659.42": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip" }, "name": "catppuccin-icons" }, @@ -1838,14 +1838,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", "243.24978.79": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", "243.25659.34": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", "243.25659.42": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip" }, "name": "mermaid-chart" }, @@ -1871,14 +1871,14 @@ "243.24978.546": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", "243.24978.79": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", "243.25659.34": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", "243.25659.42": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip" }, "name": "oxocarbon" }, @@ -1899,19 +1899,19 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.24978.546": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.24978.79": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.25659.34": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.25659.42": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.26053.12": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip" }, "name": "extra-ide-tweaks" }, @@ -1932,19 +1932,19 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.22562.220": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.24978.546": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.24978.79": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.25659.34": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.25659.42": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.26053.12": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip" }, "name": "extra-tools-pack" }, @@ -1964,14 +1964,14 @@ "builds": { "243.24978.79": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", "243.25659.34": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", "243.25659.42": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip" }, "name": "nix-lsp" }, @@ -1995,14 +1995,14 @@ "243.22562.220": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", "243.24978.79": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", "243.25659.34": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.40": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.41": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", "243.25659.42": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.43": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.45": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.52": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.54": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.59": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip" + "243.26053.12": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.26053.13": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.26053.17": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.26053.19": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.26053.20": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.26053.27": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", + "243.26053.29": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip" }, "name": "markdtask" } @@ -2012,8 +2012,8 @@ "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip": "sha256-QfJAfpKaHeKo9xQwFd+3pVRxYGTO60puORrZ0rdpaZY=", "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip": "sha256-25vtwXuBNiYL9E0pKG4dqJDkwX1FckAErdqRPKXybQA=", "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip": "sha256-Bnnvy+HDNkx2DQM7N+JUa8hQzIA3H/5Y0WpWAjPmhUI=", - "https://plugins.jetbrains.com/files/11058/686929/Extra_Icons-2025.1.2.zip": "sha256-wJgDPYDCCzehOOaXLVnHSBgpPfaNeh+uNoNHe9BBNn0=", - "https://plugins.jetbrains.com/files/11349/693441/aws-toolkit-jetbrains-standalone-3.58-243.zip": "sha256-d57NJ/A7pUnzwiDVQ4CKiYC/npp1FN9wAnDBtEHDptk=", + "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip": "sha256-suQxHLMgY0x/XHI1EikPI1mBpsTn4bkKO6HgCBb+OmA=", + "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip": "sha256-+CeHk1yCPPGP8Vn9irjDqszprqmDTtjqUGuzKk+rJpI=", "https://plugins.jetbrains.com/files/12024/622380/ReSharperPlugin.CognitiveComplexity-2024.3.0-eap04.zip": "sha256-X2x7uyWoV4aBI8E5bw35QfzmySWzbEAZ2nvdo5i+t+s=", "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip": "sha256-phv8MTGKNGzRviKzX+nIVTbkX4WkU82QVO5zXUQLtAo=", "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip": "sha256-/g1ucT18ywVJnCePH7WyMWKgM9umowBz5wFObmO7cws=", @@ -2027,7 +2027,7 @@ "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar": "sha256-mB09zvUg1hLXl9lgW1NEU+DyVel1utZv6s+mFykckYY=", "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar": "sha256-2FlEaHf2rO6xgG3LnZIPt/XKgRGjpLSiEXCncfAf3bI=", "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip": "sha256-yKpWQZGxfsKwPVTJLHpF4KGJ5ANCd73uxHlfdFE4Qf4=", - "https://plugins.jetbrains.com/files/16604/686930/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.4.zip": "sha256-W/oeD2vRxxyrjHuw+4hGcPEER6K1kzkDGRkxvEotOaw=", + "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip": "sha256-ycstNSciTV1LAsvJ3fTXN3NmQ259nkrAeX6MASjdmag=", "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip": "sha256-lq5JmR8gPsrZ9rT+byit98KZSzFsl4UppwYAaE9Kjiw=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip": "sha256-QOF3nAXOfYhNl3YUK1fc9z5H2uXTPm2X+6fVZ5QP8ZQ=", @@ -2047,29 +2047,30 @@ "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip": "sha256-qkwfEpC2f4vgVsesSiUvd6kK6XnG9DTN4gXUR+rLlK0=", "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip": "sha256-ssaSY1I6FopLBgVKHUyjBrqzxHLSuI/swtDfQWJ7gxU=", "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip": "sha256-zF89Q1LE6xwBeDKv4FSQ6H6cbABjz74Z/qGwddRWp7M=", - "https://plugins.jetbrains.com/files/23927/686932/Extra_IDE_Tweaks-2025.1.2.zip": "sha256-S9XvXtNadkb5geuar40+y5cARMgWp+vJELj7hk3Y4EY=", - "https://plugins.jetbrains.com/files/24559/686931/Extra_Tools_Pack-2025.1.3.zip": "sha256-r5oFljG92OTPbXRXqbXDI4KD2dyMp2onKTWQcdftU2k=", + "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip": "sha256-8Q0S6Iqv880JKscoiNfdYnKHFcwQV0raOpOsNe6tgO4=", + "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip": "sha256-avn3oqi6KgMQ73Q7rj7AUKzytD0dxtW2k772OWtW/mM=", "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip": "sha256-Uq5RdVQTyqRMsEwDZT6Kldv2alt0EVMCABEt/xQUHow=", "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip": "sha256-NFHB5zWH8pUwz6OT8F7eIiapeEvHX24fj0Eo1qH45Aw=", - "https://plugins.jetbrains.com/files/631/692278/python-243.25659.59.zip": "sha256-yB0Hak9H/HRy7GJPbGHur6yHk67nHqkxeKkktKcKmyE=", + "https://plugins.jetbrains.com/files/631/700118/python-243.26053.27.zip": "sha256-/Ceycp+iCxN7nrSg7L1xNqlOY1hzij/ADEvHUWBwTfE=", "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip": "sha256-pFKAZ8xFNfUh7/Hi4NYPDQAhRRYm4WKTpCQELqBfb40=", "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip": "sha256-kL/A2R8j2JKMU61T/xJahPwKPYmwFCFy55NPSoBh/Xc=", "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip": "sha256-m2iKdm4f1h+k1XdQvJCd8T83jEKip+H1E1p8XMfrGcg=", "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip": "sha256-TiVoHX56uEAsSWqE7n0jrePiabN3gcNRFNuSeBhvul4=", + "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip": "sha256-s4bSXVqrhy3VMQQd2sT+Xv9v0hQwGGIYk0H+wjonFO4=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip": "sha256-KY5VRiLJJwa9OVVog1W3MboZjwVboYwYm+i4eqooo44=", "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip": "sha256-8IHS3kmmbL8uQYnaMW7NgBIpBKT+XDJ4QDiiPZa5pzo=", "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip": "sha256-mlCow96mI2k7c/oGe064DqjUViOFhNgwNjF6DVyak4E=", "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=", - "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip": "sha256-05aBYbqNIuwe/JTwntFdIqML8NHbTOwVusl1P9FzuYY=", + "https://plugins.jetbrains.com/files/7320/701175/PHP_Annotations-11.2.0.zip": "sha256-qUgbbG+S7RVt7zLU8ngnp7NzJUb23AuKM7KLAWYQLUs=", "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip": "sha256-45UtQRZMtKF6addrrB3A+goeyICMfcZ2FKcJvJSqgg4=", "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip": "sha256-4KkUOSN9KnBjpo92LvkN/7ZtDG/gSAFHgDf5ESSsgoY=", "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip": "sha256-3RJ7YVFtynyqeLIzdrirCMbWNZmUkJ+DT/9my71H0Dk=", "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar": "sha256-Z7ZWDomXnTdHFKOElMkt53imef6aT7H5XeD6lOOFxfQ=", "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip": "sha256-ZbjLwXY+AocK1OtlyPd+wcObiArWSOWMXjtWaLWMbDo=", - "https://plugins.jetbrains.com/files/7724/654910/clouds-docker-impl-243.22562.236.zip": "sha256-3F25CTNLfQcUFklNXovLVXQ8cfOr/6Y5yetPc3jTFQM=", "https://plugins.jetbrains.com/files/7724/680796/clouds-docker-impl-243.24978.54.zip": "sha256-pGAUljrRizCer076iM1oKrNj54tN3VxSvYldfKAsqRE=", "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip": "sha256-fJatpg7WzrStvABSeIayeFF4bjv059VW6ZTTKQxLNV8=", + "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip": "sha256-WL6AQuo1zE4x2b3M2rjTa7T9AbGKc2urTZBa6PU1i3w=", "https://plugins.jetbrains.com/files/8097/636616/graphql-243.22562.13.zip": "sha256-rr2pO0mIsqWXYZgwEhcQJlk0lQabxnIPxqRCGdTFaTw=", "https://plugins.jetbrains.com/files/8097/680200/graphql-243.24978.46.zip": "sha256-RJELd6KPzlRu+UwWBPW1fN33Zj0PcgQ0hGCJ6+ii/fI=", "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip": "sha256-p52AGXhfldRiT7FoWeDQuP38+/9J1KuPDyhM4VUwQTc=", @@ -2079,10 +2080,11 @@ "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip": "sha256-JugbJM8Lr2kbhP9hdLE3kUStl2vOMUB5wGTwNLxAZd0=", "https://plugins.jetbrains.com/files/8554/684425/featuresTrainer-243.24978.79.zip": "sha256-1oI8hw6YYhUzhfv5RjtlBFG0OvucqVs/XUXMioRIuzA=", "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip": "sha256-xmjPvJVe27gL1DEwtzvKvzEkF80ZGHUCKjLOY2nO+T0=", + "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip": "sha256-LMoWgp7perGOFj6d32cQTfo+TLFeupgn53ZRLVON0JA=", "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip": "sha256-OFisV6Vs/xlbDvchxfrREDVgVh7wcfGnot+zUrgQU6M=", "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip": "sha256-hR7hC2phDJnHXxPy80WlEDFAhZHtMCu7nqYvAb0VeTI=", - "https://plugins.jetbrains.com/files/9568/680198/go-plugin-243.24978.46.zip": "sha256-H2zxIwMN/m7s7Ewhy55QO45lQcUOhG/xD29wj6V/vIM=", - "https://plugins.jetbrains.com/files/9707/690054/ansi-highlighter-premium-24.3.2.jar": "sha256-Gzpy9LHOsqomHWx64miDR2lLWrB+VgLdUty25IKWMUQ=", + "https://plugins.jetbrains.com/files/9568/700127/go-plugin-243.26053.27.zip": "sha256-SqFl1ArPLi/Bc43n0u+pMCAw+8hyqM/D41w4k1DJQcA=", + "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar": "sha256-TEF4rtS04kQ/h+SKXnbqLjrMGm3jHk0MJ7ffe0lvbs4=", "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip": "sha256-Mzmmq0RzMKZeKfBSo7FHvzeEtPGIrwqEDLAONQEsR1M=", "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip": "sha256-ArwC2HO2cHlTcFKXQBuKzZTuOiiIDEc/SGDsDQUCZmI=" } diff --git a/pkgs/applications/editors/rstudio/boost-1.86.patch b/pkgs/applications/editors/rstudio/boost-1.86.patch index ca7ca648e5b6..058eaf42e96d 100644 --- a/pkgs/applications/editors/rstudio/boost-1.86.patch +++ b/pkgs/applications/editors/rstudio/boost-1.86.patch @@ -1,8 +1,8 @@ diff --git a/src/cpp/core/json/JsonRpc.cpp b/src/cpp/core/json/JsonRpc.cpp -index d034ffecd7..4b08486517 100644 +index d034ffe..4b08486 100644 --- a/src/cpp/core/json/JsonRpc.cpp +++ b/src/cpp/core/json/JsonRpc.cpp -@@ -193,7 +193,7 @@ +@@ -193,7 +193,7 @@ void JsonRpcResponse::setAfterResponse( bool JsonRpcResponse::hasAfterResponse() const { @@ -11,3 +11,78 @@ index d034ffecd7..4b08486517 100644 } +diff --git a/src/cpp/session/modules/rmarkdown/NotebookExec.cpp b/src/cpp/session/modules/rmarkdown/NotebookExec.cpp +index 5631a1f..0e3030b 100644 +--- a/src/cpp/session/modules/rmarkdown/NotebookExec.cpp ++++ b/src/cpp/session/modules/rmarkdown/NotebookExec.cpp +@@ -193,7 +193,7 @@ void ChunkExecContext::connect() + + // leave an execution lock in this folder so it won't be moved if the notebook + // is saved while executing +- auto lock = make_unique( ++ auto lock = rstudio::core::make_unique( + FileLock::createDefault(), + outputPath_.completePath(kExecutionLock)); + locks_.push_back(std::move(lock)); +@@ -204,7 +204,7 @@ void ChunkExecContext::connect() + initializeOutput(); + + // capture conditions +- auto pConditionCapture = make_unique(); ++ auto pConditionCapture = rstudio::core::make_unique(); + pConditionCapture->connect(); + captures_.push_back(std::move(pConditionCapture)); + connections_.push_back(events().onCondition.connect( +@@ -234,7 +234,7 @@ void ChunkExecContext::connect() + boost::bind(&ChunkExecContext::onFileOutput, this, _1, _2, + _3, ChunkOutputPlot, _4))); + +- auto pPlotCapture = make_unique(); ++ auto pPlotCapture = rstudio::core::make_unique(); + if (figWidth > 0 || figHeight > 0) + { + // user specified plot size, use it +@@ -261,7 +261,7 @@ void ChunkExecContext::connect() + boost::bind(&ChunkExecContext::onFileOutput, this, _1, _2, _3, + ChunkOutputHtml, 0))); + +- auto pHtmlCapture = make_unique(); ++ auto pHtmlCapture = rstudio::core::make_unique(); + error = pHtmlCapture->connectHtmlCapture( + outputPath_, + outputPath_.getParent().completePath(kChunkLibDir), +@@ -316,14 +316,14 @@ void ChunkExecContext::connect() + prevCharWidth_ = r::options::getOptionWidth(); + r::options::setOptionWidth(charWidth_); + +- auto pDirCapture = make_unique(); ++ auto pDirCapture = rstudio::core::make_unique(); + error = pDirCapture->connectDir(docId_, workingDir_); + if (error) + LOG_ERROR(error); + captures_.push_back(std::move(pDirCapture)); + + // begin capturing errors +- auto pErrorCapture = make_unique(); ++ auto pErrorCapture = rstudio::core::make_unique(); + pErrorCapture->connect(); + captures_.push_back(std::move(pErrorCapture)); + +@@ -341,7 +341,7 @@ void ChunkExecContext::connect() + boost::bind(&ChunkExecContext::onFileOutput, this, _1, _2, _3, + ChunkOutputData, 0))); + +- auto pDataCapture = make_unique(); ++ auto pDataCapture = rstudio::core::make_unique(); + error = pDataCapture->connectDataCapture( + outputPath_, + options_.mergedOptions()); +@@ -661,7 +661,7 @@ void ChunkExecContext::initializeOutput() + + // leave an execution lock in this folder so it won't be moved if the notebook + // is saved while executing +- auto lock = make_unique( ++ auto lock = rstudio::core::make_unique( + FileLock::createDefault(), + outputPath.completePath(kExecutionLock)); + locks_.push_back(std::move(lock)); diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 84e07c350a9f..5b8f9b09db74 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -55,13 +55,12 @@ let hash = "sha256-J7SZK/9q3HcXTD7WFHxvh++ttuCd89Vc4SEBrUEU0AI="; }; - # Ideally, rev should match the rstudio release name. - # e.g. release/rstudio-mountain-hydrangea + # rev should ideally be the last commit of the release/rstudio-[codename] branch quartoSrc = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto"; - rev = "bb264a572c6331d46abcf087748c021d815c55d7"; - hash = "sha256-lZnZvioztbBWWa6H177X6rRrrgACx2gMjVFDgNup93g="; + rev = "7d1582d06250216d18696145879415e473a2ae4d"; + hash = "sha256-AaE9EDT3tJieI403QGxAf+A/PEw1rmUdhdpy4WNf40o="; }; hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts)); @@ -83,7 +82,7 @@ let in stdenv.mkDerivation rec { pname = "RStudio"; - version = "2024.04.2+764"; + version = "2024.12.1+563"; RSTUDIO_VERSION_MAJOR = lib.versions.major version; RSTUDIO_VERSION_MINOR = lib.versions.minor version; @@ -94,7 +93,7 @@ stdenv.mkDerivation rec { owner = "rstudio"; repo = "rstudio"; tag = "v${version}"; - hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw="; + hash = "sha256-fguomJHs7FBffYfMlgWgnjLWK3uDZYX4Ip4asKZ8XVQ="; }; nativeBuildInputs = @@ -159,7 +158,6 @@ stdenv.mkDerivation rec { libclang = lib.getLib llvmPackages.libclang; }) - ./fix-resources-path.patch ./ignore-etc-os-release.patch ./dont-yarn-install.patch ./boost-1.86.patch @@ -174,13 +172,13 @@ stdenv.mkDerivation rec { --replace-fail "''${CMAKE_INSTALL_PREFIX}/rstudio" "rstudio" # set install path of freedesktop files - substituteInPlace src/{cpp,node}/desktop/CMakeLists.txt \ + substituteInPlace src/node/desktop/CMakeLists.txt \ --replace-fail "/usr/share" "$out/share" ''; yarnOfflineCache = fetchYarnDeps { yarnLock = quartoSrc + "/yarn.lock"; - hash = "sha256-Qw8O1Jzl2EO0DEF3Jrw/cIT9t22zs3jyKgDA5XZbuGA="; + hash = "sha256-48Q2MkfzXZSL3ly56WSjRVwU3fgRD8xivQobStBkk6Y="; }; dontYarnInstallDeps = true; # will call manually in preConfigure @@ -190,12 +188,14 @@ stdenv.mkDerivation rec { # don't build native modules with node headers npmFlags = [ "--ignore-scripts" ]; + makeCacheWritable = true; + npmDeps = fetchNpmDeps { name = "rstudio-${version}-npm-deps"; inherit src; patches = [ ./update-nan-and-node-abi.patch ]; postPatch = "cd ${npmRoot}"; - hash = "sha256-CtHCN4sWeHNDd59TV/TgTC4d6h7X1Cl4E/aJkAfRk7g="; + hash = "sha256-9VHse+nxr5A1EWuszQ6cnJAMqYiHFqHQ4OJ/TJq+XoI="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -226,11 +226,13 @@ stdenv.mkDerivation rec { mkdir -p dependencies/common/node # node used by cmake - # version in CMakeGlobals.txt (RSTUDIO_NODE_VERSION) - ln -s ${nodejs} dependencies/common/node/18.18.2 + # version in cmake/globals.cmake (RSTUDIO_NODE_VERSION) + ln -s ${nodejs} dependencies/common/node/20.15.1 + # node used at runtime - # version in CMakeGlobals.txt (RSTUDIO_INSTALLED_NODE_VERSION) - ln -s ${nodejs} dependencies/common/node/18.20.3 + # version in cmake/globals.cmake (RSTUDIO_INSTALLED_NODE_VERSION) + # upstream uses the -patched suffix for the runtime node directory + ln -s ${nodejs} dependencies/common/node/20.15.1-patched ${lib.optionalString (!server) '' pushd $npmRoot @@ -256,7 +258,7 @@ stdenv.mkDerivation rec { rm -r electron-dist # force @electron/packager to use our electron instead of downloading it - substituteInPlace node_modules/@electron/packager/src/index.js \ + substituteInPlace node_modules/@electron/packager/dist/packager.js \ --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'" # Work around known nan issue for electron_33 and above diff --git a/pkgs/applications/editors/rstudio/fix-darwin.patch b/pkgs/applications/editors/rstudio/fix-darwin.patch index fd66f1574f5a..d07ecc6e5056 100644 --- a/pkgs/applications/editors/rstudio/fix-darwin.patch +++ b/pkgs/applications/editors/rstudio/fix-darwin.patch @@ -1,8 +1,8 @@ -diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt -index 8868c44..19b2fa0 100644 ---- a/CMakeGlobals.txt -+++ b/CMakeGlobals.txt -@@ -345,6 +345,7 @@ if (APPLE) +diff --git a/cmake/globals.cmake b/cmake/globals.cmake +index e53248b..c705d67 100644 +--- a/cmake/globals.cmake ++++ b/cmake/globals.cmake +@@ -334,6 +334,7 @@ if (APPLE) set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources/app) # handles Quarto share when not stored alongside bin set(RSTUDIO_INSTALL_RESOURCES RStudio.app/Contents/Resources) @@ -11,10 +11,10 @@ index 8868c44..19b2fa0 100644 set(RSTUDIO_INSTALL_BIN RStudio.app/Contents/MacOS) set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources) diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index b47f04f..928165d 100644 +index 76f3acb..2910cee 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt -@@ -240,7 +240,7 @@ endif() +@@ -243,7 +243,7 @@ endif() # determine whether we should statically link boost. we always do this # unless we are building a non-packaged build on linux (in which case # boost dynamic libraries are presumed to be installed on the system ldpath) @@ -23,7 +23,7 @@ index b47f04f..928165d 100644 set(Boost_USE_STATIC_LIBS ON) endif() -@@ -475,7 +475,7 @@ endif() +@@ -483,7 +483,7 @@ endif() # find SOCI libraries if(UNIX) @@ -33,7 +33,7 @@ index b47f04f..928165d 100644 find_library(SOCI_SQLITE_LIB NAMES "libsoci_sqlite3.a" "soci_sqlite3" REQUIRED) if(RSTUDIO_PRO_BUILD) diff --git a/src/node/CMakeNodeTools.txt b/src/node/CMakeNodeTools.txt -index 43f7f63..8a35a16 100644 +index 40ae0f3..756fd5f 100644 --- a/src/node/CMakeNodeTools.txt +++ b/src/node/CMakeNodeTools.txt @@ -27,17 +27,7 @@ endif() @@ -56,10 +56,10 @@ index 43f7f63..8a35a16 100644 # Detect node.js, npm, and npx; use versions supplied by the dependency scripts find_program(NODEJS diff --git a/src/node/desktop/CMakeLists.txt b/src/node/desktop/CMakeLists.txt -index 2f4d929..9769143 100644 +index 35438fd..f9b1951 100644 --- a/src/node/desktop/CMakeLists.txt +++ b/src/node/desktop/CMakeLists.txt -@@ -119,22 +119,9 @@ if (APPLE) +@@ -122,22 +122,9 @@ if (APPLE) # configure Info.plist configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) @@ -84,7 +84,7 @@ index 2f4d929..9769143 100644 set(ELECTRON_BUILD_DIR "${ELECTRON_SOURCE_DIR}" CACHE INTERNAL "") endif() -@@ -230,16 +217,21 @@ if(WIN32) +@@ -233,16 +220,21 @@ if(WIN32) PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION "${RSTUDIO_INSTALL_BIN}") @@ -110,16 +110,18 @@ index 2f4d929..9769143 100644 OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE diff --git a/src/node/desktop/src/main/session-launcher.ts b/src/node/desktop/src/main/session-launcher.ts -index 615ca1e..a9c1624 100644 +index 94f56ac..fe7d5d9 100644 --- a/src/node/desktop/src/main/session-launcher.ts +++ b/src/node/desktop/src/main/session-launcher.ts -@@ -89,27 +89,9 @@ function launchProcess(absPath: FilePath, argList: string[]): ChildProcess { +@@ -91,29 +91,9 @@ function launchProcess(absPath: FilePath, argList: string[]): ChildProcess { // DYLD_INSERT_LIBRARIES to inject the library we wish to use const rHome = new FilePath(getenv('R_HOME')); const rLib = rHome.completePath('lib/libR.dylib'); - const dyldArgs = [ -- '-e', `DYLD_INSERT_LIBRARIES=${rLib.getAbsolutePath()}`, -- '-e', `DYLD_FALLBACK_LIBRARY_PATH=${dyldFallbackLibraryPath}` +- '-e', +- `DYLD_INSERT_LIBRARIES=${rLib.getAbsolutePath()}`, +- '-e', +- `DYLD_FALLBACK_LIBRARY_PATH=${dyldFallbackLibraryPath}`, - ]; - - // launch via /usr/bin/arch, so we can control whether the OS requests @@ -144,7 +146,7 @@ index 615ca1e..a9c1624 100644 } const rsessionOptions = new LogOptions('rsession'); -@@ -542,22 +524,6 @@ export class SessionLauncher { +@@ -566,22 +546,6 @@ export class SessionLauncher { } } @@ -164,6 +166,6 @@ index 615ca1e..a9c1624 100644 - } - } - - const sessionProc = launchProcess(this.sessionPath, argList); - sessionProc.on('error', (err) => { - // Unable to start rsession (at all) + // if we're running automation tests, set that up now + if (app.commandLine.hasSwitch('run-automation')) { + argList.push('--run-automation'); diff --git a/pkgs/applications/editors/rstudio/fix-resources-path.patch b/pkgs/applications/editors/rstudio/fix-resources-path.patch deleted file mode 100644 index 24f8b3cb51b9..000000000000 --- a/pkgs/applications/editors/rstudio/fix-resources-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/cpp/desktop/DesktopOptions.cpp -+++ b/src/cpp/desktop/DesktopOptions.cpp -@@ -499,15 +499,9 @@ - { - if (resourcesPath_.isEmpty()) - { --#ifdef RSTUDIO_PACKAGE_BUILD - // release configuration: the 'resources' folder is - // part of the supporting files folder -- resourcesPath_ = supportingFilePath().completePath("resources"); --#else -- // developer configuration: the 'resources' folder is -- // a sibling of the RStudio executable -- resourcesPath_ = scriptsPath().completePath("resources"); --#endif -+ resourcesPath_ = supportingFilePath().completePath("resources"); - } - - return resourcesPath_; diff --git a/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch b/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch index 7c67edd16fcb..5dfa009546e2 100644 --- a/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch +++ b/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch @@ -1,10 +1,10 @@ -diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt -index 5f96ffb..3f15687 100644 ---- a/CMakeGlobals.txt -+++ b/CMakeGlobals.txt -@@ -29,11 +29,6 @@ endif() - get_filename_component(ROOT_SRC_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) - set(CMAKE_MODULE_PATH "${ROOT_SRC_DIR}/cmake/modules/") +diff --git a/cmake/globals.cmake b/cmake/globals.cmake +index e53248b..179e3cb 100644 +--- a/cmake/globals.cmake ++++ b/cmake/globals.cmake +@@ -23,11 +23,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) + set(LINUX TRUE CACHE INTERNAL "") + endif() -# read /etc/os-release -if(LINUX) @@ -45,7 +45,7 @@ index 81a9e1f..0000000 -endforeach() - diff --git a/package/linux/CMakeLists.txt b/package/linux/CMakeLists.txt -index 5d5c35e..a94f8fc 100644 +index 2c55ebe..7ac9651 100644 --- a/package/linux/CMakeLists.txt +++ b/package/linux/CMakeLists.txt @@ -16,7 +16,7 @@ diff --git a/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch b/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch index 7ba18405769a..bdb62dfa8a5e 100644 --- a/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch +++ b/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch @@ -1,72 +1,70 @@ diff --git a/src/node/desktop/package-lock.json b/src/node/desktop/package-lock.json -index 01c11edaf4..5e356470be 100644 +index a210521..9543abb 100644 --- a/src/node/desktop/package-lock.json +++ b/src/node/desktop/package-lock.json -@@ -19,7 +19,7 @@ +@@ -18,7 +18,7 @@ "line-reader": "0.4.0", "lodash.debounce": "4.0.8", - "net-ipc": "2.1.0", -- "node-abi": "3.52.0", -+ "node-abi": "^3.71.0", - "node-addon-api": "7.0.0", + "net-ipc": "2.2.0", +- "node-abi": "3.71.0", ++ "node-abi": "^3.74.0", + "node-addon-api": "8.3.0", "node-system-fonts": "1.0.1", "properties-reader": "2.3.0", -@@ -63,7 +63,7 @@ - "json-schema-to-typescript": "13.1.1", - "lint-staged": "15.2.0", - "mocha": "10.2.0", -- "nan": "2.18.0", -+ "nan": "^2.22.0", - "node-loader": "2.0.0", - "nyc": "15.1.0", - "prettier": "3.1.1", -@@ -9768,9 +9768,10 @@ +@@ -56,7 +56,7 @@ + "json-schema-to-typescript": "14.1.0", + "lint-staged": "15.2.10", + "mocha": "10.8.2", +- "nan": "2.22.0", ++ "nan": "^2.22.1", + "node-loader": "2.1.0", + "nyc": "17.1.0", + "prettier": "3.3.3", +@@ -9538,9 +9538,9 @@ } }, "node_modules/nan": { -- "version": "2.18.0", -- "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", -- "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==" -+ "version": "2.22.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", -+ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", -+ "license": "MIT" +- "version": "2.22.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", +- "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", ++ "version": "2.22.1", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.1.tgz", ++ "integrity": "sha512-pfRR4ZcNTSm2ZFHaztuvbICf+hyiG6ecA06SfAxoPmuHjvMu0KUIae7Y8GyVkbBqeEIidsmXeYooWIX9+qjfRQ==", + "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.3", -@@ -9863,9 +9864,10 @@ +@@ -9667,9 +9667,9 @@ } }, "node_modules/node-abi": { -- "version": "3.52.0", -- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.52.0.tgz", -- "integrity": "sha512-JJ98b02z16ILv7859irtXn4oUaFWADtvkzy2c0IAatNVX2Mc9Yoh8z6hZInn3QwvMEYhHuQloYi+TTQy67SIdQ==", -+ "version": "3.71.0", -+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz", -+ "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==", -+ "license": "MIT", +- "version": "3.71.0", +- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz", +- "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==", ++ "version": "3.74.0", ++ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz", ++ "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==", + "license": "MIT", "dependencies": { "semver": "^7.3.5" - }, diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json -index 059c39f9d7..ca9066077d 100644 +index 8b8ef47..287d879 100644 --- a/src/node/desktop/package.json +++ b/src/node/desktop/package.json -@@ -59,7 +59,7 @@ - "json-schema-to-typescript": "13.1.1", - "lint-staged": "15.2.0", - "mocha": "10.2.0", -- "nan": "2.18.0", -+ "nan": "^2.22.0", - "node-loader": "2.0.0", - "nyc": "15.1.0", - "process": "0.11.10", -@@ -83,7 +83,7 @@ +@@ -54,7 +54,7 @@ + "json-schema-to-typescript": "14.1.0", + "lint-staged": "15.2.10", + "mocha": "10.8.2", +- "nan": "2.22.0", ++ "nan": "^2.22.1", + "node-loader": "2.1.0", + "nyc": "17.1.0", + "prettier": "3.3.3", +@@ -76,7 +76,7 @@ "line-reader": "0.4.0", "lodash.debounce": "4.0.8", - "net-ipc": "2.1.0", -- "node-abi": "3.52.0", -+ "node-abi": "^3.71.0", - "node-addon-api": "7.0.0", + "net-ipc": "2.2.0", +- "node-abi": "3.71.0", ++ "node-abi": "^3.74.0", + "node-addon-api": "8.3.0", "node-system-fonts": "1.0.1", "properties-reader": "2.3.0", diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e567266349b1..2c911d26b5a1 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -70,12 +70,12 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2025-03-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "b0893fff5f2d3b22155f3113381a614fd4f65a8a"; - sha256 = "1viqnzcjifpd2w00fmq66bw7mbg9wd9dh35iwacvapf524k6rk3q"; + rev = "0b0838e31fda8a52e792a5fb6b79ab68e711bc10"; + sha256 = "0d6j042hallc7g7q278i3adi14ziv6d593avl2ykxd0h9njdca4p"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.hydraPlatforms = [ ]; @@ -200,12 +200,12 @@ final: prev: LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2025-03-05"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "17cb04b2fbb817e899ba057c0f3d794134a0c35d"; - sha256 = "1yhaxfjlsya3hpzxk7349ld02wz5mzjfl1130l8ifr18r7fcb855"; + rev = "675cd53462759796e5e410a9f25b9c39c286941c"; + sha256 = "0g7zx8qgxn7m8ffnm198115v0yyf3ggvh6gbvs16v618na0cqw5a"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; meta.hydraPlatforms = [ ]; @@ -369,12 +369,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-03-10"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "e03b50ce453b1ce9f6b7805239c52db604d740dc"; - sha256 = "17pj6lnl9dwzv5s2a40dnflxd8sx2dq0w1mm9zdx5r93m9wkxxsb"; + rev = "39015717d8b25262119df1a8dd4069b17aea8d82"; + sha256 = "11gyidsfvzpqynlx7r6bbw4qhs6ldjgkj2pj4qg3m833n0da0h3g"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -617,12 +617,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2025-03-06"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "2204cf08791449a6a2fd2ef187a29112eeefd989"; - sha256 = "1482md9kzyrr7mjkca3nnyqgy64q8clhi6xbvgql8qjw7ifz51mx"; + rev = "9ebc13583cff447f5493a63e99dfca526b3c3088"; + sha256 = "17mjs95jnnvsg1ihwbsa3z6hr88rvfh36pv1x4cad7hsaal3dcrg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -709,12 +709,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2025-03-14"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "1c91102112ac5addbdbf178268c61a2ead64fb2a"; - sha256 = "06nbwzjr85vxly8xanm96k9fims29ybxydzw4jywqx9awz18cfch"; + rev = "7fcc0548b03e1c7d7d269af76ea3e27b9a59f8bd"; + sha256 = "00is4hbxxk9wsd3z33gs5f2n1ll84l3myxs4vljx4n5ah6g9rc5m"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; meta.hydraPlatforms = [ ]; @@ -839,17 +839,30 @@ final: prev: arrow-nvim = buildVimPlugin { pname = "arrow.nvim"; - version = "2024-10-15"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "otavioschwanck"; repo = "arrow.nvim"; - rev = "5438c977e729a29d96bd54c8da3103154e80dbd1"; - sha256 = "1sjd0gv7ka6by3fkgh8h48jwwfxmbgm21xcj7637349mj2ciaz7c"; + rev = "9608ce6d7e6935efd423946a319f7f4041cbde93"; + sha256 = "00xz4wnmllw8pc707py0n8a5avag5wyrk165i9yl0al2y92fw5fn"; }; meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; meta.hydraPlatforms = [ ]; }; + arshlib-nvim = buildVimPlugin { + pname = "arshlib.nvim"; + version = "2024-05-18"; + src = fetchFromGitHub { + owner = "arsham"; + repo = "arshlib.nvim"; + rev = "111fd439268adda206a24b133096893869a50764"; + sha256 = "1jmac14w37lybanr8jg4jpi3rkbsjhmz65x5fr7mgd7kagsn3r1n"; + }; + meta.homepage = "https://github.com/arsham/arshlib.nvim/"; + meta.hydraPlatforms = [ ]; + }; + astrocore = buildVimPlugin { pname = "astrocore"; version = "2025-02-18"; @@ -1047,12 +1060,12 @@ final: prev: augment-vim = buildVimPlugin { pname = "augment.vim"; - version = "2025-02-12"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "augmentcode"; repo = "augment.vim"; - rev = "a50e362f6c16a0c43da20f613e337a6dfd3fb94a"; - sha256 = "1m1nfiij7wxw63zjh09hc14dxd45rwb6pf48ls101fh461gffdpr"; + rev = "97418c9dfc1918fa9bdd23863ea3d2e49130727f"; + sha256 = "1sq4lpwzd2xc97l4h7zyglhg0jwg3xfw9qfidi26rz28dd1v2ivs"; }; meta.homepage = "https://github.com/augmentcode/augment.vim/"; meta.hydraPlatforms = [ ]; @@ -1125,12 +1138,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2025-03-12"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "79ef41274354a486cf4f100a7adf4a7575802ccf"; - sha256 = "15f1h1pl1jsi86d2k182lbcjaqymixjgv395x7ga0zz09k1alwdm"; + rev = "317412742990371f8e4709074da5c378456a27ff"; + sha256 = "06kxf9carklffzar4q62hgdid60v5a38w4d5wrz0864wrdyh9kjd"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; meta.hydraPlatforms = [ ]; @@ -1490,12 +1503,12 @@ final: prev: blink-cmp-git = buildVimPlugin { pname = "blink-cmp-git"; - version = "2025-03-07"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "Kaiser-Yang"; repo = "blink-cmp-git"; - rev = "2b12fe6599f85e36d4c810ebcf64e30985c6b852"; - sha256 = "0s859j7p6128lwc9p22nq59g3zhzp3m132n03qpj6h6lrrvlz6fw"; + rev = "863e0670217d0dffb9edc6ab41b676a4128f813b"; + sha256 = "0g66rhd5yd3mk2shysliz7k0sh76nr1rbfv0rqxl8kjm7jnc5nh5"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/"; meta.hydraPlatforms = [ ]; @@ -1516,12 +1529,12 @@ final: prev: blink-compat = buildVimPlugin { pname = "blink.compat"; - version = "2025-02-11"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.compat"; - rev = "4104671562c663d059d91a99da3780bead5bc467"; - sha256 = "0bsf8kg5s3m1xk9d4n0yl0h5xyk484hip3z8va547f6ibim9ccv4"; + rev = "2ed6d9a28b07fa6f3bface818470605f8896408c"; + sha256 = "009475xy41l4dpayswhx65q6a7djzw7rz2ycbrbpyg041y0qynqs"; }; meta.homepage = "https://github.com/Saghen/blink.compat/"; meta.hydraPlatforms = [ ]; @@ -1529,12 +1542,12 @@ final: prev: blink-copilot = buildVimPlugin { pname = "blink-copilot"; - version = "2025-03-03"; + version = "2025-03-15"; src = fetchFromGitHub { owner = "fang2hou"; repo = "blink-copilot"; - rev = "ba25d377b567232e2a2995776500fe149ca2c072"; - sha256 = "18grp9b8afrzcs95cv1mbiz030r74i7anw9yl25ckrwvibn4ppkf"; + rev = "100691cd842ff0bd957683424ad0e829f71ce262"; + sha256 = "07bmzhx053yp2ygv07d1csbdcwqzkifcd8as54fwxcmymmr7j4wf"; }; meta.homepage = "https://github.com/fang2hou/blink-copilot/"; meta.hydraPlatforms = [ ]; @@ -1568,12 +1581,12 @@ final: prev: blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2025-03-08"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "91aee73557237b0cc1313e4ed2b32f10de6cc65e"; - sha256 = "1jg4559946rzsvvny1r7jki1gmr70yjxr8qlnsjkjyxj8h0pjjwl"; + rev = "c80675996d6c7c021a7a13dc2c8c8b9b255efdab"; + sha256 = "06c680x1ppnpz38kq0w40x732clls6403c5dx659rakksd19mif4"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; @@ -1685,12 +1698,12 @@ final: prev: bufexplorer = buildVimPlugin { pname = "bufexplorer"; - version = "2025-03-05"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "0ea8aece81c3373578cf72cdcdd34a7bd64171c0"; - sha256 = "0v3fpl7jj6asx2qlnan8zkpznzg8kbn6f0ii7j8lb8nnzbahz32w"; + rev = "974252b1a3b4ba008457f178a92e1ff4f38985a6"; + sha256 = "09hxfbx76fvmbqsi4b2lpjr5vv9mx21qjvnnfi1r2dmdznnbikbd"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; meta.hydraPlatforms = [ ]; @@ -2790,12 +2803,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2025-03-12"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "385758859b6fe348f9b6c214ec35e1d9b9f46cd2"; - sha256 = "0pg5ya9qcr5iw1l9nm4pyhps1cpq5izbpavqwdni2swym5p8ba5l"; + rev = "3660d653bf24ed9555fb1ccb59b7504e7f152440"; + sha256 = "1dv1yh07d9b8f7an005am1s3n915r9xhiyv728nlxxdnsbd8cn48"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -2842,12 +2855,12 @@ final: prev: codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-03-13"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "4f56b047f03bf5edc0d71bf0ca694243a49b912f"; - sha256 = "1mrb8qxd6mz5dlly9bh30pcd599gfy173f6pd4p8lszs3xhp598k"; + rev = "a344661b8c1eaae9a56db5c36e7f5d2101b69128"; + sha256 = "1gyakqjxxfxd27wc570c3qprinsgb7c9faq5fwx94nzybyi63ik3"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; @@ -2959,12 +2972,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2025-03-14"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "6033ca8e3c4ed39f8d0ca7cee134b1a4dd4ae7d9"; - sha256 = "0ic4xfhpqvxcyz9qi613hdin6mspb4abh0vfds1ck1g4mx8inwr6"; + rev = "27760ac90e0b554e3a066fe60127e45f924cc973"; + sha256 = "1rfkpzlvxh545j0s97hw138rf71a707ih4q2s70li8kqi5fissqi"; }; meta.homepage = "https://github.com/wincent/command-t/"; meta.hydraPlatforms = [ ]; @@ -3128,12 +3141,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-03-05"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d"; - sha256 = "13vpizk8ani64d3a9yrm0g3bz8m6m6cxnpzr2xgslbhxnkmbxq7j"; + rev = "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5"; + sha256 = "1942dsg83skxnm3jrqyxx9mvzgiq1v68i9z43hpar4bmqvggviif"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -3337,12 +3350,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2025-03-10"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "403a0abef0e2aec12749a534dc468d6fd50c6741"; - sha256 = "19ix86nbww5vljinfwfpjkz806j7dzw4pgjyjya201jb0n22lrc6"; + rev = "fd2bbca7aa588f24ffc3517831934b4c4a9588e9"; + sha256 = "1l2z447svf1ldpnsb9sn5b4q1a22g3wx126yw9hj7rcqrv50xw6i"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; meta.hydraPlatforms = [ ]; @@ -3402,12 +3415,12 @@ final: prev: csvview-nvim = buildVimPlugin { pname = "csvview.nvim"; - version = "2025-02-26"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "hat0uma"; repo = "csvview.nvim"; - rev = "ed446a55b4ff9297d9b94a955db3a2eca6cdb2b2"; - sha256 = "075qxyny89xi5awcd5blp2s8qjlafmnhw7d3vifj05g8yl76zya5"; + rev = "02edaf830c2225ec39b889173f09cbbf89da3b87"; + sha256 = "1gpw7acb2gp7xbrqkmmxwr8lldzvp4hiaqd0pv80799ny2vqr71j"; }; meta.homepage = "https://github.com/hat0uma/csvview.nvim/"; meta.hydraPlatforms = [ ]; @@ -3480,12 +3493,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2025-03-09"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "094e4eb33e7d078cbf2105604a4246092eb8046e"; - sha256 = "1nh1nxy6wqn0vlk9lpp8v8p24rlrzlcwl7y9lvhbhmlisyr5yrvj"; + rev = "339a7b1293568405847b3627247da82a6030a852"; + sha256 = "1rm1fay8r36kh32qmbsmhp1vjs9xynyqi43zn9aak6wzzpvcabmp"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; meta.hydraPlatforms = [ ]; @@ -4119,12 +4132,12 @@ final: prev: dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2025-01-14"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "34bbd9c387c358190e61ce71017faad3dffa7a74"; - sha256 = "0y020a3hw48ldsqaccsp5ygfb16l5i6yz718nifgds2x5cpd87m6"; + rev = "1fc4475c66b794aad3dde39414f73b2e2b26230e"; + sha256 = "0f8y11l7pxp07vdjll1vsmzi1phj05q1dwlxbsx3z25sf4hixq9h"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; meta.hydraPlatforms = [ ]; @@ -4262,12 +4275,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2025-03-05"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "009c214b6eadf49ec50fc81055ceb08ca3fcb8e1"; - sha256 = "1k969a0dycc5mkhci5v54xywmrpa97320yp2si53cza43alx9q95"; + rev = "a2f1b275fdf185567ab976d27749d4e8cc21fe4c"; + sha256 = "02a7wnkvvbivbwrfill3j97mdykb53pahhm7gqsk3lvqlxg1qfga"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; meta.hydraPlatforms = [ ]; @@ -4288,12 +4301,12 @@ final: prev: easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-03-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "b27ec1dda7cbb0ebb224e5136005d2a48a8ad442"; - sha256 = "04js572pqwqkjcnpbpygjg3kc0cnci2j44kvij8r6yg30vnxdbab"; + rev = "dcf5d4c9a1ee634f76acfd3429b4dc2e9642042b"; + sha256 = "086khcd38d6ay0n6c1f9bhk9vn585hn7pqwprmy8ibmpynzvf0a8"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4798,12 +4811,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2025-03-06"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "70430c32d176f4a15c6e2c80586cd2791e3a664e"; - sha256 = "01p721ca4as9b9nn4qibb6s775fn66j13zsx2d3flhkssii06v45"; + rev = "8edcdabfe982c77482ebde2ba3f46f2adc677e64"; + sha256 = "0v8xlylc7h926wrni78m4zzlxgjnm6ff1ckx730yjg9b2rajg7kr"; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -5057,6 +5070,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + gen-nvim = buildVimPlugin { + pname = "gen.nvim"; + version = "2024-12-29"; + src = fetchFromGitHub { + owner = "David-Kunz"; + repo = "gen.nvim"; + rev = "e09a8dbffa139ad60d5b47998fcc8669ead1ebf4"; + sha256 = "1fl559n01cdckv0mw5d49z72sxxqfqhqhxx1d2025gjix3db4wmk"; + }; + meta.homepage = "https://github.com/David-Kunz/gen.nvim/"; + meta.hydraPlatforms = [ ]; + }; + gen_tags-vim = buildVimPlugin { pname = "gen_tags.vim"; version = "2023-03-06"; @@ -5163,14 +5189,14 @@ final: prev: git-worktree-nvim = buildVimPlugin { pname = "git-worktree.nvim"; - version = "2023-11-07"; + version = "2025-02-15"; src = fetchFromGitHub { - owner = "ThePrimeagen"; + owner = "polarmutex"; repo = "git-worktree.nvim"; - rev = "f247308e68dab9f1133759b05d944569ad054546"; - sha256 = "0mspffvg2z5lx4ck96d2pnf1azy3s1zq720n6abnxzajadmnh47r"; + rev = "3ad8c17a3d178ac19be925284389c14114638ebb"; + sha256 = "057qh48vwiczqrwksrfk2lf24gs6cdl6fbsf3ay2yynd0jlqjyky"; }; - meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; + meta.homepage = "https://github.com/polarmutex/git-worktree.nvim/"; meta.hydraPlatforms = [ ]; }; @@ -5280,12 +5306,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-03-13"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "da15ca55705c57ca10de1fbc1f0b6d6327c13e55"; - sha256 = "1h5lf0ba2bpyn28wiy33gv8f9fkbjmpcz6hdsifarpgqgrfz2rby"; + rev = "f058a8c622edf24d27b8ef82fabffdbbc1d55707"; + sha256 = "1rs9frzbywlq509r33kd9rxgpn6mrdyx4byn1zbcqhj1pdfkq7rv"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.hydraPlatforms = [ ]; @@ -5410,12 +5436,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2025-03-12"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "0ec6c3a9ef63703975e800d7386b6114863e1f9d"; - sha256 = "1kpilvxszp4larhw9xy663wb8sajp729iwi4jclb2sw332cr77b0"; + rev = "6b1aca6018cb6ce18a46b9e8583074a2f820b51e"; + sha256 = "156hk1mxq0v2fy2ibw1bg4n6anhg9jxgq0fq7q7kh9rms8xin6ws"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; meta.hydraPlatforms = [ ]; @@ -5658,12 +5684,12 @@ final: prev: haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2024-10-07"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "bd893770dd7a0c1a473601c3c919e61670745b36"; - sha256 = "1xqv1kj86rv2xmbsb4zahzvaanaha67ghwh2n24fdjx2d202f8af"; + rev = "27ac316463b9807496cd03e65289d3e79aa23528"; + sha256 = "1z49df35vzccq5jnckbmrsfpr8g6cjiq020jbwprzj8hrb769bqh"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; meta.hydraPlatforms = [ ]; @@ -5891,6 +5917,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + houdini-nvim = buildVimPlugin { + pname = "houdini.nvim"; + version = "2024-08-06"; + src = fetchFromGitHub { + owner = "TheBlob42"; + repo = "houdini.nvim"; + rev = "1b7ec0a713a2aa9965848d8b93f66dc93716fd1c"; + sha256 = "05np3p0lnsra6c6vx3h81vrba3nhwxrqb5l3qkdbx5bl58dds9bn"; + }; + meta.homepage = "https://github.com/TheBlob42/houdini.nvim/"; + meta.hydraPlatforms = [ ]; + }; + hover-nvim = buildVimPlugin { pname = "hover.nvim"; version = "2024-12-11"; @@ -6101,12 +6140,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2025-01-20"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78"; - sha256 = "1whsjd715rr59warfy7nmw0hzkxfkxgzx9c8r6k2vka4flifirnk"; + rev = "005b56001b2cb30bfa61b7986bc50657816ba4ba"; + sha256 = "1rmpi866bg7hyw620hbgmmmksxgll9ilbpigd1kk9b0lpvwxbbyj"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; meta.hydraPlatforms = [ ]; @@ -6125,6 +6164,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + indent-tools-nvim = buildVimPlugin { + pname = "indent-tools.nvim"; + version = "2023-10-28"; + src = fetchFromGitHub { + owner = "arsham"; + repo = "indent-tools.nvim"; + rev = "31b839d65aa04b568fabe5e100a63cc44ef3f5d5"; + sha256 = "0vw3j9plwi6ari5p5hmds257xw0szlj2ddf75mjfj6nfzd93ni0p"; + }; + meta.homepage = "https://github.com/arsham/indent-tools.nvim/"; + meta.hydraPlatforms = [ ]; + }; + indentLine = buildVimPlugin { pname = "indentLine"; version = "2023-07-14"; @@ -6166,12 +6218,12 @@ final: prev: intellitab-nvim = buildVimPlugin { pname = "intellitab.nvim"; - version = "2024-11-01"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "pta2002"; repo = "intellitab.nvim"; - rev = "698ea483eb91e314f472c9c119915c034479ea08"; - sha256 = "1z3vlbccwlq1z322yxnjgq8kvr3rkhj604ng6jlgccl06482vksa"; + rev = "955af8d74b07109d36729c623cb1bb232e25e16e"; + sha256 = "1cpzw7yli1ykli4ix1y2ym7qpi6m45qji4cmxns2whc5r84h84sa"; }; meta.homepage = "https://github.com/pta2002/intellitab.nvim/"; meta.hydraPlatforms = [ ]; @@ -6390,12 +6442,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2025-02-24"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "cfd67b0e1eeaa04302b8c7eb072253d24bf22d84"; - sha256 = "1qhmqn41vr496flcrji20wq6kjgsbxpzdwi8v34kd95v7b11h2d1"; + rev = "709018d5af92d2e5780bfb8a6d36e9cad01a6402"; + sha256 = "0p0bwydhpvjx5fdya10iwqkk2d0ihmkdkc1kkpi6i1cjk4ipkxws"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; meta.hydraPlatforms = [ ]; @@ -6427,6 +6479,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + kitty-scrollback-nvim = buildVimPlugin { + pname = "kitty-scrollback.nvim"; + version = "2025-03-20"; + src = fetchFromGitHub { + owner = "mikesmithgh"; + repo = "kitty-scrollback.nvim"; + rev = "9b70b5f73b653745ddca4a8e49b9477fc33b817f"; + sha256 = "0570ng60dzwdbbq76vpkdrww6jnm15vbcyy79885fvb0sjwcpf1a"; + }; + meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/"; + meta.hydraPlatforms = [ ]; + }; + kmonad-vim = buildVimPlugin { pname = "kmonad-vim"; version = "2022-03-20"; @@ -6481,12 +6546,12 @@ final: prev: kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-03-12"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "12f2ce784c31fbba748bf230e048e1764626f3fa"; - sha256 = "1r7b2rzb14zyyd72xbwmk80vh3ilxkfpv2b04kdir31s1466n4wj"; + rev = "7defd3663afce220c7de4fe0af6deaece90faef8"; + sha256 = "0m7c3wq5qf7n9c94lckk0ryf6p65l8j53z2n1lbrlk7mrbhsv99s"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; meta.hydraPlatforms = [ ]; @@ -6611,12 +6676,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-03-12"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "c40bb6bd313b686526744b06f8e87aa71f3a2a26"; - sha256 = "1x2h8vjiv6ppdgg35xxk5qpmk29r58vxkw8k5pc0fvdm70s0jbrx"; + rev = "977c4cc16afe63c56919d296a75ea09e6d7a136c"; + sha256 = "18vi4sps7l845ldyhvrpdnqrqgjlinvb2fi5zdm43ssas1vxy7g7"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -6676,12 +6741,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2025-03-07"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "2e0c367392cb060f75f85590c2d6008aa9e31fbf"; - sha256 = "0dggn9ilv80cnrqshflv2iqcx62wph5cqn555b7pzsb3fkcycwx1"; + rev = "6de819bc285eb8c420e49e82c21d5bb696b5a727"; + sha256 = "01g87ywljszq8glzszz05hhqp83g7hfrq7fcas258fmkmdaryhp1"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; meta.hydraPlatforms = [ ]; @@ -6754,12 +6819,12 @@ final: prev: lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; - version = "2025-02-13"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "4ad6216fff79bbda07d578cfe232f6c92110b361"; - sha256 = "0ra9pijlmxlxg9kvykq3yvhp5q0lx0xv2lrxywg9p9qsvh0q2v2y"; + rev = "4e22e197368a2e0d031489cb0f777f7c7a6c1884"; + sha256 = "1hmdn8ziin659s7pjm4z6nsvszc63iz7gp90a176xs4nsi2va3sx"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; meta.hydraPlatforms = [ ]; @@ -6975,12 +7040,12 @@ final: prev: llama-vim = buildVimPlugin { pname = "llama.vim"; - version = "2025-03-11"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.vim"; - rev = "5bc35980d3b054153eaeb19403853ed576bf4513"; - sha256 = "1p05b26w44vswz0xbq7hkj05x2x3jxs5z8i15vg8kyzj661qiqn8"; + rev = "dafa50acc4df4fe8b173c7cbfa3c5901fb7e0dec"; + sha256 = "04ksf82sfd8dnbwkk4mqzgg1xwc294im9i9isym4ziw0yman64hj"; }; meta.homepage = "https://github.com/ggml-org/llama.vim/"; meta.hydraPlatforms = [ ]; @@ -7339,12 +7404,12 @@ final: prev: markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2025-03-14"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "8c6b0af556a3e58a831384a3b7bcca9ea77882ee"; - sha256 = "1s35qq9hsd3ah6jxmb0lmhnl7ak2vsdn4k7dmris4qsn0ppqh7wk"; + rev = "7a7d3ed0d276b32e121d791f73d850aae6d61b42"; + sha256 = "0zn7p5j8c9qp4abj6kywk6j2waf2dg9i397wxrbs8prykq2n12pn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -7392,12 +7457,12 @@ final: prev: mason-nvim-dap-nvim = buildVimPlugin { pname = "mason-nvim-dap.nvim"; - version = "2025-02-19"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "jay-babu"; repo = "mason-nvim-dap.nvim"; - rev = "09220b99d63d5363f219daa2785242ee5fddba7f"; - sha256 = "0csay0rb2wyzx233d9ai5v38vwbqcg713rns7ldq1h63bcndsdfg"; + rev = "444aad7977ee713a4049e9d1dd9b377967d67a4c"; + sha256 = "16yfc27d02vg37ahbx9q8rjgdbqfay7p1935dh5qk7blcs510295"; }; meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/"; meta.hydraPlatforms = [ ]; @@ -7431,12 +7496,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-12-29"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "c8ff153d2c2b22f8b2c9bcce0d741ab55c00cfed"; - sha256 = "17vcjv48fyza9gfrz4j0hdlm26ybvmf5mz0xck730n9255hp1hkv"; + rev = "96285a62923ea8e38aea7b603099752da2a97e97"; + sha256 = "1j1asmzhikwam2dvh45r0ixqznagsh1zbjq493gqwgddbx6fi6c9"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; meta.hydraPlatforms = [ ]; @@ -7691,12 +7756,12 @@ final: prev: mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "2025-03-13"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.completion"; - rev = "3b14571c9febed20f386c39c07ca85c7b7a5358f"; - sha256 = "0n0pzbcmsx3qw2p17dy0vl15b6n2fml9rqfaakfqjzrkhjl3q10q"; + rev = "732b097d395e316ed5d4eeadc19837fbaf59ad7e"; + sha256 = "07ypcjw4qzqv9jjsn1qv0g1kwgv3x8590v3wkhab54529nb4rxy7"; }; meta.homepage = "https://github.com/echasnovski/mini.completion/"; meta.hydraPlatforms = [ ]; @@ -7782,12 +7847,12 @@ final: prev: mini-fuzzy = buildVimPlugin { pname = "mini.fuzzy"; - version = "2025-01-31"; + version = "2025-03-15"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.fuzzy"; - rev = "345ff7f65f50177c5567c43ec2c79973cb1278fe"; - sha256 = "18ylb8v7g21r87qkl86hng3zvw9c2q163z535m5m85dxnrxzlgcm"; + rev = "fb42763285075e316fd4250739af9b8c442503de"; + sha256 = "0hl5ygzlf73g70j7pdd1x4975368sqpynpja1zx7bc5jln698vr4"; }; meta.homepage = "https://github.com/echasnovski/mini.fuzzy/"; meta.hydraPlatforms = [ ]; @@ -7938,12 +8003,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-03-13"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "b21cd5b1b330844e4c4b93d65e99ecb7c79a63c9"; - sha256 = "0h5j0ppfm61iwhyrh2vqsqssw7s2ghryap9cwak9w3cbmaabmqkz"; + rev = "88f18a7d018d8bb4d32f6be4c712134a10e826d3"; + sha256 = "15sgzl2wr9pqp31qy17w4dzcrcmncavh1i8ihldhsyi4hn08zlrk"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -8120,12 +8185,12 @@ final: prev: minuet-ai-nvim = buildVimPlugin { pname = "minuet-ai.nvim"; - version = "2025-03-08"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "milanglacier"; repo = "minuet-ai.nvim"; - rev = "b5a366a5c3d46b60eb780c9cd86cf62eb0a13891"; - sha256 = "0z8hy7gm0wipcrj0wkrb5l8bhv228fp5iihr3vr7scmn0sjd7wk2"; + rev = "a9f5269184070434669d8195a78c8f72f8229a2e"; + sha256 = "1cw43ay6n4hg6mmmfr5v00yncwm0s0w0z1x6kz4k95zw08g650y3"; }; meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/"; meta.hydraPlatforms = [ ]; @@ -8185,12 +8250,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2025-02-10"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "1f9ba82c732a49cdafc80f904286dd70f02c4310"; - sha256 = "1mlzdw5q49iggpp4r2rqqb6q2am5ds1f82d1lmz7nlk325skk48z"; + rev = "b6c46f8066b2d96cb75d5bc7202a9a4c097b5e9f"; + sha256 = "15sqscfkhy0rxycql1y2iwc6hirfvbfxww3j17586jxflj3nh0lq"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; meta.hydraPlatforms = [ ]; @@ -8575,12 +8640,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-03-11"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "8c6349bceb1d8a863964dd25dc7944d588a56aaa"; - sha256 = "03lgpp5vyiyfbzig5w24ph84xbakahbfg1hqv148p0i34qf6mcbn"; + rev = "876c3298a6f822123b9b81b101d5809b1b5aa0c8"; + sha256 = "0g8hbqki1fjcqv5nzwmrdlsny9q46asvis3yw0zxq6567byyq8r4"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -8601,12 +8666,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-03-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "5f0689934f788fc5a76a27a3873d660cea5429c9"; - sha256 = "0xkpy5mds8mj0zj3v7035hpjk8lymmav0f39kb4q95b7hparn92y"; + rev = "367600076c04a8f6b8060f61de57299c8ff0a9c3"; + sha256 = "08c0wchdmr0cg2ix42v7n2kcr6qyn9546x089rp7n83y2ml6p3zv"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -8653,12 +8718,12 @@ final: prev: neoformat = buildVimPlugin { pname = "neoformat"; - version = "2025-02-28"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "6a0dc851893c8bf9c932a69c4277e82b88120009"; - sha256 = "1w6bdan4hixzm26jgr9ixhvmsal5nyaa8x6rbi87j64pxrm6i0pw"; + rev = "874dcd0995db340278c41860e0209bef29d6ef87"; + sha256 = "1mgs0mgpfirn02z2ffkxv20cpffr5b3vp4np0rya5fv2v991h5x2"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; meta.hydraPlatforms = [ ]; @@ -8683,8 +8748,8 @@ final: prev: src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "0b756dd80c82da28fd7ed500eac642710ab21909"; - sha256 = "1d35xr0hm5d8gjdhg1rxqylfqkywjl6qabdgig1xbpx8l7lqfqcc"; + rev = "333968f8222fda475d3e4545a9b15fe9912ca26a"; + sha256 = "16qjyv0qcwngi9185p5bzb4xjvb2c7xpv6qnmn2hi7kald6d4wp0"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -8955,12 +9020,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-03-09"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "b1fec5e156a7403d12cc9d429920e492fecb0755"; - sha256 = "08wnn3z44w0qnqa9bcxj6890lhs9qgb8jx42qgfw5x728drnw781"; + rev = "ef8cdce17319ea90669066fa7e0f13729e39303c"; + sha256 = "0jxqakg6dhx49g2fhy5nxk2ap2hgj4kr6y032axw6xkn5kb79a7i"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; meta.hydraPlatforms = [ ]; @@ -9150,12 +9215,12 @@ final: prev: neotest-zig = buildVimPlugin { pname = "neotest-zig"; - version = "2024-12-27"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "lawrence-laz"; repo = "neotest-zig"; - rev = "c7a1a39626fa90e639fb640b6322739060a2acf3"; - sha256 = "095jv4m81qpgnak4rzp2y8kd4cwgfx2aw31am9m0nsv8mmp1i5w3"; + rev = "de63f3b9a182d374d2e71cf44385326682ec90e7"; + sha256 = "0bjqpxz6fa4m4gsx8qnkxy99r573hyhwj0d079m4wrg43n9n6vcx"; }; meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; meta.hydraPlatforms = [ ]; @@ -9163,12 +9228,12 @@ final: prev: neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-12-29"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "283badaa983234c90e857c12c1f1c18e1544360a"; - sha256 = "16pj4pkv04ff7wx5dnkzqzv69im16bgc686qbwrs5qazph702zh0"; + rev = "f5da37a8ddd62fc3a7b28900c4d1b807a3582584"; + sha256 = "0is9gibh6lrf7x3903v06l33l8nrq1hix0sm7clc2576pk2sp050"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; meta.hydraPlatforms = [ ]; @@ -9358,12 +9423,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2025-03-09"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "43cd633951ea75cad622a881953b02094fdd4b46"; - sha256 = "1wn1r7jqz23b43qpyrmfcr4bvzfk5ajnffh9z555ca3m0zvgzsl1"; + rev = "275532b004ddda91be7626fae227aaf33302d6f0"; + sha256 = "1i7idcgw0amrrxnfr7jkh5hcdl0j4dj1zv94jvlrdkaz27hprmqi"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; meta.hydraPlatforms = [ ]; @@ -9423,12 +9488,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-03-11"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "a1c208fb30dc8dd0be2badf99fe076fa75284338"; - sha256 = "0digp6bmzg0gls8m5gnwci5czhmszw5m3nd8x7zq7g57dlbx46p8"; + rev = "288141e4eec5437fe2f484fce086d84f53ec88a1"; + sha256 = "0sw7dy0dqkk338n38kr2634qv3pxh619nn70ncsw9k5wnxbw99pr"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.hydraPlatforms = [ ]; @@ -9670,12 +9735,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2025-02-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "68f0e5c3dab23261a945272032ee6700af86227a"; - sha256 = "1ai3s1083dx6bddhrkv7d3hyq3zsrblizbvpgl09r1w9cijxhj8m"; + rev = "6522027785b305269fa17088395dfc0f456cedd2"; + sha256 = "1i63wdgm54n3iiiix0y18mjvy2rsswc4iybqppsfpvi8cg2xjpa6"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; meta.hydraPlatforms = [ ]; @@ -9852,12 +9917,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2025-03-12"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "a720d4966f758ab22e8ec28812b6df90a53e0f02"; - sha256 = "0b979dhl5jr3kx9j5zih39jbrv22d554ws6y8g1cgsm2i3412s4h"; + rev = "6a5bba0ddea5d419a783e170c20988046376090d"; + sha256 = "0i10mybxpz0vjkyspv8jkxawph9c823ryf0khb4g8zwpixwhrpmx"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.hydraPlatforms = [ ]; @@ -9930,12 +9995,12 @@ final: prev: nvim-dap-rr = buildVimPlugin { pname = "nvim-dap-rr"; - version = "2024-12-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "jonboh"; repo = "nvim-dap-rr"; - rev = "920e4931e383dddaa82539b4697b752fae7ff82d"; - sha256 = "1jmx08r1jrshijshls4jizhcplm1skjp1kxflm3505vz8dx4jrf7"; + rev = "9d4cb40d04b7822b075482b4fad9742aa43a87b2"; + sha256 = "1nnnk05cn7h6dv49zpwiwqzj1v3bmh56acpb6gklg28xdf4jd2v0"; }; meta.homepage = "https://github.com/jonboh/nvim-dap-rr/"; meta.hydraPlatforms = [ ]; @@ -10073,12 +10138,12 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2025-03-14"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "af94cd45b0608755d1affa6c36851fc1e73b48bc"; - sha256 = "0v8gmnb80wgad8a24yzk03ly66lx8nj8ww06d00r4kzd5rak7gdg"; + rev = "d41a2211b8ba982c74bc190b40ba7686c2e3ffd0"; + sha256 = "0aw8vjnxydv6as5qv1sjsrj142xc4d7w1szjg6wfk7a37l24rhhm"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; meta.hydraPlatforms = [ ]; @@ -10086,12 +10151,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2025-01-30"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "2bf72fbc24eecd4c32a44771dfc6c1ab5b5dbf30"; - sha256 = "0nm0jxfl8yvw7q03pl7wg18401vl6kpxbpxh5f7z9pzi5s3kq10j"; + rev = "3cb6fed3095fcc2a47c9f9843582ec0ab08736fd"; + sha256 = "1hkadfl2prh4v4npk0cyqsjdgh3b529zsvdmnng1gykjwfs06h71"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.hydraPlatforms = [ ]; @@ -10281,12 +10346,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2025-02-06"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8"; - sha256 = "0b318dahzf9kd043mjsa41rj44zfbs7k8i4bz0rqhcqipr19rwhk"; + rev = "936197073214c26a347fb933c9459c8766376b23"; + sha256 = "0wvdyabxqjxm8mx07lw37j99hq4hvxhwiyzjiasi5fgq8xawb2md"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; meta.hydraPlatforms = [ ]; @@ -10333,12 +10398,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-03-11"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0"; - sha256 = "0l9mns71hh0jssxblr1q286z8hmxwbgyq1nw6scki9ffn23jwnz0"; + rev = "699cf2ce74e40e7c5068cf93a6bd6a74b24c5ec3"; + sha256 = "0jkqc431485rmj21pd2xahrha5dbr802ikfmjbxnax7wnqkaqbp4"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -10606,12 +10671,12 @@ final: prev: nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2025-02-28"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "ede145f6fc318dc0e15ed9a40d2a60112eaf0b5f"; - sha256 = "1ppqig48yyhpfbghgisggcsk18q9v0yannzq48yxb4pvxnjrk52r"; + rev = "ddd3562bbd93b02eb43ddfe18af7438abe46dd98"; + sha256 = "1iwgl28pdipyk4a7hbhsm7wb1a0sglsk7zb5dgc2k2kq526yn7hr"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; meta.hydraPlatforms = [ ]; @@ -10619,12 +10684,12 @@ final: prev: nvim-scissors = buildVimPlugin { pname = "nvim-scissors"; - version = "2025-03-12"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-scissors"; - rev = "c2457e8c0163fc2d00226f78c95acb2c2bd2a549"; - sha256 = "1f7mayjgair07jia15f1ckm9adlbzrplhbhgcxix0gfa2vmzv775"; + rev = "445deedd9cc8eb91275ac15e3d6c6df5bc08bff3"; + sha256 = "1y332f5sd7fjg2kf9v8wx3dgf0c3kjdfx2s2gv90r6a7p7p83idd"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; meta.hydraPlatforms = [ ]; @@ -10645,12 +10710,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2025-03-12"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "24a1995392f845e8e222c1ffcaca140a9623b2a7"; - sha256 = "0qq9lzrqy0gizzn4s12hijf8f1yjdpwvh5c81f05my5nsad5h090"; + rev = "5cdf84c85b7d9664ca5b7fd6ebe5dd2c973ba876"; + sha256 = "07npxvnxhmivymns0mhzfq3i78ik5dkz8gv3d0cgpakhyj22d6sj"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; meta.hydraPlatforms = [ ]; @@ -10736,12 +10801,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2025-03-13"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "f70d56275710e202af59148f52100d34b786aecb"; - sha256 = "1a20q9hfv1gh7si2ai68zf4m9jnggvvja4vqxvrimbnzx73vxrrl"; + rev = "6c54643ef42016b744888b06d2381abd23f9b7ea"; + sha256 = "1c5agqfffmjxc73bv8d4hmrnzx62ikqpv7pii19v5alfdcnh5j48"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; meta.hydraPlatforms = [ ]; @@ -10801,12 +10866,12 @@ final: prev: nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2025-03-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "8b79cddc708cb8549562f0101f7f509ad7cebf97"; - sha256 = "1b2sr6250gwfgakjqh48fyydq3nmdd96nfhz1rccrns1f7nqwcdy"; + rev = "ff553df2f4c5641be2b282e1a0a072c46cf03591"; + sha256 = "0xgibfj73j2241mj6vab4sbw5zxxcnfls2lahsadg0r5z7cj01lk"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.hydraPlatforms = [ ]; @@ -10814,12 +10879,12 @@ final: prev: nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2025-02-17"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "198720b4016af04c9590f375d714d5bf8afecc1a"; - sha256 = "13msw9i509ncysbgkqbl2wr1c23iw3f4mxkw30sc1yk9x9nx49ri"; + rev = "93b29a32d5f4be10e39226c6b796f28d68a8b483"; + sha256 = "12ixiqb4bj7n3kkzqi81hyhn3bjsb93250gvfy12bxya2l5bi20g"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; meta.hydraPlatforms = [ ]; @@ -10892,12 +10957,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2025-03-08"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "143856b1cee509a190cc8c17ddb0638002171235"; - sha256 = "1j5h87vrvkzgy01gijr22g6nh478naiyxw1g77gav82awgmb3pyx"; + rev = "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4"; + sha256 = "1lqxvz39d3xd6rrzazydbfg7gqd6143zz6pvq23ivgy9jan8fbfs"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; meta.hydraPlatforms = [ ]; @@ -10983,12 +11048,12 @@ final: prev: nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2025-02-23"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "ea78fbdac4a2ca10e2922721233a769770afb45b"; - sha256 = "0w67k4jxp10nmkxf9b313r73j5clcpm45xqg2512lv0br6478llk"; + rev = "2788ce64fcfaa702ae3340180be592dfcd733c86"; + sha256 = "12y2j2rzxi5mfyq1qca30dznprr9db4gljmr34xwrz3v3q84dqzd"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; meta.hydraPlatforms = [ ]; @@ -11126,14 +11191,14 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-08-01"; + version = "2025-03-13"; src = fetchFromGitHub { - owner = "epwalsh"; + owner = "obsidian-nvim"; repo = "obsidian.nvim"; - rev = "14e0427bef6c55da0d63f9a313fd9941be3a2479"; - sha256 = "15ycmhn48ryaqzch6w3w6llq2qgmjx8xwkb9dn0075z60dybpflr"; + rev = "15b8c5fc730625a3f162817b13db144c5bba3a9f"; + sha256 = "00amy1yg76ywic281pq4ycwjz1gxmqs14l35qf0ssp0vl8scq5gf"; }; - meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; + meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/"; meta.hydraPlatforms = [ ]; }; @@ -11165,12 +11230,12 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-03-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "a4cae62fd4370f544cb597df2a767945f78a120a"; - sha256 = "0k5p66z1kb42602mh38j6vyxkawlywisn1wzydaf40zd86p8nlvr"; + rev = "3dfbc7936a9057b8370b903c9e3a115f07dae00d"; + sha256 = "1m24zzy11526vbydfl00k5z7zhmdlagckkp5lwynicsm4hz0m74m"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.hydraPlatforms = [ ]; @@ -11399,12 +11464,12 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2025-03-07"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "e37053d2c6a17463e705483122eee04d41e3d4af"; - sha256 = "0sq7x2mcxl7z0j4s3a395fy0bzz13h4rxd03lp6674y6hsjxcm55"; + rev = "16fc46671b5c4e059e9f3a06d593d34d30e571c9"; + sha256 = "0k4bv870pzx5dlm16fljrmdwnw5ihda04krmcqi9pznp7harvg2g"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; meta.hydraPlatforms = [ ]; @@ -11987,12 +12052,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2025-02-20"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "93b1f5a1abc1b1da653f353947f62b294574759c"; - sha256 = "05jk3m4xxyvx90wls442fp949hij6095n8vr93dx4yyzrcghk217"; + rev = "7fd12a6c57d4575cadbf4f97552b616d62ac7e03"; + sha256 = "0r27n55bngrkcx5p0ang7yw2c0gj821sxgvawxnnp090hlb4pswi"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; meta.hydraPlatforms = [ ]; @@ -12104,12 +12169,12 @@ final: prev: range-highlight-nvim = buildVimPlugin { pname = "range-highlight.nvim"; - version = "2021-08-03"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "winston0410"; repo = "range-highlight.nvim"; - rev = "8b5e8ccb3460b2c3675f4639b9f54e64eaab36d9"; - sha256 = "1yswni0p1w7ja6cddxyd3m4hi8gsdyh8hm8rlk878b096maxkgw1"; + rev = "24078ab22d5ba8503dd8c21690db9adc3c22d28b"; + sha256 = "1f4y0hpic77bqsfxxaslqdcvv734kqpwnvgbh2rd9y2wgi44ala4"; }; meta.homepage = "https://github.com/winston0410/range-highlight.nvim/"; meta.hydraPlatforms = [ ]; @@ -12247,12 +12312,12 @@ final: prev: render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2025-03-11"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "c065031d030955e1d071a7fcdd8c59e0fd2f0343"; - sha256 = "0yjyixvz0d239clbj8f7d09lzpz10lkvyvdwcc1g1d4ygsh6pbjr"; + rev = "62d6681332365cfddbe916c888752834d9f7ad0c"; + sha256 = "1vs9y74743dm9025sgzl27arxs50mkihyc2bbmhi7vhggwf4j0hr"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -12730,12 +12795,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-03-07"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "1698623b36953cd0d6e1e648570e16e4ee8981c8"; - sha256 = "0r3a1h5adp1qjc53afjcb7jpfirrpcclrn19q513hwdwykcr86fb"; + rev = "a3ccaa1ea09e21712ded3ffdabdbdc577f784054"; + sha256 = "03sp4sd2xajnrwsj5nfby6zi8964hbvsp98rvzm5f9gknph79z8f"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -12782,12 +12847,12 @@ final: prev: smear-cursor-nvim = buildVimPlugin { pname = "smear-cursor.nvim"; - version = "2025-03-09"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "sphamba"; repo = "smear-cursor.nvim"; - rev = "81638007bf7bbe79a78a3bfcbe8c640ec83344c0"; - sha256 = "0sns7qpcz4lfsyxpq2r37pz6hi79wbg5n1k57jrgva3dmnlvl47k"; + rev = "483ec950ebe77ef92f3e7543945285ffb49093b6"; + sha256 = "15y8rxwfm3gwdd5p632vdbvb0njfyr70366k9g1z71if787mdzmm"; }; meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/"; meta.hydraPlatforms = [ ]; @@ -13030,12 +13095,12 @@ final: prev: srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2025-03-11"; + version = "2025-03-15"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "d705764b3945d856c7867b613a4570635b8bfdcf"; - sha256 = "1szf5vi783kmpm58mymdf7swkbha2zhzyjcskhai93cz7c4gjjzc"; + rev = "11cf04466429385a63e05ccea1841f82bcfc13e0"; + sha256 = "1pmwqsykkxzsrj73s9f3nnzx6d3mfzjwcaj6a384bj6n3dz2fhfq"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; meta.hydraPlatforms = [ ]; @@ -13356,12 +13421,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2025-02-19"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "d5bcb49109634720e05dd1aeff1c95578c8aa5b2"; - sha256 = "17ip40fa6vjqaygh3zvp8ij02jpc9jmnm1mv85biwgzddfzi8dgx"; + rev = "21b01d26627ee5fe94c8ae560bd1b0797dff3c40"; + sha256 = "1qfmlafp7yjby1qmfimrrxy479c0gh4biyxv38pb0ciglwl927gn"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; meta.hydraPlatforms = [ ]; @@ -13657,12 +13722,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2025-03-03"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "dd6ab9b6a5a26e239f268a06ef5bb1e69928ac5b"; - sha256 = "1dgdya9g9n1gdnjakpwl24l0xq9h0jfisry22v0d5crvy6mh37gz"; + rev = "eeda21e429c86bd38ea287700e77f96058331be7"; + sha256 = "1wm70kvk1as623jdy0pgd2kgw4db0fd66f6k1z3s76mz1y8kdma1"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; meta.hydraPlatforms = [ ]; @@ -14218,12 +14283,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2025-02-24"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "b2f509311e4cbdc06a93c0da66a8b7b33aa6bec9"; - sha256 = "1agqqsjv6hbga7zlldb1plwdx5ysjv33x3a2aca6gznbl6iqavg7"; + rev = "2c1c3be0ef287073cef963f2aefa31a15c8b9cd8"; + sha256 = "0md775rhl7cxkfdbrkrsirr2093dfsf6jhvn9naqb5px1alj6wpx"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; meta.hydraPlatforms = [ ]; @@ -14349,12 +14414,12 @@ final: prev: treewalker-nvim = buildVimPlugin { pname = "treewalker.nvim"; - version = "2025-03-08"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "aaronik"; repo = "treewalker.nvim"; - rev = "0bad88a449642fca1080930260482628b692841a"; - sha256 = "088ksm6rvj4vabrisbpg2xngc11bbqihms57rz0dw22mbr7chy6q"; + rev = "b9e6520a08dc8e62891dcb759fce29f988e68da9"; + sha256 = "0vp7kzf790qsasnrxlhx1qvqhvwski3h889lhbmm1yj8pz71jvzf"; }; meta.homepage = "https://github.com/aaronik/treewalker.nvim/"; meta.hydraPlatforms = [ ]; @@ -14662,12 +14727,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2025-03-06"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "af2ff1088ccbf98d944c9131dbddcc21c279ebf7"; - sha256 = "1nlf7pnh2rkiwapc7306knqxfqns32y2dp4iwy1q9xg6sf195qy2"; + rev = "d67de6f71353df51510a232f55390445d944c3c4"; + sha256 = "116d3s2pix6vnqi5408xfac3jhrz1z5zmnflxx5gzdmpvik2jmbp"; }; meta.homepage = "https://github.com/unisonweb/unison/"; meta.hydraPlatforms = [ ]; @@ -14779,12 +14844,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2025-02-08"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "617e3dc7c9af1f03cc664124aff2fe98fafcf1b2"; - sha256 = "0w2yhyg5m2pr8c5zjn86f2ms4vh748h503cdvgbiyk33ina3708v"; + rev = "14d81758ff57420a961c7a8d10d7d672d2e00fe4"; + sha256 = "13iv8hwd9xczdc6qraghq7bf82xkqndzndi8sk00xfiizsc1rbdm"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; meta.hydraPlatforms = [ ]; @@ -16001,12 +16066,12 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2025-02-28"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "3f5783c12e184e4b6f05dfcbd7c1a6da05b4d66e"; - sha256 = "0vml575g6i2r5l4gwg490q2kwvkfqr45v6dqm8kl05vwip1lqqp1"; + rev = "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6"; + sha256 = "0gzhn6px019kd955di3540ngfn050hwll37wd5hdpj6i1apc5rhp"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; meta.hydraPlatforms = [ ]; @@ -16378,12 +16443,12 @@ final: prev: vim-erlang-runtime = buildVimPlugin { pname = "vim-erlang-runtime"; - version = "2024-01-24"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "275454182752162ac680c214675cb2a45d010cdc"; - sha256 = "0crg7sf2ziz1zkjf794fnyb5rfcc0s48g3qngc4in44d71b7gc16"; + rev = "eff3cbd3306892b23ad2e55f5252061c1aad0871"; + sha256 = "0jwny8a4rrmdqvx9i55wzpxvni3q233mmjs7kkfwb3galwddz1fn"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; meta.hydraPlatforms = [ ]; @@ -16573,12 +16638,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2025-02-27"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "77c86cb5db8960d224f2a866120893e61d62f5e8"; - sha256 = "03ggb5b05wpl5axgkilgkchj91ql25fwkm9kmyqrrax95z8vsw9j"; + rev = "665b16ac8915f746bc43c9572b4581a5e9047216"; + sha256 = "1qr6ys7qapjkd9la6sqix6kfk4wy380yx9izchq48b41rfcx9iy7"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; meta.hydraPlatforms = [ ]; @@ -17797,12 +17862,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2025-01-16"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "4f8471dfd3d34a3d1547b755afed8a673b236b2c"; - sha256 = "0h08dbik2pvv90vfy2f17bi5700yxmknkvirxl8aab36mk5zy5r1"; + rev = "82cae9df8f2ffca5f66a2947fee15da575838413"; + sha256 = "06jvs613g5yb2sf2037zj6izjbydxw9r87izl8i4srvrh54v5xda"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.hydraPlatforms = [ ]; @@ -18486,12 +18551,12 @@ final: prev: vim-pandoc-syntax = buildVimPlugin { pname = "vim-pandoc-syntax"; - version = "2023-11-26"; + version = "2025-03-15"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "16939cda184ff555938cc895cc62477c172997f9"; - sha256 = "1rk3iqqzckrni1qznv1rmi63lf2h2qcis6z7priqn7zi2v41jgpa"; + rev = "05ef7f44ebaea37159db8d365058c0a9e2ef14b5"; + sha256 = "0w48hmcs0dfpc28v9bxslxgvizppkcvw0zpj6sxha747bbi715fc"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; meta.hydraPlatforms = [ ]; @@ -19422,12 +19487,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2025-03-13"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "a2bc578485759f79c38c6b3e573b4f5db7f354bb"; - sha256 = "19lif6z7bgm92n9bdbhvy242jp4px1ikkn4fvn913jih2r6h05gd"; + rev = "3a21e6ce512ee88bf892294bc6d05fdf1a860cb4"; + sha256 = "1xzkw0vlnpgfl59czgmylxkcvsn84ligaz6ggkypg58vgnyvbz0a"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.hydraPlatforms = [ ]; @@ -20177,12 +20242,12 @@ final: prev: vim-wayland-clipboard = buildVimPlugin { pname = "vim-wayland-clipboard"; - version = "2024-01-18"; + version = "2025-03-15"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "cd4efac3e77177afdf220146948d0e06245946de"; - sha256 = "02kn9dry67jckzwan4rqd4nsycrpvg62vg23prg8wc2i9j0p389p"; + rev = "f5c1aa97c6f757c958572507ca2a6032f92974e3"; + sha256 = "14b1h18nypa6gq2123mm24adxxq0f9ljljacxg0fmkd98ipv46l6"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; meta.hydraPlatforms = [ ]; @@ -20516,12 +20581,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2025-03-11"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "691ee15e1459e4420d207cfbc4a79b383f32b411"; - sha256 = "0ylyzhdx6fpbkdba0sr7lm7w3z501x1d6x9hxpb00rfyii3cslz4"; + rev = "ae6d6ce6c962ffcabe6d1776341b055a85b18bd6"; + sha256 = "0j0n9h91v4bsr7yfkj5cnr6xvkifgzk9lpj8ngyq64wvnimysk7p"; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.hydraPlatforms = [ ]; @@ -20867,12 +20932,12 @@ final: prev: wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2024-09-19"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "16eec1f32c3608bd8519e9e520041fe34201abb0"; - sha256 = "1clpik3z79mvxxph5z4ghiwrq560jy0zdr0yxmp9byl2r0ggfa64"; + rev = "22dac666c8847c9cb03afe99229d459f1d0822c4"; + sha256 = "0hraiw10ia93ryhfb207kha6hhhnsbmfdid6h44dsg87mkixm3c8"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; meta.hydraPlatforms = [ ]; @@ -20906,12 +20971,12 @@ final: prev: yanky-nvim = buildVimPlugin { pname = "yanky.nvim"; - version = "2025-03-05"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "gbprod"; repo = "yanky.nvim"; - rev = "80d9385dbebe7049fd1961d7909b835a58ce9dcc"; - sha256 = "1lg9nxc01shkazqk5g3j0iskiqbwr9sxv07sqrwkwlh36jn59rcp"; + rev = "a21a0b4f593e1fb17b17882f1ab3a3c1b943b831"; + sha256 = "1sk3acrwwmx9wfxnfymgvl88bnp0xh8a30pyx040czrj3zl5l920"; }; meta.homepage = "https://github.com/gbprod/yanky.nvim/"; meta.hydraPlatforms = [ ]; @@ -20933,12 +20998,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-03-08"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "0e4e699496a5ee1c37bdca2f216f8e956c04de56"; - sha256 = "0n3qaxldy25y0chlbvw5cvqfppfh8s47amv1jxd2763v1z1qxbmj"; + rev = "a4c14eab6787b13ab14ef1c2fbb44a0383b9c9c2"; + sha256 = "1485xpw2mg55sy9c2qpjym1f3l8xv4dmw4j7i0cbahlmpk3zgjhz"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; @@ -21115,12 +21180,12 @@ final: prev: zotcite = buildVimPlugin { pname = "zotcite"; - version = "2025-02-20"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "618d44b2478defd1898d96cc8722cc9c39bd5d50"; - sha256 = "1r1r4nyv6lnfaafmgq6ysdbj2bs5mvvmkb5b0h40f838jbp5aix8"; + rev = "67d4bef627854c418dfae7ef121e8752e82d7440"; + sha256 = "0f6x1x8bwl54i2294kxcqji6f5kigj4af13gqxgpyl3apmbqxqdm"; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; meta.hydraPlatforms = [ ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix index a951974fd126..96460633f4d7 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix @@ -8,12 +8,12 @@ git, }: let - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; tag = "v${version}"; - hash = "sha256-aY+bBP3DOdr+yA0HKKUBR/87g096NXH9h4EUrIJY92Y="; + hash = "sha256-iIHV2M+cbXVb/XsFhEMyNDu2TvTlBb2R6DVGmvbQpn4="; }; blink-fuzzy-lib = rustPlatform.buildRustPackage { inherit version src; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 71d53fb3ab93..2a87578e8b5a 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -303,12 +303,12 @@ }; commonlisp = buildGrammar { language = "commonlisp"; - version = "0.0.0+rev=bf2a65b"; + version = "0.0.0+rev=3232350"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; - rev = "bf2a65b1c119898a1a17389e07f2a399c05cdc0c"; - hash = "sha256-dCrHrNfJoHfOt3sS2fUqbrw4snHMu+MoPumLYTGfoho="; + rev = "32323509b3d9fe96607d151c2da2c9009eb13a2f"; + hash = "sha256-cNGxZXoxhnXGo4yhMHDSjF/j43JNXg1ClpqN2xJgLQU="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; @@ -381,12 +381,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=757e0a6"; + version = "0.0.0+rev=014628a"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "757e0a61f9d38b3d9eaa299e8d866e8283ffc284"; - hash = "sha256-66tJ1GVAWKqXBCzBXUGdzG/Rl2vw/eJ6mQnWnnnpBcU="; + rev = "014628ae8d2df391b88ddb9fa0260fd97f770829"; + hash = "sha256-zlG7/ERVZFLRBqu7q/wjcYG+iBlDY7s/SwKyqzIA0OM="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -535,12 +535,12 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=2128a0b"; + version = "0.0.0+rev=0d9a809"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "2128a0b249263e238d88cb894dad00c3168fea37"; - hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc="; + rev = "0d9a8099c963ed53e183425c1b47fa2622c8eaf7"; + hash = "sha256-0kqCDLCxsvrqu5pKrDZDJt9lSlxU6fzM/CxrWb/oodw="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; @@ -768,12 +768,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=21b7408"; + version = "0.0.0+rev=64e1100"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "21b740801794b6570a0380f8aef22bb67214ea65"; - hash = "sha256-/PEl7Cl/SIbwEo88gFppPCBjBU/dfovN5J7PXNu7CBw="; + rev = "64e11001d7ef3e8ac18e55a3a2d811fe36430923"; + hash = "sha256-6l+cfLVbs8geKIYhnfuZDac8uzmNHOZf2rFANdl4tDs="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -945,34 +945,34 @@ }; glimmer_javascript = buildGrammar { language = "glimmer_javascript"; - version = "0.0.0+rev=7e8ea8c"; + version = "0.0.0+rev=4801ac4"; src = fetchFromGitHub { owner = "NullVoxPopuli"; repo = "tree-sitter-glimmer-javascript"; - rev = "7e8ea8cf39fc360cb97bd253442cd48e4f7a9ce3"; - hash = "sha256-gqadIB5tB7aIOl3g6pxDeOsuENAwzb5RLVFn4d0G9MY="; + rev = "4801ac4d0a611502001035f45d1cba5cb57d272f"; + hash = "sha256-wK8buxg2Yil6eS4u+m/iursdx9GHcj6CTCRz1nhdCNs="; }; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript"; }; glimmer_typescript = buildGrammar { language = "glimmer_typescript"; - version = "0.0.0+rev=4006128"; + version = "0.0.0+rev=c011b05"; src = fetchFromGitHub { owner = "NullVoxPopuli"; repo = "tree-sitter-glimmer-typescript"; - rev = "4006128790efb58ca82a4492d8ef0983b260fc6a"; - hash = "sha256-oOF36q09hcOCdFWrFQlhDX79tS9xBNVgcp1vmxjRdGM="; + rev = "c011b053626f27a0fe5cc99eeae4185399a572f9"; + hash = "sha256-vRxR86NmIVv5iO1C5xb/n8k3qaILaUnnWne5Hnszgyk="; }; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript"; }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=66aec57"; + version = "0.0.0+rev=24a6c8e"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "66aec57f7119c7e8e40665b723cd7af5594f15ee"; - hash = "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4="; + rev = "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4"; + hash = "sha256-TjF79WH3bX4nueYr8CbPptkNb2lNkHQNB0VZoMB35Nk="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -1809,12 +1809,12 @@ }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=03fd221"; + version = "0.0.0+rev=9c74e8e"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "03fd2216bc52976c9b92ca64b5ec2e1f06408f7e"; - hash = "sha256-EhpqSS0R8aCqUnmDHtmfwzyMZMsqkGC/6U3zJpjuVAc="; + rev = "9c74e8e8917b83d90e38ac040949079437ec0043"; + hash = "sha256-uxJfDIsqTROc5YSZkVwr2zZEcpqt3IEdGVkzwp59gnI="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; @@ -2156,12 +2156,12 @@ }; powershell = buildGrammar { language = "powershell"; - version = "0.0.0+rev=e904962"; + version = "0.0.0+rev=66d5e61"; src = fetchFromGitHub { owner = "airbus-cert"; repo = "tree-sitter-powershell"; - rev = "e904962e25858b7e8e19c653e737ad3b7d1c55bd"; - hash = "sha256-RlzGW09DE6gLM1G+y57gkEDPzMHc5Vi1jTHROUxMOt8="; + rev = "66d5e61126989c0aca57ff77d19b2064919b51e1"; + hash = "sha256-M2vOS2UleHpZC8PbUf+PHxjWz4BMBhyVxcuUsuMx34Q="; }; meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell"; }; @@ -2357,12 +2357,12 @@ }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=0555ac0"; + version = "0.0.0+rev=930202c"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "0555ac0da902abff06076e40501102cee3ba68bd"; - hash = "sha256-2JxX4KntUP/DvoCik0NYzfrU/qzs43uDwy21JkU8Hjc="; + rev = "930202c2a80965a7a9ca018b5b2a08b25dfa7f12"; + hash = "sha256-uXApakOZy9Gd/fl9C9qFZgptlT6rUlOmT6KW8sWP5Ag="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; @@ -2599,12 +2599,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=ed939ed"; + version = "0.0.0+rev=041dea1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "ed939ed550ebff7d4ad8aafb4d5aad44de69965d"; - hash = "sha256-OR0GIC7bDOkUZZvbvd1XdyOdYnjUAXhbYnOhNddH8wU="; + rev = "041dea1ca8b25f20fa564854922ac6a99c050ec6"; + hash = "sha256-hK4/FeB11H2x1c2rbYH2IoejgDSyrvlnObgeN3TVASU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2856,12 +2856,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=91d9284"; + version = "0.0.0+rev=fc7c594"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "91d92846e8baaafc8854d2b9d0ac436bc16234db"; - hash = "sha256-vBquZJOfE4HBsUKIG3o/Wo9s6wMSJ8U77u7e8n2Gc0M="; + rev = "fc7c594f52528e4a4a08671137850143d55a5bf2"; + hash = "sha256-SEaefbbQFd+Viks55eijUT3YHaEZJMvmZcXm3V6R05I="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -2901,12 +2901,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=02db52e"; + version = "0.0.0+rev=6b1ebb8"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "02db52e14bc303322d22019fff7823d72904dfe5"; - hash = "sha256-Uh1YVc871KdYXeAhF/lRDv58NW/XdHqasfZw0jDUSBE="; + rev = "6b1ebb86c97fca00835e7fce4a95c5069172145e"; + hash = "sha256-VR6GmMWueFa/4PXRtnTNWeI0N19vD1qd5XBM+e9HalM="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -3327,12 +3327,12 @@ }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=d2e4b5c"; + version = "0.0.0+rev=2694c3d"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "d2e4b5c172a109966c2ce0378f73df6cede39400"; - hash = "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI="; + rev = "2694c3d27e2ca98a0ccde72f33887394300d524e"; + hash = "sha256-DAHOhNqd9DQ9KNkJdjbUmSV6qhTOmPrIaC/7rBNCqzY="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -3415,12 +3415,12 @@ }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=2128a0b"; + version = "0.0.0+rev=0d9a809"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "2128a0b249263e238d88cb894dad00c3168fea37"; - hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc="; + rev = "0d9a8099c963ed53e183425c1b47fa2622c8eaf7"; + hash = "sha256-0kqCDLCxsvrqu5pKrDZDJt9lSlxU6fzM/CxrWb/oodw="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; @@ -3493,24 +3493,24 @@ }; ziggy = buildGrammar { language = "ziggy"; - version = "0.0.0+rev=00958fa"; + version = "0.0.0+rev=8a29017"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "00958faeaeb97d9b7beb76f128a5401441182204"; - hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4="; + rev = "8a29017169f43dc2c3526817e98142eb9a335087"; + hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8="; }; location = "tree-sitter-ziggy"; meta.homepage = "https://github.com/kristoff-it/ziggy"; }; ziggy_schema = buildGrammar { language = "ziggy_schema"; - version = "0.0.0+rev=00958fa"; + version = "0.0.0+rev=8a29017"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "00958faeaeb97d9b7beb76f128a5401441182204"; - hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4="; + rev = "8a29017169f43dc2c3526817e98142eb9a335087"; + hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8="; }; location = "tree-sitter-ziggy-schema"; meta.homepage = "https://github.com/kristoff-it/ziggy"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c81e450df2e7..81907f3a7e34 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -6,7 +6,6 @@ buildVimPlugin, callPackage, fetchFromGitHub, - fetchFromSourcehut, fetchpatch, fetchurl, neovimUtils, @@ -158,14 +157,6 @@ in ####################### # Regular overrides - aerial-nvim = super.aerial-nvim.overrideAttrs { - # optional dependencies - nvimSkipModule = [ - "lualine.components.aerial" - "telescope._extensions.aerial" - ]; - }; - advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs { dependencies = with self; [ telescope-nvim @@ -176,6 +167,14 @@ in ]; }; + aerial-nvim = super.aerial-nvim.overrideAttrs { + # optional dependencies + nvimSkipModule = [ + "lualine.components.aerial" + "telescope._extensions.aerial" + ]; + }; + agitator-nvim = super.agitator-nvim.overrideAttrs { dependencies = with self; [ telescope-nvim @@ -183,6 +182,23 @@ in ]; }; + aider-nvim = super.aider-nvim.overrideAttrs { + patches = [ + (replaceVars ./patches/aider-nvim/bin.patch { aider = lib.getExe' aider-chat "aider"; }) + ]; + }; + + animation-nvim = super.animation-nvim.overrideAttrs { + dependencies = [ self.middleclass ]; + }; + + arshlib-nvim = super.arshlib-nvim.overrideAttrs { + dependencies = with self; [ + nui-nvim + plenary-nvim + ]; + }; + astrocore = super.astrocore.overrideAttrs { dependencies = [ self.lazy-nvim ]; }; @@ -200,10 +216,6 @@ in ]; }; - animation-nvim = super.animation-nvim.overrideAttrs { - dependencies = [ self.middleclass ]; - }; - autosave-nvim = super.autosave-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -296,6 +308,10 @@ in dependencies = [ self.plenary-nvim ]; }; + blink-cmp-git = super.blink-cmp-git.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs { dependencies = [ self.blink-cmp ]; }; @@ -304,10 +320,6 @@ in dependencies = [ self.blink-cmp ]; }; - blink-cmp-git = super.blink-cmp-git.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - }; - blink-pairs = callPackage ./non-generated/blink-pairs { }; bluloco-nvim = super.bluloco-nvim.overrideAttrs { @@ -578,6 +590,10 @@ in dependencies = [ self.vim-lsp ]; }; + cmp-vimtex = super.cmp-vimtex.overrideAttrs { + checkInputs = [ self.nvim-cmp ]; + }; + cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs { checkInputs = [ self.nvim-cmp ]; dependencies = [ self.vimwiki ]; @@ -587,10 +603,6 @@ in checkInputs = [ self.nvim-cmp ]; }; - cmp-vimtex = super.cmp-vimtex.overrideAttrs { - checkInputs = [ self.nvim-cmp ]; - }; - cmp-zsh = super.cmp-zsh.overrideAttrs { checkInputs = [ self.nvim-cmp ]; dependencies = [ zsh ]; @@ -946,29 +958,14 @@ in dependencies = [ self.ddc-vim ]; }; - ddc-source-lsp = super.ddc-source-lsp.overrideAttrs { - dependencies = [ self.ddc-vim ]; - }; - - ddc-vim = super.ddc-vim.overrideAttrs { - dependencies = [ self.denops-vim ]; - }; - ddc-filter-sorter_rank = super.ddc-filter-sorter_rank.overrideAttrs { dependencies = [ self.ddc-vim ]; }; - ddc-ui-native = super.ddc-ui-native.overrideAttrs { + ddc-fuzzy = super.ddc-fuzzy.overrideAttrs { dependencies = [ self.ddc-vim ]; }; - ddc-ui-pum = super.ddc-ui-pum.overrideAttrs { - dependencies = with self; [ - ddc-vim - pum-vim - ]; - }; - ddc-source-around = super.ddc-source-around.overrideAttrs { dependencies = [ self.ddc-vim ]; }; @@ -977,10 +974,25 @@ in dependencies = [ self.ddc-vim ]; }; - ddc-fuzzy = super.ddc-fuzzy.overrideAttrs { + ddc-source-lsp = super.ddc-source-lsp.overrideAttrs { dependencies = [ self.ddc-vim ]; }; + ddc-ui-pum = super.ddc-ui-pum.overrideAttrs { + dependencies = with self; [ + ddc-vim + pum-vim + ]; + }; + + ddc-ui-native = super.ddc-ui-native.overrideAttrs { + dependencies = [ self.ddc-vim ]; + }; + + ddc-vim = super.ddc-vim.overrideAttrs { + dependencies = [ self.denops-vim ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = [ self.nvim-yarp ]; }; @@ -1149,9 +1161,9 @@ in }; flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs { + # Optional dap integration + checkInputs = [ self.nvim-dap ]; dependencies = [ self.plenary-nvim ]; - # Optional nvim-dap module - nvimSkipModule = "flutter-tools.dap"; }; follow-md-links-nvim = super.follow-md-links-nvim.overrideAttrs { @@ -1196,18 +1208,6 @@ in ''; }); - fuzzy-nvim = super.fuzzy-nvim.overrideAttrs { - checkInputs = with self; [ - # Optional sorters - telescope-zf-native-nvim - ]; - dependencies = [ self.telescope-fzf-native-nvim ]; - nvimSkipModule = [ - # TODO: package fzy-lua-native - "fuzzy_nvim.fzy_matcher" - ]; - }; - fugit2-nvim = super.fugit2-nvim.overrideAttrs { # Requires web-devicons but mini.icons can mock them up checkInputs = [ @@ -1226,6 +1226,18 @@ in ''; }; + fuzzy-nvim = super.fuzzy-nvim.overrideAttrs { + checkInputs = with self; [ + # Optional sorters + telescope-zf-native-nvim + ]; + dependencies = [ self.telescope-fzf-native-nvim ]; + nvimSkipModule = [ + # TODO: package fzy-lua-native + "fuzzy_nvim.fzy_matcher" + ]; + }; + fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs { # The plugin has a makefile which tries to run tests in a docker container. # This prevents it. @@ -1273,6 +1285,10 @@ in ''; }; + gen-nvim = super.gen-nvim.overrideAttrs { + runtimeDeps = [ curl ]; + }; + ghcid = super.ghcid.overrideAttrs { configurePhase = "cd plugins/nvim"; }; @@ -1288,6 +1304,18 @@ in dependencies = [ self.plenary-nvim ]; }; + git-conflict-nvim = super.git-conflict-nvim.overrideAttrs { + # TODO: Remove after next fixed version + # https://github.com/akinsho/git-conflict.nvim/issues/103 + version = "2.1.0"; + src = fetchFromGitHub { + owner = "akinsho"; + repo = "git-conflict.nvim"; + tag = "v2.1.0"; + hash = "sha256-1t0kKxTGLuOvuRkoLgkoqMZpF+oKo8+gMsTdgPsSb+8="; + }; + }; + git-worktree-nvim = super.git-worktree-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -1363,14 +1391,14 @@ in ]; }; - haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs { - dependencies = [ self.luasnip ]; - }; - haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter ]; }; + haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs { + dependencies = [ self.luasnip ]; + }; + haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.haskell-tools-nvim; nvimSkipModule = [ @@ -1447,6 +1475,14 @@ in nvimSkipModule = "ibl.config.types"; }; + indent-tools-nvim = super.indent-tools-nvim.overrideAttrs { + dependencies = with self; [ + arshlib-nvim + nvim-treesitter + nvim-treesitter-textobjects + ]; + }; + instant-nvim = super.instant-nvim.overrideAttrs { nvimSkipModule = [ # Requires global variable config @@ -1533,13 +1569,6 @@ in ]; }; - lean-nvim = super.lean-nvim.overrideAttrs { - dependencies = with self; [ - nvim-lspconfig - plenary-nvim - ]; - }; - LeaderF = super.LeaderF.overrideAttrs { nativeBuildInputs = [ python3.pkgs.setuptools ]; buildInputs = [ python3 ]; @@ -1553,6 +1582,13 @@ in stripDebugList = [ "autoload/leaderf/python" ]; }; + lean-nvim = super.lean-nvim.overrideAttrs { + dependencies = with self; [ + nvim-lspconfig + plenary-nvim + ]; + }; + leap-ast-nvim = super.leap-ast-nvim.overrideAttrs { dependencies = with self; [ leap-nvim @@ -1663,12 +1699,6 @@ in dependencies = [ self.nvim-lspconfig ]; }; - lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - }; - - lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { }; - lspecho-nvim = super.lspecho-nvim.overrideAttrs { meta.license = lib.licenses.mit; }; @@ -1678,6 +1708,12 @@ in nvimRequireCheck = "lspsaga"; }; + lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + + lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { }; + ltex_extra-nvim = super.ltex_extra-nvim.overrideAttrs { # Other modules require setup call first nvimRequireCheck = "ltex_extra"; @@ -1806,18 +1842,6 @@ in ''; }; - git-conflict-nvim = super.git-conflict-nvim.overrideAttrs { - # TODO: Remove after next fixed version - # https://github.com/akinsho/git-conflict.nvim/issues/103 - version = "2.1.0"; - src = fetchFromGitHub { - owner = "akinsho"; - repo = "git-conflict.nvim"; - tag = "v2.1.0"; - hash = "sha256-1t0kKxTGLuOvuRkoLgkoqMZpF+oKo8+gMsTdgPsSb+8="; - }; - }; - minimap-vim = super.minimap-vim.overrideAttrs { preFixup = '' substituteInPlace $out/plugin/minimap.vim \ @@ -2229,11 +2253,11 @@ in dependencies = [ self.plenary-nvim ]; }; - notmuch-vim = notmuch.vim; - NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs { }; + notmuch-vim = notmuch.vim; + nterm-nvim = super.nterm-nvim.overrideAttrs { dependencies = [ self.aniseed ]; }; @@ -2296,12 +2320,6 @@ in dependencies = [ self.plenary-nvim ]; }; - nvim-dap-cortex-debug = super.nvim-dap-cortex-debug.overrideAttrs { - dependencies = [ self.nvim-dap ]; - }; - - nvim-dbee = callPackage ./non-generated/nvim-dbee { }; - nvim-coverage = super.nvim-coverage.overrideAttrs { dependencies = with self; [ neotest @@ -2313,6 +2331,10 @@ in ]; }; + nvim-dap-cortex-debug = super.nvim-dap-cortex-debug.overrideAttrs { + dependencies = [ self.nvim-dap ]; + }; + nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs { dependencies = [ self.nvim-dap ]; }; @@ -2342,16 +2364,18 @@ in dependencies = [ self.nvim-dap ]; }; + nvim-dbee = callPackage ./non-generated/nvim-dbee { }; + + nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs { + dependencies = [ self.nvim-treesitter ]; + }; + nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs { dependencies = [ self.nvim-fzf ]; # Requires global variable setup nvim_fzf_directory nvimSkipModule = "fzf-commands.rg"; }; - nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs { - dependencies = [ self.nvim-treesitter ]; - }; - nvim-genghis = super.nvim-genghis.overrideAttrs { dependencies = [ self.dressing-nvim ]; @@ -2362,6 +2386,11 @@ in dependencies = [ self.nvim-treesitter ]; }; + nvim-highlight-colors = super.nvim-highlight-colors.overrideAttrs { + # Test module + nvimSkipModule = [ "nvim-highlight-colors.color.converters_spec" ]; + }; + nvim-java = super.nvim-java.overrideAttrs { dependencies = with self; [ lua-async @@ -2428,6 +2457,9 @@ in nvim-navic ]; }; + nvim-navic = super.nvim-navic.overrideAttrs { + dependencies = [ self.nvim-lspconfig ]; + }; nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs { nvimSkipModule = [ @@ -2442,6 +2474,11 @@ in checkInputs = [ self.nvim-web-devicons ]; }; + nvim-notify = super.nvim-notify.overrideAttrs { + # Optional fzf integration + nvimSkipModule = "notify.integrations.fzf"; + }; + nvim-nu = super.nvim-nu.overrideAttrs { dependencies = with self; [ nvim-treesitter @@ -2449,19 +2486,6 @@ in ]; }; - vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs { - passthru.python3Dependencies = [ python3.pkgs.mwclient ]; - }; - - nvim-navic = super.nvim-navic.overrideAttrs { - dependencies = [ self.nvim-lspconfig ]; - }; - - nvim-notify = super.nvim-notify.overrideAttrs { - # Optional fzf integration - nvimSkipModule = "notify.integrations.fzf"; - }; - nvim-paredit = super.nvim-paredit.overrideAttrs { dependencies = with self; [ nvim-treesitter ]; }; @@ -2497,6 +2521,29 @@ in vimCommandCheck = "TealBuild"; }; + nvim-test = super.nvim-test.overrideAttrs { + dependencies = with self; [ + nvim-treesitter + nvim-treesitter-parsers.c_sharp + nvim-treesitter-parsers.go + nvim-treesitter-parsers.haskell + nvim-treesitter-parsers.javascript + nvim-treesitter-parsers.python + nvim-treesitter-parsers.ruby + nvim-treesitter-parsers.rust + nvim-treesitter-parsers.typescript + nvim-treesitter-parsers.zig + ]; + nvimSkipModule = [ + # Optional toggleterm integration + "nvim-test.terms.toggleterm" + # Broken runners + "nvim-test.runners.zig" + "nvim-test.runners.hspec" + "nvim-test.runners.stack" + ]; + }; + nvim-tree-lua = super.nvim-tree-lua.overrideAttrs { nvimSkipModule = [ # Meta can't be required @@ -2548,29 +2595,6 @@ in dependencies = [ self.nvim-treesitter ]; }; - nvim-test = super.nvim-test.overrideAttrs { - dependencies = with self; [ - nvim-treesitter - nvim-treesitter-parsers.c_sharp - nvim-treesitter-parsers.go - nvim-treesitter-parsers.haskell - nvim-treesitter-parsers.javascript - nvim-treesitter-parsers.python - nvim-treesitter-parsers.ruby - nvim-treesitter-parsers.rust - nvim-treesitter-parsers.typescript - nvim-treesitter-parsers.zig - ]; - nvimSkipModule = [ - # Optional toggleterm integration - "nvim-test.terms.toggleterm" - # Broken runners - "nvim-test.runners.zig" - "nvim-test.runners.hspec" - "nvim-test.runners.stack" - ]; - }; - nvim-ufo = super.nvim-ufo.overrideAttrs { dependencies = [ self.promise-async ]; }; @@ -2590,12 +2614,17 @@ in dependencies = [ self.nvzone-volt ]; }; + nvzone-typr = super.nvzone-typr.overrideAttrs { + dependencies = [ self.nvzone-volt ]; + }; + obsidian-nvim = super.obsidian-nvim.overrideAttrs { checkInputs = with self; [ # Optional pickers fzf-lua - telescope-nvim mini-nvim + snacks-nvim + telescope-nvim ]; dependencies = [ self.plenary-nvim ]; }; @@ -2615,10 +2644,6 @@ in dependencies = [ self.plenary-nvim ]; }; - onehalf = super.onehalf.overrideAttrs { - configurePhase = "cd vim"; - }; - omni-vim = super.omni-vim.overrideAttrs { # Optional lightline integration nvimSkipModule = "omni-lightline"; @@ -2634,6 +2659,10 @@ in ]; }; + onehalf = super.onehalf.overrideAttrs { + configurePhase = "cd vim"; + }; + one-nvim = super.one-nvim.overrideAttrs { # E5108: /lua/one-nvim.lua:14: Unknown option 't_Co' # https://github.com/Th3Whit3Wolf/one-nvim/issues/23 @@ -2785,6 +2814,17 @@ in ]; }; + quarto-nvim = super.quarto-nvim.overrideAttrs { + checkInputs = [ + # Optional runner + self.iron-nvim + ]; + dependencies = with self; [ + nvim-lspconfig + otter-nvim + ]; + }; + quicker-nvim = super.quicker-nvim.overrideAttrs { }; @@ -2802,12 +2842,6 @@ in ''; }; - aider-nvim = super.aider-nvim.overrideAttrs { - patches = [ - (replaceVars ./patches/aider-nvim/bin.patch { aider = lib.getExe' aider-chat "aider"; }) - ]; - }; - refactoring-nvim = super.refactoring-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter @@ -2855,6 +2889,21 @@ in ]; }; + rocks-nvim = + (neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.rocks-nvim; + }).overrideAttrs + (oa: { + passthru = oa.passthru // { + initLua = '' + vim.g.rocks_nvim = { + luarocks_binary = "${neovim-unwrapped.lua.pkgs.luarocks_bootstrap}/bin/luarocks" + } + ''; + }; + + }); + rustaceanvim = neovimUtils.buildNeovimPlugin { checkInputs = [ # Optional integration @@ -3090,16 +3139,16 @@ in meta.maintainers = with lib.maintainers; [ callumio ]; }; - taskwarrior3 = buildVimPlugin { - inherit (taskwarrior3) version pname; - src = "${taskwarrior3.src}/scripts/vim"; - }; - taskwarrior2 = buildVimPlugin { inherit (taskwarrior2) version pname; src = "${taskwarrior2.src}/scripts/vim"; }; + taskwarrior3 = buildVimPlugin { + inherit (taskwarrior3) version pname; + src = "${taskwarrior3.src}/scripts/vim"; + }; + telekasten-nvim = super.telekasten-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim @@ -3284,17 +3333,6 @@ in dependencies = with self; [ telescope-nvim ]; }; - quarto-nvim = super.quarto-nvim.overrideAttrs { - checkInputs = [ - # Optional runner - self.iron-nvim - ]; - dependencies = with self; [ - nvim-lspconfig - otter-nvim - ]; - }; - telescope-zoxide = super.telescope-zoxide.overrideAttrs { dependencies = with self; [ telescope-nvim ]; @@ -3344,6 +3382,11 @@ in dependencies = [ self.plenary-nvim ]; }; + trouble-nvim = super.trouble-nvim.overrideAttrs { + # Meta file + nvimSkipModule = "trouble.docs"; + }; + tsc-nvim = super.tsc-nvim.overrideAttrs { patches = [ ./patches/tsc.nvim/fix-path.patch ]; @@ -3355,11 +3398,6 @@ in nvimSkipModule = "tsc.better-messages-test"; }; - trouble-nvim = super.trouble-nvim.overrideAttrs { - # Meta file - nvimSkipModule = "trouble.docs"; - }; - tssorter-nvim = super.tssorter-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter ]; }; @@ -3400,8 +3438,13 @@ in ]; }; - nvzone-typr = super.nvzone-typr.overrideAttrs { - dependencies = [ self.nvzone-volt ]; + typst-preview-nvim = super.typst-preview-nvim.overrideAttrs { + postPatch = '' + substituteInPlace lua/typst-preview/config.lua \ + --replace-fail "['tinymist'] = nil," "tinymist = '${lib.getExe tinymist}'," \ + --replace-fail "['websocat'] = nil," "websocat = '${lib.getExe websocat}'," + ''; + }; unicode-vim = @@ -3439,6 +3482,22 @@ in }; }; + vimacs = super.vimacs.overrideAttrs { + buildPhase = '' + substituteInPlace bin/vim \ + --replace-fail '/usr/bin/vim' 'vim' \ + --replace-fail '/usr/bin/gvim' 'gvim' + # remove unnecessary duplicated bin wrapper script + rm -r plugin/vimacs + ''; + meta = with lib; { + description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; + homepage = "http://algorithm.com.au/code/vimacs"; + license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ millerjason ]; + }; + }; + vimade = super.vimade.overrideAttrs { checkInputs = with self; [ # Optional providers @@ -3448,6 +3507,51 @@ in ]; }; + # The GitHub repository returns 404, which breaks the update script + VimCompletesMe = buildVimPlugin { + pname = "VimCompletesMe"; + version = "2022-02-18"; + src = fetchFromGitHub { + owner = "ackyshake"; + repo = "VimCompletesMe"; + rev = "9adf692d7ae6424038458a89d4a411f0a27d1388"; + sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0"; + }; + meta.homepage = "https://github.com/ackyshake/VimCompletesMe/"; + }; + + vim2nix = buildVimPlugin { + pname = "vim2nix"; + version = "1.0"; + src = ./vim2nix; + dependencies = [ self.vim-addon-manager ]; + }; + + vimsence = super.vimsence.overrideAttrs { + meta = with lib; { + description = "Discord rich presence for Vim"; + homepage = "https://github.com/hugolgst/vimsence"; + maintainers = with lib.maintainers; [ hugolgst ]; + }; + }; + + vimproc-vim = super.vimproc-vim.overrideAttrs { + buildInputs = [ which ]; + + # TODO: revisit + buildPhase = '' + substituteInPlace autoload/vimproc.vim \ + --replace-fail vimproc_mac.so vimproc_unix.so \ + --replace-fail vimproc_linux64.so vimproc_unix.so \ + --replace-fail vimproc_linux32.so vimproc_unix.so + make -f make_unix.mak + ''; + }; + + vimshell-vim = super.vimshell-vim.overrideAttrs { + dependencies = [ self.vimproc-vim ]; + }; + vim-addon-actions = super.vim-addon-actions.overrideAttrs { dependencies = with self; [ vim-addon-mw-utils @@ -3678,6 +3782,10 @@ in nvimSkipModule = "treesitter-matchup.third-party.query"; }; + vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs { + passthru.python3Dependencies = [ python3.pkgs.mwclient ]; + }; + vim-metamath = super.vim-metamath.overrideAttrs { preInstall = "cd vim"; }; @@ -3743,6 +3851,12 @@ in nvimSkipModule = "tpipeline.main"; }; + vim-ultest = super.vim-ultest.overrideAttrs { + # NOTE: vim-ultest is no longer maintained. + # If using Neovim, you can switch to using neotest (https://github.com/nvim-neotest/neotest) instead. + nvimSkipModule = "ultest"; + }; + vim-unimpaired = super.vim-unimpaired.overrideAttrs { dependencies = [ self.vim-repeat ]; }; @@ -3773,73 +3887,6 @@ in ''; }; - vim2nix = buildVimPlugin { - pname = "vim2nix"; - version = "1.0"; - src = ./vim2nix; - dependencies = [ self.vim-addon-manager ]; - }; - - vimacs = super.vimacs.overrideAttrs { - buildPhase = '' - substituteInPlace bin/vim \ - --replace-fail '/usr/bin/vim' 'vim' \ - --replace-fail '/usr/bin/gvim' 'gvim' - # remove unnecessary duplicated bin wrapper script - rm -r plugin/vimacs - ''; - meta = with lib; { - description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; - homepage = "http://algorithm.com.au/code/vimacs"; - license = licenses.gpl2Plus; - maintainers = with lib.maintainers; [ millerjason ]; - }; - }; - - # The GitHub repository returns 404, which breaks the update script - VimCompletesMe = buildVimPlugin { - pname = "VimCompletesMe"; - version = "2022-02-18"; - src = fetchFromGitHub { - owner = "ackyshake"; - repo = "VimCompletesMe"; - rev = "9adf692d7ae6424038458a89d4a411f0a27d1388"; - sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0"; - }; - meta.homepage = "https://github.com/ackyshake/VimCompletesMe/"; - }; - - vimsence = super.vimsence.overrideAttrs { - meta = with lib; { - description = "Discord rich presence for Vim"; - homepage = "https://github.com/hugolgst/vimsence"; - maintainers = with lib.maintainers; [ hugolgst ]; - }; - }; - - vimproc-vim = super.vimproc-vim.overrideAttrs { - buildInputs = [ which ]; - - # TODO: revisit - buildPhase = '' - substituteInPlace autoload/vimproc.vim \ - --replace-fail vimproc_mac.so vimproc_unix.so \ - --replace-fail vimproc_linux64.so vimproc_unix.so \ - --replace-fail vimproc_linux32.so vimproc_unix.so - make -f make_unix.mak - ''; - }; - - vimshell-vim = super.vimshell-vim.overrideAttrs { - dependencies = [ self.vimproc-vim ]; - }; - - vim-ultest = super.vim-ultest.overrideAttrs { - # NOTE: vim-ultest is no longer maintained. - # If using Neovim, you can switch to using neotest (https://github.com/nvim-neotest/neotest) instead. - nvimSkipModule = "ultest"; - }; - vim-zettel = super.vim-zettel.overrideAttrs { dependencies = with self; [ vimwiki @@ -3987,28 +4034,4 @@ in --replace-fail "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" ''; }; - - typst-preview-nvim = super.typst-preview-nvim.overrideAttrs { - postPatch = '' - substituteInPlace lua/typst-preview/config.lua \ - --replace-fail "['tinymist'] = nil," "tinymist = '${lib.getExe tinymist}'," \ - --replace-fail "['websocat'] = nil," "websocat = '${lib.getExe websocat}'," - ''; - - }; - - rocks-nvim = - (neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.rocks-nvim; - }).overrideAttrs - (oa: { - passthru = oa.passthru // { - initLua = '' - vim.g.rocks_nvim = { - luarocks_binary = "${neovim-unwrapped.lua.pkgs.luarocks_bootstrap}/bin/luarocks" - } - ''; - }; - - }); } diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index b5ac5a364d9e..7fd33b6350bc 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -64,6 +64,7 @@ https://github.com/ckarnell/antonys-macro-repeater/,, https://github.com/solarnz/arcanist.vim/,, https://github.com/vim-scripts/argtextobj.vim/,, https://github.com/otavioschwanck/arrow.nvim/,, +https://github.com/arsham/arshlib.nvim/,HEAD, https://github.com/AstroNvim/astrocore/,HEAD, https://github.com/AstroNvim/astrolsp/,HEAD, https://github.com/AstroNvim/astrotheme/,, @@ -387,6 +388,7 @@ https://github.com/gfanto/fzf-lsp.nvim/,, https://github.com/junegunn/fzf.vim/,, https://github.com/NTBBloodbath/galaxyline.nvim/,, https://github.com/gbprod/nord.nvim/,,gbprod-nord +https://github.com/David-Kunz/gen.nvim/,HEAD, https://github.com/jsfaint/gen_tags.vim/,, https://github.com/gentoo/gentoo-syntax/,, https://github.com/ndmitchell/ghcid/,, @@ -395,7 +397,7 @@ https://github.com/f-person/git-blame.nvim/,, https://github.com/akinsho/git-conflict.nvim/,HEAD, https://github.com/rhysd/git-messenger.vim/,, https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD, -https://github.com/ThePrimeagen/git-worktree.nvim/,, +https://github.com/polarmutex/git-worktree.nvim/,HEAD, https://github.com/projekt0n/github-nvim-theme/,HEAD, https://github.com/wintermute-cell/gitignore.nvim/,HEAD, https://github.com/vim-scripts/gitignore.vim/,, @@ -451,6 +453,7 @@ https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, https://github.com/smoka7/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, +https://github.com/TheBlob42/houdini.nvim/,HEAD, https://github.com/lewis6991/hover.nvim/,HEAD, https://github.com/othree/html5.vim/,HEAD, https://github.com/julienvincent/hunk.nvim/,HEAD, @@ -469,6 +472,7 @@ https://github.com/haya14busa/incsearch-easymotion.vim/,, https://github.com/haya14busa/incsearch.vim/,, https://github.com/lukas-reineke/indent-blankline.nvim/,, https://github.com/Darazaki/indent-o-matic/,, +https://github.com/arsham/indent-tools.nvim/,HEAD, https://github.com/Yggdroot/indentLine/,, https://github.com/ciaranm/inkpot/,, https://github.com/jbyuki/instant.nvim/,HEAD, @@ -492,6 +496,7 @@ https://github.com/GCBallesteros/jupytext.nvim/,HEAD, https://github.com/rebelot/kanagawa.nvim/,, https://github.com/imsnif/kdl.vim/,HEAD, https://github.com/anuvyklack/keymap-layer.nvim/,HEAD, +https://github.com/mikesmithgh/kitty-scrollback.nvim/,HEAD, https://github.com/kmonad/kmonad-vim/,, https://github.com/frabjous/knap/,HEAD, https://github.com/b3nj5m1n/kommentary/,, @@ -853,7 +858,7 @@ https://github.com/nvzone/menu/,HEAD,nvzone-menu https://github.com/nvzone/minty/,HEAD,nvzone-minty https://github.com/nvzone/typr/,HEAD,nvzone-typr https://github.com/nvzone/volt/,HEAD,nvzone-volt -https://github.com/epwalsh/obsidian.nvim/,HEAD, +https://github.com/obsidian-nvim/obsidian.nvim/,HEAD, https://github.com/nvimdev/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix index b8ab88818b71..a552111931e5 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-pyright"; name = "pyright"; - version = "1.1.396"; - hash = "sha256-QKfFJvzyPlF9tPDeg271/oZ506hIlr3OX7JuF0f6kEE="; + version = "1.1.397"; + hash = "sha256-Z6iKOgAglxDdPz9D4pL1STj3+uy8S89oOalqfdV1reI="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 2b2b8b8264b0..5a2806f92f2c 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-OB+e4lerPONs7QDqHJO3pqU1yQ3BvM2k+Tz998ibmHo="; + hash = "sha256-7GoFmflHaHXpw0ijX7YGBKewV+HmRhcm4eTYVgCYLHY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 2690383e57fd..988b02475cfc 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "RooVeterinaryInc"; name = "roo-cline"; - version = "3.8.6"; - hash = "sha256-t3QUqe0qYizrJQcsEmYYmNYS/cpYiHQXJHtzHk9MGS8="; + version = "3.9.2"; + hash = "sha256-zRVppwnYpw03L+socmxAtLnkD72Ag7Wz9B4BbxpdFrk="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 7822a034f980..f75dcc1828df 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.6.9"; - hash = "sha256-KAP9NhZDfga9/qLcoF/KJJNFRYnAxLlxxnITV3bUYtw="; + version = "3.8.0"; + hash = "sha256-v3ejRGAvJm4nExQLMuQEB06Kf0IERVSivVxadovrboo="; }; meta = { diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix index 191342e0e575..04c4f768e9bd 100644 --- a/pkgs/applications/emulators/box64/default.nix +++ b/pkgs/applications/emulators/box64/default.nix @@ -21,13 +21,13 @@ assert stdenv.mkDerivation (finalAttrs: { pname = "box64"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "ptitSeb"; repo = "box64"; rev = "v${finalAttrs.version}"; - hash = "sha256-SHAfZatLrc6+8kRHGwUlXuUP0blQazZtdQmDv58Csv4="; + hash = "sha256-CY5Emg5TsMVs++2EukhVzqn9440kF/BO8HZGQgCpGu4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix deleted file mode 100644 index 26d84ff1da98..000000000000 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, alsa-lib -, bluez -, bzip2 -, cubeb -, curl -, enet -, ffmpeg -, fmt_10 -, gtest -, hidapi -, libevdev -, libGL -, libiconv -, libpulseaudio -, libspng -, libusb1 -, libXdmcp -, libXext -, libXrandr -, lz4 -, lzo -, mbedtls_2 -, miniupnpc -, minizip-ng -, openal -, pugixml -, qtbase -, qtsvg -, SDL2 -, sfml -, udev -, vulkan-loader -, xxHash -, xz - - # Used in passthru -, testers - - # Darwin-only dependencies -, CoreBluetooth -, ForceFeedback -, IOBluetooth -, IOKit -, moltenvk -, OpenGL -, VideoToolbox -, xcbuild -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dolphin-emu"; - version = "2503"; - - src = fetchFromGitHub { - owner = "dolphin-emu"; - repo = "dolphin"; - tag = finalAttrs.version; - hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs="; - fetchSubmodules = true; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - xcbuild # for plutil - ]; - - buildInputs = [ - bzip2 - cubeb - curl - enet - ffmpeg - fmt_10 - gtest - hidapi - libiconv - libpulseaudio - libspng - libusb1 - libXdmcp - lz4 - lzo - mbedtls_2 - miniupnpc - minizip-ng - openal - pugixml - qtbase - qtsvg - SDL2 - sfml - xxHash - xz - # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838 - #zlib-ng - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - bluez - libevdev - libGL - libXext - libXrandr - # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version - #mgba # Derivation doesn't support Darwin - udev - vulkan-loader - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreBluetooth - ForceFeedback - IOBluetooth - IOKit - moltenvk - OpenGL - VideoToolbox - ]; - - cmakeFlags = [ - "-DDISTRIBUTOR=NixOS" - "-DDOLPHIN_WC_REVISION=${finalAttrs.src.rev}" - "-DDOLPHIN_WC_DESCRIBE=${finalAttrs.version}" - "-DDOLPHIN_WC_BRANCH=master" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" - "-DUSE_BUNDLED_MOLTENVK=OFF" - "-DMACOS_CODE_SIGNING=OFF" - # Bundles the application folder into a standalone executable, so we cannot devendor libraries - "-DSKIP_POSTPROCESS_BUNDLE=ON" - # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. - # Note: The updater isn't available on linux, so we don't need to disable it there. - "-DENABLE_AUTOUPDATE=OFF" - ]; - - qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" - # https://bugs.dolphin-emu.org/issues/11807 - # The .desktop file should already set this, but Dolphin may be launched in other ways - "--set QT_QPA_PLATFORM xcb" - ]; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Only gets installed automatically if the standalone executable is used - mkdir -p $out/Applications - cp -r ./Binaries/Dolphin.app $out/Applications - ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin - ''; - - passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "dolphin-emu-nogui --version"; - inherit (finalAttrs) version; - }; - }; - - meta = with lib; { - homepage = "https://dolphin-emu.org"; - description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; - branch = "master"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ pbsds ]; - }; -}) diff --git a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix index 8ef0e6d442bd..7b4d61f82703 100644 --- a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix +++ b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix @@ -38,5 +38,11 @@ mkLibretroCore { description = "Parallel Mupen64plus rewrite for libretro"; homepage = "https://github.com/libretro/parallel-n64"; license = lib.licenses.gpl3Only; + badPlatforms = [ + # ./mupen64plus-core/src/r4300/new_dynarec/arm64/linkage_aarch64.o: in function `.E12': + # (.text+0x5b4): relocation truncated to fit: R_AARCH64_CONDBR19 against symbol `invalidate_block' defined in .text section in ./mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.o + # collect2: error: ld returned 1 exit status + "aarch64-linux" + ]; }; } diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index eb10bd383457..7a5013f1eb3b 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -51,5 +51,9 @@ mkLibretroCore { description = "PPSSPP libretro port"; homepage = "https://github.com/hrydgard/ppsspp"; license = lib.licenses.gpl2Plus; + badPlatforms = [ + # error: cannot convert 'uint32x4_t' to 'int' in initialization + "aarch64-linux" + ]; }; } diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index d8123435e9fa..03976a6bde74 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.2"; + version = "10.3"; url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; - hash = "sha256-nZDfts8QuBCntHifAGdxK0cw0+oqiLkfG+Jzsq0EJD8="; + hash = "sha256-3j2I/wBWuC/9/KhC8RGVkuSRT0jE6gI3aOBBnDZGfD4="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-qWje1nJ5LIVFj5PmB6RRITYOWGovXzCLEVFTazmp30o="; + hash = "sha256-H52ZM+eA0bZPHFlP+uXew7JtOH29BZcXr8hvsqPDtig="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index d0466a3a64bb..1f28b59322fc 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "xfe"; - version = "2.0"; + version = "2.0.1"; src = fetchurl { url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; - sha256 = "sha256-oGqBZjBL/Uc1+ZJZCVnUxwFvWAT+2mQGZgygTZuymEg="; + sha256 = "sha256-vlu0yshT72rWQB0aqCleIsdJSZ4kEL8MUsYET1VqJbM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix index 71157b656031..c398e8b98026 100644 --- a/pkgs/applications/graphics/eddy/default.nix +++ b/pkgs/applications/graphics/eddy/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "eddy"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "obdasystems"; repo = pname; tag = "v${version}"; - sha256 = "sha256-vRmLUIqU0qfcnKzymBGb9gfM/uQiAcUHUnyz8iH/GrM="; + sha256 = "sha256-ywAxlXuKoTXfJSzSsvVXxhycVEklIPQfUogs8QJ8DGQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix index 136d0fe12836..ab8ff96ae2b2 100644 --- a/pkgs/applications/graphics/kcc/default.nix +++ b/pkgs/applications/graphics/kcc/default.nix @@ -32,7 +32,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { meta = with lib; { description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ"; - homepage = "https://kcc.iosphe.re"; + homepage = "https://github.com/ciromattia/kcc"; license = licenses.isc; maintainers = with maintainers; [ dawidsowa ]; }; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 75ef7b1a9bf0..bf705566c2b3 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -12,7 +12,8 @@ let pname = "1password"; versions = builtins.fromJSON (builtins.readFile ./versions.json); - inherit (versions.${channel} or (throw "unknown channel ${channel}")) version; + hostOs = if stdenv.hostPlatform.isLinux then "linux" else "darwin"; + version = versions."${channel}-${hostOs}" or (throw "unknown channel-os ${channel}-${hostOs}"); sources = builtins.fromJSON (builtins.readFile ./sources.json); diff --git a/pkgs/applications/misc/1password-gui/sources.json b/pkgs/applications/misc/1password-gui/sources.json index e6f70a4e3f01..18c27f4d62fe 100644 --- a/pkgs/applications/misc/1password-gui/sources.json +++ b/pkgs/applications/misc/1password-gui/sources.json @@ -1,20 +1,20 @@ { "stable": { "x86_64-linux": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.60.x64.tar.gz", - "hash": "sha256-QCoV66LvGo6vA5fjuE3fG+LwehKVMPmgaDghh9YEvmA=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.68.x64.tar.gz", + "hash": "sha256-6MekdtKnjvrP0dai6VfBEFJ+oKf2WvPp+sU/kVIzCTw=" }, "aarch64-linux": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.60.arm64.tar.gz", - "hash": "sha256-E5TniXur9ATJ3ER/zTFc6EiBrH/kbNvIao0ADLyBZZE=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.68.arm64.tar.gz", + "hash": "sha256-2SpfkLu/4K1t2ILwOBMVAXeW7rbEzsjofn8naM1Szfc=" }, "x86_64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.60-x86_64.zip", - "hash": "sha256-2Nv4CHKLgCFbU1TeJQhIq8YdkJSQJXtUw2S17B8cS4s=" + "url": "https://downloads.1password.com/mac/1Password-8.10.68-x86_64.zip", + "hash": "sha256-t/glPvEGJH+IcYyrnW0fMSEeLB8mKqGqmZ8wnVFCJpo=" }, "aarch64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.60-aarch64.zip", - "hash": "sha256-drJiM8EiUM3M54+KPQdLvAmSfBH5YPqQk14yjHzoBtM=" + "url": "https://downloads.1password.com/mac/1Password-8.10.68-aarch64.zip", + "hash": "sha256-bhmuy8gUVCv+hYSIpYXgm8a0f1+JtyKb4g5cUIJCb28=" } }, "beta": { diff --git a/pkgs/applications/misc/1password-gui/update.sh b/pkgs/applications/misc/1password-gui/update.sh index c32076304537..1d31ef972f76 100755 --- a/pkgs/applications/misc/1password-gui/update.sh +++ b/pkgs/applications/misc/1password-gui/update.sh @@ -30,8 +30,8 @@ mk_url() { } cleanup() { - if [[ -f ${GPG_KEYRING-} ]]; then - rm "${GPG_KEYRING}" + if [[ -d ${TMP_GNUPGHOME-} ]]; then + rm -r "${TMP_GNUPGHOME}" fi if [[ -f ${JSON_HEAP-} ]]; then @@ -42,14 +42,14 @@ cleanup() { trap cleanup EXIT # Get channel versions from versions.json -declare -A version=( - ["stable"]=$(jq -r '.stable.version' versions.json) - ["beta"]=$(jq -r '.beta.version' versions.json) -) +declare -A versions +while IFS='=' read -r key value; do + versions["${key}"]="${value}" +done < <(jq -r 'to_entries[] | "\(.key)=\(.value)"' versions.json) -# -GPG_KEYRING=$(mktemp -t 1password.kbx.XXXXXX) -gpg --no-default-keyring --keyring "${GPG_KEYRING}" \ +TMP_GNUPGHOME=$(mktemp -dt 1password-gui.gnupghome.XXXXXX) +export GNUPGHOME="${TMP_GNUPGHOME}" +gpg --no-default-keyring --keyring trustedkeys.kbx \ --keyserver keyserver.ubuntu.com \ --receive-keys 3FEF9748469ADBE15DA7CA80AC2D62742012EA22 @@ -57,7 +57,8 @@ JSON_HEAP=$(mktemp -t 1password-gui.jsonheap.XXXXXX) for channel in stable beta; do for os in linux darwin; do for arch in x86_64 aarch64; do - url=$(mk_url ${os} ${channel} ${arch} "${version[${channel}]}") + version="${versions[${channel}-${os}]}" + url=$(mk_url ${os} ${channel} ${arch} ${version}) nix store prefetch-file --json "${url}" | jq " { \"${channel}\": { @@ -71,7 +72,7 @@ for channel in stable beta; do # For some reason 1Password PGP signs only Linux binaries. if [[ ${os} == "linux" ]]; then - gpgv --keyring "${GPG_KEYRING}" \ + gpgv \ $(nix store prefetch-file --json "${url}.sig" | jq -r .storePath) \ $(jq -r --slurp ".[-1].[].[].storePath" "${JSON_HEAP}") fi diff --git a/pkgs/applications/misc/1password-gui/versions.json b/pkgs/applications/misc/1password-gui/versions.json index 803d5238d94c..95dfd6b9078d 100644 --- a/pkgs/applications/misc/1password-gui/versions.json +++ b/pkgs/applications/misc/1password-gui/versions.json @@ -1,9 +1,6 @@ { - "stable": { - "version": "8.10.60" - }, - - "beta": { - "version": "8.10.68-12.BETA" - } + "stable-linux": "8.10.68", + "stable-darwin": "8.10.68", + "beta-linux":"8.10.68-12.BETA", + "beta-darwin": "8.10.68-12.BETA" } diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index 64aa654e77d3..e667e71f9d70 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation { meta = with lib; { description = description; + homepage = "https://github.com/Attempto/APE"; license = license; platforms = platforms.unix; maintainers = with maintainers; [ yrashk ]; diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix index e97d9ec3f91a..fb94b2d1e4de 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.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-/X+S91EA7jrjSYb/jafmRhbbZJUQyg1DoTkzd4ZRjWY="; + hash = "sha256-1G9H+1YBoIgSE8GO8UuUaG9gbVtY+gCp0oPNSNw0oO8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 19a63f9e8a21..564d28e73f2b 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "heimer"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - hash = "sha256-47bQmT2bHcbWpeosuF/vpSJcws4SqTmalY/XFEf7cxQ="; + hash = "sha256-eKnGCYxC3b7qd/g2IMDyZveBg+jvFA9s3tWEGeTPSkU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 6e5d4a332d5f..8a3717a8eefc 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "3.4.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-b4kZ//+rO70uZh1fvI4A2dbCZ7ymci9g/u5keMBWYf8="; + hash = "sha256-TDxTj7VGzJzd6RWyVbe2ubpVS57bqq7OVvi23ZHmYDM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-MDUBP1NI50I8sSXHYFiAdyL8C2DloCjnq8pr7PsBBIE="; + cargoHash = "sha256-R94D9/J+Zl86Rb4+5O2Hp9GmcwnRt+0wJ56CHFoy/zg="; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 3579a3a0b625..95597a6ee411 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -11,6 +11,7 @@ git, cairo, libxcb, + xcb-imdkit, xcb-util-cursor, xcbutilkeysyms, xcbutil, @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { check libstartup_notification libxcb + xcb-imdkit xcb-util-cursor xcbutilkeysyms xcbutil @@ -74,6 +76,8 @@ stdenv.mkDerivation rec { which ]; + mesonFlags = [ "-Dimdkit=true" ]; + doCheck = false; meta = with lib; { diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix index f9bd5c9d0c1f..5c78d28b090e 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -31,7 +31,6 @@ buildPythonApplication rec { ]; format = "setuptools"; - dontUseSetuptoolsCheck = true; installPhase = '' install -D -m 0755 SL1_to_Photon.py $out/bin/${pname} diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 7ac5133d11b9..e84b1a93af97 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -2,7 +2,7 @@ builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { zettlr = { - version = "3.2.0"; - hash = "sha256-gttDGWFJ/VmOyqgOSKnCqqPtNTKJd1fmDpa0ZAX3xc8="; + version = "3.4.3"; + hash = "sha256-Xb9zszbkHWAaIcu74EGQH0PVbuXIZXH/dja1F1Hkx1c="; }; } diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index f0434cc6c658..5bc9fdf260dc 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,9 +1,9 @@ { "chromium": { - "version": "134.0.6998.88", + "version": "134.0.6998.165", "chromedriver": { - "hash_darwin": "sha256-UtXlvBUnMZpCXT/xI7l4nfv3EgJZgugP1/fVg4rKgk4=", - "hash_darwin_aarch64": "sha256-yWRVP5LaEEhHfKkV0UmC7cpEuSnU5sgL3C/Aa2Ri3sc=" + "hash_darwin": "sha256-yiURcjAoIksCZYJMTVygUtud+IQcKSDDDdGlXMHWtFY=", + "hash_darwin_aarch64": "sha256-pkZBqQL7UqT9BWRbrdnbVn+u3Obth1g+0B/PPnAJj40=" }, "deps": { "depot_tools": { @@ -19,8 +19,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "7e3d5c978c6d3a6eda25692cfac7f893a2b20dd0", - "hash": "sha256-4RRB7uYI3I7c1dSypU2gzF9TCA2MJ7yStKEvm6vfSnE=", + "rev": "fd886e2cb29dd984c13deec032832dee68d8abe3", + "hash": "sha256-xD06hGSrccTGB6fUGw0b7RrGNBQjNmdGKPaRqhXVVOY=", "recompress": true }, "src/third_party/clang-format/script": { @@ -360,8 +360,8 @@ }, "src/third_party/icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "bbccc2f6efc1b825de5f2c903c48be685cd0cf22", - "hash": "sha256-O9qrAt8lwNBg5LCVz+SfTe48uJx8onVYwn0LRXIhUvY=" + "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b", + "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=" }, "src/third_party/jsoncpp/source": { "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", @@ -615,8 +615,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "fb519f2fe5d4409bc0033a4ae00ab9a7095fe566", - "hash": "sha256-Y0KtUKn6DxpxVLRM+jPvUPhPzekTAma1HYs27xlJlkw=" + "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125", + "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -780,13 +780,13 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "a57459aad9ec3ed5f78d9ded700d52e31029efd2", - "hash": "sha256-IE1X6lfMyoXsN+7ebJ3RWXAgpR98AjituL3faQbNag0=" + "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6", + "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8=" } } }, "ungoogled-chromium": { - "version": "134.0.6998.88", + "version": "134.0.6998.117", "deps": { "depot_tools": { "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688", @@ -797,16 +797,16 @@ "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U=" }, "ungoogled-patches": { - "rev": "134.0.6998.88-1", - "hash": "sha256-Mn7Cr2jCSh1yMw6racIPAbj0gX44xhonHMQLSz4La/E=" + "rev": "134.0.6998.117-1", + "hash": "sha256-UEdho4QgVy+iQzH+hxnQC7T1juF25Dc4fDeKqd0FRnU=" }, "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "7e3d5c978c6d3a6eda25692cfac7f893a2b20dd0", - "hash": "sha256-4RRB7uYI3I7c1dSypU2gzF9TCA2MJ7yStKEvm6vfSnE=", + "rev": "cbb247b860ca6b9b18dfa791157e274eab8cad6e", + "hash": "sha256-StWP7bsmD5Byn9uLZz6mo/OTChUsW1Y0RhxuofsPLbY=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1401,8 +1401,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "fb519f2fe5d4409bc0033a4ae00ab9a7095fe566", - "hash": "sha256-Y0KtUKn6DxpxVLRM+jPvUPhPzekTAma1HYs27xlJlkw=" + "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125", + "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1566,8 +1566,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "a57459aad9ec3ed5f78d9ded700d52e31029efd2", - "hash": "sha256-IE1X6lfMyoXsN+7ebJ3RWXAgpR98AjituL3faQbNag0=" + "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6", + "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8=" } } } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 4c334514c761..db07fa616186 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = pname; - version = "137.0b6"; + version = "137.0b8"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "91fb3e010d62805ec29758bb46b3d520dc3a3e2b0f040de4e284aeb5fe812b5b084563f560a229f54a404a5130429d60b35eac15d89f1cb586fd364b61a7f8be"; + sha512 = "d978dbbe5215fe0787ca571d9676c9572917e88f347ea46e4656d8e0a849e11d3e8c7c918e159a0eaea41bf480897e91fd26776e1dd28c5bfbb37934c44511a1"; }; meta = { diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 952c18256874..e7edb3ebee33 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -71,7 +71,7 @@ buildGoModule rec { }; meta = with lib; { - homepage = "https://github.com/kubernetes/helm"; + homepage = "https://github.com/helm/helm"; description = "Package manager for kubernetes"; mainProgram = "helm"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix index f4815a6653ed..098b1d1741e5 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "helm-dt"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "vmware-labs"; repo = "distribution-tooling-for-helm"; rev = "refs/tags/v${version}"; - hash = "sha256-jSX18FJCQORHFIUBROWZqAO5EBPXFvN/k0NRfkdkUFM="; + hash = "sha256-/TRhi4YgEB5RwRZXuwGCCqHz3SoBfs1SdKLBWg1yed0="; }; - vendorHash = "sha256-8HefE1a3pcbBgq/bC0mnhWzSa5xTi2dbqw0tyJ9EyTI="; + vendorHash = "sha256-54QB8dZSqSpDb4z7di5K6d8/fFbXftKfQJAljV50/Jk="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 3697da2bd7f7..aa8b29ca8e2a 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (8.0.1) + activesupport (8.0.2) base64 benchmark (>= 0.3) bigdecimal @@ -35,10 +35,11 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake - google-cloud-env (2.2.1) + google-cloud-env (2.2.2) + base64 (~> 0.2) faraday (>= 1.0, < 3.a) google-logging-utils (0.1.0) - googleauth (1.13.1) + googleauth (1.14.0) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.2) google-logging-utils (~> 0.1) @@ -58,12 +59,12 @@ GEM http-form_data (2.3.0) i18n (1.14.7) concurrent-ruby (~> 1.0) - json (2.10.1) + json (2.10.2) jsonpath (1.1.5) multi_json jwt (2.10.1) base64 - krane (3.7.1) + krane (3.7.2) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -79,7 +80,7 @@ GEM jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) - llhttp-ffi (0.5.0) + llhttp-ffi (0.5.1) ffi-compiler (~> 1.0) rake (~> 13.0) logger (1.6.6) @@ -87,7 +88,7 @@ GEM logger mime-types-data (~> 3.2015) mime-types-data (3.2025.0304) - minitest (5.25.4) + minitest (5.25.5) multi_json (1.15.0) net-http (0.6.0) uri @@ -122,4 +123,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.5.22 + 2.6.2 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index f51087e1f07f..5025ceafb682 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -18,10 +18,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0drfj44a16r86clrrqz3vqmg93qri6bqghjm21ac6jn2853cfnzx"; + sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5"; type = "gem"; }; - version = "8.0.1"; + version = "8.0.2"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -175,15 +175,18 @@ version = "1.3.2"; }; google-cloud-env = { - dependencies = [ "faraday" ]; + dependencies = [ + "base64" + "faraday" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ks9yv21d8bl9cw0sz5gy6npll1ig3m2bq9w7yw67j5mw2p64q1w"; + sha256 = "1rr1ksjxrh8468brxz32zjl0mad9zf4q7cqwrrl98zm60l7d9gll"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; google-logging-utils = { groups = [ "default" ]; @@ -209,10 +212,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "187c8y2arv0akkpmff0zf2qnf93ixvsbjpnvwsrzw2p4cbk8qi1k"; + sha256 = "0jai8xv2rmhz8nb6vxg4whq6aldmkbyjsn3hvk9w740qg48xxrv2"; type = "gem"; }; - version = "1.13.1"; + version = "1.14.0"; }; http = { dependencies = [ @@ -278,10 +281,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x"; + sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; type = "gem"; }; - version = "2.10.1"; + version = "2.10.2"; }; jsonpath = { dependencies = [ "multi_json" ]; @@ -322,10 +325,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gkbrk08l8zdcnp62yc0r89kq9sv79v6v0ni1d6ghm4mil8apbm9"; + sha256 = "0765hl9hl1dm0sxkgxbh3fl2hzxvcwigx5khmhpha6361w4za5ir"; type = "gem"; }; - version = "3.7.1"; + version = "3.7.2"; }; kubeclient = { dependencies = [ @@ -352,10 +355,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yph78m8w8l6i9833fc7shy5krk4mnqjc7ys0bg9kgxw8jnl0vs9"; + sha256 = "1g57iw0l3y7x50132x6a1jyssxa6pw7srh69g0d6j7ri37yaf9cs"; type = "gem"; }; - version = "0.5.0"; + version = "0.5.1"; }; logger = { groups = [ "default" ]; @@ -396,10 +399,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw"; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; type = "gem"; }; - version = "5.25.4"; + version = "5.25.5"; }; multi_json = { groups = [ "default" ]; diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/Cargo.lock b/pkgs/applications/networking/cluster/kubectl-view-allocations/Cargo.lock deleted file mode 100644 index 452130670dec..000000000000 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/Cargo.lock +++ /dev/null @@ -1,2178 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" - -[[package]] -name = "async-compression" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.4", -] - -[[package]] -name = "clap" -version = "4.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "color-eyre" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" -dependencies = [ - "once_cell", - "owo-colors", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http", - "hyper", - "log", - "rustls", - "rustls-native-certs", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indexmap" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jsonpath-rust" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cc127b7c3d270be504572364f9569761a180b981919dd0d87693a7f5fb7829" -dependencies = [ - "pest", - "pest_derive", - "regex", - "serde_json", - "thiserror", -] - -[[package]] -name = "k8s-openapi" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc3606fd16aca7989db2f84bb25684d0270c6d6fa1dbcd0025af7b4130523a6" -dependencies = [ - "base64", - "bytes", - "chrono", - "serde", - "serde-value", - "serde_json", -] - -[[package]] -name = "kube" -version = "0.87.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3499c8d60c763246c7a213f51caac1e9033f46026904cb89bc8951ae8601f26e" -dependencies = [ - "k8s-openapi", - "kube-client", - "kube-core", -] - -[[package]] -name = "kube-client" -version = "0.87.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033450dfa0762130565890dadf2f8835faedf749376ca13345bcd8ecd6b5f29f" -dependencies = [ - "base64", - "bytes", - "chrono", - "either", - "futures", - "home", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-timeout", - "jsonpath-rust", - "k8s-openapi", - "kube-core", - "pem", - "pin-project", - "rustls", - "rustls-pemfile", - "secrecy", - "serde", - "serde_json", - "serde_yaml", - "tame-oauth", - "thiserror", - "tokio", - "tokio-util", - "tower", - "tower-http", - "tracing", -] - -[[package]] -name = "kube-core" -version = "0.87.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5bba93d054786eba7994d03ce522f368ef7d48c88a1826faa28478d85fb63ae" -dependencies = [ - "chrono", - "form_urlencoded", - "http", - "k8s-openapi", - "once_cell", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "kubectl-view-allocations" -version = "0.18.1" -dependencies = [ - "anyhow", - "chrono", - "clap", - "color-eyre", - "itertools", - "k8s-openapi", - "kube", - "pretty_assertions", - "prettytable-rs", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "tracing-bunyan-formatter", - "tracing-error", - "tracing-subscriber", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall", -] - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "ordered-float" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits", -] - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "pem" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" -dependencies = [ - "base64", - "serde", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pest_meta" -version = "2.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "prettytable-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" -dependencies = [ - "encode_unicode", - "is-terminal", - "lazy_static", - "term", - "unicode-width", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "secrecy" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" -dependencies = [ - "serde", - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "syn" -version = "2.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tame-oauth" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd95ca1e8f5d9d3e83a626370af9ff1356ed1605ad128d99f9bea57432c112be" -dependencies = [ - "data-encoding", - "http", - "ring", - "serde", - "serde_json", - "twox-hash", - "url", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "async-compression", - "base64", - "bitflags 2.4.2", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "mime", - "pin-project-lite", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-bunyan-formatter" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c266b9ac83dedf0e0385ad78514949e6d89491269e7065bee51d2bb8ec7373" -dependencies = [ - "ahash", - "gethostname", - "log", - "serde", - "serde_json", - "time", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "once_cell", - "regex", - "sharded-slab", - "thread_local", - "tracing", - "tracing-core", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index 71b0f9d9ed65..6866703b4454 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -4,34 +4,34 @@ rustPlatform, fetchFromGitHub, Security ? null, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "kubectl-view-allocations"; - version = "0.18.1"; + version = "0.20.5"; src = fetchFromGitHub { owner = "davidB"; - repo = pname; - rev = version; - sha256 = "sha256-BM0TLzoXQg3m5fdQEnO/tErW8xmuljo74GprwEgJN8o="; + repo = "kubectl-view-allocations"; + tag = version; + hash = "sha256-Y+Yki0wTi/OTWbUvk+8EhTlhF7H51RrdFLFXk2VqF1M="; }; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - cargoLock = { - lockFile = ./Cargo.lock; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-6sRpsXydzKB0ZaV1HeagINgb6ol9dj3XT0+pd53QOCw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { description = "kubectl plugin to list allocations (cpu, memory, gpu,... X utilization, requested, limit, allocatable,...)"; homepage = "https://github.com/davidB/kubectl-view-allocations"; - license = licenses.cc0; - maintainers = [ maintainers.mrene ]; - platforms = platforms.unix; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ mrene ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index a2fc303698fd..541bf4d25e01 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.32.2"; + version = "1.32.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-pie36Y3zKGKvnCDHtjNHYox1b2xhy6w7MShkAfkDVrs="; + hash = "sha256-kF3Oo+YETnsrFPWBO5b7nH2A2eONIOkE84+u6vOSrpE="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/rke2/1_29/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_29/images-versions.json new file mode 100644 index 000000000000..d51126a5f43b --- /dev/null +++ b/pkgs/applications/networking/cluster/rke2/1_29/images-versions.json @@ -0,0 +1,122 @@ +{ + "images-calico-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "4b3743795b3fb431c53f183d43b004925ff06863bd95e9fbf3949c5c5092c7bd" + }, + "images-calico-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "eca2ac2eda2fcaf055f54dfc1baf7f21a88f3454a84716d8d0f57574f2a36664" + }, + "images-calico-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "d2baf446c4ec832bf870d57bc7cfd496de6bd1df3cc26b83ea7853a8e6e85de9" + }, + "images-calico-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "18922628e7c9a9045b60393fe049a01ec2137b80b3312ea09735bce978ae88c8" + }, + "images-canal-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "351c2c73acc9a88869735430b604a60237122e778f5eb95c503530e8cc42d790" + }, + "images-canal-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "a8b0825efd30f2e4ee0e82730d820b5ab0e2074b76d99a4662555726440a1542" + }, + "images-canal-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "5a43dd70e1efac0ee0deeb5637b8fd8b19c4f70b5854d9af69dde7299c7315c0" + }, + "images-canal-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "d42f6de81cc2a0ca8cb8716189c782c58de3ec7f6159ac240228755bfc586b4a" + }, + "images-cilium-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "b8ead14a0c131f9a91997635670cb03191c4f4e4b14bee77fe0da0b9629d5b01" + }, + "images-cilium-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "b89382ac45f36536ff8d458d74938f6558f510f7bed5cebbaf0834abbb81d03d" + }, + "images-cilium-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "f6918df76be1395bb193091d5a356555284da56294f0ab6ed6e2c5f11bf9ddbb" + }, + "images-cilium-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "7715c4073dfbba766605ec16aa238a7e171b53def9933e9e3cd6c69780dc669c" + }, + "images-core-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "2d138c9f5c08e0783bcec973de388e21cb0733a30a8f87123662f155e22d1cb6" + }, + "images-core-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "2eaae797f44ab269b271fa9fb0f02ecaf14d1209c16d83b395d9549b736c149d" + }, + "images-core-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "caee89bef5f95aa812de8314cc8612b525840b98e7e654c7b256277df7faaf07" + }, + "images-core-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "252cbe2f8f7d262a884094411b84a0e98b16886d2c0e13edea02b81993395283" + }, + "images-flannel-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "1495baefc0b8d727e5baf16b71a56f3d8a9dee414e614e7511fd9ca629e6146f" + }, + "images-flannel-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "925e1b36c1d1fd65e61de76f21816866dd539a3345e29ba9aca8a66b6aa1e135" + }, + "images-flannel-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "fcf737645558c91d525fc8c855c3f674fa0c0dea2d2114b67d2df8236c1905ca" + }, + "images-flannel-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "a1eda6aba79af9eb58614d656106196c9159253bb17f1418ee23c4eabf400410" + }, + "images-harvester-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "3aff7d410d88fbffed80642c044958601e325a7fb3b5f11b7b989179659b8f14" + }, + "images-harvester-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "3d7a80dc64e96c27fd5fe4210c02357c7f2870d25b8067338f45b12c92d80d9f" + }, + "images-harvester-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "4fbefae4e2fd15e97e81f4a6eaa1b407d39125caaf60feb766197b1914afbef6" + }, + "images-harvester-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "d1644e15125da089225372f44d9c537f5c4ac3b298024ecda0b1537bc245f896" + }, + "images-multus-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "2327286a7d695c0596e7536018710373aff10c3f1adc847f07f820c33b68ad81" + }, + "images-multus-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "2d5cb1b383aa2a6bb840d185e01a09e7d667b05c91e4be42a04dffa5cd6b4d92" + }, + "images-multus-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "9bbd253fdb9fd7913569b651c2591e2b97bdd3b98d0398bcc563a09f1387d6a3" + }, + "images-multus-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "ce929e823814cda57d187a219dc2719cbab390bf2a2d939e44d48d70f288d25c" + }, + "images-vsphere-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "d405c544026e9aac8edad7cc64abcb4c20578a3abb8aff114910df3161aac28a" + }, + "images-vsphere-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "d71d9dbc916988b2d9236c56ed46dfdd269db892bcbf8e5e11675d851ec7a3f6" + } +} diff --git a/pkgs/applications/networking/cluster/rke2/1_29/versions.nix b/pkgs/applications/networking/cluster/rke2/1_29/versions.nix index 64f32eaeee5c..c22c6bece1b5 100644 --- a/pkgs/applications/networking/cluster/rke2/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_29/versions.nix @@ -1,11 +1,12 @@ { - rke2Version = "1.29.13+rke2r1"; - rke2Commit = "00803ef95072be9d13b6e52a56fa9b6d9e7b0a51"; - rke2TarballHash = "sha256-1OphaTrEU2MvV0kdEyxomRGgbl/YSVikcYtLuL3QnBI="; - rke2VendorHash = "sha256-6XczvyQMqYqHHu+cSsmXsi7zMG128ZwiAHr482qQqpI="; - k8sImageTag = "v1.29.13-rke2r1-build20250117"; - etcdVersion = "v3.5.16-k3s1-build20241106"; + rke2Version = "1.29.14+rke2r1"; + rke2Commit = "700728b7c1efe5db28004c747819b635254e9a91"; + rke2TarballHash = "sha256-K1Yn85NBl4t0OwaETfqgeZVIgAzbLevY0lyOHs5YwfM="; + rke2VendorHash = "sha256-WG++RPbIhDNnd9BRbEop4qtDcaKJTUz+YzeygZfDxLI="; + k8sImageTag = "v1.29.14-rke2r1-build20250213"; + etcdVersion = "v3.5.18-k3s1-build20250210"; pauseVersion = "3.6"; ccmVersion = "v1.29.10-0.20241016053521-9510ac25fefb-build20241016"; - dockerizedVersion = "v1.29.13-rke2r1"; + dockerizedVersion = "v1.29.14-rke2r1"; + imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/1_30/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_30/images-versions.json new file mode 100644 index 000000000000..2de4c9d6d9be --- /dev/null +++ b/pkgs/applications/networking/cluster/rke2/1_30/images-versions.json @@ -0,0 +1,138 @@ +{ + "images-calico-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "ad47733ffcfa7194ff3f8e9b1aad4028868b6def24bfc613d30104dfbaa103d2" + }, + "images-calico-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "fda9d7d50ed44dd15a31b74720fa71fa5d6d504091a47bfa6f766adbeaf5eb08" + }, + "images-calico-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "bb01eca1bb1a30e2ef83d4c528934a445e56e7e4c38d4ba795699827bcab1f79" + }, + "images-calico-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "020b55868818efbf5b27854416ad2f5c71a757c674a49e493f44c1b4146b16cf" + }, + "images-canal-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "827fe2baa8ba2429cc5a6853c7447461e0452ad46bae46e47ab53d078c34856c" + }, + "images-canal-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "931a778ff65cfca3b76bddf65d71792422d6ffe0abc6feecc1ca8923555550a3" + }, + "images-canal-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "49d4502fab5236c7b96f07636349f902d781c55d03ecd2e563a8f7e544fd30af" + }, + "images-canal-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "f75946b503600b0ca1b24f0da7355ece0a96380772fdc8c75f94ab6839bc559f" + }, + "images-cilium-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "000c57f474e1b70a81dc7f0b831fd01cb8d147664e00eff566ab8d89fa9caf8a" + }, + "images-cilium-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "00a5971a62c02e192de910f6c5f1cd230d23547335d94399fa306a355e23750f" + }, + "images-cilium-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "da8793a53ac5c64387872db810d3b94f11ba063af6e11b48ac6df2a943ea8f79" + }, + "images-cilium-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "85e78feaeac5dba9ef18eac8dd42081afe4f0bffe11921dbfd6b7cc585ca1496" + }, + "images-core-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "c5c4c7389312642c6dc9ef3a07d954be5d3776a8fc1e6df90bb46eb95fd75513" + }, + "images-core-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "8ec619a8b458c27f14bfdb796b1aa399ed34b7db176ea3ae64ba20189f529835" + }, + "images-core-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "413566078e9315aa5d9339e6fb1f7859aea399a7f7934019aa7b1229e223e293" + }, + "images-core-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "586a55ed0aff2bd149bd2a5ad586177ba78814a7da8acb0640365bffaa5c39bb" + }, + "images-flannel-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "6eaa3a7f058abd192eab13533cc47a47d4571eee3f6f688f1c316c8a62c1f9d8" + }, + "images-flannel-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "42e2f3ce038d7262afcea8c5603f59bd501653e6dcbcbf571e71c8637a85297a" + }, + "images-flannel-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "e2a9164923bec9998879224c74edf36fa14e6534cddb20220f399679c28348ef" + }, + "images-flannel-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "8b49d5670be6794813d70fbebf1b681d8d0661ada1cd15d74bf08d6302a85898" + }, + "images-harvester-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "5c0e2ab04cf30e6e862f88d75cc2c5130da68d893be723f91212b9b49caa2a60" + }, + "images-harvester-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "787ae168c950c6d5a10296511fc4a54d819f4587a8ffaaccafd766ea5252cc4d" + }, + "images-harvester-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "89d2713b0843eb9638f3d242fd3d8f6a4ceb35d83c62067940d8624025fbfc0f" + }, + "images-harvester-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "64c2a373c19ed7fc0254e24ce8d9dae4ae21826fea9094b14ece90471706b753" + }, + "images-multus-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "20e1811dae1c233a836162b432540cb3e2f974aecf0d1b57bcf79d4b269a8531" + }, + "images-multus-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "025ded7faf603991975c4f17708b0887bffbc265aa5546e6df96ab625ebb65ac" + }, + "images-multus-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "e8919421560a548576eed90c9d442d84ce1a3cfab0739cd98c400f7ed17876d9" + }, + "images-multus-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "55bb64bd256ac9a185db583d4dd178a609cb8a047123dbae5aadf9b56183f99b" + }, + "images-traefik-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "c219b1c1fb311b2e0981c2c280e0e51e7b0e2081f5521ed0dedcc25aeaf701f4" + }, + "images-traefik-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "5118c0fe338141c154eca5386db49b40d55f29a07d77486e6f82117c433176ae" + }, + "images-traefik-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "0b618a0a48ffb91d61dc0f685dc1a0859ed7824c5ac315b7a62856cdd1282a83" + }, + "images-traefik-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "24f90b544f5b962ca35333b9ae6bb3b1b5ce0bf0d270d006cad7c8c6ffa3f011" + }, + "images-vsphere-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "93f668a01a753c40b72ba9936909bf49bc2c6c857bdb900eef22f237a2600d07" + }, + "images-vsphere-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "e68ff9127360537ef0f351741fbbd27b6fe927cf792a0a80c25a9a78f1aeeab1" + } +} diff --git a/pkgs/applications/networking/cluster/rke2/1_30/versions.nix b/pkgs/applications/networking/cluster/rke2/1_30/versions.nix index 8ff0e4f20431..3ac7c852a755 100644 --- a/pkgs/applications/networking/cluster/rke2/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_30/versions.nix @@ -1,11 +1,12 @@ { - rke2Version = "1.30.9+rke2r1"; - rke2Commit = "bfd23524f32a4d9fa6f19ab58a2d47572e56f813"; - rke2TarballHash = "sha256-/WVKmK9ZackY9ULST0zFi/RRwA4ZR3u1DXULWTc6G3o="; - rke2VendorHash = "sha256-kghiYswm3s7bILGp8t452jx84MY73EF9OTaWdncFr34="; - k8sImageTag = "v1.30.9-rke2r1-build20250116"; - etcdVersion = "v3.5.16-k3s1-build20241106"; + rke2Version = "1.30.10+rke2r1"; + rke2Commit = "b83bb8e150236c43aa3d52d31523feb879d09911"; + rke2TarballHash = "sha256-YpF2SBIH3GwWOtSIbIZb88Nd1GNUvOmbgeyNDKAo+qU="; + rke2VendorHash = "sha256-aExBaQuqW2ZNCniHjur5OcvBogC4zofn5UNQS8gHSrA="; + k8sImageTag = "v1.30.10-rke2r1-build20250213"; + etcdVersion = "v3.5.18-k3s1-build20250210"; pauseVersion = "3.6"; ccmVersion = "v1.30.6-0.20241016053533-5ec454f50e7a-build20241016"; - dockerizedVersion = "v1.30.9-rke2r1"; + dockerizedVersion = "v1.30.10-rke2r1"; + imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json new file mode 100644 index 000000000000..fb9af4ff20df --- /dev/null +++ b/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json @@ -0,0 +1,138 @@ +{ + "images-calico-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "5a3b85760345b131e733be993b5a7fff7b244095d04d1f3b09085167eda5ec48" + }, + "images-calico-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "3c4b349c4c5dcf77d5c064ac7d8e7cd17b86575f1861d423f02f5e5dde4bab2a" + }, + "images-calico-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "11db0d5a766421ffd11009f78444d42f20fca5ddc35654aaadcc32aae31f487b" + }, + "images-calico-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "d1570a698616ee0f9dc430e6374f299fc93b0b53da7b61f9b0e0e66562ddb001" + }, + "images-canal-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "d26574208df6e8196066620c12854c73ec3f9d92ae927ba401447f54bbd9bf65" + }, + "images-canal-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "b5945ac08d74bcc67415efc1c293b2af119befe04f377880eb045ca7dcf4276c" + }, + "images-canal-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "8a63fe4069c811d94004132afa16fb21b8ca1548eba075529ef3d812b682119a" + }, + "images-canal-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "8cbb92e40590b372cb1b962de2c2e8d6b92d26bd5d9b71aee577865587e46e56" + }, + "images-cilium-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "f989d984753b166cffbfaec8866ec9b28ca852978de737f5195cd8da929fbd31" + }, + "images-cilium-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "784b5817f5f8ab4226cbce3d074d467d397dd0ed0ed6397e4c1be0a327423f13" + }, + "images-cilium-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "b4dc7787e43d3148cd45f56ba2197469b9901e710a844b49024e7d675862f1d8" + }, + "images-cilium-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "209d566b382c6c8af5ddfd2350228ec0669b341ce503ac001cc79928add3accd" + }, + "images-core-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "e8e687f3063cfdc7e6f93feffc0a2e63b90f3228c4f6c85532d4e1f436fbaeb7" + }, + "images-core-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "2faf4f9ee2e77b7db6963147d3685197f32f6af5b3dd2305221273bcfefa5af9" + }, + "images-core-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "1d514169c112dd295a03f22ba35905edd0c550e0b09ef5191b9389bb7fd1a945" + }, + "images-core-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "b4e3cfe5f250dcdb1daa02002d4caf9349add11c4392df644c9fb16c5605ffd9" + }, + "images-flannel-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "1f069844a35857e264065c2e5f9157b1005fda3eb7dcffd20e2218f7ab64c250" + }, + "images-flannel-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "1bd4e97a5391916cf703d8503d51f05c8db1fe5e130a718fe8fefb4cf8d95e4b" + }, + "images-flannel-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "c49971bcc55765e3ac036f59cb6df5158efcb664d4fc5a3e0f7f40e962e5b153" + }, + "images-flannel-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "9dc874dc452cd3c28cb313c70b1cbfb465195b4c308d893555b1fb8b20296756" + }, + "images-harvester-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "4837a8c559fca6e31436128040b99e90f3ab2210022f02a618405ccfc7185e7a" + }, + "images-harvester-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "a38aa37f2f8362055ef5dfa16a3c4d9f85eaed6e1b56b928bb4888c52e96b76f" + }, + "images-harvester-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "beea6e39cc1f522b59de42598a8431ee006292bb6568cb8a0b46ed614225264d" + }, + "images-harvester-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "cf7f030fd86fcc2425a7a7819c523f6497eae59066fab04a56d8f1cf01c7aac2" + }, + "images-multus-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "d473aee06f24d49d1d6b6baee9bfd2079036ef40c0cda126a83851078b0f7e40" + }, + "images-multus-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "18957569b6a5fa5aab5fd4dc180fec8b403cae2c07ee07b18505a5f6901d5e5b" + }, + "images-multus-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "b5acbce9e9ccd2213807bd27896a6d6b29795dd2f55e5b2281a77dfa41366a60" + }, + "images-multus-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "eb7ea1b45d01cab215a1bba7bfc223ed03c16d1383a5e0df141e5ecee9708def" + }, + "images-traefik-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "2b29e30e1daac4277da7f6a27ad021e0380a4585278d7e8440b38b2e1207ee68" + }, + "images-traefik-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "70147f487109bd7e4db5b525a8a2a01030f3a6e985e4ce06e8c28dd98e6ff131" + }, + "images-traefik-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "15c03df525be312caac8431bfb9d0a3842834b25faf0551bc8e185337d623522" + }, + "images-traefik-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "4b53b94f2dbdc142987718dff210d381cb6d38ad01846278654d77ec1f6f44f0" + }, + "images-vsphere-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "169828a17efdd4a14682c49c0bed437bcec6cde27378d985e15ecbfdfa1523e4" + }, + "images-vsphere-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "4f7663357f47f696eaf2de34d980ba3aebaa8e42de635e17736ae1ef6c58629c" + } +} diff --git a/pkgs/applications/networking/cluster/rke2/1_31/versions.nix b/pkgs/applications/networking/cluster/rke2/1_31/versions.nix index 9fcc4fd66b7f..b5db3ba59059 100644 --- a/pkgs/applications/networking/cluster/rke2/1_31/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_31/versions.nix @@ -1,11 +1,12 @@ { - rke2Version = "1.31.5+rke2r1"; - rke2Commit = "08e198bbe3f0b8d4c9b0af4d92085c06bb94aa89"; - rke2TarballHash = "sha256-GG1GOs/kLWDCvc/+l0ymRpJzEthIyGpampCjvfnEPB8="; - rke2VendorHash = "sha256-xWqMidOWiLgJXp6AEITkyOieLw4yi1JMmi80YS4RNy0="; - k8sImageTag = "v1.31.5-rke2r1-build20250115"; - etcdVersion = "v3.5.16-k3s1-build20241106"; + rke2Version = "1.31.6+rke2r1"; + rke2Commit = "f75cdf813703af4bc224b91bfb3c48d10aeb9fd0"; + rke2TarballHash = "sha256-6HMF3EngR2S8LTpMq4b3B1ZUiBUJO8D3fhwaNMuAuPc="; + rke2VendorHash = "sha256-ug1dO4t/QfPpg3mobCIJWb8/MERUoP9tEMlKRKZigXo="; + k8sImageTag = "v1.31.6-rke2r1-build20250213"; + etcdVersion = "v3.5.18-k3s1-build20250210"; pauseVersion = "3.6"; ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016"; - dockerizedVersion = "v1.31.5-rke2r1"; + dockerizedVersion = "v1.31.6-rke2r1"; + imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json new file mode 100644 index 000000000000..5f81c0449535 --- /dev/null +++ b/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json @@ -0,0 +1,138 @@ +{ + "images-calico-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "a5bbae876483eac841d0c86d07b9a2f681d14ceba49127d86f206c60416dea02" + }, + "images-calico-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "f5bb26e2d2c755b19459af960c5e06f45771f95c257aa40aa206d65712664784" + }, + "images-calico-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "8a1854a27c1269628a2318ef9b200f861a3a9b390948ac50340d1fa2c338c22d" + }, + "images-calico-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "844d7ed5be7525971de7612980a49f0c326be638dbd59146bf22d02b65687ac6" + }, + "images-canal-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "052ffd11c271daf158361d6b2ad99b8c2a7b30d110e6530b3db1d08a809861b9" + }, + "images-canal-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "c4f2434302fa287e13385d3c7f50ec0b3f9989cf8a16a70f5d0c85232570371a" + }, + "images-canal-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "433d22412cdeadaf3dad899517af66aaf2167c096c95ef2462b0b2ed74bbd036" + }, + "images-canal-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "445cd57b28cc69f487e95698c84c4339729a5a6f11fd36d57b37cc3ef49d11ab" + }, + "images-cilium-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "e6facccbc711757982f5b625427e04e286671a14be7fed13647d7ce59fdd6f5b" + }, + "images-cilium-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "745216763991e712800edb5f04ba0a3a647a73e5076d28237cd44064da0254e8" + }, + "images-cilium-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "3ab86ac3c021681ee1cb10d0d7bb4dd05f96830ea84e8bfdd1d5c239e1c1db00" + }, + "images-cilium-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "b160d69f45818dbc8526aa92784c935c471863d9d6ad5f83a434419cee0d1dd1" + }, + "images-core-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "5da5bc70814ae25f55e75d194d3e56eed9d48d2e2bd50cce329f72a8658a2c71" + }, + "images-core-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "9542793ad13822d02bc5b3aef237c21cb8ea807cde8c1f7edd50c9c8de3257a1" + }, + "images-core-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "b48c79e0e68d7c8ae3dd52f6647f4f859eb0a81e4cb81ca98a08788a3eeb208c" + }, + "images-core-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "97ebc6e37d73d2fefbd861ae9e44a97c649c5876def02fa0e99b136e4cc43834" + }, + "images-flannel-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "cebc30d3648804c8f6a57de63b7a8c6dd131e2338e4c7e40bb4a3a4ec9962033" + }, + "images-flannel-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "2caa2ba283f683070cedfbcef4058a0172541c0675d2582cffc09a8ab97c3af8" + }, + "images-flannel-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "cbbbadf33bb38b22340db52c7f72e2685ad20f64f27a31eb3c90ae2575ac676d" + }, + "images-flannel-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "db13267b1bf8d27003f6056cea683e34af4ff3743d05de7f84bfb089cc2e28ad" + }, + "images-harvester-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "b54b4ba783469334a492fdb4f2cfb68ce4a57a7f700d27d060d11213bb026a33" + }, + "images-harvester-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "68e232d40c9ddb67ce17181e48e8accd6be6b55ee01d78937100ce3faf3f7042" + }, + "images-harvester-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "3847f03a2351ed9182ae52b0b03f8cf7705123b301f1cc4d7da01cfd2359f743" + }, + "images-harvester-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "abdae17a19b8da8aeda83e434052c86e4be24bb37dc64c696e42ed59dac9d3c9" + }, + "images-multus-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "712ff37f4ea472c485fa887ab6b60df441ebda40c7b6bc66c28433b52f69a0d9" + }, + "images-multus-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "e556ae1d1db3923e57a050da3a9176fa9e7c3a0378229f7dd7a1c34145e8b96e" + }, + "images-multus-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "0308c83ee9f8affa237cc7b528639558e18b9fdbf5a914220f1c1818654c5874" + }, + "images-multus-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "d420a305e3d5b95f05da90177484df38b7178381acdb0806bd17aa2612a26583" + }, + "images-traefik-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "39f6f02a012e24237b8ed0106d83f6248f133a6d83feaca2aaf4c692b31edd94" + }, + "images-traefik-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "8608cd8d01fd2ad00fcc28bf7a9a54e89f96b2d0efe45ea6ce940fefc22ba36e" + }, + "images-traefik-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "3a47c3207fcf3e670f8b58262aecb777d63a56f744feb3b99612d86516f63f90" + }, + "images-traefik-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "afd2e4c6066fcbbde4d7cb2245cdc18542b9f510e8908c4ffe07181a459d6703" + }, + "images-vsphere-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "5c5531032ded256f0834169fe4db65e698ef4b44a76128b9aec174d8cc24d6e0" + }, + "images-vsphere-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "5f38ba2a8060f82ee407edb77433afb53635798f1be6f1fa53fbe9921c2eb3a0" + } +} diff --git a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix b/pkgs/applications/networking/cluster/rke2/1_32/versions.nix index a0ffa83fe29b..84e6091e6cd2 100644 --- a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_32/versions.nix @@ -1,11 +1,12 @@ { - rke2Version = "1.32.1+rke2r1"; - rke2Commit = "c0f7be4407cf2c437cacfe735e5c943e827f2ff8"; - rke2TarballHash = "sha256-clZpTnMnj2PRDDYz7+r11RlyX2ExwsE1Tmdt3/kUmtE="; - rke2VendorHash = "sha256-aIB2fRkccx5fXMnFxZ+tirXp5gg8o/h/a6Lgc+EG4L4="; - k8sImageTag = "v1.32.1-rke2r1-build20250115"; - etcdVersion = "v3.5.16-k3s1-build20241106"; + rke2Version = "1.32.2+rke2r1"; + rke2Commit = "8a5c3a23c25cc9b423a303be5f4f1c0e8b885726"; + rke2TarballHash = "sha256-9sNlOkzPCTqHSqaphuSUsfRpS39QYcTDHgjMuYdircc="; + rke2VendorHash = "sha256-fECmrfLayXRhACH7YkuIAUVFqSyPpy/JZb2ZPvITfqQ="; + k8sImageTag = "v1.32.2-rke2r1-build20250213"; + etcdVersion = "v3.5.18-k3s1-build20250210"; pauseVersion = "3.6"; ccmVersion = "v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101"; - dockerizedVersion = "v1.32.1-rke2r1"; + dockerizedVersion = "v1.32.2-rke2r1"; + imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix index 88003eebcbde..3fc25f67480a 100644 --- a/pkgs/applications/networking/cluster/rke2/builder.nix +++ b/pkgs/applications/networking/cluster/rke2/builder.nix @@ -10,6 +10,7 @@ lib: pauseVersion, ccmVersion, dockerizedVersion, + imagesVersions, }: # Build dependencies @@ -20,6 +21,7 @@ lib: go, makeWrapper, fetchzip, + fetchurl, # Runtime dependencies procps, @@ -118,18 +120,19 @@ let doCheck = false; - passthru.updateScript = updateScript; - - passthru.tests = - { - version = testers.testVersion { - package = rke2; - version = "v${version}"; + passthru = { + inherit updateScript; + tests = + { + version = testers.testVersion { + package = rke2; + version = "v${version}"; + }; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + inherit (nixosTests) rke2; }; - } - // lib.optionalAttrs stdenv.hostPlatform.isLinux { - inherit (nixosTests) rke2; - }; + } // (lib.mapAttrs (_: value: fetchurl value) imagesVersions); meta = with lib; { homepage = "https://github.com/rancher/rke2"; diff --git a/pkgs/applications/networking/cluster/rke2/update-script.sh b/pkgs/applications/networking/cluster/rke2/update-script.sh index f14214369e65..fa1023bcdb9a 100755 --- a/pkgs/applications/networking/cluster/rke2/update-script.sh +++ b/pkgs/applications/networking/cluster/rke2/update-script.sh @@ -39,6 +39,27 @@ cd ${WORKDIR} FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" +# Get sha256sums for amd64 and arm64 +SHA256_AMD64=$(curl -L "https://github.com/rancher/rke2/releases/download/v${RKE2_VERSION}/sha256sum-amd64.txt") +SHA256_ARM64=$(curl -L "https://github.com/rancher/rke2/releases/download/v${RKE2_VERSION}/sha256sum-arm64.txt") +# Merge both sha256sums in a single variable, one entry per line +SHA256_SUMS="$SHA256_AMD64\n$SHA256_ARM64" +# Get a list of images archives that are assets of this release, one entry (name and download_url) per line +IMAGES_ARCHIVES=$(curl "https://api.github.com/repos/rancher/rke2/releases/tags/v${RKE2_VERSION}" | \ + # Filter the assets by name, discard .txt files and legacy image archives (e.g. rke2-images.linux-arm64.tar.gz) + jq -r '.assets[] | select(.name | test("^rke2-images-.*\\.tar\\.")) | "\(.name) \(.browser_download_url)"') +# Iterate over all lines of IMAGES_ARCHIVES, pick the appropriate sha256, and create a JSON file +# that can be imported by builder.nix +while read -r name url; do + sha256=$(grep "$name" <<< "$SHA256_SUMS" | cut -d ' ' -f 1) + # Remove the rke2 prefix and replace all dots in $name with hyphens + clean_name=$(sed -e "s/^rke2-//" -e "s/\./-/g" <<< "$name") + jq --null-input --arg name "$clean_name" \ + --arg url "$url" \ + --arg sha256 "$sha256" \ + '{$name: {"url": $url, "sha256": $sha256}}' +done <<<"${IMAGES_ARCHIVES}" | jq --slurp 'reduce .[] as $item ({}; . * $item)' > "${WORKDIR}/1_${MINOR_VERSION}/images-versions.json" + cat << EOF > "${WORKDIR}/1_${MINOR_VERSION}/versions.nix" { rke2Version = "${RKE2_VERSION}"; @@ -50,6 +71,7 @@ cat << EOF > "${WORKDIR}/1_${MINOR_VERSION}/versions.nix" pauseVersion = "${PAUSE_VERSION}"; ccmVersion = "${CCM_VERSION}"; dockerizedVersion = "${DOCKERIZED_VERSION}"; + imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } EOF diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index b0372f6f297f..302101bb34e7 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.6.3"; + version = "4.7.0"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-QrQLIqP70IUDY9lOZ0cTBIRYY8mVVW4sRt8522y/q80="; + sha256 = "sha256-hi9K1FIMxDJKEyabPNWTwLkZJTm+iAuMfoH3cywVTkI="; }; - vendorHash = "sha256-Zuln5na8MrL+IVOk+NOBrrYJIQ3RincJRYgpAd1WiS8="; + vendorHash = "sha256-T3A0Sm2eKIO3UcyReFRfpKUgLM15AhSgcGpJbYgmnHA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile index c4f9a5511de9..38ea0aec7f43 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile @@ -1,2 +1,3 @@ source 'https://rubygems.org' gem 'terraform_landscape' +gem 'abbrev' diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock index 7307d8a33f3c..90e90dcc3f66 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock @@ -1,25 +1,27 @@ GEM remote: https://rubygems.org/ specs: + abbrev (0.1.2) colorize (0.8.1) - commander (4.4.6) - highline (~> 1.7.2) - diffy (3.2.1) - highline (1.7.10) + commander (4.6.0) + highline (~> 2.0.0) + diffy (3.4.3) + highline (2.0.3) polyglot (0.3.5) - terraform_landscape (0.2.1) + terraform_landscape (0.3.4) colorize (~> 0.7) commander (~> 4.4) diffy (~> 3.0) treetop (~> 1.6) - treetop (1.6.10) + treetop (1.6.14) polyglot (~> 0.3) PLATFORMS ruby DEPENDENCIES + abbrev terraform_landscape BUNDLED WITH - 2.1.4 + 2.6.2 diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix index 9b3dafac6340..2f67a79e60a1 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix +++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix @@ -1,5 +1,7 @@ { colorize = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; @@ -9,30 +11,38 @@ }; commander = { dependencies = [ "highline" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11sd2sb0id2dbxkv4pvymdiia1xxhms45kh4nr8mryqybad0fwwf"; + sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx"; type = "gem"; }; - version = "4.4.6"; + version = "4.6.0"; }; diffy = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg"; + sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22"; type = "gem"; }; - version = "3.2.1"; + version = "3.4.3"; }; highline = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; - version = "1.7.10"; + version = "2.0.3"; }; polyglot = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; @@ -47,20 +57,24 @@ "diffy" "treetop" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1i93pih7r6zcqpjhsmvkpfkgbh0l66c60i6fkiymq7vy2xd6wnns"; + sha256 = "1lcsqasn8k2i6kxy9sv76mvf8s60qkdg3a3sb5shj6lvh2dk8n8s"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.4"; }; treetop = { dependencies = [ "polyglot" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; + sha256 = "1m5fqy7vq6y7bgxmw7jmk7y6pla83m16p7lb41lbqgg53j8x2cds"; type = "gem"; }; - version = "1.6.10"; + version = "1.6.14"; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3253d1b18c69..6727c8104ac6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -9,13 +9,13 @@ "vendorHash": null }, "acme": { - "hash": "sha256-kQvZMab3PJkltM1sQzhpMcRpyyas7rZsdYZoDwe0mtU=", + "hash": "sha256-bHx997DT7JhL0bc9Z62KwShlaqKmuyQsGI1d5X7XoxE=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.30.1", + "rev": "v2.30.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-A50AoUbuY7EcRJly7A8HiFfrIVuFI4i1Q0z4P0hBQCw=" + "vendorHash": "sha256-Opxhz3ymrDLe/1FhiCPXkzpvC/fSQA+PD+nuL/f2rPo=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -27,13 +27,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-Odrs9MXYhfb4F5LjWxKyEA8+BQtzsBCB3lMQNqRMWXw=", + "hash": "sha256-tfkJ86MwXEvWfrUGL4yrHNoMeBWqEtQwCHhvuGRNU4o=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.34.2", + "rev": "v4.37.0", "spdx": "MIT", - "vendorHash": "sha256-0Tbns4vIMxmDUxN8NbCFsTwRoGB6PBzMnrstffbVm7s=" + "vendorHash": "sha256-bviZHOxZajmx++SG6k/mkjHCa4Q7jMY7CaLUele/jgw=" }, "akamai": { "hash": "sha256-MZF4yTG4wiFeOi4NLItQmxZ9ZcgHCryFpxpGy2jQYE8=", @@ -45,11 +45,11 @@ "vendorHash": "sha256-NO7e8S+UhbbGWeBm4+bzm6HqqA3G3WZwj3wJmug0aSA=" }, "alicloud": { - "hash": "sha256-wMoS45YbnDCbjhEE/Mv7oDH7RMixri5mxtG6G/pavDY=", + "hash": "sha256-cZUOABxdartcPnDSXR7K+tbQtum89Uk/r4kG0jVlgAM=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.244.0", + "rev": "v1.245.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -135,11 +135,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-SiYM4G0GTvWlpB+6/bDINB0COFplR/fdFfrIf9DPhoA=", + "hash": "sha256-RyFHg/YG+8dDTRxHN8vI3NRCkrupENViPC0lrsZNo1o=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.21.1", + "rev": "v4.23.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -252,13 +252,13 @@ "vendorHash": "sha256-lQrtAU8zbeIGplfC8+017Ib9d4MFVF0pMvxmE3MLt3M=" }, "cloudflare": { - "hash": "sha256-ne+G7tn09sDWVoU9JezCJxIn3F/bHXBp9QIDd0UhH9c=", + "hash": "sha256-5L5fnJCQU2gcXbbUq8KDid8NhedFXyYBgysggPxNxSY=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.51.0", - "spdx": "MPL-2.0", - "vendorHash": "sha256-jZLkDnZpguVEZpbXG/IhgeyyvRLOVWBacoFTs7H8js0=" + "rev": "v5.2.0", + "spdx": "Apache-2.0", + "vendorHash": "sha256-vh31Teu4PruX3i7EIlfumOn/R6libKzAxMPqhTxqBTA=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -417,11 +417,11 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-VkzGGrUV4fhp6lcMV9sni1pYL1CFluCsfP4aI8fsVAg=", + "hash": "sha256-SCjw2IFRrtcY9jrPUNETr2IZIU9C3wW/WAS2TbzlsWE=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v3.4.0", + "rev": "v3.5.0", "spdx": "MIT", "vendorHash": "sha256-aTQreRL0UTMYWLs25qsdwdN+PaJcOHwLRA8CjIAsYi0=" }, @@ -615,11 +615,11 @@ "vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8=" }, "huaweicloud": { - "hash": "sha256-PxS9ivTEz3Z6oaTFwjdS1yko1B1bjzZzn3ncXgq0JrU=", + "hash": "sha256-TwL7b9BqoE5/pmdFgkdGBCZq3r9/ytl9NJHneA6MA/A=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.73.0", + "rev": "v1.73.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -813,13 +813,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-L126FiXRuMuoQMeWm/wP84d4YVOix+eDTpoxWjtzoSc=", + "hash": "sha256-W7P3grg0ZZ9irmzFEODr1G8gXytA8Q1Q58ZX16xeVs0=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2025.2.27", + "rev": "2025.3.13", "spdx": "0BSD", - "vendorHash": "sha256-OhOqczFwKk5W9gsuMR0J4aP+qHFP2Iss3CHsb2QwG3k=" + "vendorHash": "sha256-JBjydLqwSzsUKRNz8s0xg/JZWSajPkin6Fff9ymQRlA=" }, "minio": { "hash": "sha256-OIdXZIy+W8yO3y7z/1JzG7QegJmMLTFSoC7FmioscmA=", @@ -866,6 +866,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-ZZtfVgxp7YXNRXpeUisLzweQhHzgYOuQDAp1MsxAVhg=" }, + "nexus": { + "hash": "sha256-6RPga80ZoqEEFL7I2OVXcrwaxbdhSzZDEV07xL07rZs=", + "homepage": "https://registry.terraform.io/providers/datadrivers/nexus", + "owner": "datadrivers", + "repo": "terraform-provider-nexus", + "rev": "v2.5.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-wOpR+AJYW7YiARSIACta8Tr4bmGLUONRTEBLxHyHZZk=" + }, "nomad": { "hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", @@ -958,13 +967,13 @@ "vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI=" }, "opentelekomcloud": { - "hash": "sha256-RK5N8LTwQNF46nzfQ6yD5bl2HBl46G8hjbYySZscc6E=", + "hash": "sha256-+ngMqXN5jrHTNZm0BJWppUzD/i6r6UznY8YsA26SdY4=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.31", + "rev": "v1.36.33", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ny5d1ysswBzz8QqiS8No80hIhjnx6jFEFmcD1kz53XI=" + "vendorHash": "sha256-v0Jr7yh2DCA89UxxOUU7sC7jQ1myv70T3+DjBPpz5pE=" }, "openwrt": { "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=", @@ -1066,11 +1075,11 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-9I5awIsF/hQ4l4u518GoaUS+ik89mVPSkhHd9itE2eU=", + "hash": "sha256-LJgYGgJ7PLRq3WlT2rAnnM8svn4EGghLy3rY7lpmJxI=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v6.0.0", + "rev": "v6.1.4", "spdx": "MPL-2.0", "vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA=" }, @@ -1219,11 +1228,11 @@ "vendorHash": "sha256-oEamCseBGmETqeBLiBHfh81oQNUHWfTrsegkFijvb20=" }, "spotinst": { - "hash": "sha256-1fX8ojz1EOhwehVkKfnUEwLxHfXc72tH7mBw5sKo640=", + "hash": "sha256-2y7fPIz+4L4Hz2s52yOGqVAT7W8k0bgtr1ypl1i0InE=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.211.0", + "rev": "v1.213.1", "spdx": "MPL-2.0", "vendorHash": "sha256-xvA7znqcCESUOsNGaik2xHeZNSV70VQww31sQGhEvm0=" }, @@ -1255,20 +1264,20 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-/ysh6W9vSZ8uwfebjVTktsxLm7CDnOqXx2wh+N7RfJ0=", + "hash": "sha256-bjOyxgdEAfd98OvjWT8pQrrqEcmDp0qeQ7gitvTdLVA=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.0.5", + "rev": "v3.0.6", "spdx": "MPL-2.0", "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, "sysdig": { - "hash": "sha256-TzwrfI4P3C7jIm7LHk00IOrKXSfZ1MOTw/gq9vVtcHw=", + "hash": "sha256-2glf4p19Ni3gCsOXtRlty7bxGRE4RsEr/B2EuEC9S40=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v1.47.0", + "rev": "v1.50.0", "spdx": "MPL-2.0", "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s=" }, @@ -1300,11 +1309,11 @@ "vendorHash": "sha256-0B2XRpvUk0mgDu3inz37LLJijwH3aQyoSb8IaHr6was=" }, "tencentcloud": { - "hash": "sha256-UO3Gjz5+h4YIj62gCJccFWW8k7qNbmmBzFlT1WWdXl8=", + "hash": "sha256-vWMEaA64/h1dhXJDw2kqoWgpp79ZuWP25rvfd6GiReg=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.171", + "rev": "v1.81.174", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 7c2ff3342650..e8e51c476574 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2025-02-08"; + version = "0-unstable-2025-03-19"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "ea51fac7d6ea0fcb48decac8600d82e39a6879dd"; - hash = "sha256-pQjukqycdiMG9aCk37+LKZXlJPxgi8ZrI0G5Tsnv9xg="; + rev = "aa58ee2a8a177f01d39bde7368f017fe0fcf425a"; + hash = "sha256-H+m5HqHGC1DzWgTQ0cyD5uwGLiRrKU3eJZ5M/InNmBg="; }; - vendorHash = "sha256-FsZRh4k9ucmAruJa1MZ4kVVryrEuHy9StgXHvgBiWSg="; + vendorHash = "sha256-tKY/8JUWNnHXtl305k/azAVsVihjC7TBYpopf/Ocqac="; env.CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index d0d8a85bc199..ef77a66f3bb4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -65,12 +65,11 @@ withMoonlight ? false, moonlight, withTTS ? true, + enableAutoscroll ? false, }: - assert lib.assertMsg ( !(withMoonlight && withVencord) ) "discord: Moonlight and Vencord can not be enabled at the same time"; - let disableBreakingUpdates = runCommand "disable-breaking-updates.py" @@ -86,7 +85,6 @@ let chmod +x $out/bin/disable-breaking-updates.py ''; in - stdenv.mkDerivation rec { inherit pname @@ -176,6 +174,7 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ ${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ --run "${lib.getExe disableBreakingUpdates}" diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index b492f036cd9a..365aefcc4543 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { hash = "sha256-hZHOg1wUR8Kpd6017fWzhMmG+/WQxSOCnsiyIvUcpbU="; }) (fetchpatch { + # error: 'is_regular' was not declared in this scope name = "boost_is_regular.patch"; url = "https://github.com/astroidmail/astroid/commit/abd84171dc6c4e639f3e86649ddc7ff211077244.patch"; hash = "sha256-IY60AnWm18ZwrCFsOvBg76UginpMo7gXBf8GT87FqW4="; @@ -101,7 +102,5 @@ stdenv.mkDerivation rec { ]; license = licenses.gpl3Plus; platforms = platforms.linux; - # error: 'is_regular' was not declared in this scope - broken = true; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 31961c88b514..ec1af8d8f5fd 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "128.8.0esr"; + version = "128.8.1esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/af/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/af/thunderbird-128.8.1esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9588d0fe6fd2368bb0fb509364e57fc03438992da3d73928f533d9f1fe4d0023"; + sha256 = "1013fceb548167ca90b7125291eb85bca2d2e9a3ae4f414f6c7d2a6848bc1b45"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ar/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ar/thunderbird-128.8.1esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9eea4ca2f14295953006e95163b9311a4d466520b46b7bef1ce9fcdc1215ab4d"; + sha256 = "a1c1ec155cdf1ca9ce1e56202da91fb7c6f30ed3f6db7ad1971ac4fdbd4bbb6b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ast/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ast/thunderbird-128.8.1esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "afbf4ef8c79c6f70b3c3a41caf1dc25a6531de855e3729859f06c62159e63d1a"; + sha256 = "a85e37acbbdf1c3361b35bb5ab38b49124322923836feb937a7acdbb61e16cf6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/be/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/be/thunderbird-128.8.1esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "7eb6f634aaa165533d023e3b948457139c32d10305c76470e7670ce4e2e94d08"; + sha256 = "3db91b4244478bc98a160b45a9d26069f35cf128a7552b3ea036c8998f28ee24"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/bg/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/bg/thunderbird-128.8.1esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "008ea5f4e6f045848dcef59d054bb09b354f6954536fe99885afe6070266a504"; + sha256 = "7c70e78e6e5bc46466a01921dc7341724752211a59201d07933c20d0f0343991"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/br/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/br/thunderbird-128.8.1esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0a57171647f6715dd5f585cec30dfe6b02b98dc5c4ed5127357b84d4eb086b82"; + sha256 = "e3c187dbaa095b046a0797d4448c717416c457312abeef910595940638f0450e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ca/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ca/thunderbird-128.8.1esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "2b1cbdc07b1365ba05fd6f9562bdf93ef2e078a42e3a54ae28871e9399673ca7"; + sha256 = "dc5fb1457bff9ca89d96472d5bed05150e6968dec081f3ecf83db7fd77b672e5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/cak/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/cak/thunderbird-128.8.1esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "4aa28604aacdcb2af30a166bd96fba5b3e41b088bae36056bc80a4f1d0a0053c"; + sha256 = "db0cf8c9769d1f43dd10d9981837bc9eee8d561c0caa3170f76caef5e8de8cf3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/cs/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/cs/thunderbird-128.8.1esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6250f19ef04adfcaeac9af92745cf984c004497da887de8148b0f60bfbba3b24"; + sha256 = "ffed1d03587b43b8f91bf1ae951faec6b504f782a79ce157318858a385492d7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/cy/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/cy/thunderbird-128.8.1esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5c240616a175162ccfbb657acfd6ee8d542a5b1e3d11340e491513cb66f4daea"; + sha256 = "fc47f033c0c2978cec6bbe8b17cd5d3d6be40262c5ca99b868b0ffc35d5b8a72"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/da/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/da/thunderbird-128.8.1esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "f668e62471429afb72264dac9b903c74b8f457af4370307bdaaf3d1ffdc2ac1b"; + sha256 = "57f0e2016573fed49e1240a19a94c46d7707b646c0d61b9ddf5c8649d89a435a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/de/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/de/thunderbird-128.8.1esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c71591b9064b7aa3d983e7adfb4be5b6de5ceb5ab22dc5481ad77b8e2f56ab69"; + sha256 = "cb5267e7f41b8ccec5105e0602ddd75f912d0627416bd29c0211121aab6e4dfd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/dsb/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/dsb/thunderbird-128.8.1esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9ea0d07f1f1825054a0e0297df2379dbc37e0fc81d063f787e21c6fd60935adc"; + sha256 = "c9123f5f024a150fb26e8155e405d73649f2b8f384114c6e437514a1df59856c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/el/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/el/thunderbird-128.8.1esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "8197597e8ca4cfc29ed18991715ac45ab6c4d189d3bdff5736f323e9599ab1e1"; + sha256 = "5bfdb2b5136cb792cd6ec027ee3b4c099172fe38e555867f954c408d689a18ff"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/en-CA/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/en-CA/thunderbird-128.8.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "366b649b46f1a6020045fa55a9191908208854dc8a37b04a37003efde55319c9"; + sha256 = "3295ccf7957a21a44987dce3af0aeedb6c3b743060eb7223740829c819a04071"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/en-GB/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/en-GB/thunderbird-128.8.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c9146a918e88758ec3681ea067adee2cc993b3c7a9118cb6e06cdbb231187a3b"; + sha256 = "4213003e05d7e25638e2064dcdd1d869e35662ad288070fd321fe2b60e254004"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/en-US/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/en-US/thunderbird-128.8.1esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "1a154cf1af7044817b61405a9ed2582a029c5a90a12dbd1df22b99328f789564"; + sha256 = "2df2b8fab412eb3dbe6a2f3bb0547af5fa66d2c2dbc7f78c0201bbe255fa779d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/es-AR/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/es-AR/thunderbird-128.8.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "73e21e28d213070b9eb5792ac494d77167708419388bd42eb51096e7400e57b9"; + sha256 = "f0e3980d7771b3ab3d82e352f333cb9ef182e2005b634ef904710bd74de3503f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/es-ES/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/es-ES/thunderbird-128.8.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0fe24ced84d5dea9cf847c545a5ff4399b1e81b8f58ac8c17ef7d15d91eca247"; + sha256 = "8fe833d918e46a4717ea3539200dedd1e712fa89bf9427a983eb3f4dcc8f067e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/es-MX/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/es-MX/thunderbird-128.8.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "534c94a1d5f5078292a6838d2fd9887e65464ed845ad4da4a45cb7ac8a0fb6c9"; + sha256 = "00426c67a097968ef0ef876532b1ddaecbcc4d8635dc8805e1a282cefc59ccd7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/et/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/et/thunderbird-128.8.1esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "f7eea1df70f2f4ec456202e281b2e0291a10b0f86bfa3491bff6fdac5b680e40"; + sha256 = "1453ef45e4a8d1bb6c74dc91150d3a4f895dd5220b4be33f428845d13417b6bc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/eu/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/eu/thunderbird-128.8.1esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8d13b74989508963cd29bb01048755fcf98ade7cdd2c271a6f801b7ea82377f7"; + sha256 = "bb258a3b54aab7661bfa35be0bc2e3c9de833663dae87df64dc61465f4e4d75e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/fi/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/fi/thunderbird-128.8.1esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "98d387f97b69ffc2171720fb6d37b738d2fc376dda9e57fc6b39b7bbc9bbe655"; + sha256 = "9c2ea3244de9763164fb17626cb0a3f40757f86cdee76b5d63ed251fd149f59c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/fr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/fr/thunderbird-128.8.1esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "41ec309f7b3a9d4e2d071e68f8e4b503fcbbd554f3e312af7d7dfc93b750a1d2"; + sha256 = "aa0dc1e0adb9fc5928c4594de763becb41e8423fc3adeec5f6f27a643cd9fbfb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/fy-NL/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/fy-NL/thunderbird-128.8.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8cfbee2cc94f11b2b53e6075688974b0233227fc83634ca5721ff9664e2eb46c"; + sha256 = "b20065b2e2cc571b02b90e85c7e61c4db76c27ed86f12efc57ddfc3f53ebee31"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ga-IE/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ga-IE/thunderbird-128.8.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "54677c9563f37ed0f56b3b8d20f6125f67ea864ef98d07dc865d47239f0002f7"; + sha256 = "c2a0f4c18c88cec7bfdef86069014cdba89ef969dbecc00605be18ba6a5c4495"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/gd/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/gd/thunderbird-128.8.1esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "94b4db949d642e14e9f6ec055f455f8bc8b3cbe231d6348cc359fd751002b69e"; + sha256 = "f702d1931310215a3f091f560ce34086e1864a7d2a981b6890182d1f6b817c68"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/gl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/gl/thunderbird-128.8.1esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ec28d6276a01ca6a1aa8b6038fa47dd2f434487a1f90eedd25ad4c80122d2cb2"; + sha256 = "ac1c1996ec521a6c59d2e55fa5af1f9a71ec1a40fa71aef1de2fa87f30400dc0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/he/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/he/thunderbird-128.8.1esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "2ae7a156e9eb0156176488d6181f99cc8646a4998dca30dd452bae27cb2c22dc"; + sha256 = "5bd1242155f000a9e1c3eff3ae1df0900208613f085ecff42ccbf6d2dcc8e673"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/hr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hr/thunderbird-128.8.1esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7462960417715330cc164fd2a716ceb25305fb641e3e258ed6796c6508b4c394"; + sha256 = "16ae5be658966d5ba8b90dd2a970cbc9c04f5037312b283fd2b7b3b26fcd40ab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/hsb/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hsb/thunderbird-128.8.1esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2cdf6e8e1f022023c5496aaa6ef228ea40d77ead81486754bd650a22e45751af"; + sha256 = "3fd7eb3258053f88498dfb1138f157e7d0d501cb9e2815145e6a11a48dbb1b59"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/hu/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hu/thunderbird-128.8.1esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e7390e18f16b71fa10428c23fb84f50b559685598c8b0bb5dfb46628cb44e4dd"; + sha256 = "9cfb8919c62a73aa3940d2ada6bd9d43c1bff3841d1ede8b6d65ea36b9fec255"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/hy-AM/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hy-AM/thunderbird-128.8.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6a2d4439cbe650d9648db4783bf5a434da3077aed5244c0cd5bd9867c045744f"; + sha256 = "743d74587977da860f566b82cca1af36920f3a11e4c6f8cb6c388276e105632a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/id/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/id/thunderbird-128.8.1esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a2a753d99147a3793c8f01bd3b7a02da8777c54cbec3e406451176a4f6cd7585"; + sha256 = "1b550d116c2174f478d13fba988bc070165507a61a0ed341a8fbb551cfa2777d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/is/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/is/thunderbird-128.8.1esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "afb66adbe8e8f5c41ec3e2482d710c0defae5a1d398611768ad7119f3b5adcc1"; + sha256 = "44f80b2b0358c18e5d5810d59aa9dca376485c12fc4c2da4786d41e979286a7f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/it/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/it/thunderbird-128.8.1esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "802ea9a7051008cc288c0ea7db029939524d106ef816195726889bf1ae147de2"; + sha256 = "981b59ba68471132f2529512d2f922c43e4cdc62fe1c8eff5d9e135443e1be89"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ja/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ja/thunderbird-128.8.1esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9b5f4529726b08c25222808fb388b47801355325b931c5b50c552efec2540154"; + sha256 = "5095d5ef27963ac2da3cb017c30dff3409ef1e8932b8faa5a8b58b9005a136ab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ka/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ka/thunderbird-128.8.1esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1d32e3d11e026719c49933a75b0c654beb02fa42fb59114285945a83a07e417c"; + sha256 = "bba448d866c26bf7c545ce72db99d72f4743e3e0b5b26e5dc234d934a75d6f60"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/kab/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/kab/thunderbird-128.8.1esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d6a82905ce033298b9b069cb71f9d1314b3114c78a91b432404a0a80d29666dd"; + sha256 = "6406fb5dd20ad88a71fc412f95e54d3219299830dd665680beec30c96624a95a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/kk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/kk/thunderbird-128.8.1esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "5f2a79864551f5f1e9ef1598d2d654123e1506915958d8f9e0144ed186a469c3"; + sha256 = "bab3729c2efcf5642fe7db4d3ca182788a4e3e76472f03c481fb95c749047f04"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ko/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ko/thunderbird-128.8.1esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "17a521c722f9adaba473e24ee5127bf7afc51e6d015694a2c67ff06e7506de42"; + sha256 = "ef6120480f99b42cd2b748391e7ebb9d0242e25e9b5878ffc3c617ba10a85aab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/lt/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/lt/thunderbird-128.8.1esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0f523e80a96e3ce460992eb4ad62bc864171c5e603181e638e03d07bbdd042e8"; + sha256 = "0aab7f17137b9db634f6f8112715825488b5847e9deb6ff1fdb2618046caafe1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/lv/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/lv/thunderbird-128.8.1esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ddca006e3c88266da806d672f4a63e4a6a5e9fc7feee6fd7189cc86269e3e5b4"; + sha256 = "706071eaa2cce1446080d7ef4c768fcb405f439d1bc0ca4da7a3fab8f36fdac7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ms/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ms/thunderbird-128.8.1esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "beed3a3e60b085d2ba77b5efbdc5c96c602d5494c8e7826d33b6a8153bfc5d7d"; + sha256 = "89886f05fe1aef90349c9b7141fd22137d8558cc3d7b3dd99ff3519e74b6c795"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/nb-NO/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/nb-NO/thunderbird-128.8.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "acdd4df71cb59511d4487be975c07ec6afad2711e91e51d881f6a15f25e7d011"; + sha256 = "915fc851b73e6555d2fcefd17a0b96cd410f03014fe97f6f678d6c98f9c1926d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/nl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/nl/thunderbird-128.8.1esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "993a168d50dfc3525e6c5d1f3395c462a5196524618df74d096ad454804b5670"; + sha256 = "4a82daffc2bd00a66bdcfdb8aecc1e3cda51bd3b71b249a55400c4f16b5db5a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/nn-NO/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/nn-NO/thunderbird-128.8.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1ff1ae6d49f22cc09caf48b43297bb156aa1875e12ba2da1d2a8bb31cabaa76c"; + sha256 = "fc2a46f1ba379a379f5840964bf42f35298371b109a4fc880720c324c5ce6b48"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/pa-IN/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pa-IN/thunderbird-128.8.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c0c37e8a27d1e8b6fe954821b3fc22ced28904224ec493f735eccf573187ca42"; + sha256 = "2968d0233af502cf1a1e82b51039208be05f11e31f1bf01a410841464fa65eb7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/pl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pl/thunderbird-128.8.1esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b2b5c897d8faf2b5c64ba52891cdf8414de3e04b348727d93ad00752c9e419ec"; + sha256 = "c2acdaf2418654558f35e524daefe206320c8f4d27c388ae1322fa92f4a8cb53"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/pt-BR/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pt-BR/thunderbird-128.8.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0ce70dd79cb78d48999ea5161123618c333d647a5036e4e55edd48c96f7fd766"; + sha256 = "0c67de7e9501c1e497da49f9001b8b08f5dbed321e435322015a5b5c69b8c0ff"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/pt-PT/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pt-PT/thunderbird-128.8.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6b14610b364c3fa9181bc129c59d2342f8791ad6c05077c064db8dc3dbbdf504"; + sha256 = "09e2a9f011cdf67135bb527c5ad1c856b5f2227e411e711d16ec02cb88208981"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/rm/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/rm/thunderbird-128.8.1esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "966c4ff91819318a7f252406688f921c9edce8bb98117e784818a6e7e775fcb1"; + sha256 = "b5d298e135f5143cef392447754874d2e847f8e46eb914789f352fca5894d26b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ro/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ro/thunderbird-128.8.1esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a5faf488b80ba04bdccdbbda0602dfb640ca48fbe2e9c5a8cff53ba0c4763c00"; + sha256 = "35c67e8bc6b4b472e40dedf05034cc923198767ba0cc1e356c5badbd00edaa77"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ru/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ru/thunderbird-128.8.1esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "aa0af6116771ed02bad3e6bcab5977ebcfab1bff74f7b806caaacc4429f510e4"; + sha256 = "373307b2ff24b1e9d484e4b22a7bf185482753c986bda0e2b952fe25a882ca75"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/sk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sk/thunderbird-128.8.1esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ec92c634d954dd7eff05dbea2fab7ed118c5db88742d15fd1bcca4c4008e44a8"; + sha256 = "8267535b2778242133ba229970f49cf9a7036531fe3e2d83835e5cc13f70a7f6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/sl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sl/thunderbird-128.8.1esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "367ea27becf9f044f00fbd454bbcdb8578f99e42b56c2ad73c709b183911abf8"; + sha256 = "e7091b7c2350c360e2f26e65fba645dbab48628d975e205dacb92dd9dd5c5cdf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/sq/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sq/thunderbird-128.8.1esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a649b75a0750fd3e11074023877314add6b941e25c8741bf697bbba48301a219"; + sha256 = "52ce1a83eba397ae34b09b3759183cdab32b3d40ac0751c0984f9fdd6842740b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/sr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sr/thunderbird-128.8.1esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b1a12748f3f9a87f757b6b854b912768c2c9a53671b0f3d62aef8b399c6194f8"; + sha256 = "ec2dc3a96d11e0bf514f2ec1087ab05cd7513af6a64804f3655ea5adfd17226e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/sv-SE/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sv-SE/thunderbird-128.8.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "58f2a293a2757128cc5dc0bf6299b4687cb3f728bbbd2b6ad85678702c1a7eb1"; + sha256 = "93a0b09b23e97503222db4daea393843626b151e496ba68ae04460b649fae72d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/th/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/th/thunderbird-128.8.1esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "411dab56cd9962a89c42e4bb10bb58dd1c7f5413b58c115f9ee74acc32c67d64"; + sha256 = "252058b29a9012a55b48757bff728ce11810ebe4e3d41cacb264aff5e18a839d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/tr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/tr/thunderbird-128.8.1esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "44cc10105689efd49f47cd9476fd2c579605daa2295bf336910fa2596afa19c6"; + sha256 = "00f006c00b7b585bac99ef3ad1fdcebe0d44405b793cf963ef7ea8e4cdf41253"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/uk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/uk/thunderbird-128.8.1esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "3ed67c60a1ac64c84a20950c740b0a015ec1499f3b4980c0435555579933571c"; + sha256 = "21af80c8d76000967f204d9ebe7298d4501b98fe350cac0f3b6b04b2bb44d8e5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/uz/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/uz/thunderbird-128.8.1esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e0e064197e595478761f210f8bd951f720be9fac342776c7c4e1e510e95c8e85"; + sha256 = "d54696821cc28b860702a98b869a74e7ba5f74c00718b5bbd62912231823ca31"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/vi/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/vi/thunderbird-128.8.1esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "78b681c882a117338e7666dd0b483952e70a115ea281e472ff5c551feecf9b81"; + sha256 = "35545cd2fbc4a76603192c8dd93378e4a7ab65fcb292fc3625d8ef5fc7ac57fb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/zh-CN/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/zh-CN/thunderbird-128.8.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "87c62ff9f0f312cf790e8a6292076b559df52cf7b1449163d9c83da8d9eda873"; + sha256 = "8347af59e572a4dd2a3e38ee6385bdeebdfd9ca589d258d230ef2ef9f042b0c7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/zh-TW/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/zh-TW/thunderbird-128.8.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dd9d9ab103fc41ef2319b0a54c34e0ec2aca8b76796d8fe36b765e1252130b47"; + sha256 = "262b3086e15bc43b91ba609b74e6f53d678bcb5edaf64d66f592508fcfe99b1d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/af/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/af/thunderbird-128.8.1esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6ee7604d646e6847cb17b646c7e7c892d6afc3cd96a379ae21384b8b6c788e92"; + sha256 = "930f42ae5aa3b8f85cb801724060024729143e889e2ac59d8d37a70d962360c0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ar/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ar/thunderbird-128.8.1esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "0c02a13c9f0da42a23d106dc2a071b75f5db19ca3fafe5357247eddab51eae4b"; + sha256 = "c4733b184c1dbcf2e8eab86dba07770512a0a579d512b027efae0bd853a8440d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ast/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ast/thunderbird-128.8.1esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "9caaecb9c84f499e8828a2a6eec22d6164248d93e69a8f8607d3558d05a741d2"; + sha256 = "e92d681785cc4e7445f913cbcba0590bdc777081b15f54da3df3f0e97b9576bc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/be/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/be/thunderbird-128.8.1esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "328fd7af7a8d675f5058842361dc8d5e29f50d19a56658da13b25e96499469da"; + sha256 = "2e83b8a276e57b2b6cbef4815c2aaaf5bda18a7607a9cf372feb08c2b84bbded"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/bg/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/bg/thunderbird-128.8.1esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f04dc9f990d0e828d62786ff954c40d74bdc0922a9660fd27861d514493b032f"; + sha256 = "cac015b5f0a949af81278830ef3f31177c1488f28f1724fcd0f5af7943fc7da8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/br/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/br/thunderbird-128.8.1esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f356ea134619ea796051a62f7eaaaa2ac58134e286c771576de3b8fefae17b7e"; + sha256 = "3250ed40c32e88e34f8bb08cd98afa80761cf1659acbaa7d13cbea0b5f4285b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ca/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ca/thunderbird-128.8.1esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1171a2b0d63ff9c9c3e3c0cd7918b5d4fa3bdaa86b3b97817a79180f6c00263d"; + sha256 = "007f19df18a04a1d132d9013df6e749fed1248d09ce66bb7514e13c393e338bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/cak/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/cak/thunderbird-128.8.1esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "150ae2063d7b7675d4b2c969d973f28fc76855c114e8c8707ffff59b07d6aa33"; + sha256 = "37ca027a41d337c7f7ca933dd789850a6ee8f978754af7ae0e77c450e36735d7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/cs/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/cs/thunderbird-128.8.1esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1f621cdbb2f57ca97e5e16148b8f291a4de73ab19d42abf32d62ae1bc62158b5"; + sha256 = "bb31b0a0db3a2b664fa0c2d0b1471e1ea1c9921ac9ade74c011497a1aa35064b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/cy/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/cy/thunderbird-128.8.1esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8c8e3d13e8963c599dd4fbb1cdbd851258ae898514750b66e93786874c90d43a"; + sha256 = "5731c82e849aeeabf1efe223f026e715a5a84938dc530c5af47a33401f0cb045"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/da/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/da/thunderbird-128.8.1esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5e29eb1e57542dd161fe78539998ef7ec750e83cb5152e833cc04ac38ec46770"; + sha256 = "36dbd8f9b33a82f30bfa64130a4a8eaa3fd411c0e04ffe3e8b22f1d2797756a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/de/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/de/thunderbird-128.8.1esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "9ce32575c6b42942817fd7b0aa0f43a1f5950eb0e509780d71bb917e965ca3e3"; + sha256 = "d026c72e97890974f59887768419f52230306f79b70d2e1551d7582e20b6cabb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/dsb/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/dsb/thunderbird-128.8.1esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e4f4a7f18e38f60b06d92e47106d00bd6589ca7d0e7b989fcc21cc4d32d1811f"; + sha256 = "4ed5855cf55679b5139d4b701fc10c8bab6c2d25dfcac876f8f2f1e22e6afd33"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/el/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/el/thunderbird-128.8.1esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "788cb80d20f3cd2fcb4de1f4771424fe53f6330f559d6c4046d7626407c0db84"; + sha256 = "9f6b006ced02883b7806d6338c0263afcae9da2ea61a9a95d44a08879ef66977"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/en-CA/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/en-CA/thunderbird-128.8.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8e6d7a469722746196e3d8561bf36abfb8f6ca8cf9c5662537486672453f2609"; + sha256 = "b4ed296be204307fd6da4f48ef2f500a936d599b08535ef25c72b7be291f63dd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/en-GB/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/en-GB/thunderbird-128.8.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "27bac1ababa688a3a06eb91db015a6a9464ee1bfdaec26bb5cad80e11f71b69d"; + sha256 = "db1a929bfb0498446e1925cba740441a6b359c5dbb4d7cc8896b2aec867f89b1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/en-US/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/en-US/thunderbird-128.8.1esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "2907e9b6847e21ccbc554b0df0bfda274639aca519cc7e34e0ef1a0db9fa97ef"; + sha256 = "9261a06bcaa2c418333deb60ddef961894aab90409b7981b36e98a0fc18a7dba"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/es-AR/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/es-AR/thunderbird-128.8.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c5fe849c7653a5f3c8114b5dd0351f1f785a04d66afb79469d76eeb6e3028d1d"; + sha256 = "bd03068065aabd747be87f86e73c17ca93acab9efb6dcb243e587eb53a736dcc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/es-ES/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/es-ES/thunderbird-128.8.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0a54f085c0cb01649224d278521d106300a4e6b5c787612979d2bba0811e289a"; + sha256 = "42d9656001b299d04e39061c4b1c4756e55a2fb5cc1652b77bfb755edac94ab8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/es-MX/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/es-MX/thunderbird-128.8.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b7aa1e5c2b5a9b8b70e0911dc7cb008d43a04da8cd48b1c9f54e5ec042faa38c"; + sha256 = "e0c97af5388c3d44d27275f1e3dd16265906ae81d4e1afc2ca9a329b637b7915"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/et/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/et/thunderbird-128.8.1esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "06c3c2934c7f716d22aa44fde42efdf2a40cbf2bb384e71b609ed4e98203b4a6"; + sha256 = "e5e2f18051fca84dd44b2c5a3778ad4969965f2cac86aa4264149edf680edbec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/eu/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/eu/thunderbird-128.8.1esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d0c8e2226382568c9b7aaa2c18b9104c41706ab8d3ec6b89853ede0a77c4db7f"; + sha256 = "a22ab6539a7e9572a7fb6913e9b976d570b67ff69ce585be5132cafd8ec86a52"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/fi/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/fi/thunderbird-128.8.1esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4cbe90fa120c42cc202b4faed2cb282abd8cf0eac3a95efae0f423663331488e"; + sha256 = "a0f2a030c8cce5f2c2969376813d39306a948752fe01c36b7dd81122ae3586ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/fr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/fr/thunderbird-128.8.1esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0cf4eb481d53cfa06c1c8a1f1a2e38730b076bf4e302bd01b7370e24e2480de2"; + sha256 = "f76eab20e735637746a6980ad3c99d2d35b6b5985f0b9a65c4ef467abcea3d06"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/fy-NL/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/fy-NL/thunderbird-128.8.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "a2aa822703030cb8ec722e9dfb87d66102094933a5869d6008a2a30cf8594f3d"; + sha256 = "c40cf21e2f8c0e7ea73ea23b4f63dc61c16c1d83966a2754f5b9e7a751f3413a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ga-IE/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ga-IE/thunderbird-128.8.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "4608ba885d297ac95ee07fc3b8c2ccf9755851141fef6a39c4bc7369f3a6a338"; + sha256 = "f9293a76a3fba4d952a06f689d51273876597213fdda5123c22e8c2749aef046"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/gd/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/gd/thunderbird-128.8.1esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "dcd93fcb4b0770cf91392eeacb1ed1e02732c628e89abc7fb1150671ed08cdc0"; + sha256 = "1bcf521d0b4d8b3f878ae8361db92ed32f55a7355eaade166ddda37d8ee2f342"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/gl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/gl/thunderbird-128.8.1esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "40face85eb1a4b73b38901bd0e803ebfed360e76b629f01902a8b643e430d45a"; + sha256 = "b96b2db085fc1cdd1605cbab4f812d2ae1f6cee7d313a3559af470e9239c3b5b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/he/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/he/thunderbird-128.8.1esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "5d85a0e842d86026204b2380760ed322a28e9288095315874a7c8870a0b5216d"; + sha256 = "4d997401092bf51594fbb85416fc0c3bc39de6f6904603ce2711937c7869b74b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/hr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hr/thunderbird-128.8.1esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "35b6bdcc49fa4dd9b43cc0f3637b8a6901126ec3faa0a276dc2bbd08cf248e9b"; + sha256 = "f18606396db272a32c5eac538b13ac96268a95162262b4672d85015b0b5a4721"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/hsb/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hsb/thunderbird-128.8.1esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "81c7e740bc5b1fb9b409460f8026ded7141c8fe6a07cd3eb2e1147fe6c0d367f"; + sha256 = "647baf1093bb16e9649fca57df1a5dce55edf157de7720edc36fae94cd5c9188"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/hu/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hu/thunderbird-128.8.1esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e0616cc5706edb9e185e2b89a241d558b70a2563a3b224d956eea3b1eedcd393"; + sha256 = "647dc9a3a4e7bb2c40832f5ad4703d19989b1f9f368ddfe450c2244ddd8a913c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/hy-AM/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hy-AM/thunderbird-128.8.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e745f1131e2e0959da4e912cda82f1045d95ff99d534df1041b81d027e296609"; + sha256 = "9f7c2d861ad0126821748473dd0d157eeda187517bb69fd1d4e0f8a08a6c0e73"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/id/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/id/thunderbird-128.8.1esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "1876cd1daf32f3e63ac7aba974b40cd24e3a273b1a0b041700a7fd7e742ec474"; + sha256 = "3d13da114658f3205186cf66e55cebcc68ff2de4da2f1c1db0701420445691c2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/is/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/is/thunderbird-128.8.1esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7d6936ccd345bd1171b3fa8f3433825fe7642cdf27fd606ba0569a4fabf0b019"; + sha256 = "b177efd5a418b6d0c7552319e6051f8cc0b8d9ec5a393fa27a3bdd9b2821766b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/it/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/it/thunderbird-128.8.1esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2e7f066928590934208a80d1509b92479cd59277af65782b867c4bbb5c5ee98e"; + sha256 = "a20b753d2ddfb27af61636956c18937d730237af9b367b24ff88d79840fe8383"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ja/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ja/thunderbird-128.8.1esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "519c5002dfe234ba9ede21d1937c603a43077ef3de0e4a41e75a7982a91aa7cc"; + sha256 = "e90bc454fa9d2d6c8edac68fe919f4ab449979a857fe51063a9109a6fbbe5b5d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ka/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ka/thunderbird-128.8.1esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "e5918b0bbd7be4dde5dfcd8bba4d25163afe1ae91d5179cc8338b7cb40a4ed45"; + sha256 = "82bbe2fa5a34bb4ad238b8b2c683322b7bc3d1ac3121ef4d231264196a7526be"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/kab/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/kab/thunderbird-128.8.1esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "9bd22a75faed090c6e277e3c125f46945df6123b4a8bd4d4b56d21e358c08f37"; + sha256 = "5a999970c668dd7a6ab87f0e180a3991a6bf8778c704a12492507e46129e3cd4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/kk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/kk/thunderbird-128.8.1esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "42b1deca6cd6a432e5d8ef0c3201eaad7f07dd691a176b95b81af7b4a5ca6152"; + sha256 = "d359db37616b5daef05712caeb7ee5132d01d59ac01ff2f583e591a4f6364d32"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ko/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ko/thunderbird-128.8.1esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d7946d96e69d3df2caa77c987823115d0e250eb01916a56a6aaf350b2ff95329"; + sha256 = "a99a4cc4659eaadb70ab51cb1172b8e97b1bd87dec87655247a5c828cbf2f1f2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/lt/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/lt/thunderbird-128.8.1esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4d2a2e8f04a2cdfbe90e38267d915e03e172a76ab1526e865d20baeb3d7f193f"; + sha256 = "078bda43f06b5e6e3027542b8dfe4e58799e96557bdf29996aab5f25f8ca40ab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/lv/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/lv/thunderbird-128.8.1esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0d6728bfb6f333689cc2ae2a881e2847579877ead88ac8778e688dcf2ffbcf3e"; + sha256 = "f15ee9402ecd9f11434f585446b3578fb2b93a0e4e5dca44826982e4b0a82d6c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ms/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ms/thunderbird-128.8.1esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "89fb06ff7ef59cc9f42508c0428e030b1f266c48a9a7559aa95c4b77501d761d"; + sha256 = "86004e8ce785f8fef61bf253f002fa9d7f5de04a4e7e09edd070c107888fb390"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/nb-NO/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/nb-NO/thunderbird-128.8.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4ba60571c2ecb6f22981714994e759ceb9cb483c3dd6bc041a8cc61998b40be4"; + sha256 = "d483f4dcb1e0ead9be294f7f95b3f89669242511b87fce4a5ce4b95c70f21f99"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/nl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/nl/thunderbird-128.8.1esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9de5fdf33067b827e58c84318a2190492e59c21dc2a00e69cc18f37d0a83ad84"; + sha256 = "b07a12fa9fe4f6df7e3ab079e03d812edcc617ad8ab7a359303dc8f25f613bb5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/nn-NO/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/nn-NO/thunderbird-128.8.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "44e4d3aaef8b88095de1936b613f3921525b7f519714116d8051766ea2efd033"; + sha256 = "4128292d44d973421529200a69ea702e278363090b5bcd94c6c09d4e11edfa54"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/pa-IN/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pa-IN/thunderbird-128.8.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f77d7bc8181ef537325eb5a6f22f60c2d40e2c8dcf15b02831b57203e276edcd"; + sha256 = "c34f0f3d50ea007d82e107e4cb527890af8c3e544720b547c235d6ce0e5563f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/pl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pl/thunderbird-128.8.1esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "e948dfa022ea94d25762612e63c76e416dbe913aa1d47c5aa6cd358cc77c2ea3"; + sha256 = "fa1a049f1164b313c10d91e207a642e5c0ecb9f03fbb777753acdd7e7dd004ce"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/pt-BR/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pt-BR/thunderbird-128.8.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d472e41fd62b31a19af12e271fbce644a4d2d116635f3c64421858d1b51abe4a"; + sha256 = "9f7e7cf6e2efa7af246ecb98f8c24a2458ab14b31552ca978f6a7030435a2084"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/pt-PT/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pt-PT/thunderbird-128.8.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "3fbf0a2b4434f5932f08578a3af14a49480d1930a1229edddeaa3336264ea0ad"; + sha256 = "e668083cdce68fd2ad29aa87270944e5632bf0ad1ced7e005a95abfbb523bebb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/rm/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/rm/thunderbird-128.8.1esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d97bcf58c214e8465a51fb564f5c1b9e1aa9f2a17ff29234fb92196e8b9ee2ee"; + sha256 = "7bfcedc109e5e2034f8647e79228e88b4375b613f41cbe8ddb45105146f64087"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ro/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ro/thunderbird-128.8.1esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e8b6ca77aa53e2070246f224ce5dc29fd008d7c986b48eabdf69145470ce52b6"; + sha256 = "a7c1e99b66cff5a3e5c2ba6131f93a7b6c551fb1e75e8b97b742d3c0b82e86d0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ru/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ru/thunderbird-128.8.1esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e489b69413451f6ddbf289bde34ad48e00db84ec37ff757001821b844b5c16e1"; + sha256 = "3e851b9b7c831dcfd3fe1bce762df5ca518e85ed47a13a80220cae99c32752d2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/sk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sk/thunderbird-128.8.1esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c1d325a06b97cc4dd62408ff32709a51f5665f509d407347e1f243a59eeed698"; + sha256 = "54d0d040a9b780a95306e7994e139292fb4cf135a0fa2c66a0bdbfb27dd5a9a1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/sl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sl/thunderbird-128.8.1esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e4519c0f7fdf2393d0bfa15fba9948e9efaa89c1e667a2d61903392b2f044594"; + sha256 = "0398d487fbd0c5ecb57aac1510e26888577188afc28d075686aa78204b1bb02c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/sq/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sq/thunderbird-128.8.1esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "66296bbe89d276e62fea05138ea93b7b7a388ad1738e70b4814b76696ff1dd65"; + sha256 = "b13870f6713eaf55661411e4aceef8079a270306be17301e49e8871a421d2d6e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/sr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sr/thunderbird-128.8.1esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c53049ce45ca361168b3370f1ee0f64fa16e8551747a86747684140028a67ca6"; + sha256 = "16ef868a87edf38215d331d018e3c25909bb6e6d9cd0ea01545590e9fb73bfb7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/sv-SE/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sv-SE/thunderbird-128.8.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "5a537a27653c7ecf7076253e5a1b72c16e1e3f75c28a88470e29bd347ced40a7"; + sha256 = "4ef5386b75fabd2e42ca2cfceb8ef85c9278d4cd709f7878742ad4e6693e0483"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/th/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/th/thunderbird-128.8.1esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b4116e1f2d2aad6b7c864581921bf59055bc450673cec552f29897a3a1568d77"; + sha256 = "ea09ac54c7fdc357d11cadf51ddc555235c6d3ad1ab713b884ca4ebb9ec14b0a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/tr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/tr/thunderbird-128.8.1esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b2501fea5df377bb527c91e89361d92b289dac637617be11372d06c6d68f8f0b"; + sha256 = "5c43584fbbaf34bceff32c9d98156f109ab1c67c9e0d18c612ab90f3f3675cd5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/uk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/uk/thunderbird-128.8.1esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c7dbb9ae871c807cc670d1c3e9a034865f8000f5d5dece38f98a9022f206ca54"; + sha256 = "a474ab35b1b7305fff98e512738e32cbdd50193a98c9e5c6eea1418054407218"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/uz/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/uz/thunderbird-128.8.1esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "8941fc3a641a0d883b43efb97480310f6772bcfe107026c39843255558c2296d"; + sha256 = "79caad981fde8c0ffa13157ef64224ce5e27aae218a15370eb7b0c686f82aba5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/vi/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/vi/thunderbird-128.8.1esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ca123b7c755cd8d6021d9bf658313e33a3e2cb68ecfdb872dc0acc88fa3b8dd2"; + sha256 = "225480794d385493ecc1beb84f84c8c9509d6ad306648902d03277b0cb33feb8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/zh-CN/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/zh-CN/thunderbird-128.8.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3db69d00105d970c9cbf5daf6690f8d0325688627a9af9587b1e1a4a7680dcc8"; + sha256 = "d6ab0c6c1a3171b3efd6c4684c9b6ef593fd4ba014e9ad77dd04691006027b64"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/zh-TW/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/zh-TW/thunderbird-128.8.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f9dd0043b71e59e34312f2dc53b19a42ecca8a1d3a223e07a73772723a3fba3d"; + sha256 = "970b4015c12d149fb598abf585c5955944840dff254b3c4110d0c834161ceda2"; } ]; } diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index e7772624061e..e8e9867e2cdd 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -113,6 +113,7 @@ stdenv.mkDerivation rec { opencv4' openssl' pango + pcsclite speex (lib.getLib systemd) stdenv.cc.cc diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 328d330475fd..801ba69d20f5 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -82,6 +82,18 @@ let x86suffix = ""; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; + + "24.11.0" = { + major = "24"; + minor = "11"; + patch = "0"; + x64hash = "0kylvqdzkw0635mbb6r5k1lamdjf1hr9pk5rxcff63z4f8q0g3zf"; + x86hash = ""; + x64suffix = "85"; + x86suffix = ""; + homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + }; + }; # Retain attribute-names for abandoned versions of Citrix workspace to diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix index a986c7b38e48..5c8de9b45f1c 100644 --- a/pkgs/applications/networking/remote/freerdp/3.nix +++ b/pkgs/applications/networking/remote/freerdp/3.nix @@ -51,29 +51,24 @@ libopus, buildServer ? true, nocaps ? false, - AudioToolbox, - AVFoundation, - Carbon, - Cocoa, - CoreMedia, withUnfree ? false, # tries to compile and run generate_argument_docbook.c withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, - gnome, + gnome-remote-desktop, remmina, }: stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.12.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = finalAttrs.version; - hash = "sha256-Bbpwfnz8xPyNLZ+UtcYw4arpzGEh3znqncExl4DlByA="; + hash = "sha256-Dd7J0QpKNY0cbTldtKkXjBoAJUSCyDf9Pzoah+Ak9Vw="; }; postPatch = @@ -154,13 +149,6 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-scanner ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - AVFoundation - Carbon - Cocoa - CoreMedia - ] ++ lib.optionals withUnfree [ faac ]; @@ -205,15 +193,9 @@ stdenv.mkDerivation (finalAttrs: { ] ); - env.NIX_LDFLAGS = toString ( - lib.optionals stdenv.hostPlatform.isDarwin [ - "-framework AudioToolbox" - ] - ); - passthru.tests = { inherit remmina; - inherit (gnome) gnome-remote-desktop; + inherit gnome-remote-desktop; }; meta = with lib; { diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d50dbf09c5d2..d613cc647432 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -58,7 +58,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.4.4"; + version = "4.4.5"; outputs = [ "out" @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-8Xpi66UI7S1k1IQ/nWAnnX5EXR29tOCO8XqrzY9Frmw="; + hash = "sha256-NO8tc5Av5Gl3yzkxK9KJAZwIjkrXEnIGmbLBPYKRm0E="; }; patches = [ diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 33370e9815e7..2236a31a5ab5 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,164 +1,212 @@ -{ stdenv -, fetchurl -, fetchgit -, fetchpatch2 -, lib -, pam -, python311 -, libxslt -, perl -, perlPackages -, box2d -, gettext -, zlib -, libjpeg -, liblangtag -, expat -, freetype -, libwpd -, libxml2 -, db -, curl -, fontconfig -, libsndfile -, neon -, bison -, flex -, zip -, unzip -, gtk3 -, libmspack -, getopt -, file -, cairo -, which -, icu -, boost -, jdk21 -, ant -, cups -, xorg -, fontforge -, jre21_minimal -, openssl -, gperf -, cppunit -, poppler -, util-linux -, librsvg -, libGLU -, libGL -, bsh -, coinmp -, libwps -, libabw -, libargon2 -, libmysqlclient -, autoconf -, automake -, openldap -, bash -, hunspell -, librdf_rasqal -, librdf_redland -, nss -, nspr -, libwpg -, dbus-glib -, clucene_core_2 -, libcdr -, lcms2 -, unixODBC -, mdds -, sane-backends -, mythes -, libexttextcat -, libvisio -, pkg-config -, bluez5 -, libtool -, libatomic_ops -, graphite2 -, harfbuzz -, libodfgen -, libzmf -, librevenge -, libe-book -, libmwaw -, glm -, gst_all_1 -, gdb -, adwaita-icon-theme -, glib -, ncurses -, libepoxy -, gpgme -, libwebp -, abseil-cpp -, libepubgen -, libetonyek -, liborcus -, libpng -, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" "zh-TW" ] -, withFonts ? false -, withHelp ? true -, kdeIntegration ? false -, qtbase ? null -, qtx11extras ? null -, qtwayland ? null -, ki18n ? null -, kconfig ? null -, kcoreaddons ? null -, kio ? null -, kwindowsystem ? null -, variant ? "fresh" -, symlinkJoin -, libpq -, makeFontsConf -, amiri -, caladea -, carlito -, culmus -, dejavu_fonts -, rubik -, liberation-sans-narrow -, liberation_ttf_v2 -, libertine -, libertine-g -, noto-fonts -, noto-fonts-cjk-sans -, rhino -, lp_solve -, xmlsec -, libcmis -# The rest are used only in passthru, for the wrapper -, kauth ? null -, kcompletion ? null -, kconfigwidgets ? null -, kglobalaccel ? null -, kitemviews ? null -, knotifications ? null -, ktextwidgets ? null -, kwidgetsaddons ? null -, kxmlgui ? null -, phonon ? null -, qtdeclarative ? null -, qtmultimedia ? null -, qtquickcontrols ? null -, qtsvg ? null -, qttools ? null -, solid ? null -, sonnet ? null +{ + stdenv, + runCommand, + fetchurl, + fetchgit, + fetchpatch2, + lib, + pam, + python311, + libxslt, + perl, + perlPackages, + box2d, + gettext, + zlib, + libjpeg, + liblangtag, + expat, + freetype, + libwpd, + libxml2, + db, + curl, + fontconfig, + libsndfile, + neon, + bison, + flex, + zip, + unzip, + gtk3, + libmspack, + getopt, + file, + cairo, + which, + icu, + boost, + jdk21, + ant, + cups, + xorg, + fontforge, + jre21_minimal, + openssl, + gperf, + cppunit, + poppler, + util-linux, + librsvg, + libGLU, + libGL, + bsh, + coinmp, + libwps, + libabw, + libargon2, + libmysqlclient, + autoconf, + automake, + openldap, + bash, + hunspell, + librdf_rasqal, + librdf_redland, + nss, + nspr, + libwpg, + dbus-glib, + clucene_core_2, + libcdr, + lcms2, + unixODBC, + mdds, + sane-backends, + mythes, + libexttextcat, + libvisio, + pkg-config, + bluez5, + libtool, + libatomic_ops, + graphite2, + harfbuzz, + libodfgen, + libzmf, + librevenge, + libe-book, + libmwaw, + glm, + gst_all_1, + gdb, + adwaita-icon-theme, + glib, + ncurses, + libepoxy, + gpgme, + libwebp, + abseil-cpp, + libepubgen, + libetonyek, + liborcus, + libpng, + langs ? [ + "ar" + "ca" + "cs" + "da" + "de" + "en-GB" + "en-US" + "eo" + "es" + "fi" + "fr" + "hu" + "it" + "ja" + "ko" + "nl" + "pl" + "pt" + "pt-BR" + "ro" + "ru" + "sk" + "sl" + "tr" + "uk" + "zh-CN" + "zh-TW" + ], + withFonts ? false, + withHelp ? true, + kdeIntegration ? false, + qtbase ? null, + qtx11extras ? null, + qtwayland ? null, + ki18n ? null, + kconfig ? null, + kcoreaddons ? null, + kio ? null, + kwindowsystem ? null, + variant ? "fresh", + debugLogging ? variant == "still", + symlinkJoin, + libpq, + makeFontsConf, + amiri, + caladea, + carlito, + culmus, + dejavu_fonts, + rubik, + liberation-sans-narrow, + liberation_ttf_v2, + libertine, + libertine-g, + noto-fonts, + noto-fonts-lgc-plus, + noto-fonts-cjk-sans, + rhino, + lp_solve, + xmlsec, + libcmis, + # The rest are used only in passthru, for the wrapper + kauth ? null, + kcompletion ? null, + kconfigwidgets ? null, + kglobalaccel ? null, + kitemviews ? null, + knotifications ? null, + ktextwidgets ? null, + kwidgetsaddons ? null, + kxmlgui ? null, + phonon ? null, + qtdeclarative ? null, + qtmultimedia ? null, + qtquickcontrols ? null, + qtsvg ? null, + qttools ? null, + solid ? null, + sonnet ? null, }: -assert builtins.elem variant [ "fresh" "still" "collabora" ]; +assert builtins.elem variant [ + "fresh" + "still" + "collabora" +]; let inherit (lib) - flatten flip - concatMapStrings concatStringsSep - getDev getLib - optionals optionalString; + flatten + flip + concatMapStrings + concatStringsSep + getDev + getLib + optionals + optionalString + ; + + notoSubset = suffixes: runCommand "noto-fonts-subset" {} '' + mkdir -p "$out/share/fonts/noto/" + ${concatMapStrings (x: '' + cp "${noto-fonts}/share/fonts/noto/NotoSans${x}["*.[ot]tf "$out/share/fonts/noto/" + '') suffixes} + ''; fontsConf = makeFontsConf { fontDirectories = [ @@ -172,13 +220,20 @@ let liberation_ttf_v2 libertine libertine-g - noto-fonts + # Font priority issues in some tests in Still + noto-fonts-lgc-plus + (if variant == "fresh" then noto-fonts else (notoSubset ["Arabic"])) noto-fonts-cjk-sans ]; }; jre' = jre21_minimal.override { - modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ]; + modules = [ + "java.base" + "java.desktop" + "java.logging" + "java.sql" + ]; }; importVariant = f: import (./. + "/src-${variant}/${f}"); @@ -201,12 +256,15 @@ let ]; }; srcs = { - third_party = map (x: + third_party = map ( + x: (fetchurl { inherit (x) url sha256 name; - }) // { + }) + // { inherit (x) md5name md5; - }) srcsAttributes.deps; + } + ) srcsAttributes.deps; translations = srcsAttributes.translations { inherit fetchurl fetchgit; }; help = srcsAttributes.help { inherit fetchurl fetchgit; }; }; @@ -216,66 +274,85 @@ let # See `postPatch` for details kdeDeps = symlinkJoin { name = "libreoffice-kde-dependencies-${version}"; - paths = flatten (map (e: [ (getDev e) (getLib e) ]) [ - qtbase - qtmultimedia - qtx11extras - kconfig - kcoreaddons - ki18n - kio - kwindowsystem - ]); + paths = flatten ( + map + (e: [ + (getDev e) + (getLib e) + ]) + [ + qtbase + qtmultimedia + qtx11extras + kconfig + kcoreaddons + ki18n + kio + kwindowsystem + ] + ); }; tarballPath = "external/tarballs"; -in stdenv.mkDerivation (finalAttrs: { +in +stdenv.mkDerivation (finalAttrs: { pname = "libreoffice"; inherit version; src = srcsAttributes.main { inherit fetchurl fetchgit; }; - postUnpack = '' - mkdir -v $sourceRoot/${tarballPath} + postUnpack = + '' + mkdir -v $sourceRoot/${tarballPath} - ${flip concatMapStrings srcs.third_party (f: '' - ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} - ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} - '')} + ${flip concatMapStrings srcs.third_party (f: '' + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} + '')} - '' + (if (variant != "collabora") then '' - ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} - ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} + '' + + ( + if (variant != "collabora") then + '' + ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} + ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} - tar -xf ${srcs.help} - tar -xf ${srcs.translations} - '' else '' - cp -r --no-preserve=mode ${srcs.help}/. $sourceRoot/helpcontent2/ - cp -r --no-preserve=mode ${srcs.translations}/. $sourceRoot/translations/ - ''); + tar -xf ${srcs.help} + tar -xf ${srcs.translations} + '' + else + '' + cp -r --no-preserve=mode ${srcs.help}/. $sourceRoot/helpcontent2/ + cp -r --no-preserve=mode ${srcs.translations}/. $sourceRoot/translations/ + '' + ); - patches = [ - # Skip some broken tests: - # - tdf160386 does not fall back to a CJK font properly for some reason - # - the remaining tests have notes in the patches - # FIXME: get rid of this ASAP - ./skip-broken-tests.patch - (./skip-broken-tests- + variant + ".patch") + patches = + [ + # Skip some broken tests: + # - tdf160386 does not fall back to a CJK font properly for some reason + # - the remaining tests have notes in the patches + # FIXME: get rid of this ASAP + ./skip-broken-tests.patch + (./skip-broken-tests- + variant + ".patch") - # Don't detect Qt paths from qmake, so our patched-in onese are used - ./dont-detect-qt-paths-from-qmake.patch + # Don't detect Qt paths from qmake, so our patched-in onese are used + ./dont-detect-qt-paths-from-qmake.patch - # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking - ./readd-explicit-zlib-link.patch - ] ++ lib.optionals (lib.versionOlder version "24.8") [ - (fetchpatch2 { - name = "icu74-compat.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch"; - hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y="; - }) - ] ++ lib.optionals (variant == "collabora") [ - ./fix-unpack-collabora.patch - ]; + # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking + ./readd-explicit-zlib-link.patch + ] + ++ lib.optionals (lib.versionOlder version "24.8") [ + (fetchpatch2 { + name = "icu74-compat.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch"; + hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y="; + }) + ] + ++ lib.optionals (variant == "collabora") [ + ./fix-unpack-collabora.patch + ./skip-broken-sentence-breaking-rules.patch + ]; postPatch = '' # configure checks for header 'gpgme++/gpgmepp_version.h', @@ -303,242 +380,257 @@ in stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = finalAttrs.passthru.gst_packages ++ [ - # Make libpng not handle APNG images, so LibreOffice's own handler kicks in - # This should be ordered first, so it gets picked up before any other - # propagated libpng - # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html - (libpng.override { apngSupport = false; }) - perlPackages.ArchiveZip - coinmp - perlPackages.IOCompress - abseil-cpp - ant - bluez5 - boost - box2d - cairo - clucene_core_2 - cppunit - cups - curl - db - dbus-glib - expat - file - flex - fontconfig - freetype - getopt - gettext - glib - glm - adwaita-icon-theme - gperf - gpgme - graphite2 - gtk3 - (harfbuzz.override { withIcu = true; }) - hunspell - icu - jre' - lcms2 - libGL - libGLU - xorg.libX11 - xorg.libXaw - xorg.libXdmcp - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXtst - libabw - libargon2 - libatomic_ops - libcdr - libcmis - libe-book - libepoxy - libepubgen - libetonyek - libexttextcat - libjpeg - liblangtag - libmspack - libmwaw - libmysqlclient - libodfgen - liborcus - xorg.libpthreadstubs - librdf_redland - librevenge - librsvg - libsndfile - libvisio - libwpd - libwpg - libwps - libxml2 - xorg.libxshmfence - libxslt - libzmf - libwebp - lp_solve - mdds - mythes - ncurses - neon - nspr - nss - openldap - openssl - pam - perl - poppler - libpq - python311 - sane-backends - unixODBC - unzip - util-linux - which - xmlsec - zip - zlib - ] ++ optionals kdeIntegration [ - qtbase - qtx11extras - kcoreaddons - kio - ]; + buildInputs = + finalAttrs.passthru.gst_packages + ++ [ + # Make libpng not handle APNG images, so LibreOffice's own handler kicks in + # This should be ordered first, so it gets picked up before any other + # propagated libpng + # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html + (libpng.override { apngSupport = false; }) + perlPackages.ArchiveZip + coinmp + perlPackages.IOCompress + abseil-cpp + ant + bluez5 + boost + box2d + cairo + clucene_core_2 + cppunit + cups + curl + db + dbus-glib + expat + file + flex + fontconfig + freetype + getopt + gettext + glib + glm + adwaita-icon-theme + gperf + gpgme + graphite2 + gtk3 + (harfbuzz.override { withIcu = true; }) + hunspell + icu + jre' + lcms2 + libGL + libGLU + xorg.libX11 + xorg.libXaw + xorg.libXdmcp + xorg.libXext + xorg.libXi + xorg.libXinerama + xorg.libXtst + libabw + libargon2 + libatomic_ops + libcdr + libcmis + libe-book + libepoxy + libepubgen + libetonyek + libexttextcat + libjpeg + liblangtag + libmspack + libmwaw + libmysqlclient + libodfgen + liborcus + xorg.libpthreadstubs + librdf_redland + librevenge + librsvg + libsndfile + libvisio + libwpd + libwpg + libwps + libxml2 + xorg.libxshmfence + libxslt + libzmf + libwebp + lp_solve + mdds + mythes + ncurses + neon + nspr + nss + openldap + openssl + pam + perl + poppler + libpq + python311 + sane-backends + unixODBC + unzip + util-linux + which + xmlsec + zip + zlib + ] + ++ optionals kdeIntegration [ + qtbase + qtx11extras + kcoreaddons + kio + ]; - preConfigure = '' - configureFlagsArray=( - "--with-parallelism=$NIX_BUILD_CORES" - # here because we need to be very specific about spaces - "--with-lang=${concatStringsSep " " langs}" + preConfigure = + '' + configureFlagsArray=( + "--with-parallelism=$NIX_BUILD_CORES" + # here because we need to be very specific about spaces + "--with-lang=${concatStringsSep " " langs}" + ); + + patchShebangs . + + NOCONFIGURE=1 ./autogen.sh + '' + + optionalString kdeIntegration '' + # configure.ac assumes that the first directory that contains headers and + # libraries during its checks contains *all* the relevant headers/libs which + # obviously doesn't work for us, so we have 2 options: + # + # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE + # dependencies which is ugly and brittle, or + # + # 2. use symlinkJoin to pull in the relevant dependencies and just patch in + # that path which is *also* ugly, but far less likely to break + # + # The 2nd option is not very Nix'y, but I'll take robust over nice any day. + # Additionally, it's much easier to fix if LO breaks on the next upgrade (just + # add the missing dependencies to it). + export QT${qtMajor}INC=${kdeDeps}/include + export QT${qtMajor}LIB=${kdeDeps}/lib + export KF${qtMajor}INC="${kdeDeps}/include ${kdeDeps}/include/KF${qtMajor}" + export KF${qtMajor}LIB=${kdeDeps}/lib + ''; + + configureFlags = + [ + # Explicitly passing in --host even on non-cross, because + # LibreOffice will attempt to detect WSL and cross-compile + # itself to Windows automatically, and we don't want it + # doing that. + "--host=${stdenv.hostPlatform.config}" + "--without-buildconfig-recorded" + + (lib.withFeature withHelp "help") + "--with-boost=${getDev boost}" + "--with-boost-libdir=${getLib boost}/lib" + "--with-beanshell-jar=${bsh}" + "--with-vendor=NixOS" + "--disable-report-builder" + "--disable-online-update" + "--enable-python=system" + "--enable-dbus" + "--enable-release-build" + "--enable-epm" + "--with-ant-home=${ant.home}" + + # Without these, configure does not finish + "--without-junit" + + # Schema files for validation are not included in the source tarball + "--without-export-validation" + + # We do tarball prefetching ourselves + "--disable-fetch-external" + "--enable-build-opensymbol" + + # I imagine this helps. Copied from go-oo. + # Modified on every upgrade, though + "--disable-odk" + "--disable-firebird-sdbc" + (lib.withFeature withFonts "fonts") + "--without-doxygen" + + "--with-system-beanshell" + "--with-system-cairo" + "--with-system-coinmp" + "--with-system-headers" + "--with-system-libabw" + "--with-system-libcmis" + "--with-system-libepubgen" + "--with-system-libetonyek" + "--with-system-liblangtag" + "--with-system-libs" + "--with-system-libwps" + "--with-system-lpsolve" + "--with-system-mdds" + "--with-system-openldap" + "--with-system-openssl" + "--with-system-orcus" + "--with-system-postgresql" + "--with-system-xmlsec" + + # TODO: package these as system libraries + "--without-system-altlinuxhyph" + "--without-system-frozen" + "--without-system-libfreehand" + "--without-system-libmspub" + "--without-system-libnumbertext" + "--without-system-libpagemaker" + "--without-system-libstaroffice" + "--without-system-libqxp" + "--without-system-dragonbox" + "--without-system-libfixmath" + + # requires an oddly specific, old version + "--without-system-hsqldb" + + # searches hardcoded paths that are wrong + "--without-system-zxing" + + # is packaged but headers can't be found because there is no pkg-config file + "--without-system-zxcvbn" + ] + ++ optionals kdeIntegration [ + "--enable-kf${qtMajor}" + "--enable-qt${qtMajor}" + ] + ++ optionals (kdeIntegration && qtMajor == "5") [ + "--enable-gtk3-kde5" + ] + ++ ( + if variant == "fresh" then + [ + "--with-system-rhino" + "--with-rhino-jar=${rhino}/share/java/js.jar" + + "--without-system-java-websocket" + ] + else + [ + # our Rhino is too new for older versions + "--without-system-rhino" + ] ); - patchShebangs . - - NOCONFIGURE=1 ./autogen.sh - '' + optionalString kdeIntegration '' - # configure.ac assumes that the first directory that contains headers and - # libraries during its checks contains *all* the relevant headers/libs which - # obviously doesn't work for us, so we have 2 options: - # - # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE - # dependencies which is ugly and brittle, or - # - # 2. use symlinkJoin to pull in the relevant dependencies and just patch in - # that path which is *also* ugly, but far less likely to break - # - # The 2nd option is not very Nix'y, but I'll take robust over nice any day. - # Additionally, it's much easier to fix if LO breaks on the next upgrade (just - # add the missing dependencies to it). - export QT${qtMajor}INC=${kdeDeps}/include - export QT${qtMajor}LIB=${kdeDeps}/lib - export KF${qtMajor}INC="${kdeDeps}/include ${kdeDeps}/include/KF${qtMajor}" - export KF${qtMajor}LIB=${kdeDeps}/lib - ''; - - configureFlags = [ - # Explicitly passing in --host even on non-cross, because - # LibreOffice will attempt to detect WSL and cross-compile - # itself to Windows automatically, and we don't want it - # doing that. - "--host=${stdenv.hostPlatform.config}" - "--without-buildconfig-recorded" - - (lib.withFeature withHelp "help") - "--with-boost=${getDev boost}" - "--with-boost-libdir=${getLib boost}/lib" - "--with-beanshell-jar=${bsh}" - "--with-vendor=NixOS" - "--disable-report-builder" - "--disable-online-update" - "--enable-python=system" - "--enable-dbus" - "--enable-release-build" - "--enable-epm" - "--with-ant-home=${ant.home}" - - # Without these, configure does not finish - "--without-junit" - - # Schema files for validation are not included in the source tarball - "--without-export-validation" - - # We do tarball prefetching ourselves - "--disable-fetch-external" - "--enable-build-opensymbol" - - # I imagine this helps. Copied from go-oo. - # Modified on every upgrade, though - "--disable-odk" - "--disable-firebird-sdbc" - (lib.withFeature withFonts "fonts") - "--without-doxygen" - - "--with-system-beanshell" - "--with-system-cairo" - "--with-system-coinmp" - "--with-system-headers" - "--with-system-libabw" - "--with-system-libcmis" - "--with-system-libepubgen" - "--with-system-libetonyek" - "--with-system-liblangtag" - "--with-system-libs" - "--with-system-libwps" - "--with-system-lpsolve" - "--with-system-mdds" - "--with-system-openldap" - "--with-system-openssl" - "--with-system-orcus" - "--with-system-postgresql" - "--with-system-xmlsec" - - # TODO: package these as system libraries - "--without-system-altlinuxhyph" - "--without-system-frozen" - "--without-system-libfreehand" - "--without-system-libmspub" - "--without-system-libnumbertext" - "--without-system-libpagemaker" - "--without-system-libstaroffice" - "--without-system-libqxp" - "--without-system-dragonbox" - "--without-system-libfixmath" - - # requires an oddly specific, old version - "--without-system-hsqldb" - - # searches hardcoded paths that are wrong - "--without-system-zxing" - - # is packaged but headers can't be found because there is no pkg-config file - "--without-system-zxcvbn" - ] ++ optionals kdeIntegration [ - "--enable-kf${qtMajor}" - "--enable-qt${qtMajor}" - ] ++ optionals (kdeIntegration && qtMajor == "5") [ - "--enable-gtk3-kde5" - ] ++ (if variant == "fresh" then [ - "--with-system-rhino" - "--with-rhino-jar=${rhino}/share/java/js.jar" - - "--without-system-java-websocket" - ] else [ - # our Rhino is too new for older versions - "--without-system-rhino" - ]); - - env = { # FIXME: this is a hack, because the right cflags are not being picked up # from rasqal's .pc file. Needs more investigation. - NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal"; + NIX_CFLAGS_COMPILE = + "-I${librdf_rasqal}/include/rasqal" + + (lib.optionalString debugLogging " -DSAL_LOG_WARN=1 -DSAL_LOG_INFO=1 "); # Provide all the fonts used in tests. FONTCONFIG_FILE = fontsConf; @@ -561,7 +653,7 @@ in stdenv.mkDerivation (finalAttrs: { checkTarget = concatStringsSep " " [ "unitcheck" "slowcheck" - "--keep-going" # easier to debug test failures + "--keep-going" # easier to debug test failures ]; postInstall = optionalString (variant != "collabora") '' @@ -654,7 +746,9 @@ in stdenv.mkDerivation (finalAttrs: { # (see above), make sure these don't leak again by accident. # FIXME: disabled for kdeIntegration builds because the weird symlinkJoin setup # leaks all the -dev dependencies :( - disallowedRequisites = lib.optionals (!kdeIntegration) (lib.concatMap (x: lib.optional (x?dev) x.dev) finalAttrs.buildInputs); + disallowedRequisites = lib.optionals (!kdeIntegration) ( + lib.concatMap (x: lib.optional (x ? dev) x.dev) finalAttrs.buildInputs + ); requiredSystemFeatures = [ "big-parallel" ]; @@ -664,7 +758,11 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://libreoffice.org/"; # at least one jar in dependencies sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = with lib.licenses; [ mpl20 lgpl3Plus asl20 ]; + license = with lib.licenses; [ + mpl20 + lgpl3Plus + asl20 + ]; maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.linux; mainProgram = "libreoffice"; diff --git a/pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patch b/pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patch new file mode 100644 index 000000000000..0f0973146c28 --- /dev/null +++ b/pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patch @@ -0,0 +1,48 @@ +This part caused build failures in Collabora. + +LibreOffice has just dropped the entire file some time ago. + +--- a/i18npool/source/breakiterator/data/sent.txt 1970-01-01 01:00:01.000000000 +0100 +--- b/i18npool/source/breakiterator/data/sent.txt 1970-01-01 01:00:01.000000000 +0100 +@@ -88,41 +88,3 @@ + [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend $Thai]{bof}] ($Extend | $Format | $Close | $Sp)* [^$Thai]; + [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend]{bof}] ($Extend | $Format | $Close | $Sp)* ([$Sep{eof}] | $CR $LF){100}; + +-## ------------------------------------------------- +- +-!!reverse; +- +-$SpEx_R = ($Extend | $Format)* $Sp; +-$ATermEx_R = ($Extend | $Format)* $ATerm; +-$STermEx_R = ($Extend | $Format)* $STerm; +-$CloseEx_R = ($Extend | $Format)* $Close; +- +-# +-# Reverse rules. +-# For now, use the old style inexact reverse rules, which are easier +-# to write, but less efficient. +-# TODO: exact reverse rules. It appears that exact reverse rules +-# may require improving support for look-ahead breaks in the +-# builder. Needs more investigation. +-# +- +-[{bof}] (.? | $LF $CR) [^$Sep]* [$Sep {eof}] ($SpEx_R* $CloseEx_R* ($STermEx_R | $ATermEx_R))*; +-#.*; +- +-# Explanation for this rule: +-# +-# It needs to back over +-# The $Sep at which we probably begin +-# All of the non $Sep chars leading to the preceding $Sep +-# The preceding $Sep, which will be the second one that the rule matches. +-# Any immediately preceding STerm or ATerm sequences. We need to see these +-# to get the correct rule status when moving forwards again. +-# +-# [{bof}] inhibit rule chaining. Without this, rule would loop on itself and match +-# the entire string. +-# +-# (.? | $LF $CR) Match one $Sep instance. Use .? rather than $Sep because position might be +-# at the beginning of the string at this point, and we don't want to fail. +-# Can only use {eof} once, and it is used later. +-# +- diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch index f162d7c407f4..48c8ca880947 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch @@ -63,3 +63,31 @@ #if HAVE_MORE_FONTS #if !defined _WIN32 // TODO: Fails on jenkins but passes locally vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72)); +--- ./sd/qa/unit/tiledrendering/tiledrendering.cxx 2025-03-22 19:42:09.450877126 +0100 ++++ ./sd/qa/unit/tiledrendering/tiledrendering.cxx 2025-03-22 19:47:05.663896648 +0100 +@@ -2496,6 +2496,7 @@ + + CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testGetViewRenderState) + { ++ return ; // SD;Dark instead of S;Dark is the correct outcome elsewhere? + SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp"); + int nFirstViewId = SfxLokHelper::getView(); + ViewCallback aView1; +--- ./sc/qa/unit/subsequent_export_test2.cxx 2025-03-22 19:51:50.959915451 +0100 ++++ ./sc/qa/unit/subsequent_export_test2.cxx 2025-03-22 19:51:54.691915697 +0100 +@@ -103,6 +103,7 @@ + + CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX) + { ++ return; // Apparently an issue with loading reference config + // this doc is configured with CalcA1 ref syntax + createScDoc("xlsx/empty.xlsx"); + +@@ -140,6 +141,7 @@ + + CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified) + { ++ return; // Apparently an issue with loading reference config + createScDoc(); + + ScDocument* pDoc = getScDoc(); diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch index 24d4cdeeaee8..43bb332be8cf 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch @@ -135,3 +135,33 @@ comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); +--- a/sw/qa/extras/odfexport/odfexport2.cxx ++++ b/sw/qa/extras/odfexport/odfexport2.cxx +@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) + // - Error: "2001-01-01" does not satisfy the "dateTime" type + // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip. + loadAndReload("midnight_redline.fodt"); ++ return; // fails on aarch64 + + xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); + assertXPathContent(pXmlDoc, +--- a/sdext/qa/unit/pdfimport.cxx 2025-03-22 14:46:52.202082763 +0100 ++++ b/sdext/qa/unit/pdfimport.cxx 2025-03-22 14:49:22.947719369 +0100 +@@ -785,6 +785,7 @@ + + void testTdf104597_textrun() + { ++ return; // apparently geometry-sensitive ? + #if HAVE_FEATURE_POPPLER + rtl::Reference xAdaptor(new pdfi::PDFIRawAdaptor(OUString(), getComponentContext())); + xAdaptor->setTreeVisitorFactory(createDrawTreeVisitorFactory()); +--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 2025-03-22 14:51:45.421728759 +0100 ++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 2025-03-22 14:51:59.684729699 +0100 +@@ -5721,6 +5721,7 @@ + + CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) + { ++ return; // Unsure where the extra objects on the page come from + aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr; + saveAsPDF(u"tdf164106.fodt"); + diff --git a/pkgs/applications/office/libreoffice/src-collabora/deps.nix b/pkgs/applications/office/libreoffice/src-collabora/deps.nix index f697e3f6140f..d072fa55775c 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/deps.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/deps.nix @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.7.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.7.1.tar.xz"; - sha256 = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd"; + name = "curl-8.11.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.11.0.tar.xz"; + sha256 = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb"; md5 = ""; - md5name = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd-curl-8.7.1.tar.xz"; + md5name = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb-curl-8.11.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -147,11 +147,11 @@ md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.6.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.2.tar.xz"; - sha256 = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364"; + name = "expat-2.6.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; + sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; md5 = ""; - md5name = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364-expat-2.6.2.tar.xz"; + md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -196,11 +196,11 @@ md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; } { - name = "karla.zip"; - url = "https://dev-www.libreoffice.org/src/506757f768adb2331881d5186f7286bd-karla.zip"; - sha256 = "0cba83e7d555ae792d98a657b847cff1ccb198ecf740117a610f76d66e48eaba"; - md5 = "506757f768adb2331881d5186f7286bd"; - md5name = "506757f768adb2331881d5186f7286bd-karla.zip"; + name = "2024-09-19-karla-main.zip"; + url = "https://dev-www.libreoffice.org/src/2024-09-19-karla-main.zip"; + sha256 = "c64cdbc55389c1bfb320dcef41a19f156bad271a99bc9253be118564dbb738b5"; + md5 = ""; + md5name = "c64cdbc55389c1bfb320dcef41a19f156bad271a99bc9253be118564dbb738b5-2024-09-19-karla-main.zip"; } { name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz"; @@ -238,18 +238,18 @@ md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; } { - name = "NotoSans-v2.012.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSans-v2.012.zip"; - sha256 = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293"; + name = "NotoSans-v2.014.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSans-v2.014.zip"; + sha256 = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1"; md5 = ""; - md5name = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293-NotoSans-v2.012.zip"; + md5name = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1-NotoSans-v2.014.zip"; } { - name = "NotoSerif-v2.012.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.012.zip"; - sha256 = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a"; + name = "NotoSerif-v2.014.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.014.zip"; + sha256 = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3"; md5 = ""; - md5name = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a-NotoSerif-v2.012.zip"; + md5name = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3-NotoSerif-v2.014.zip"; } { name = "NotoSerifHebrew-v2.004.zip"; @@ -763,11 +763,11 @@ md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz"; } { - name = "libxml2-2.12.8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.12.8.tar.xz"; - sha256 = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93"; + name = "libxml2-2.12.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz"; + sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590"; md5 = ""; - md5name = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93-libxml2-2.12.8.tar.xz"; + md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz"; } { name = "libxslt-1.1.39.tar.xz"; @@ -791,11 +791,11 @@ md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz"; } { - name = "mariadb-connector-c-3.3.8-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.8-src.tar.gz"; - sha256 = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8"; + name = "mariadb-connector-c-3.3.11-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz"; + sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a"; md5 = ""; - md5name = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8-mariadb-connector-c-3.3.8-src.tar.gz"; + md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -833,11 +833,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.99-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.99-with-nspr-4.35.tar.gz"; - sha256 = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31"; + name = "nss-3.101.2-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.101.2-with-nspr-4.35.tar.gz"; + sha256 = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa"; md5 = ""; - md5name = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31-nss-3.99-with-nspr-4.35.tar.gz"; + md5name = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa-nss-3.101.2-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -875,11 +875,11 @@ md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz"; } { - name = "openssl-3.0.14.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz"; - sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca"; + name = "openssl-3.0.16.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz"; + sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86"; md5 = ""; - md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz"; + md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz"; } { name = "liborcus-0.19.2.tar.xz"; @@ -910,25 +910,25 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.43.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.43.tar.xz"; - sha256 = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c"; + name = "libpng-1.6.44.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz"; + sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e"; md5 = ""; - md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz"; + md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz"; } { - name = "tiff-4.6.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.6.0.tar.xz"; - sha256 = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2"; + name = "tiff-4.7.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz"; + sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017"; md5 = ""; - md5name = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2-tiff-4.6.0.tar.xz"; + md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; } { - name = "poppler-23.09.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz"; - sha256 = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55"; + name = "poppler-25.01.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz"; + sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112"; md5 = ""; - md5name = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55-poppler-23.09.0.tar.xz"; + md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -938,18 +938,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.14.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.14.tar.bz2"; - sha256 = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed"; + name = "postgresql-13.16.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2"; + sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865"; md5 = ""; - md5name = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed-postgresql-13.14.tar.bz2"; + md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2"; } { - name = "Python-3.8.19.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.19.tar.xz"; - sha256 = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076"; + name = "Python-3.9.21.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.9.21.tar.xz"; + sha256 = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1"; md5 = ""; - md5name = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076-Python-3.8.19.tar.xz"; + md5name = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1-Python-3.9.21.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -959,11 +959,11 @@ md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { - name = "raptor2-2.0.15.tar.gz"; - url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; - sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; - md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; - md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + name = "raptor2-2.0.16.tar.gz"; + url = "https://dev-www.libreoffice.org/src/raptor2-2.0.16.tar.gz"; + sha256 = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680"; + md5 = ""; + md5name = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680-raptor2-2.0.16.tar.gz"; } { name = "rasqal-0.9.33.tar.gz"; @@ -1022,11 +1022,11 @@ md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { - name = "libvisio-0.1.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; - sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; + name = "libvisio-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz"; + sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b"; md5 = ""; - md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; + md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-collabora/help.nix b/pkgs/applications/office/libreoffice/src-collabora/help.nix index fc5d4a3fa2a0..1ad21771ece7 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/help.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/help.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/help"; - rev = "27f62cdb52fe23f6090a3249fcd1433777b2598d"; + rev = "refs/tags/cp-24.04.13-2"; hash = "sha256-lyBuj7FI1jwVLLBkB6JJcmQVtm1FKExYWvRUoGqRbJ0="; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/main.nix b/pkgs/applications/office/libreoffice/src-collabora/main.nix index ef4d5d77bfc1..d6ceb8ce2229 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/main.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/main.nix @@ -1,7 +1,7 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/core"; - rev = "refs/tags/cp-24.04.5-4"; - hash = "sha256-OJ3R8qs8/R8QnXGCRgn/ZJK7Nn8cWwYbZxjEWg0VpBc="; + rev = "refs/tags/cp-24.04.13-2"; + hash = "sha256-m+kNUxpHwr7dfWsmvM9FSzR2YvTWYpeawOr8YH3b700="; fetchSubmodules = false; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/translations.nix b/pkgs/applications/office/libreoffice/src-collabora/translations.nix index 06f5fe5a3624..8d6a1717239b 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/translations.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/translations.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/translations"; - rev = "5fd34a953e6861cb8e392363c0a3500059ed6b01"; - hash = "sha256-1j0kTvPbytsCWszXz+xFE+n53zPkR8gNgVaawn+rjfI="; + rev = "refs/tags/cp-24.04.13-2"; + hash = "sha256-BlV36hcR5mvwlnGNvCE/semLQPFTcL6HLqVK2cP357Y="; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/version.nix b/pkgs/applications/office/libreoffice/src-collabora/version.nix index f88ef53af8e6..27b8f494b15f 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/version.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/version.nix @@ -1 +1 @@ -"24.04.5-4" +"24.04.13-2" diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index bcc3344b5bad..3858e5aaa303 100644 --- a/pkgs/applications/office/libreoffice/src-still/deps.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.11.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.11.1.tar.xz"; - sha256 = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56"; + name = "curl-8.12.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.12.0.tar.xz"; + sha256 = "9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d"; md5 = ""; - md5name = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56-curl-8.11.1.tar.xz"; + md5name = "9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d-curl-8.12.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -385,11 +385,11 @@ md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; } { - name = "gpgme-1.24.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.24.0.tar.bz2"; - sha256 = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da"; + name = "gpgme-1.24.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2"; + sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581"; md5 = ""; - md5name = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da-gpgme-1.24.0.tar.bz2"; + md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -539,11 +539,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2024-11-19.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-11-19.tar.bz2"; - sha256 = "121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864"; + name = "language-subtag-registry-2025-02-06.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-02-06.tar.bz2"; + sha256 = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662"; md5 = ""; - md5name = "121f27bd1fabac9a74fb042cf68396b6df74cdf5d1ccc30f4c9b78584cc13864-language-subtag-registry-2024-11-19.tar.bz2"; + md5name = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662-language-subtag-registry-2025-02-06.tar.bz2"; } { name = "lcms2-2.16.tar.gz"; @@ -616,11 +616,11 @@ md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; } { - name = "libwebp-1.4.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.4.0.tar.gz"; - sha256 = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5"; + name = "libwebp-1.5.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz"; + sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c"; md5 = ""; - md5name = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5-libwebp-1.4.0.tar.gz"; + md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz"; } { name = "xmlsec1-1.3.5.tar.gz"; @@ -658,11 +658,11 @@ md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz"; } { - name = "mariadb-connector-c-3.3.13-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.13-src.tar.gz"; - sha256 = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef"; + name = "mariadb-connector-c-3.3.14-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.14-src.tar.gz"; + sha256 = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49"; md5 = ""; - md5name = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef-mariadb-connector-c-3.3.13-src.tar.gz"; + md5name = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49-mariadb-connector-c-3.3.14-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -742,11 +742,11 @@ md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz"; } { - name = "openssl-3.0.15.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.15.tar.gz"; - sha256 = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533"; + name = "openssl-3.0.16.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz"; + sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86"; md5 = ""; - md5name = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533-openssl-3.0.15.tar.gz"; + md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz"; } { name = "liborcus-0.19.2.tar.xz"; @@ -777,11 +777,11 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.44.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz"; - sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e"; + name = "libpng-1.6.46.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.46.tar.xz"; + sha256 = "f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1"; md5 = ""; - md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz"; + md5name = "f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1-libpng-1.6.46.tar.xz"; } { name = "tiff-4.7.0.tar.xz"; @@ -791,11 +791,11 @@ md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; } { - name = "poppler-24.08.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-24.08.0.tar.xz"; - sha256 = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174"; + name = "poppler-25.01.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz"; + sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112"; md5 = ""; - md5name = "97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174-poppler-24.08.0.tar.xz"; + md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index 2d3477707242..62a68fbcfaa7 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0z09pif1xmivmrnf5rjbcqc72khj0sg44905qrphp8cgvbx4n3ph"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-help-24.8.4.2.tar.xz"; + sha256 = "1g1fzp5bd5rim3wdqjwfgzyw14g7bdkc4i0pdfymybgsgxdrcc5z"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-help-24.8.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix index 7315b6e7b9bb..ff9a0742d778 100644 --- a/pkgs/applications/office/libreoffice/src-still/main.nix +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "05qs12z0xkpqy3yl7378d99y82rswic101aw65k1macslcpdwr0m"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-24.8.4.2.tar.xz"; + sha256 = "0sdqap232lcs8jkrxxs4h29zncyg9pibx8w6bczwa2nr2i0vv2ls"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-24.8.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix index 698f2eefb726..b1b69e9fe10d 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0z84m2q5c9zjbb491m84s8sf2dgaxvvx03dl3f1qyajvpf1mnlld"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.4/libreoffice-translations-24.8.4.2.tar.xz"; + sha256 = "108qfnxdz9xw9njkq1lmiwa72ygiwnpzb5ghzr13v8jmhlk1a3fd"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-translations-24.8.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix index 845b695dd16b..18bff564ccc3 100644 --- a/pkgs/applications/office/libreoffice/src-still/version.nix +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -1 +1 @@ -"24.8.4.2" +"24.8.5.2" diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index e6278d57f160..1e5cb3416f6d 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -9,7 +9,7 @@ git, python3, swig, - boost, + boost186, # 1.87.0 broken https://github.com/boostorg/asio/issues/442 cbc, # for clp cimg, clp, # for or-tools @@ -44,20 +44,16 @@ let in mkDerivation rec { pname = "openroad"; - version = "2.0-unstable-2024-12-31"; + version = "2.0-unstable-2025-03-01"; src = fetchFromGitHub { owner = "The-OpenROAD-Project"; repo = "OpenROAD"; - rev = "21cf29eda317e0c7777fbfaa3f384ec9fab1a0f9"; + rev = "e794373d44ac5421f0633d8dda7e5c59e8fe79bf"; fetchSubmodules = true; - hash = "sha256-cRETSW8cG/Q0hgxaFJjtnBqsIU0r6/kCRy1+5gJfC9o="; + hash = "sha256-a/X4FHkbiqHeblse2ZkLT56gYP+LCrAIZVCdsWF59jM="; }; - patches = [ - ./swig43-compat.patch # https://github.com/The-OpenROAD-Project/OpenROAD/issues/6451 - ]; - nativeBuildInputs = [ bison cmake @@ -70,7 +66,7 @@ mkDerivation rec { ]; buildInputs = [ - boost + boost186 cbc cimg clp @@ -99,12 +95,15 @@ mkDerivation rec { postPatch = '' patchShebangs --build etc/find_messages.py + # Disable two tests that are failing curently. + sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CMakeLists.txt ''; cmakeFlags = [ "-DENABLE_TESTS=ON" "-DUSE_SYSTEM_BOOST=ON" "-DUSE_SYSTEM_ABC=OFF" + "-DABC_SKIP_TESTS=ON" # it attempts to download gtest "-DUSE_SYSTEM_OPENSTA=OFF" "-DOPENROAD_VERSION=${version}_${src.rev}" "-DCMAKE_RULE_MESSAGES=OFF" @@ -119,8 +118,6 @@ mkDerivation rec { # to see if there are any breaking changes in unstable that should be vendored as well. doCheck = true; checkPhase = '' - # Disable two tests that are failing curently. - sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CTestTestfile.cmake make test ../test/regression ''; diff --git a/pkgs/applications/science/electronics/openroad/swig43-compat.patch b/pkgs/applications/science/electronics/openroad/swig43-compat.patch deleted file mode 100644 index 9bc49991e8e6..000000000000 --- a/pkgs/applications/science/electronics/openroad/swig43-compat.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/odb/src/swig/python/dbtypes.i -+++ b/src/odb/src/swig/python/dbtypes.i -@@ -271,7 +271,7 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return) - swig_type_info *tf = SWIG_TypeQuery("odb::dbShape" "*"); - for(std::vector::iterator it = $1->begin(); it != $1->end(); it++) { - PyObject *o = SWIG_NewInstanceObj(&(*it), tf, 0); -- $result = SWIG_Python_AppendOutput($result, o); -+ $result = SWIG_AppendOutput($result, o); - } - } - -@@ -283,14 +283,14 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return) - auto layer = it->second; - PyObject *layer_swig = SWIG_NewInstanceObj(layer, tf, 0); - PyObject *tuple = PyTuple_Pack(2, PyFloat_FromDouble(value), layer_swig); -- $result = SWIG_Python_AppendOutput($result, tuple); -+ $result = SWIG_AppendOutput($result, tuple); - } - } - - %typemap(argout) std::vector &OUTPUT { - for(auto it = $1->begin(); it != $1->end(); it++) { - PyObject *obj = PyInt_FromLong((long)*it); -- $result = SWIG_Python_AppendOutput($result, obj); -+ $result = SWIG_AppendOutput($result, obj); - } - } - diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 20be36ebda6c..2152f68fe270 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -153,6 +153,10 @@ let fixupPatches = dir: map (patch: replaceVars patch { inherit dir; }); in { + z3_4_14 = common { + version = "4.14.1"; + sha256 = "sha256-pTsDzf6Frk4mYAgF81wlR5Kb1x56joFggO5Fa3G2s70="; + }; z3_4_13 = common { version = "4.13.4"; sha256 = "sha256-8hWXCr6IuNVKkOegEmWooo5jkdmln9nU7wI8T882BSE="; diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index f9d4cd0fde4f..b15fdcf87311 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -10,12 +10,12 @@ }: let - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-793qKSo9/FVzchlHqQKSBF4MT3rJUv9xvf7YJBiQnZo="; + hash = "sha256-ClRjU9xGZLtLhjnvWrEVEojniVMpVNGyBu9bmEGqSDI="; }; npmPkg = buildNpmPackage { diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index 70c0bd6e3597..80f4858aa5f4 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Safely store secrets in a VCS repo"; + homepage = "https://github.com/StackExchange/blackbox"; maintainers = with maintainers; [ ericsagnes ]; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix index 91b664b7a748..8c4f1c79b585 100644 --- a/pkgs/applications/version-management/git-recent/default.nix +++ b/pkgs/applications/version-management/git-recent/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-recent"; - version = "1.1.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-recent"; rev = "v${version}"; - sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i"; + sha256 = "sha256-KPM24DVwvLdHeOkq77fz1TJ6NxJ2h21bP0TrItCPamo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index fc0c34474d4f..ca0d4088569b 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -4,7 +4,7 @@ defaultGemConfig, fetchFromGitLab, fetchYarnDeps, - fixup-yarn-lock, + yarnConfigHook, git, gitlabEnterprise ? false, lib, @@ -16,7 +16,6 @@ ruby_3_3, stdenv, tzdata, - yarn, # gem dependencies: # gitlab-glfm-markdown @@ -151,10 +150,9 @@ let rubyEnv.wrappedRuby rubyEnv.bundler nodejs_20 - yarn git cacert - fixup-yarn-lock + yarnConfigHook ]; patches = [ @@ -176,9 +174,7 @@ let SKIP_YARN_INSTALL = 1; NODE_OPTIONS = "--max-old-space-size=8192"; - configurePhase = '' - runHook preConfigure - + postConfigure = '' # Some rake tasks try to run yarn automatically, which won't work rm lib/tasks/yarn.rake @@ -186,32 +182,18 @@ let mv config/database.yml.postgresql config/database.yml mv config/gitlab.yml.example config/gitlab.yml - # Yarn and bundler wants a real home directory to write cache, config, etc to - export HOME=$NIX_BUILD_TOP/fake_home - - # Make yarn install packages from our offline cache, not the registry - yarn config --offline set yarn-offline-mirror $yarnOfflineCache - - # Fixup "resolved"-entries in yarn.lock to match our offline cache - fixup-yarn-lock yarn.lock - - yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive - - patchShebangs node_modules/ patchShebangs scripts/frontend/ - - # TODO: Try to remove --ignore-scripts - # Needed for the js dependency pinia to work - pushd node_modules/vue-demi - yarn run postinstall - popd - - runHook postConfigure ''; buildPhase = '' runHook preBuild + # TODO: Try to yarn install without --ignore-scripts + # Needed for the js dependency pinia to work + pushd node_modules/vue-demi + yarn run postinstall + popd + bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production SKIP_YARN_INSTALL=true runHook postBuild diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 6ce5b2919bb4..4978722e6382 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -2,25 +2,27 @@ lib, python3, fetchPypi, + fetchFromGitHub, coreutils, gitMinimal, mercurial, }: python3.pkgs.buildPythonApplication rec { - version = "0.6.1"; + version = "0.8.1"; pname = "nbstripout"; src = fetchPypi { inherit pname version; - hash = "sha256-kGW83RSIs4bk88CB/8HUj0UTovjYv00NmiggjF2v6dM="; + hash = "sha256-6qyLa05yno3+Hl3ywPi6RKvFoXplRI8EgBQfgL4jC7E="; }; - # for some reason, darwin uses /bin/sh echo native instead of echo binary, so - # force using the echo binary - postPatch = '' - substituteInPlace tests/test-git.t --replace "echo" "${coreutils}/bin/echo" - ''; + testAssets = fetchFromGitHub { + owner = "kynan"; + repo = "nbstripout"; + rev = "${version}"; + hash = "sha256-OSJLrWkYQIhcdyofS3Bo39ppsU6K3A4546UKB8Q1GGg="; + }; propagatedBuildInputs = with python3.pkgs; [ nbformat @@ -33,14 +35,21 @@ python3.pkgs.buildPythonApplication rec { mercurial ] ++ (with python3.pkgs; [ - pytest-cram pytestCheckHook ]); + checkInputs = [ + testAssets + ]; + preCheck = '' export HOME=$(mktemp -d) export PATH=$out/bin:$PATH git config --global init.defaultBranch main + + cp -r --no-preserve=mode,ownership ${testAssets}/tests/e2e_notebooks $TMPDIR/e2e_notebooks + chmod -R +w $TMPDIR/e2e_notebooks + substituteInPlace tests/test_end_to_end.py --replace "tests/e2e_notebooks" "$TMPDIR/e2e_notebooks" ''; meta = { diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 5fa4c086482b..c8dc6e41ce9c 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -83,7 +83,6 @@ buildPythonPackage rec { PKGVER = version; - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "srht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index ea7ba30aa656..cdccbe1a56e6 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -37,8 +37,6 @@ buildPythonPackage rec { export PKGVER=${version} ''; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "scmsrht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index e920333c3115..de43d829fb4e 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -72,8 +72,6 @@ buildPythonPackage rec { pytest factory-boy ]; - - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "todosrht" ]; meta = with lib; { diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 70d3a4c20073..7868257ffda7 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "mpc-qt"; - version = "24.06"; + version = "24.12.1-flatpak"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; rev = "v${version}"; - hash = "sha256-kEG7B99io3BGjN94nEX1pN10Bcjj21rb46Vcn2OtpN8="; + hash = "sha256-gn94kVs3Lbd+ggj4jTacHpmnVO2lH/QDhFk+hJC1N/c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/scripts/videoclip.nix b/pkgs/applications/video/mpv/scripts/videoclip.nix index 3a2ac5e4e992..ecfb427e2069 100644 --- a/pkgs/applications/video/mpv/scripts/videoclip.nix +++ b/pkgs/applications/video/mpv/scripts/videoclip.nix @@ -10,13 +10,13 @@ }: buildLua { pname = "videoclip"; - version = "0-unstable-2024-08-20"; + version = "0-unstable-2025-03-10"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "videoclip"; - rev = "249122d245bc5ec2a0687346af730b1cc2273b21"; - hash = "sha256-VSMFddi8Lvmipo8Un79v+LXGNiKeaSxHQ44HddJgTkE="; + rev = "785eb86bc080c445e8feb947d7caa8f3a097bf2b"; + hash = "sha256-oanc9MggMjVDrSW42XrQwwWw2YTrifiCVrg/r42oGx8="; }; patchPhase = diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 2eca00244349..3db4dc213b0f 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -16,6 +16,8 @@ obs-3d-effect = callPackage ./obs-3d-effect.nix { }; + obs-advanced-masks = callPackage ./obs-advanced-masks.nix { }; + obs-backgroundremoval = callPackage ./obs-backgroundremoval { }; obs-color-monitor = qt6Packages.callPackage ./obs-color-monitor.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix b/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix new file mode 100644 index 000000000000..764ebfb70f2a --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + obs-studio, + cmake, +}: + +stdenv.mkDerivation rec { + pname = "obs-advanced-masks"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "FiniteSingularity"; + repo = "obs-advanced-masks"; + rev = "refs/tags/v${version}"; + hash = "sha256-NtmOWKk3eZeRa3TvclZpg4sj8lbOoY8hUhxs1z6kEW4="; + }; + + buildInputs = [ + obs-studio + ]; + + nativeBuildInputs = [ + cmake + ]; + + postInstall = '' + rm -rf "$out/share" + mkdir -p "$out/share/obs" + mv "$out/data/obs-plugins" "$out/share/obs" + rm -rf "$out/obs-plugins" "$out/data" + ''; + + meta = { + description = "Advanced Masking Plugin for OBS"; + homepage = "https://github.com/FiniteSingularity/obs-advanced-masks"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ rytswd ]; + mainProgram = "obs-advanced-masks"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 7e95a2df2d8c..0971bcf3b788 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -21,19 +21,19 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2025-02-18"; + version = "0-unstable-2025-03-14"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "10d2f33440475cb1a96eba1dc27c59c8b57b68bd"; - hash = "sha256-FUTscDaqRgsabLcYq/fny3qXtBiwRRf8RVQBmDUyYrY="; + rev = "af765802907dafe1ae1d1f39704c5020a882d362"; + hash = "sha256-p15gljpEaSloorT37J8Akn5DaqkjVD/QInik4FaF1HE="; fetchSubmodules = true; }; separateDebugInfo = true; useFetchCargoVendor = true; - cargoHash = "sha256-hkDfqNoDn0TSvnQ2eVYEeB+f+JAnPI7BVcQBd9sjYzk="; + cargoHash = "sha256-3+gV/4l+N4U2zZWU+UtA1gcmdwnXavbhBPQOB3hhGDk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 2c7690864456..0866cce66a4b 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -9,19 +9,19 @@ let callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.3.6"; + version = "1.4.0"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; tag = "v${version}"; - hash = "sha256-ZdSo9bKZ7Q1xwMe4SR840U3+fVpKwtiZQA5KDM5qF9M="; + hash = "sha256-whitdwFOvQgRS9lwbsWhhm92+i1qGW+OFOreNSyvldk="; }; # Override vendorHash with overrideAttrs. # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash - vendorHash = "sha256-W853++SSvkAYYUczbl8vnoBQZnimUdsAEXp4MCkLPBU="; + vendorHash = "sha256-HP5XJ74ELaZT/bZgAPqe7vBPvJhHwyZVSNrUa+KToIE="; extraDescription = " (previously known as Singularity)"; extraMeta.homepage = "https://apptainer.org"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 753386fef4ea..5c41bc86d719 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -14,13 +14,13 @@ let mkHyprlandPlugin, }: let - version = "0.47.0"; + version = "0.48.0"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; - rev = "refs/tags/v${version}"; - hash = "sha256-zys4H2zSSIw54ecnYnBh2NUKZQraWD4B7qftuClrXho="; + tag = "v${version}"; + hash = "sha256-q6v3nkJZdu45bwCuymQ+q3U7uwfA+M3GqsvZ0TgNsi4="; }; in mkHyprlandPlugin hyprland { diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh index 9abd07e99525..039263e9aaca 100644 --- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh +++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh @@ -1,15 +1,35 @@ needsTarget=true +targetValue="" + +declare -i n=0 +nParams=${#params[@]} +while (("$n" < "$nParams")); do + p=${params[n]} + v=${params[n + 1]:-} # handle `p` being last one + n+=1 -for p in "${params[@]}"; do case "$p" in - -target | --target=*) + -target) + if [ -z "$v" ]; then + echo "Error: -target requires an argument" >&2 + exit 1 + fi needsTarget=false - - echo "Warning: supplying the --target argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2 + targetValue=$v + # skip parsing the value of -target + n+=1 + ;; + --target=*) + needsTarget=false + targetValue="${p#*=}" ;; esac done +if ! $needsTarget && [[ "$targetValue" != "@defaultTarget@" ]]; then + echo "Warning: supplying the --target $targetValue != @defaultTarget@ argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2 +fi + if $needsTarget && [[ $0 != *cpp ]]; then extraBefore+=(-target @defaultTarget@ @machineFlags@) fi diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index ef591a4d9aa5..946db43afdee 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -20,7 +20,6 @@ let in { stdenvNoCC, - perl, cpio, ubootTools, lib, @@ -101,7 +100,6 @@ stdenvNoCC.mkDerivation ( builder = ./make-initrd.sh; nativeBuildInputs = [ - perl cpio ] ++ lib.optional makeUInitrd ubootTools; @@ -121,14 +119,7 @@ stdenvNoCC.mkDerivation ( symlinks = map (x: x.symlink) contents; suffices = map (x: if x ? suffix then x.suffix else "none") contents; - # For obtaining the closure of `contents'. - # Note: we don't use closureInfo yet, as that won't build with nix-1.x. - # See #36268. - exportReferencesGraph = lib.zipListsWith (x: i: [ - ("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") - x.object - ]) contents (lib.range 0 (lib.length contents - 1)); - pathsFromGraph = ./paths-from-graph.pl; + closureInfo = "${pkgsBuildHost.closureInfo { rootPaths = objects; }}"; } // lib.optionalAttrs makeUInitrd { uInitrdCompression = uInitrdCompression; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index defa8a7d9b8e..cc67c14a6a50 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -24,7 +24,7 @@ done # Get the paths in the closure of `object'. -storePaths=$(perl $pathsFromGraph closure-*) +storePaths="$(cat $closureInfo/store-paths)" # Paths in cpio archives *must* be relative, otherwise the kernel diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix index a830c97eea9a..611c01abe018 100644 --- a/pkgs/build-support/kernel/modules-closure.nix +++ b/pkgs/build-support/kernel/modules-closure.nix @@ -11,6 +11,7 @@ rootModules, kmod, allowMissing ? false, + extraFirmwarePaths ? [ ], }: stdenvNoCC.mkDerivation { @@ -25,6 +26,7 @@ stdenvNoCC.mkDerivation { firmware rootModules allowMissing + extraFirmwarePaths ; allowedReferences = [ "out" ]; } diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index b53c64e30525..45423d21a570 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -87,6 +87,15 @@ for module in $(< ~-/closure); do done || : done +for path in $extraFirmwarePaths; do + mkdir -p $(dirname $out/lib/firmware/$path) + for name in "$path" "$path.xz" "$path.zst" ""; do + if cp -v --parents --no-preserve=mode lib/firmware/$name "$out" 2>/dev/null; then + break + fi + done +done + if test -e lib/firmware/edid ; then echo "lib/firmware/edid found, copying." mkdir -p "$out/lib/firmware" diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/pkgs/build-support/kernel/paths-from-graph.pl deleted file mode 100644 index 1465b73fddb6..000000000000 --- a/pkgs/build-support/kernel/paths-from-graph.pl +++ /dev/null @@ -1,68 +0,0 @@ -# NOTE: this script is deprecated. Use closureInfo instead. - -# Parses a /nix/store/*-closure file and prints -# various information. -# By default, the nodes in the graph are printed to stdout. -# If printRegistration is set, then the graph is written -# as a registration file for a manifest is written -# in the `nix-store --load-db' format. - -use strict; -use File::Basename; - -my %storePaths; -my %refs; - -# Each argument on the command line is a graph file. -# The graph file contains line-triples and a variable -# number of references: -# -# -# -# -# ... -# -foreach my $graph (@ARGV) { - open GRAPH, "<$graph" or die; - - while () { - chomp; - my $storePath = "$_"; - $storePaths{$storePath} = 1; - - my $deriver = ; chomp $deriver; - my $count = ; chomp $count; - - my @refs = (); - for (my $i = 0; $i < $count; ++$i) { - my $ref = ; chomp $ref; - push @refs, $ref; - } - $refs{$storePath} = \@refs; - - } - - close GRAPH; -} - - -if ($ENV{"printRegistration"} eq "1") { - # This is the format used by `nix-store --register-validity - # --hash-given' / `nix-store --load-db'. - foreach my $storePath (sort (keys %storePaths)) { - print "$storePath\n"; - print "0000000000000000000000000000000000000000000000000000000000000000\n"; # !!! fix - print "0\n"; # !!! fix - print "\n"; # don't care about preserving the deriver - print scalar(@{$refs{$storePath}}), "\n"; - foreach my $ref (@{$refs{$storePath}}) { - print "$ref\n"; - } - } -} - -else { - foreach my $storePath (sort (keys %storePaths)) { - print "$storePath\n"; - } -} diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index d372d3a3f9d3..f0e155633503 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -38,7 +38,7 @@ cargoBuildHook() { concatTo flagsArray cargoBuildFlags echoCmd 'cargoBuildHook flags' "${flagsArray[@]}" - cargo build "${flagsArray[@]}" + @setEnv@ cargo build "${flagsArray[@]}" if [ -n "${buildAndTestSubdir-}" ]; then popd diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index ee07b0f86512..241061e7c7ba 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -37,7 +37,7 @@ cargoCheckHook() { concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray echoCmd 'cargoCheckHook flags' "${flagsArray[@]}" - cargo test "${flagsArray[@]}" + @setEnv@ cargo test "${flagsArray[@]}" if [[ -n "${buildAndTestSubdir-}" ]]; then popd diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 76baa7d18168..21278ec382d1 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -27,6 +27,8 @@ name = "cargo-build-hook.sh"; substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; + }; passthru.tests = { @@ -44,6 +46,7 @@ name = "cargo-check-hook.sh"; substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; }; passthru.tests = { @@ -136,6 +139,8 @@ ]; substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; + }; } ./maturin-build-hook.sh ) { }; diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 2039339fc80c..77972c2fe171 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -31,7 +31,7 @@ maturinBuildHook() { concatTo flagsArray maturinBuildFlags echoCmd 'maturinBuildHook flags' "${flagsArray[@]}" - maturin build "${flagsArray[@]}" + @setEnv@ maturin build "${flagsArray[@]}" if [ -n "${buildAndTestSubdir-}" ]; then popd diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index e2694c2b7bde..c51e4ae22ce2 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -13,7 +13,8 @@ postFixupHooks+=(noBrokenSymlinksInAllOutputs) # A symlink is "dangling" if it points to a non-existent target. # A symlink is "reflexive" if it points to itself. -# A symlink is considered "broken" if it is either dangling or reflexive. +# A symlink is "unreadable" if the readlink command fails, e.g. because of permission errors. +# A symlink is considered "broken" if it is either dangling, reflexive or unreadable. noBrokenSymlinks() { local -r output="${1:?}" local path @@ -21,6 +22,7 @@ noBrokenSymlinks() { local symlinkTarget local -i numDanglingSymlinks=0 local -i numReflexiveSymlinks=0 + local -i numUnreadableSymlinks=0 # NOTE(@connorbaker): This hook doesn't check for cycles in symlinks. @@ -33,7 +35,11 @@ noBrokenSymlinks() { # NOTE: path is absolute because we're running `find` against an absolute path (`output`). while IFS= read -r -d $'\0' path; do pathParent="$(dirname "$path")" - symlinkTarget="$(readlink "$path")" + if ! symlinkTarget="$(readlink "$path")"; then + nixErrorLog "the symlink $path is unreadable" + numUnreadableSymlinks+=1 + continue + fi # Canonicalize symlinkTarget to an absolute path. if [[ $symlinkTarget == /* ]]; then @@ -61,8 +67,8 @@ noBrokenSymlinks() { fi done < <(find "$output" -type l -print0) - if ((numDanglingSymlinks > 0 || numReflexiveSymlinks > 0)); then - nixErrorLog "found $numDanglingSymlinks dangling symlinks and $numReflexiveSymlinks reflexive symlinks" + if ((numDanglingSymlinks > 0 || numReflexiveSymlinks > 0 || numUnreadableSymlinks > 0)); then + nixErrorLog "found $numDanglingSymlinks dangling symlinks, $numReflexiveSymlinks reflexive symlinks and $numUnreadableSymlinks unreadable symlinks" exit 1 fi return 0 diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 4450b79a8fa8..a1befd9aae6e 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -1107,7 +1107,7 @@ rec { '' # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16 awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out - gixy $out + gixy $out || (echo "\n\nThis can be caused by combining multiple incompatible services on the same hostname.\n\nFull merged config:\n\n"; cat $out; exit 1) ''; /** diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index ab64c0b300f9..2dfd5476c152 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -6,6 +6,7 @@ autoreconfHook, allegro, libsamplerate, + libGLU, libX11, libXext, SDL, @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ allegro libsamplerate + libGLU libX11 libXext SDL diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index 210c7537ccc9..c2a305cc0663 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "ab-av1"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; rev = "v${version}"; - hash = "sha256-I9XApll0/mvfhL/BLWoVwL0ffqa5r3dOBWYTHizJ0hc="; + hash = "sha256-rj02Opkwi4M249Ya4uBl4u1l8Mx+FBcRcxDgD6ng9kg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-y+5rW3LruV1WeJXizbhHs01jkWrYsMXZkn1NG0Xz3bg="; + cargoHash = "sha256-Vi38eNn+SnhQx7Gp1T2RPIBeu3bUAZ74dr0mMG5Mha0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ac/acgtk/package.nix b/pkgs/by-name/ac/acgtk/package.nix index a8b32495689a..599e2f522002 100644 --- a/pkgs/by-name/ac/acgtk/package.nix +++ b/pkgs/by-name/ac/acgtk/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch, ocamlPackages, }: @@ -18,6 +19,20 @@ stdenv.mkDerivation { hash = "sha256-XuPcubt1lvnQio+km6MhmDu41NXNVXKKpzGd/Y1XzLo="; }; + # Compatibility with fmt 0.10.0 + patches = [ + (fetchpatch { + url = "https://gitlab.inria.fr/ACG/dev/ACGtk/-/commit/613454b376d10974f539ab398a269be061c5bc9c.patch"; + hash = "sha256-l/V8oEgntnFtrhpTQSk7PkpaX+dBq4izG/tloCQRbDY="; + }) + ]; + + # Compatibility with logs 0.8.0 + postPatch = '' + substituteInPlace src/utils/dune \ + --replace-warn 'logs mtime' 'logs logs.fmt mtime' + ''; + strictDeps = true; nativeBuildInputs = with ocamlPackages; [ diff --git a/pkgs/by-name/ac/acpi/package.nix b/pkgs/by-name/ac/acpi/package.nix index 2d9decc66244..54ea37c8ca2e 100644 --- a/pkgs/by-name/ac/acpi/package.nix +++ b/pkgs/by-name/ac/acpi/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "acpi"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz"; - sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp"; + sha256 = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws="; }; meta = with lib; { diff --git a/pkgs/by-name/ac/acr-cli/package.nix b/pkgs/by-name/ac/acr-cli/package.nix index cd5e5121e5a4..0b5f19ac355e 100644 --- a/pkgs/by-name/ac/acr-cli/package.nix +++ b/pkgs/by-name/ac/acr-cli/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "acr-cli"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "Azure"; repo = "acr-cli"; tag = "v${version}"; - hash = "sha256-h4vRtxAu/ggEu5HuzaiEoLslOyAXP1rMI1/ua9YARug="; + hash = "sha256-5uEaptJSB5mb12vqeSGkRj4oRed+0VgcJx4vpTBQCAU="; }; vendorHash = null; diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix index 9898b183c3cf..427e8e81bf7c 100644 --- a/pkgs/by-name/ac/activemq/package.nix +++ b/pkgs/by-name/ac/activemq/package.nix @@ -5,7 +5,7 @@ }: let - version = "6.1.5"; + version = "6.1.6"; in stdenvNoCC.mkDerivation { pname = "activemq"; @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "mirror://apache/activemq/${version}/apache-activemq-${version}-bin.tar.gz"; - hash = "sha256-JrLLSm6+Be1vSBTTryRcZfbiGK0PrmJ/pM2uYnGuN9E="; + hash = "sha256-MqxpLaSG1+goGVht08VmG7u11tQlmYMqSUeXBYYI8KQ="; }; installPhase = '' diff --git a/pkgs/by-name/ad/adminneo/package.nix b/pkgs/by-name/ad/adminneo/package.nix index 7f09f1ff73d5..e770d10153e7 100644 --- a/pkgs/by-name/ad/adminneo/package.nix +++ b/pkgs/by-name/ad/adminneo/package.nix @@ -10,13 +10,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "adminneo"; - version = "4.17"; + version = "4.17.2"; src = fetchFromGitHub { owner = "adminneo-org"; repo = "adminneo"; tag = "v${finalAttrs.version}"; - hash = "sha256-WVNeox5xygQjD5ekmcwZX9AnfhBq6YpHBLC2+WZJzvI="; + hash = "sha256-erz/kkaywkuT4k3wg8a48p2pTEqzsr3pHDrtNDtrq2I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ae/aewan/package.nix b/pkgs/by-name/ae/aewan/package.nix index 6a93cc9de774..9ebb2a4d1479 100644 --- a/pkgs/by-name/ae/aewan/package.nix +++ b/pkgs/by-name/ae/aewan/package.nix @@ -28,6 +28,18 @@ stdenv.mkDerivation rec { # patch is in CVS diff format, add 'a/' prefix extraPrefix = ""; }) + # https://sourceforge.net/p/aewan/bugs/14/ + (fetchpatch { + url = "https://sourceforge.net/p/aewan/bugs/14/attachment/aewan-1.0.01-fix-incompatible-function-pointer-types.patch"; + sha256 = "sha256-NlnsOe/OCMXCrehBq20e0KOMcWt5rUv9fIvu9eoOMqw="; + }) + # https://sourceforge.net/p/aewan/bugs/16/ + (fetchpatch { + url = "https://sourceforge.net/p/aewan/bugs/16/attachment/implicit-function-declaration.patch"; + sha256 = "sha256-RWFJRDaYoiQySkB2L09JHSX90zgIJ9q16IrPhg03Ruc="; + # patch is in CVS diff format, add 'a/' prefix + extraPrefix = ""; + }) ]; buildInputs = [ diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index c5441f128389..d3c48e9592ec 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "aiken"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; rev = "v${version}"; - hash = "sha256-es1opcYGoryRLpEPJuuuusTSVDnNAoEoGLg+LB8VnM0="; + hash = "sha256-aydujI8yPfUEEonasOT0uFCpLKOXSh/c9iw12kACLuw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-g4DHkHw6Nog+ZtquvVaRaZdfcuH/ReLYsLeARbnCqac="; + cargoHash = "sha256-D7N9liDcthV4YLH+XzG4E1PAcLg9PQlTeGBmUcGOYes="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index 74fc2982563f..2c2f3e3d3610 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -11,14 +11,14 @@ }: buildGoModule rec { pname = "alist"; - version = "3.42.0"; - webVersion = "3.42.0"; + version = "3.43.0"; + webVersion = "3.43.0"; src = fetchFromGitHub { owner = "AlistGo"; repo = "alist"; tag = "v${version}"; - hash = "sha256-qUW9bA2TeAVve77i43+ITxClLaO3aqm5959itf+iFqs="; + hash = "sha256-0+gt5S/eklSp8K4z1bXUVHaG7L3zKhi6TdVaxX/Y83w="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -32,11 +32,11 @@ buildGoModule rec { }; web = fetchzip { url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz"; - hash = "sha256-g2+qdLrxuyuqxlyVk32BKJCbMfXNs29KLEPxAkTQHjU="; + hash = "sha256-uFa9V8DSHk0ET0BCdfT37qUNP2kLNjmt2S6fEk1muME="; }; proxyVendor = true; - vendorHash = "sha256-uid+uT4eOtDsCNsKqGqPc4vMDnKUatG4V2n0Z7r6ccY="; + vendorHash = "sha256-40YuarjrOvwHyXmHZoiqGMueN7dzu8zQ6hgInmsWVJg="; buildInputs = [ fuse ]; diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix index deafade29a69..bcce322418c9 100644 --- a/pkgs/by-name/al/allure/package.nix +++ b/pkgs/by-name/al/allure/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://docs.qameta.io/allure/"; + homepage = "https://allurereport.org/"; description = "Allure Report is a flexible, lightweight multi-language test reporting tool"; longDescription = '' Allure Report is a flexible, lightweight multi-language test reporting diff --git a/pkgs/by-name/al/alterx/package.nix b/pkgs/by-name/al/alterx/package.nix index 035db050cbf3..198b8fed43be 100644 --- a/pkgs/by-name/al/alterx/package.nix +++ b/pkgs/by-name/al/alterx/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "alterx"; - version = "0.0.3"; + version = "0.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "alterx"; tag = "v${version}"; - hash = "sha256-A01XROFB2NkArfFtRMv/r9Nu5QoKMTOVzVIUnFoVe78="; + hash = "sha256-IjCK0TVZOBegNdfpqOFoOTuj8KtmCuIqNPvcIa1vSo0="; }; - vendorHash = "sha256-efwU41kFR8QYa2cevvj4pYAXgCisJ4OHaRIhWVnETvc="; + vendorHash = "sha256-aTA5KGeYmJnbVRbEhT9LigQoJFLD17q9spzBV4BGhNw="; meta = with lib; { description = "Fast and customizable subdomain wordlist generator using DSL"; diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index 79d10d3a0762..7612f3376d53 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdvlk"; - version = "2025.Q1.2"; + version = "2025.Q1.3"; src = fetchRepoProject { name = "amdvlk-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${finalAttrs.version}"; - hash = "sha256-NIRIrcCVFPxeILnfmOaE8yFBXYrXhtljXsccvoU2lf8="; + hash = "sha256-ZXou5g0emeK++NyV/hQllZAdZAMEY9TYs9c+umFdcfo="; }; buildInputs = diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index b1d471582f74..ed17dc8c903f 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -56,13 +56,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn"; - version = "4.8.4.4"; + version = "4.8.5.0"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amnezia-client"; tag = finalAttrs.version; - hash = "sha256-uWO38eK4pJ7pkViyBh3QSVWPIMXn1tcMSS4Bt1M1bpk="; + hash = "sha256-k0BroQYrmJzM0+rSZMf20wHba5NbOK/xm5lbUFBNEHI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/am/amtterm/package.nix b/pkgs/by-name/am/amtterm/package.nix index 6d6788cd2238..8e90685b40c3 100644 --- a/pkgs/by-name/am/amtterm/package.nix +++ b/pkgs/by-name/am/amtterm/package.nix @@ -3,10 +3,13 @@ lib, stdenv, makeWrapper, + gtk3, openssl, perl, perlPackages, pkg-config, + vte, + withGamt ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -18,7 +21,12 @@ stdenv.mkDerivation (finalAttrs: { perl SOAPLite ]) - ++ [ openssl ]; + ++ [ openssl ] + + ++ lib.optionals withGamt [ + gtk3 + vte + ]; nativeBuildInputs = [ makeWrapper pkg-config diff --git a/pkgs/by-name/an/annextimelog/package.nix b/pkgs/by-name/an/annextimelog/package.nix index 88a914f94f63..d1259995737b 100644 --- a/pkgs/by-name/an/annextimelog/package.nix +++ b/pkgs/by-name/an/annextimelog/package.nix @@ -2,32 +2,44 @@ lib, python3, fetchFromGitLab, + fetchPypi, }: +let + tzdata = python3.pkgs.tzdata.overrideAttrs rec { + version = "2023.4"; + + src = fetchPypi { + pname = "tzdata"; + inherit version; + hash = "sha256-3VTJTylHZVIsdzmWSbT+/ZVSJHmmZKDOyH9BvrxhSMk="; + }; + }; +in python3.pkgs.buildPythonApplication rec { pname = "annextimelog"; - version = "0.13.1"; + version = "0.14.0"; format = "pyproject"; src = fetchFromGitLab { owner = "nobodyinperson"; repo = "annextimelog"; rev = "v${version}"; - hash = "sha256-VgeILw8WfqVrmsU/kBw+jHTOt2a6sVT7YgP2pKRp2AY="; + hash = "sha256-+3PkG33qKckagSVvVdqkypulO7uu5AMOv8fQiP8IUbs="; }; nativeBuildInputs = with python3.pkgs; [ setuptools wheel poetry-core - ]; + ] ++ [ tzdata ]; propagatedBuildInputs = with python3.pkgs; [ rich ]; meta = with lib; { - description = "️Git Annex-backed Time Tracking"; + description = "git-annex based cli time tracker"; homepage = "https://gitlab.com/nobodyinperson/annextimelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix new file mode 100644 index 000000000000..4e568fcca434 --- /dev/null +++ b/pkgs/by-name/an/anubis/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + stdenv, +}: +buildGoModule (finalAttrs: { + pname = "anubis"; + version = "1.14.2"; + + src = fetchFromGitHub { + owner = "TecharoHQ"; + repo = "anubis"; + tag = "v${finalAttrs.version}"; + hash = "sha256-K4VXTO8F3GTOA9jOrI0OF6CYTRaDUlUT9/HujYmnHpM="; + }; + + vendorHash = "sha256-t+E3sILEwXGkTaBtKLO2kFEntivY9fVK8o86arvMaOU="; + + subPackages = [ + "cmd/anubis" + ]; + + ldflags = + [ + "-s" + "-w" + "-X=github.com/TecharoHQ/anubis.Version=v${finalAttrs.version}" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "-extldflags=-static" + ]; + + preCheck = '' + export DONT_USE_NETWORK=1 + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Weighs the soul of incoming HTTP requests using proof-of-work to stop AI crawlers"; + homepage = "https://github.com/TecharoHQ/anubis/"; + changelog = "https://github.com/TecharoHQ/anubis/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ knightpp ]; + mainProgram = "anubis"; + }; +}) diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index cbec3f98d2fd..d7f316ea540f 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-ODhN2Nu53nxzMNLsxlw/hSf6nLS7www6SXAyNeSOHmA="; + hash = "sha256-e0G7J2BRRC+2MMqpvu5BNnimS7RRTjRBgo/j1T9iYWU="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-ZVJjUHkzEjDbFottwGKi9fTfcMdebDqP0r9Wecwro+o="; + hash = "sha256-A9BCdYxeWPjCOZ/L0wYTVuqybLHfc1vsWWxAY7IJohw="; }; aarch64-darwin = x86_64-darwin; } @@ -30,7 +30,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.8.6"; + version = "0.8.7"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; diff --git a/pkgs/by-name/ap/apriltag/package.nix b/pkgs/by-name/ap/apriltag/package.nix new file mode 100644 index 000000000000..d21d97aa8689 --- /dev/null +++ b/pkgs/by-name/ap/apriltag/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + python3Packages, + nix-update-script, +}: + +let + opencv4WithGtk = python3Packages.opencv4.override { + enableGtk2 = true; # For GTK2 support + enableGtk3 = true; # For GTK3 support + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "apriltags"; + version = "3.4.3"; + + src = fetchFromGitHub { + owner = "AprilRobotics"; + repo = "AprilTags"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1XbsyyadUvBZSpIc9KPGiTcp+3G7YqHepWoORob01Ss="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ opencv4WithGtk ]; + + cmakeFlags = [ (lib.cmakeBool "BUILD_EXAMPLES" true) ]; + + doCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Visual fiducial system popular for robotics research"; + homepage = "https://april.eecs.umich.edu/software/apriltag"; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ phodina ]; + }; +}) diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index 66197c162d8d..80a34de0a0e7 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; rev = "v${finalAttrs.version}"; - hash = "sha256-ldWD4ci3LcBIfUN41qlBO/oR5chcsRLejMbSW8eH628="; + hash = "sha256-ybpV2+yNExdHnMhhhmtxqgBCgI+nRr8gi/D+VVb9lQY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ar/argo-rollouts/package.nix b/pkgs/by-name/ar/argo-rollouts/package.nix index 83d21dce64bc..34dda4412482 100644 --- a/pkgs/by-name/ar/argo-rollouts/package.nix +++ b/pkgs/by-name/ar/argo-rollouts/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-PjtuUlZ+qAnmXo4QDfgi8onJ6QVBHIj/wTothma5H88="; + sha256 = "sha256-SNzWAs1ytduU2XhPccJ+HUagh8cHcIb6zj0/EosdpTc="; }; - vendorHash = "sha256-ypx5DF24CQNHLAVlw59bSHK++LMyNgcXMn0qkTUh/qs="; + vendorHash = "sha256-1YtRc2xLP8QAIK+vO690zHb9tXCkR7na/zwwlIdAxgQ="; # Disable tests since some test fail because of missing test data doCheck = false; diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix index dd26570d6891..59cd39c98412 100644 --- a/pkgs/by-name/ar/argo-workflows/package.nix +++ b/pkgs/by-name/ar/argo-workflows/package.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo-workflows"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; tag = "v${version}"; - hash = "sha256-R6njT6Lae+8KiTyXjxE5/U922pP0VqgCIRwGhWBOZUI="; + hash = "sha256-LvFpYVylVwWhoVtMDldalSHa5KGdbKVB6yFnP5ha4gg="; }; - vendorHash = "sha256-uCIdZkoPgppJtrFf7nOVIyEXo1bVILYXNs5LtLLLmsY="; + vendorHash = "sha256-hMegxeUFSBf32dnXmD7QagkvWgWDeB4Fu4nlKNoePWY="; doCheck = false; diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 1cde424edc38..1f03ca226775 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.14.4"; + version = "2.14.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-CL6LPjTngAW/SI+qH4HHZ1NTkmSKUWc8GCIRjcB2GyA="; + hash = "sha256-ilXJWPvu3qwzuUN6AsQNyzrTHdQO51IFZcvZiQ/+/tU="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-uKqiA/ybe0P0rpLFasq6BC/NzhQGgZf5dx2hUYHtPI8="; + vendorHash = "sha256-sfyTXP2vKVJQdUti0TNW/vrKovvN1/PMhEOUI8IiY44="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/by-name/as/assemblyscript/package.nix b/pkgs/by-name/as/assemblyscript/package.nix index 9eaa48b51cda..cff941fe1413 100644 --- a/pkgs/by-name/as/assemblyscript/package.nix +++ b/pkgs/by-name/as/assemblyscript/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "assemblyscript"; - version = "0.27.34"; + version = "0.27.35"; src = fetchFromGitHub { owner = "AssemblyScript"; repo = "assemblyscript"; rev = "v${version}"; - hash = "sha256-GM45I8L+cgdbky8wAhpKnWVqCPYIBOH3HyV131tSHkQ="; + hash = "sha256-Wop7S7GvvXFcONER+TYIygLkAZpCdhMlPz3hhWSOZro="; }; - npmDepsHash = "sha256-ptndMTc68/L+YgrfwhK/woVzyzG8KpL9KPGGtRXFdho="; + npmDepsHash = "sha256-DisQ5T5gEHkCZNBInN12uTquwrg3n/sOmNVz/iSI1Mw="; meta = with lib; { homepage = "https://github.com/AssemblyScript/assemblyscript"; diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 1f68d8af3a6a..15999f4de70a 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "audacity"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${finalAttrs.version}"; - hash = "sha256-uRFLtjawMI5mHvlQNWkqSICPKbTiwp2bnBBsuj2JAP8="; + hash = "sha256-j3rbcUUHXAQmn/7SzpKHvpxGZ3bBhIYrNOFLc7jMPlc="; }; postPatch = diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix index f7ec693a8fb4..23e328d7a4af 100644 --- a/pkgs/by-name/au/audiobookshelf/package.nix +++ b/pkgs/by-name/au/audiobookshelf/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, runCommand, buildNpmPackage, - nodejs_18, + nodejs, ffmpeg-full, nunicode, util-linux, @@ -14,8 +14,6 @@ }: let - nodejs = nodejs_18; - source = builtins.fromJSON (builtins.readFile ./source.json); pname = "audiobookshelf"; diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 2fc7ab7d8e58..6418af8b9d2f 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.64"; + version = "2.0.66"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${version}"; - sha256 = "sha256-S8VMvFP6MGhZ6zjAbgRGH7WfL5X4KELx60cOrey2/4Q="; + sha256 = "sha256-Hf3g0USudI6Df1Js1lRWFVHo2np5ZpCnEXX312Fx7EM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LdGwdzXsmNUAVm4EtG4i0GvZcJmc0iscgnccutGXTms="; + cargoHash = "sha256-tM3ikX51ZWadtRe2bnmIo167Hw0e5wjoY86Z5hFLizI="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/aw/awatcher/package.nix b/pkgs/by-name/aw/awatcher/package.nix index cb30efc1b5d2..9dd509ecdf28 100644 --- a/pkgs/by-name/aw/awatcher/package.nix +++ b/pkgs/by-name/aw/awatcher/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "awatcher"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "2e3s"; repo = "awatcher"; rev = "v${version}"; - hash = "sha256-G7UH2JcKseGZUA+Ac431cTXUP7rxWxYABfq05/ENjUM="; + hash = "sha256-bxFc6oM+evIQTjrsWmb7dXOUlSjurjc4CzHpxB+667c="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; useFetchCargoVendor = true; - cargoHash = "sha256-QO6qCQEJesZAN0A0nk2VBxTxElnZy59J7pczX+kBo24="; + cargoHash = "sha256-pUqwg7jblSWRLPcsUDqkir/asSM8zY0jrvrre4OIeZc="; meta = with lib; { description = "Activity and idle watchers"; diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index 90c5fb5a2581..1caaab62108e 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-datetime"; - version = "24.5.0"; + version = "24.5.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-datetime"; tag = finalAttrs.version; - hash = "sha256-lY49v2uZ7BawQoN/hmN6pbetHlSGjMHbS6S8Wl1bDmQ="; + hash = "sha256-rbKAixFjXOMYzduABmoIXissQXAoehfbkNntdtRyAqA="; }; postPatch = '' diff --git a/pkgs/by-name/ay/ayatana-indicator-power/package.nix b/pkgs/by-name/ay/ayatana-indicator-power/package.nix index 1b9b16d5bc3b..00385980367d 100644 --- a/pkgs/by-name/ay/ayatana-indicator-power/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-power/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-power"; - version = "24.5.1"; + version = "24.5.2"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-power"; tag = finalAttrs.version; - hash = "sha256-M7BzyQRPKyXMEY0FTMBXsCemC3+w8upjTHApWkRf71I="; + hash = "sha256-A9Kbs+qH01rkuLt8GINdPI2vCu0bCO+/g4kZhDj8GsY="; }; postPatch = '' diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/az/azahar/package.nix similarity index 55% rename from pkgs/by-name/li/lime3ds/package.nix rename to pkgs/by-name/az/azahar/package.nix index 3b18a88f6e91..0c4a9e76d424 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -12,6 +12,7 @@ fmt, ffmpeg_6-headless, gamemode, + glslang, httplib, inih, lib, @@ -31,43 +32,41 @@ soundtouch, stdenv, vulkan-headers, - vulkan-loader, xorg, zstd, - enableSdl2Frontend ? true, + enableSDL2 ? true, SDL2, enableQt ? true, - kdePackages, enableQtTranslations ? enableQt, + qt6, enableCubeb ? true, cubeb, - useDiscordRichPresence ? false, + useDiscordRichPresence ? true, rapidjson, }: let inherit (lib) - optional optionals cmakeBool - optionalString getLib - makeLibraryPath ; in stdenv.mkDerivation (finalAttrs: { - pname = "lime3ds"; - version = "2119.1"; + pname = "azahar"; + version = "2120.1"; src = fetchzip { - url = "https://github.com/Lime3DS/Lime3ds-archive/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-37KFGCVyc4QW+D00CzN1+lpNYZxCWRkflt7rkIFcdM8="; + # TODO: use this when https://github.com/azahar-emu/azahar/issues/779 is resolved + # url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; + url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250322-6ecee96.tar.xz"; + hash = "sha256-d4JHp/BZEQTKErh476NZoizQjgAldR19Waq9GQg2Ebk="; }; nativeBuildInputs = [ cmake doxygen pkg-config - ] ++ lib.optionals enableQt [ kdePackages.wrapQtAppsHook ]; + ] ++ lib.optionals enableQt [ qt6.wrapQtAppsHook ]; buildInputs = [ @@ -79,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { enet fmt ffmpeg_6-headless + glslang httplib inih libGL @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { zstd ] ++ optionals enableQt ( - with kdePackages; + with qt6; [ qtbase qtmultimedia @@ -108,10 +108,10 @@ stdenv.mkDerivation (finalAttrs: { qtwayland ] ) - ++ optionals enableSdl2Frontend [ SDL2 ] - ++ optionals enableQtTranslations [ kdePackages.qttools ] + ++ optionals enableQtTranslations [ qt6.qttools ] + ++ optionals enableSDL2 [ SDL2 ] ++ optionals enableCubeb [ cubeb ] - ++ optional useDiscordRichPresence rapidjson; + ++ optionals useDiscordRichPresence [ rapidjson ]; patches = [ # Fix boost errors @@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - # Fix file not found when looking in var/empty instead of opt + # Fix "file not found" bug when looking in var/empty instead of opt mkdir externals/dynarmic/src/dynarmic/ir/var ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty @@ -141,47 +141,24 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "libgamemode.so.0" "${getLib gamemode}/lib/libgamemode.so.0" ''; - postInstall = - let - libs = makeLibraryPath [ vulkan-loader ]; - in - optionalString enableSdl2Frontend '' - for binfile in lime3ds lime3ds-room - do - wrapProgram "$out/bin/$binfile" \ - --prefix LD_LIBRARY_PATH : ${libs} - '' - + optionalString enableQt '' - qtWrapperArgs+=( - --prefix LD_LIBRARY_PATH : ${libs} - ) - done - ''; - - cmakeFlags = - [ - (cmakeBool "LIME3DS_USE_PRECOMPILED_HEADERS" false) - (cmakeBool "USE_SYSTEM_LIBS" true) - (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) - (cmakeBool "DISABLE_SYSTEM_GLSLANG" true) - (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) - (cmakeBool "DISABLE_SYSTEM_VMA" true) - (cmakeBool "DISABLE_SYSTEM_XBYAK" true) - (cmakeBool "ENABLE_QT" enableQt) - (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend) - (cmakeBool "ENABLE_CUBEB" enableCubeb) - (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) - ] - ++ optionals enableQt [ - (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) - ]; + cmakeFlags = [ + (cmakeBool "USE_SYSTEM_LIBS" true) + (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) + (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) + (cmakeBool "DISABLE_SYSTEM_VMA" true) + (cmakeBool "DISABLE_SYSTEM_XBYAK" true) + (cmakeBool "ENABLE_QT" enableQt) + (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) + (cmakeBool "ENABLE_SDL2" enableSDL2) + (cmakeBool "ENABLE_CUBEB" enableCubeb) + (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) + ]; meta = { - description = "A Nintendo 3DS emulator based on Citra"; - homepage = "https://github.com/Lime3DS/Lime3ds-archive"; + description = "An open-source 3DS emulator project based on Citra"; + homepage = "https://github.com/azahar-emu/azahar"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ arthsmn ]; - mainProgram = "lime3ds"; - platforms = lib.platforms.linux; + mainProgram = "azahar"; }; }) diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix index 3a986d9c5b65..98680949229f 100644 --- a/pkgs/by-name/az/azimuth/package.nix +++ b/pkgs/by-name/az/azimuth/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + libGL, SDL, which, installTool ? false, @@ -19,7 +20,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ which ]; - buildInputs = [ SDL ]; + buildInputs = [ + libGL + SDL + ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=maybe-uninitialized" ]; diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix index 190129e5e204..9dc855b9ded8 100644 --- a/pkgs/by-name/ba/badger/package.nix +++ b/pkgs/by-name/ba/badger/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "badger"; - version = "4.5.2"; + version = "4.6.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "badger"; rev = "v${version}"; - hash = "sha256-kjMLJAEZN+WANgXsQT7XYLEsc+IL9QwBmaNeD3kyjGw="; + hash = "sha256-W3vPTLGI7YT7dFklJnOcpfYqQ9aBCsel9L6q4WNincY="; }; - vendorHash = "sha256-m4Bv8RhaUzqyzQ78/Ktr+wLRwL4mlXEsisW4pOJw1DI="; + vendorHash = "sha256-UVdOiaj1FN0etB9F0kt+THfO0Aa1kgdGYVeSVv4GpxY="; subPackages = [ "badger" ]; diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index 5cfae745e7d9..191780802441 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -22,16 +22,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "20.2.10"; + version = "21.1.0"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-kY8hXNDxbQwM2QleQ8MafDuANQzBRL3+Tei10P976bU="; + hash = "sha256-STixd/xJikV9qt2aG3smyLPEwG7fLYrN3jfVTwBxJrI="; }; - npmDepsHash = "sha256-AD/5QMgko1l8xH8dwua6YkrYuXe1Af7eo17p2L2PkyY="; + npmDepsHash = "sha256-dyUWQoR0EweHdNc5NN+qW2OdbCIspTQ1C/QsesnlvRU="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 6c2dc8f9b12c..d809646b59de 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.28.1"; + version = "1.28.2"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-fP8c6AntD2rW8nr8OlSag89NOvOo32YRDDFQh65/nho="; + hash = "sha256-xcjP35Av+XNlfrIqvjfamZIc/+BXw8SFvAi2OniJQd4="; }; - npmDepsHash = "sha256-4EFl0hOI6DcpzcSedanQBOrNbHTxR0G7C8L4+7EnESE="; + npmDepsHash = "sha256-o985HeQBZY7XNn+GULbn6hMWRBI/d0xili0wnV/udi8="; npmWorkspace = "packages/pyright"; preBuild = '' diff --git a/pkgs/by-name/ba/basex/package.nix b/pkgs/by-name/ba/basex/package.nix index e73f2271a9fa..b52de9c4c210 100644 --- a/pkgs/by-name/ba/basex/package.nix +++ b/pkgs/by-name/ba/basex/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "11.7"; + version = "11.8"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${ builtins.replaceStrings [ "." ] [ "" ] version }.zip"; - hash = "sha256-4xeMdmfk6JmfetfDGlqKQYTMtf15vRGRKYRdyrC90Cc="; + hash = "sha256-bzRsKKwOWbXfgbJ51VX3ND9tf+CO3lpB10hw032oJyM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ba/bashly/Gemfile.lock b/pkgs/by-name/ba/bashly/Gemfile.lock index c3f08f1947ce..35f47550c99e 100644 --- a/pkgs/by-name/ba/bashly/Gemfile.lock +++ b/pkgs/by-name/ba/bashly/Gemfile.lock @@ -1,21 +1,20 @@ GEM remote: https://rubygems.org/ specs: - bashly (1.2.6) + bashly (1.2.10) colsole (>= 0.8.1, < 2) - completely (~> 0.6.1) + completely (>= 0.6.1, < 0.8) filewatcher (~> 2.0) - gtx (~> 0.1) + gtx (~> 0.1.1) logger (>= 1, < 3) - lp (~> 0.2) - mister_bin (~> 0.7) + lp (~> 0.2.0) + mister_bin (~> 0.8.1) ostruct (>= 0, < 2) - psych (>= 3.3.2, < 7) - requires (~> 1.1.0) - tty-markdown (~> 0.7) - cgi (0.4.1) + requires (~> 1.1) + tty-markdown (~> 0.7.2) + cgi (0.4.2) colsole (1.0.0) - completely (0.6.3) + completely (0.7.0) colsole (>= 0.8.1, < 2) mister_bin (~> 0.7) docopt_ng (0.7.1) @@ -25,23 +24,20 @@ GEM module_methods (~> 0.1.0) gtx (0.1.1) erb (~> 4.0) - kramdown (2.4.0) - rexml - logger (1.6.1) + kramdown (2.5.1) + rexml (>= 3.3.9) + logger (1.6.6) lp (0.2.1) - mister_bin (0.7.6) + mister_bin (0.8.1) colsole (>= 0.8.1, < 2) docopt_ng (~> 0.7, >= 0.7.1) module_methods (0.1.0) ostruct (0.6.1) pastel (0.8.0) tty-color (~> 0.5) - psych (5.2.0) - stringio requires (1.1.0) - rexml (3.3.9) - rouge (4.5.0) - stringio (3.1.2) + rexml (3.4.1) + rouge (4.5.1) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) @@ -66,4 +62,4 @@ DEPENDENCIES bashly BUNDLED WITH - 2.5.16 + 2.6.2 diff --git a/pkgs/by-name/ba/bashly/gemset.nix b/pkgs/by-name/ba/bashly/gemset.nix index 0bfcd463529f..f295e3b5d434 100644 --- a/pkgs/by-name/ba/bashly/gemset.nix +++ b/pkgs/by-name/ba/bashly/gemset.nix @@ -9,7 +9,6 @@ "lp" "mister_bin" "ostruct" - "psych" "requires" "tty-markdown" ]; @@ -17,20 +16,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dzyqwf43i92jq5j66j31qvsbfcpd6zk74ssqz14kj51wn2d8vw3"; + sha256 = "1dzvgrk5vqncvwi1dn7kk5gzfjcr58jmqb6cyqcspwj6mr6zp7sw"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.10"; }; cgi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c5494n3n6l51n1w1vc118zckbqdzk7r6b656hswg72w0bif2ja3"; + sha256 = "1rj7agrnd1a4282vg13qkpwky0379svdb2z2lc0wl8588q6ikjx3"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.2"; }; colsole = { groups = [ "default" ]; @@ -51,10 +50,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ci8iza647hvc4f1cmf9mpsm3i78ysf6g6213wkyrr5jk296hjjb"; + sha256 = "1j3kpgmcvvs257m2zqhc3jlyrflhphcmy19lwgamv9p6xg100ak1"; type = "gem"; }; - version = "0.6.3"; + version = "0.7.0"; }; docopt_ng = { groups = [ "default" ]; @@ -105,20 +104,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; + sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.1"; }; logger = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.6"; }; lp = { groups = [ "default" ]; @@ -139,10 +138,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xx8cxvzcn47zsnshcllf477x4rbssrchvp76929qnsg5k9q7fas"; + sha256 = "1zz3vpy6xrgzln2dpxgcnrq1bpzz0syl60whqc9zf8j29mayw1fy"; type = "gem"; }; - version = "0.7.6"; + version = "0.8.1"; }; module_methods = { groups = [ "default" ]; @@ -175,17 +174,6 @@ }; version = "0.8.0"; }; - psych = { - dependencies = [ "stringio" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wq567f615x1ilgaqlh4yzf322f96rgn45xw4nm4vwfaddszw0v6"; - type = "gem"; - }; - version = "5.2.0"; - }; requires = { groups = [ "default" ]; platforms = [ ]; @@ -201,30 +189,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.3.9"; + version = "3.4.1"; }; rouge = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dllqyxlxsmsy4xdpgwbn6w9w6qsha9ay6cl5kq06jgw63k5dp10"; + sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a"; type = "gem"; }; - version = "4.5.0"; - }; - stringio = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0"; - type = "gem"; - }; - version = "3.1.2"; + version = "4.5.1"; }; strings = { dependencies = [ diff --git a/pkgs/by-name/be/beatsabermodmanager/deps.json b/pkgs/by-name/be/beatsabermodmanager/deps.json deleted file mode 100644 index e5670991426c..000000000000 --- a/pkgs/by-name/be/beatsabermodmanager/deps.json +++ /dev/null @@ -1,531 +0,0 @@ -[ - { - "pname": "Avalonia", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "0bcc3h5hxy8mfkgxn07vnnq2rn8whn2gx3d67lmlpm01r16rndyc", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia/11.0.999-cibuild0030643-beta/avalonia.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.Angle.Windows.Natives", - "version": "2.1.0.2023020321", - "sha256": "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd" - }, - { - "pname": "Avalonia.Controls.ColorPicker", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "06n0c8dyh1q4a97nm31vyr8b6jzcq8nvvligwzp4xaxdwhkphg2x", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.controls.colorpicker/11.0.999-cibuild0030643-beta/avalonia.controls.colorpicker.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.Controls.DataGrid", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "1vfkbjy9fl24i6skn02wgr047579x4a1liiw79qwbkx7mgvw9pvn", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.controls.datagrid/11.0.999-cibuild0030643-beta/avalonia.controls.datagrid.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.Desktop", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "0nh6hdw07hwq92n0m1sx7qxwp4ccqash5f8sivj3lflx786s9i5f", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.desktop/11.0.999-cibuild0030643-beta/avalonia.desktop.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.Diagnostics", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "0ddcq2w54cywpzcwb9av54zkblvpnp0g7xs4dsw6s39wrxyh8spw", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.diagnostics/11.0.999-cibuild0030643-beta/avalonia.diagnostics.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.FreeDesktop", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "1wshqaikd1b2a91yixgsnvl8i1arhmlviavjywi67a2w1xv98das", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.freedesktop/11.0.999-cibuild0030643-beta/avalonia.freedesktop.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.Native", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "10pp6lh5hlcfs3xrqg1rv7xkckkpnbvdvx0ndfqgpfqxyv99jdhd", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.native/11.0.999-cibuild0030643-beta/avalonia.native.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.ReactiveUI", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "1pl35gkpc36hydd350ch6iilyfngbg8wxw3vkx5a971761lqrgbz", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.reactiveui/11.0.999-cibuild0030643-beta/avalonia.reactiveui.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.Remote.Protocol", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "179l5w9j2hy683fhxi25q98sfgz03l48qj8mgg1asjjpqcbybgh2", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.remote.protocol/11.0.999-cibuild0030643-beta/avalonia.remote.protocol.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.Skia", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "0fvc83phdjxhfg3pndr7j178i2km5wjbm1xiplh4bvg6pwa2xypz", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.skia/11.0.999-cibuild0030643-beta/avalonia.skia.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.Themes.Fluent", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "1ch7v19xpg4nkq2aqap82sd237735g5nrp06h1i0m83kks4xz6as", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.themes.fluent/11.0.999-cibuild0030643-beta/avalonia.themes.fluent.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.Themes.Simple", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "0aify5nh31bf347k4s4d5c36mhh6yc6q4l6araq3fxb05v4pb5c0", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.themes.simple/11.0.999-cibuild0030643-beta/avalonia.themes.simple.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.Win32", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "1b86hlr25w8i3hdxxxb9qrbaf91d56vmiwm5ikywglk28c9x8zyq", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.win32/11.0.999-cibuild0030643-beta/avalonia.win32.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Avalonia.X11", - "version": "11.0.999-cibuild0030643-beta", - "sha256": "15pcbv0hw099080s2ndi7cqm3gnyzcvva3jgp8z33g4h8qaiiyvn", - "url": "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.x11/11.0.999-cibuild0030643-beta/avalonia.x11.11.0.999-cibuild0030643-beta.nupkg" - }, - { - "pname": "Devlooped.SponsorLink", - "version": "0.9.6", - "sha256": "0d6sdy4312fb9g7l3q9x78vmw4ngrzf2f961778h4zqga8nc23rm" - }, - { - "pname": "DynamicData", - "version": "7.9.5", - "sha256": "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x" - }, - { - "pname": "HarfBuzzSharp", - "version": "2.8.2.3", - "sha256": "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2" - }, - { - "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "2.8.2.3", - "sha256": "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z" - }, - { - "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "2.8.2.3", - "sha256": "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236" - }, - { - "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "2.8.2.3", - "sha256": "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36" - }, - { - "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "2.8.2.3", - "sha256": "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74" - }, - { - "pname": "MicroCom.Runtime", - "version": "0.11.0", - "sha256": "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m" - }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "sha256": "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3" - }, - { - "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.0.0", - "sha256": "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8" - }, - { - "pname": "Microsoft.CodeAnalysis.Common", - "version": "3.8.0", - "sha256": "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "3.8.0", - "sha256": "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", - "version": "3.8.0", - "sha256": "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw" - }, - { - "pname": "Microsoft.CodeAnalysis.Scripting.Common", - "version": "3.8.0", - "sha256": "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk" - }, - { - "pname": "Microsoft.CSharp", - "version": "4.3.0", - "sha256": "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb" - }, - { - "pname": "Microsoft.CSharp", - "version": "4.7.0", - "sha256": "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.1.2", - "sha256": "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" - }, - { - "pname": "Microsoft.VisualStudio.Threading", - "version": "17.1.46", - "sha256": "0w7b17xh88rqzjjsy66gg2kfaqmg7sdmx70sharkqb7qh3pih87m" - }, - { - "pname": "Microsoft.VisualStudio.Threading.Analyzers", - "version": "17.1.46", - "sha256": "0lgx7776ivmz0gr0whyacxpnlp6w5b80mj012a28mm79r1qxpf60" - }, - { - "pname": "Microsoft.VisualStudio.Validation", - "version": "17.0.53", - "sha256": "0y34dvc5z6ash2cpp69mclb3wr52fd8khsmm61sv7lkql0pg03ki" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n" - }, - { - "pname": "Microsoft.Win32.SystemEvents", - "version": "6.0.0", - "sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p" - }, - { - "pname": "Nerdbank.Streams", - "version": "2.9.112", - "sha256": "1i10xr5zm9vapfzvimim9gn2pm9vgnsnb44sq3b0162r0k572rrp" - }, - { - "pname": "ReactiveUI", - "version": "18.3.1", - "sha256": "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn" - }, - { - "pname": "Serilog", - "version": "2.10.0", - "sha256": "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v" - }, - { - "pname": "Serilog.Sinks.File", - "version": "5.0.1-dev-00947", - "sha256": "153vi3xjy65ixfr8nfs59n0bmgj0jxfyydmhjs8h3apr9f29lbh4" - }, - { - "pname": "SkiaSharp", - "version": "2.88.3", - "sha256": "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv" - }, - { - "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.3", - "sha256": "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q" - }, - { - "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.3", - "sha256": "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph" - }, - { - "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.3", - "sha256": "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx" - }, - { - "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.3", - "sha256": "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q" - }, - { - "pname": "Splat", - "version": "14.4.1", - "sha256": "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b" - }, - { - "pname": "StrongInject", - "version": "1.4.5-ci-20220524-023137", - "sha256": "1ksiv5rs22j193sxwjvdc4vhblikka9z8hhs705f4mi1r4q0x1ha" - }, - { - "pname": "System.Collections", - "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" - }, - { - "pname": "System.Collections.Immutable", - "version": "5.0.0", - "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r" - }, - { - "pname": "System.ComponentModel.Annotations", - "version": "4.5.0", - "sha256": "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" - }, - { - "pname": "System.Drawing.Common", - "version": "6.0.0", - "sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.3.0", - "sha256": "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" - }, - { - "pname": "System.IO.Pipelines", - "version": "6.0.3", - "sha256": "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.3.0", - "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59" - }, - { - "pname": "System.ObjectModel", - "version": "4.3.0", - "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2" - }, - { - "pname": "System.Reactive", - "version": "5.0.0", - "sha256": "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.3.0", - "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq" - }, - { - "pname": "System.Reflection.Metadata", - "version": "5.0.0", - "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.3.0", - "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.7.1", - "sha256": "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" - }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "4.5.1", - "sha256": "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" - }, - { - "pname": "System.Threading.Channels", - "version": "7.0.0", - "sha256": "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153" - }, - { - "pname": "ThisAssembly.AssemblyInfo", - "version": "1.2.9", - "sha256": "1pilnin62fb2frmybl3n0xvxn1xpr8bymbzialspl6cbw2xvag97" - }, - { - "pname": "ThisAssembly.Prerequisites", - "version": "1.2.9", - "sha256": "0skk9sk8lc4dn9rmykz337n5apg76if9l327q7787fabisr9rbw7" - }, - { - "pname": "Tmds.DBus.Protocol", - "version": "0.13.0", - "sha256": "1r5lc8x3iq795l7vnyzs3shvpqz92fldkayvkqmrfjxnqmy0w3kg" - }, - { - "pname": "Tmds.DBus.SourceGenerator", - "version": "0.0.2", - "sha256": "03q0fja30216npb3hd39iapr9psriz2k35lymaf4921195y40fiq" - }, - { - "pname": "XamlNameReferenceGenerator", - "version": "1.6.1", - "sha256": "0348gj9g5rl0pj2frx4vscj6602gfyn9ba3i1rmfcrxh9jwwa09m" - }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "6.0.31", - "hash": "sha256-rVxnpwa8B1weEzkJIxm+todHXrSdIT3KY38D09MncUI=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "6.0.31", - "hash": "sha256-z6HNgiyLyXN5+QlktIZmOQh9D4KRHWd6yonmKChEji4=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "6.0.31", - "hash": "sha256-Rq97wUeAD2bZhe0XRLB9Ffq1MBU/u4Yq45KwRLz7DRQ=" - }, - { - "pname": "Microsoft.CSharp", - "version": "4.7.0", - "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "6.0.31", - "hash": "sha256-mjS1IKBwxDFT2UmcyC5ZMIQ3mWSADw887CIV0pZhQRc=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "6.0.31", - "hash": "sha256-VifKEirDStL5vpjnEe0hGsODssK20XBX/Mm6j8G4QIM=" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "6.0.31", - "hash": "sha256-p/KpNGwJfvoWNRn057o4t8u8La2LvsmOjF0i2W1URKU=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "6.0.31", - "hash": "sha256-N3xRbF5nQo9Okixqg1mN86L7VB72bpDR0C6wlfzntPI=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "6.0.31", - "hash": "sha256-TE1DmzoBKO9qKoATBWZPRKXBRoRzs6AafKuubeSwgl8=" - } -] diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix deleted file mode 100644 index 51e6b983ec19..000000000000 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - buildDotnetModule, - fetchFromGitHub, - - dotnetCorePackages, - - xdg-utils, -}: - -buildDotnetModule rec { - pname = "beatsabermodmanager"; - version = "0.0.5"; - - src = fetchFromGitHub { - owner = "affederaffe"; - repo = "BeatSaberModManager"; - rev = "v${version}"; - hash = "sha256-HHWC+MAwJ+AMCuBzSuR7FbW3k+wLri0B9J1DftyfNEU="; - fetchSubmodules = true; # It vendors BSIPA-Linux - }; - - dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0-bin - sdk_6_0-bin - ]; - - dotnet-runtime = dotnetCorePackages.runtime_7_0-bin; - - projectFile = [ "BeatSaberModManager/BeatSaberModManager.csproj" ]; - - executables = [ "BeatSaberModManager" ]; - - nugetDeps = ./deps.json; - - preConfigureNuGet = '' - # This should really be in the upstream nuget.config - dotnet nuget add source https://api.nuget.org/v3/index.json \ - -n nuget.org --configfile nuget.config - ''; - - # Required for OneClick - makeWrapperArgs = [ - ''--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}"'' - ]; - - meta = with lib; { - description = "Yet another mod installer for Beat Saber, heavily inspired by ModAssistant"; - mainProgram = "BeatSaberModManager"; - homepage = "https://github.com/affederaffe/BeatSaberModManager"; - longDescription = '' - BeatSaberModManager is yet another mod installer for Beat Saber, heavily inspired by ModAssistant - It strives to look more visually appealing and support both Windows and Linux, while still being as feature-rich as ModAssistant. - - Features - - - Windows and Linux support - - Dependency resolution - - Installed mod detection - - Mod uninstallation - - Theming support - - OneClick™ support for BeatSaver, ModelSaber and Playlists - ''; - license = licenses.mit; - maintainers = with maintainers; [ atemu ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/by-name/be/below/package.nix b/pkgs/by-name/be/below/package.nix index 9478efa68fd3..684dbda9eca7 100644 --- a/pkgs/by-name/be/below/package.nix +++ b/pkgs/by-name/be/below/package.nix @@ -11,19 +11,24 @@ rustPlatform.buildRustPackage rec { pname = "below"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "below"; - rev = "v${version}"; - sha256 = "sha256-87Fdx3Jqi3dNWM5DZl+UYs031qn2DoiiWd3IysT/glQ="; + tag = "v${version}"; + hash = "sha256-tPweJFqhZMOL+M08bDjW6HPmtuhr9IXJNP0c938O7Cg="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-iRDe3zg7tfEYGLCRY6bJ6OdoT8ej0MB/vteCIf5xqNA="; + # Upstream forgot to commit an up-to-date lockfile. + cargoPatches = [ ./update-Cargo.lock.patch ]; - prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service''; + useFetchCargoVendor = true; + cargoHash = "sha256-uNeWdsvJtkUz3E1NL10heDC7B55yKzDMMYzRhEE32EQ="; + + prePatch = '' + sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service + ''; postInstall = '' install -d $out/lib/systemd/system install -t $out/lib/systemd/system etc/below.service @@ -48,11 +53,11 @@ rustPlatform.buildRustPackage rec { # needs /sys/fs/cgroup doCheck = false; - meta = with lib; { - platforms = platforms.linux; - maintainers = with maintainers; [ globin ]; + meta = { + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ globin ]; description = "Time traveling resource monitor for modern Linux systems"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://github.com/facebookincubator/below"; mainProgram = "below"; }; diff --git a/pkgs/by-name/be/below/update-Cargo.lock.patch b/pkgs/by-name/be/below/update-Cargo.lock.patch new file mode 100644 index 000000000000..74c7c1b3e659 --- /dev/null +++ b/pkgs/by-name/be/below/update-Cargo.lock.patch @@ -0,0 +1,3079 @@ +diff --git a/Cargo.lock b/Cargo.lock +index e1f0f1f4..851b1b36 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,39 +1,40 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "addr2line" +-version = "0.21.0" ++version = "0.24.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" ++checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" + dependencies = [ + "gimli", + ] + + [[package]] +-name = "adler" +-version = "1.0.2" ++name = "adler2" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + + [[package]] + name = "ahash" +-version = "0.8.0" ++version = "0.8.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57e6e951cfbb2db8de1828d49073a113a29fd7117b1596caa781a258c7e38d72" ++checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" + dependencies = [ + "cfg-if", +- "getrandom", ++ "getrandom 0.2.15", + "once_cell", + "version_check", ++ "zerocopy 0.7.35", + ] + + [[package]] + name = "aho-corasick" +-version = "1.0.5" ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" ++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" + dependencies = [ + "memchr", + ] +@@ -55,104 +56,95 @@ dependencies = [ + + [[package]] + name = "anstream" +-version = "0.6.13" ++version = "0.6.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" ++checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" + dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", ++ "is_terminal_polyfill", + "utf8parse", + ] + + [[package]] + name = "anstyle" +-version = "1.0.1" ++version = "1.0.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" ++checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + + [[package]] + name = "anstyle-parse" +-version = "0.2.1" ++version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" ++checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" + dependencies = [ + "utf8parse", + ] + + [[package]] + name = "anstyle-query" +-version = "1.0.0" ++version = "1.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" ++checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" + dependencies = [ +- "windows-sys 0.48.0", ++ "windows-sys 0.59.0", + ] + + [[package]] + name = "anstyle-wincon" +-version = "3.0.2" ++version = "3.0.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" ++checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" + dependencies = [ + "anstyle", +- "windows-sys 0.52.0", ++ "once_cell", ++ "windows-sys 0.59.0", + ] + + [[package]] + name = "anyhow" +-version = "1.0.80" ++version = "1.0.97" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" ++checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" + + [[package]] + name = "async-trait" +-version = "0.1.71" ++version = "0.1.88" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" ++checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", +-] +- +-[[package]] +-name = "atty" +-version = "0.2.14" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +-dependencies = [ +- "hermit-abi 0.1.19", +- "libc", +- "winapi", ++ "syn 2.0.100", + ] + + [[package]] + name = "autocfg" +-version = "1.1.0" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + + [[package]] + name = "backtrace" +-version = "0.3.69" ++version = "0.3.74" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" ++checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" + dependencies = [ + "addr2line", +- "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", ++ "windows-targets 0.52.6", + ] + + [[package]] + name = "below" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "anyhow", + "below-common", +@@ -182,27 +174,26 @@ dependencies = [ + "tar", + "tempfile", + "tokio", +- "uzers", + ] + + [[package]] + name = "below-btrfs" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "below-common", + "libc", +- "nix 0.25.0", ++ "nix", + "openat", + "rand", + "rand_distr", + "serde", + "slog", +- "thiserror", ++ "thiserror 2.0.12", + ] + + [[package]] + name = "below-common" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "anyhow", + "chrono", +@@ -218,19 +209,19 @@ dependencies = [ + + [[package]] + name = "below-config" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "anyhow", + "below-btrfs", + "cgroupfs", + "serde", + "tempfile", +- "toml 0.8.6", ++ "toml", + ] + + [[package]] + name = "below-dump" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "anyhow", + "below-common", +@@ -246,21 +237,21 @@ dependencies = [ + "slog", + "tar", + "tempfile", +- "toml 0.8.6", ++ "toml", + ] + + [[package]] + name = "below-ethtool" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ +- "nix 0.25.0", ++ "nix", + "serde", +- "thiserror", ++ "thiserror 2.0.12", + ] + + [[package]] + name = "below-gpu-stats" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "below-common", + "serde", +@@ -268,7 +259,7 @@ dependencies = [ + + [[package]] + name = "below-model" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "anyhow", + "async-trait", +@@ -281,7 +272,7 @@ dependencies = [ + "cgroupfs", + "enum-iterator", + "fb_procfs", +- "futures 0.3.30", ++ "futures 0.3.31", + "hostname", + "os_info", + "regex", +@@ -293,7 +284,7 @@ dependencies = [ + + [[package]] + name = "below-render" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "below-common", + "below-model", +@@ -301,19 +292,19 @@ dependencies = [ + + [[package]] + name = "below-store" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "anyhow", + "below-common", + "below-model", +- "bitflags 2.4.0", ++ "bitflags 2.9.0", + "bytes", + "humantime", + "itertools", + "lazy_static", + "maplit", + "memmap2", +- "nix 0.25.0", ++ "nix", + "paste", + "serde", + "serde_cbor", +@@ -327,20 +318,19 @@ dependencies = [ + + [[package]] + name = "below-tc" +-version = "0.0.1" ++version = "0.9.0" + dependencies = [ + "netlink-packet-core", + "netlink-packet-route", +- "netlink-packet-utils", + "netlink-sys", +- "nix 0.27.1", ++ "nix", + "serde", +- "thiserror", ++ "thiserror 2.0.12", + ] + + [[package]] + name = "below-view" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "anyhow", + "below-common", +@@ -348,10 +338,11 @@ dependencies = [ + "below-render", + "below-store", + "chrono", +- "crossterm 0.27.0", ++ "crossterm 0.28.1", + "cursive", + "cursive_buffered_backend", + "enum-iterator", ++ "fb_procfs", + "humantime", + "itertools", + "libc", +@@ -359,12 +350,12 @@ dependencies = [ + "serde", + "slog", + "tempfile", +- "toml 0.8.6", ++ "toml", + ] + + [[package]] + name = "below_derive" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "proc-macro2", + "quote", +@@ -379,18 +370,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "bitflags" +-version = "2.4.0" ++version = "2.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" ++checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" + dependencies = [ + "serde", + ] + + [[package]] + name = "bumpalo" +-version = "3.11.1" ++version = "3.17.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" ++checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" + + [[package]] + name = "byteorder" +@@ -400,27 +391,27 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + + [[package]] + name = "bytes" +-version = "1.6.0" ++version = "1.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" ++checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + dependencies = [ + "serde", + ] + + [[package]] + name = "camino" +-version = "1.1.1" ++version = "1.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" ++checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" + dependencies = [ + "serde", + ] + + [[package]] + name = "cargo-platform" +-version = "0.1.2" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" ++checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" + dependencies = [ + "serde", + ] +@@ -436,17 +427,18 @@ dependencies = [ + "semver", + "serde", + "serde_json", +- "thiserror", ++ "thiserror 1.0.69", + ] + + [[package]] + name = "cc" +-version = "1.0.90" ++version = "1.2.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" ++checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" + dependencies = [ + "jobserver", + "libc", ++ "shlex", + ] + + [[package]] +@@ -455,36 +447,43 @@ version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + ++[[package]] ++name = "cfg_aliases" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" ++ + [[package]] + name = "cgroupfs" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ +- "nix 0.25.0", ++ "below-common", ++ "nix", + "openat", + "paste", + "serde", + "tempfile", +- "thiserror", ++ "thiserror 2.0.12", + ] + + [[package]] + name = "chrono" +-version = "0.4.29" ++version = "0.4.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d87d9d13be47a5b7c3907137f1290b0459a7f80efb26be8c52afb11963bccb02" ++checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" + dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", +- "windows-targets 0.48.0", ++ "windows-link", + ] + + [[package]] + name = "clap" +-version = "4.5.4" ++version = "4.5.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" ++checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83" + dependencies = [ + "clap_builder", + "clap_derive", +@@ -492,124 +491,104 @@ dependencies = [ + + [[package]] + name = "clap_builder" +-version = "4.5.2" ++version = "4.5.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" ++checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" + dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +- "terminal_size 0.3.0", ++ "terminal_size", + "unicase", +- "unicode-width", ++ "unicode-width 0.2.0", + ] + + [[package]] + name = "clap_complete" +-version = "4.5.1" ++version = "4.5.46" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" ++checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98" + dependencies = [ + "clap", + ] + + [[package]] + name = "clap_derive" +-version = "4.5.4" ++version = "4.5.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" ++checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" + dependencies = [ +- "heck 0.5.0", ++ "heck", + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.100", + ] + + [[package]] + name = "clap_lex" +-version = "0.7.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +- +-[[package]] +-name = "codespan-reporting" +-version = "0.11.1" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +-dependencies = [ +- "termcolor", +- "unicode-width", +-] ++checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + + [[package]] + name = "colorchoice" +-version = "1.0.0" ++version = "1.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" ++checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + + [[package]] + name = "console" +-version = "0.15.2" ++version = "0.15.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" ++checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" + dependencies = [ + "encode_unicode", +- "lazy_static", + "libc", +- "terminal_size 0.1.17", +- "unicode-width", +- "winapi", ++ "once_cell", ++ "unicode-width 0.2.0", ++ "windows-sys 0.59.0", + ] + + [[package]] + name = "core-foundation-sys" +-version = "0.8.3" ++version = "0.8.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" ++checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + + [[package]] + name = "crossbeam-channel" +-version = "0.5.6" ++version = "0.5.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" ++checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" + dependencies = [ +- "cfg-if", + "crossbeam-utils", + ] + + [[package]] + name = "crossbeam-deque" +-version = "0.8.2" ++version = "0.8.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" ++checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" + dependencies = [ +- "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", + ] + + [[package]] + name = "crossbeam-epoch" +-version = "0.9.11" ++version = "0.9.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" ++checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" + dependencies = [ +- "autocfg", +- "cfg-if", + "crossbeam-utils", +- "memoffset 0.6.5", +- "scopeguard", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.8.12" ++version = "0.8.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +-dependencies = [ +- "cfg-if", +-] ++checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + + [[package]] + name = "crossterm" +@@ -620,7 +599,7 @@ dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi", + "libc", +- "mio", ++ "mio 0.8.11", + "parking_lot", + "signal-hook", + "signal-hook-mio", +@@ -629,16 +608,16 @@ dependencies = [ + + [[package]] + name = "crossterm" +-version = "0.27.0" ++version = "0.28.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" ++checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.9.0", + "crossterm_winapi", + "futures-core", +- "libc", +- "mio", ++ "mio 1.0.3", + "parking_lot", ++ "rustix 0.38.44", + "signal-hook", + "signal-hook-mio", + "winapi", +@@ -669,28 +648,28 @@ dependencies = [ + "log", + "signal-hook", + "unicode-segmentation", +- "unicode-width", ++ "unicode-width 0.1.14", + ] + + [[package]] + name = "cursive_buffered_backend" +-version = "0.6.1" ++version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e902dfdc09ca6729606f45a5ce6ce4ef9637fc257e8b11ca7806fc9aabd03cf7" ++checksum = "cf6287f9e06f44558a3264976e70c51187482a0271d48abfd88f0d3af18d3ee6" + dependencies = [ + "cursive_core", + "enumset", + "log", + "smallvec", + "unicode-segmentation", +- "unicode-width", ++ "unicode-width 0.2.0", + ] + + [[package]] + name = "cursive_core" +-version = "0.3.5" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e8c04587ebe2dc513de481bfaadd99edef636269b3b722ad11db6a12307aecbe" ++checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d" + dependencies = [ + "ahash", + "crossbeam-channel", +@@ -702,59 +681,15 @@ dependencies = [ + "owning_ref", + "time", + "unicode-segmentation", +- "unicode-width", ++ "unicode-width 0.1.14", + "xi-unicode", + ] + +-[[package]] +-name = "cxx" +-version = "1.0.80" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" +-dependencies = [ +- "cc", +- "cxxbridge-flags", +- "cxxbridge-macro", +- "link-cplusplus", +-] +- +-[[package]] +-name = "cxx-build" +-version = "1.0.80" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" +-dependencies = [ +- "cc", +- "codespan-reporting", +- "once_cell", +- "proc-macro2", +- "quote", +- "scratch", +- "syn 1.0.109", +-] +- +-[[package]] +-name = "cxxbridge-flags" +-version = "1.0.80" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" +- +-[[package]] +-name = "cxxbridge-macro" +-version = "1.0.80" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn 1.0.109", +-] +- + [[package]] + name = "darling" +-version = "0.14.2" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" ++checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" + dependencies = [ + "darling_core", + "darling_macro", +@@ -762,26 +697,35 @@ dependencies = [ + + [[package]] + name = "darling_core" +-version = "0.14.2" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" ++checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" + dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", +- "syn 1.0.109", ++ "syn 2.0.100", + ] + + [[package]] + name = "darling_macro" +-version = "0.14.2" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" ++checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" + dependencies = [ + "darling_core", + "quote", +- "syn 1.0.109", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "deranged" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" ++dependencies = [ ++ "powerfmt", + ] + + [[package]] +@@ -807,145 +751,136 @@ dependencies = [ + + [[package]] + name = "either" +-version = "1.8.0" ++version = "1.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" ++checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + + [[package]] + name = "encode_unicode" +-version = "0.3.6" ++version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" ++checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + + [[package]] + name = "enum-iterator" +-version = "1.4.1" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" ++checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" + dependencies = [ + "enum-iterator-derive", + ] + + [[package]] + name = "enum-iterator-derive" +-version = "1.2.1" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" ++checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.100", + ] + + [[package]] + name = "enum-map" +-version = "2.4.1" ++version = "2.7.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f5a56d54c8dd9b3ad34752ed197a4eb2a6601bc010808eb097a04a58ae4c43e1" ++checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" + dependencies = [ + "enum-map-derive", + ] + + [[package]] + name = "enum-map-derive" +-version = "0.10.0" ++version = "0.17.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a9045e2676cd5af83c3b167d917b0a5c90a4d8e266e2683d6631b235c457fc27" ++checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.109", ++ "syn 2.0.100", + ] + + [[package]] + name = "enumset" +-version = "1.0.12" ++version = "1.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "19be8061a06ab6f3a6cf21106c873578bf01bd42ad15e0311a9c76161cb1c753" ++checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" + dependencies = [ + "enumset_derive", + ] + + [[package]] + name = "enumset_derive" +-version = "0.6.1" ++version = "0.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "03e7b551eba279bf0fa88b83a46330168c1560a52a94f5126f892f0b364ab3e0" ++checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" + dependencies = [ + "darling", + "proc-macro2", + "quote", +- "syn 1.0.109", ++ "syn 2.0.100", + ] + + [[package]] + name = "equivalent" +-version = "1.0.0" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" ++checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + + [[package]] + name = "erased-serde" +-version = "0.3.23" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "54558e0ba96fbe24280072642eceb9d7d442e32c7ec0ea9e7ecd7b4ea2cf4e11" ++checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" + dependencies = [ + "serde", + ] + + [[package]] + name = "errno" +-version = "0.3.1" ++version = "0.3.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" ++checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" + dependencies = [ +- "errno-dragonfly", +- "libc", +- "windows-sys 0.48.0", +-] +- +-[[package]] +-name = "errno-dragonfly" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +-dependencies = [ +- "cc", + "libc", ++ "windows-sys 0.59.0", + ] + + [[package]] + name = "fastrand" +-version = "2.0.1" ++version = "2.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" ++checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + + [[package]] + name = "fb_procfs" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ ++ "below-common", + "lazy_static", + "libc", +- "nix 0.25.0", ++ "nix", + "openat", ++ "parking_lot", + "serde", + "slog", + "slog-term", + "tempfile", +- "thiserror", ++ "thiserror 2.0.12", + "threadpool", + ] + + [[package]] + name = "filetime" +-version = "0.2.18" ++version = "0.2.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" ++checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" + dependencies = [ + "cfg-if", + "libc", +- "redox_syscall 0.2.16", +- "windows-sys 0.42.0", ++ "libredox", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -962,9 +897,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + + [[package]] + name = "futures" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" ++checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" + dependencies = [ + "futures-channel", + "futures-core", +@@ -977,9 +912,9 @@ dependencies = [ + + [[package]] + name = "futures-channel" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" ++checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" + dependencies = [ + "futures-core", + "futures-sink", +@@ -987,15 +922,15 @@ dependencies = [ + + [[package]] + name = "futures-core" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" ++checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + + [[package]] + name = "futures-executor" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" ++checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" + dependencies = [ + "futures-core", + "futures-task", +@@ -1004,38 +939,38 @@ dependencies = [ + + [[package]] + name = "futures-io" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" ++checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + + [[package]] + name = "futures-macro" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" ++checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.100", + ] + + [[package]] + name = "futures-sink" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" ++checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + + [[package]] + name = "futures-task" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" ++checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + + [[package]] + name = "futures-util" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" ++checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" + dependencies = [ + "futures 0.1.31", + "futures-channel", +@@ -1052,38 +987,44 @@ dependencies = [ + + [[package]] + name = "getrandom" +-version = "0.2.8" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" ++checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" + dependencies = [ + "cfg-if", + "libc", +- "wasi", ++ "wasi 0.11.0+wasi-snapshot-preview1", + ] + + [[package]] +-name = "gimli" +-version = "0.28.1" ++name = "getrandom" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" ++checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "r-efi", ++ "wasi 0.14.2+wasi-0.2.4", ++] + + [[package]] +-name = "half" +-version = "1.8.2" ++name = "gimli" ++version = "0.31.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" ++checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + + [[package]] +-name = "hashbrown" +-version = "0.14.0" ++name = "half" ++version = "1.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" ++checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + + [[package]] +-name = "heck" +-version = "0.4.0" ++name = "hashbrown" ++version = "0.15.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" ++checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + + [[package]] + name = "heck" +@@ -1093,18 +1034,15 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + + [[package]] + name = "hermit-abi" +-version = "0.1.19" ++version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +-dependencies = [ +- "libc", +-] ++checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + + [[package]] + name = "hermit-abi" +-version = "0.3.9" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" ++checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" + + [[package]] + name = "hostname" +@@ -1119,32 +1057,31 @@ dependencies = [ + + [[package]] + name = "humantime" +-version = "2.1.0" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" ++checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" + + [[package]] + name = "iana-time-zone" +-version = "0.1.53" ++version = "0.1.61" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" ++checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" + dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", +- "winapi", ++ "windows-core", + ] + + [[package]] + name = "iana-time-zone-haiku" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" ++checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" + dependencies = [ +- "cxx", +- "cxx-build", ++ "cc", + ] + + [[package]] +@@ -1155,9 +1092,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + + [[package]] + name = "indexmap" +-version = "2.0.0" ++version = "2.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" ++checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" + dependencies = [ + "equivalent", + "hashbrown", +@@ -1165,84 +1102,90 @@ dependencies = [ + + [[package]] + name = "indicatif" +-version = "0.17.6" ++version = "0.17.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" ++checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" + dependencies = [ + "console", +- "instant", ++ "futures-core", + "number_prefix", + "portable-atomic", + "rayon", + "tokio", + "unicode-segmentation", +- "unicode-width", ++ "unicode-width 0.2.0", ++ "web-time", + ] + + [[package]] +-name = "instant" +-version = "0.1.12" ++name = "is-terminal" ++version = "0.4.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" + dependencies = [ +- "cfg-if", ++ "hermit-abi 0.5.0", ++ "libc", ++ "windows-sys 0.59.0", + ] + ++[[package]] ++name = "is_terminal_polyfill" ++version = "1.70.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" ++ + [[package]] + name = "itertools" +-version = "0.11.0" ++version = "0.14.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" ++checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" + dependencies = [ + "either", + ] + + [[package]] + name = "itoa" +-version = "1.0.4" ++version = "1.0.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" ++checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + + [[package]] + name = "jobserver" +-version = "0.1.25" ++version = "0.1.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" ++checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" + dependencies = [ + "libc", + ] + + [[package]] + name = "js-sys" +-version = "0.3.60" ++version = "0.3.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" ++checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" + dependencies = [ ++ "once_cell", + "wasm-bindgen", + ] + + [[package]] + name = "lazy_static" +-version = "1.4.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + + [[package]] + name = "libbpf-cargo" +-version = "0.23.0" ++version = "0.25.0-beta.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d230f1634d0ef9f5708bcf644c3644c357ee324649c3001d50ef4250fb3af9df" ++checksum = "d78971d366f266fd02f310b68e8cbf08ebaa35d7dd458ba98360448d8bb25467" + dependencies = [ + "anyhow", + "cargo_metadata", + "clap", + "libbpf-rs", +- "libbpf-sys", + "memmap2", +- "num_enum", + "regex", +- "scroll", +- "scroll_derive", + "semver", + "serde", + "serde_json", +@@ -1251,63 +1194,67 @@ dependencies = [ + + [[package]] + name = "libbpf-rs" +-version = "0.23.0" ++version = "0.25.0-beta.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e289c054443e63d3f09d4ee53044c4311166f3df31b7835a29995a6c3b03c18d" ++checksum = "ad0b2c8f481a850c965da7642f3a844c6d32d7f8709b5afb74c5f6bff1e37582" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.9.0", + "libbpf-sys", + "libc", +- "num_enum", +- "strum_macros", +- "thiserror", + "vsprintf", + ] + + [[package]] + name = "libbpf-sys" +-version = "1.4.0+v1.4.0" ++version = "1.5.0+v1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a4ee5f6d35341ad5d492fd92466c45ff11d6e8104ffa8208f62450875c93e258" ++checksum = "2d8306b516a70a129cb6afed17c1e51e162d35aadfcc6339364addcebe32de90" + dependencies = [ + "cc", +- "nix 0.27.1", +- "num_cpus", ++ "nix", + "pkg-config", + ] + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.171" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" + + [[package]] + name = "libm" +-version = "0.2.5" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" ++checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" + + [[package]] +-name = "link-cplusplus" +-version = "1.0.7" ++name = "libredox" ++version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" ++checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" + dependencies = [ +- "cc", ++ "bitflags 2.9.0", ++ "libc", ++ "redox_syscall", + ] + + [[package]] + name = "linux-raw-sys" +-version = "0.4.10" ++version = "0.4.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" ++checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" ++ ++[[package]] ++name = "linux-raw-sys" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" + + [[package]] + name = "lock_api" +-version = "0.4.9" ++version = "0.4.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" ++checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" + dependencies = [ + "autocfg", + "scopeguard", +@@ -1315,9 +1262,9 @@ dependencies = [ + + [[package]] + name = "log" +-version = "0.4.21" ++version = "0.4.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" ++checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" + + [[package]] + name = "maplit" +@@ -1333,9 +1280,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + + [[package]] + name = "memchr" +-version = "2.6.3" ++version = "2.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" ++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + + [[package]] + name = "memmap2" +@@ -1346,15 +1293,6 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "memoffset" +-version = "0.6.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +-dependencies = [ +- "autocfg", +-] +- + [[package]] + name = "memoffset" + version = "0.9.1" +@@ -1366,11 +1304,11 @@ dependencies = [ + + [[package]] + name = "miniz_oxide" +-version = "0.7.2" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" ++checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" + dependencies = [ +- "adler", ++ "adler2", + ] + + [[package]] +@@ -1381,10 +1319,22 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" + dependencies = [ + "libc", + "log", +- "wasi", ++ "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "mio" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" ++dependencies = [ ++ "libc", ++ "log", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++ "windows-sys 0.52.0", ++] ++ + [[package]] + name = "netlink-packet-core" + version = "0.7.0" +@@ -1419,14 +1369,14 @@ dependencies = [ + "anyhow", + "byteorder", + "paste", +- "thiserror", ++ "thiserror 1.0.69", + ] + + [[package]] + name = "netlink-sys" +-version = "0.8.5" ++version = "0.8.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" ++checksum = "16c903aa70590cb93691bf97a767c8d1d6122d2cc9070433deb3bbf36ce8bd23" + dependencies = [ + "bytes", + "libc", +@@ -1435,35 +1385,22 @@ dependencies = [ + + [[package]] + name = "nix" +-version = "0.25.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" +-dependencies = [ +- "autocfg", +- "bitflags 1.3.2", +- "cfg-if", +- "libc", +- "memoffset 0.6.5", +- "pin-utils", +-] +- +-[[package]] +-name = "nix" +-version = "0.27.1" ++version = "0.29.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" ++checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.9.0", + "cfg-if", ++ "cfg_aliases", + "libc", +- "memoffset 0.9.1", ++ "memoffset", + ] + + [[package]] + name = "num" +-version = "0.4.0" ++version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" ++checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" + dependencies = [ + "num-complex", + "num-integer", +@@ -1474,28 +1411,33 @@ dependencies = [ + + [[package]] + name = "num-complex" +-version = "0.4.2" ++version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" ++checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" + dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" +-version = "0.1.45" ++version = "0.1.46" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" ++checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" + dependencies = [ +- "autocfg", + "num-traits", + ] + + [[package]] + name = "num-iter" +-version = "0.1.43" ++version = "0.1.45" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" ++checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" + dependencies = [ + "autocfg", + "num-integer", +@@ -1504,20 +1446,19 @@ dependencies = [ + + [[package]] + name = "num-rational" +-version = "0.4.1" ++version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" ++checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" + dependencies = [ +- "autocfg", + "num-integer", + "num-traits", + ] + + [[package]] + name = "num-traits" +-version = "0.2.15" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" ++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" + dependencies = [ + "autocfg", + "libm", +@@ -1533,32 +1474,11 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "num_enum" +-version = "0.5.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +-dependencies = [ +- "num_enum_derive", +-] +- +-[[package]] +-name = "num_enum_derive" +-version = "0.5.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +-dependencies = [ +- "proc-macro-crate", +- "proc-macro2", +- "quote", +- "syn 1.0.109", +-] +- + [[package]] + name = "num_threads" +-version = "0.1.6" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" + dependencies = [ + "libc", + ] +@@ -1571,18 +1491,18 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + + [[package]] + name = "object" +-version = "0.32.2" ++version = "0.36.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" ++checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" + dependencies = [ + "memchr", + ] + + [[package]] + name = "once_cell" +-version = "1.15.0" ++version = "1.21.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" ++checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" + + [[package]] + name = "openat" +@@ -1595,13 +1515,13 @@ dependencies = [ + + [[package]] + name = "os_info" +-version = "3.5.1" ++version = "3.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" ++checksum = "2a604e53c24761286860eba4e2c8b23a0161526476b1de520139d69cdb85a6b5" + dependencies = [ + "log", + "serde", +- "winapi", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1615,9 +1535,9 @@ dependencies = [ + + [[package]] + name = "parking_lot" +-version = "0.12.1" ++version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" ++checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" + dependencies = [ + "lock_api", + "parking_lot_core", +@@ -1625,28 +1545,28 @@ dependencies = [ + + [[package]] + name = "parking_lot_core" +-version = "0.9.4" ++version = "0.9.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" ++checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" + dependencies = [ + "cfg-if", + "libc", +- "redox_syscall 0.2.16", ++ "redox_syscall", + "smallvec", +- "windows-sys 0.42.0", ++ "windows-targets 0.52.6", + ] + + [[package]] + name = "paste" +-version = "1.0.14" ++version = "1.0.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" ++checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + + [[package]] + name = "pin-project-lite" +-version = "0.2.13" ++version = "0.2.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" ++checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + + [[package]] + name = "pin-utils" +@@ -1656,9 +1576,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + + [[package]] + name = "pkg-config" +-version = "0.3.30" ++version = "0.3.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" ++checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + + [[package]] + name = "plain" +@@ -1668,9 +1588,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + + [[package]] + name = "portable-atomic" +-version = "1.3.2" ++version = "1.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" ++checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + + [[package]] + name = "portpicker" +@@ -1682,40 +1602,44 @@ dependencies = [ + ] + + [[package]] +-name = "ppv-lite86" +-version = "0.2.16" ++name = "powerfmt" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + + [[package]] +-name = "proc-macro-crate" +-version = "1.2.1" ++name = "ppv-lite86" ++version = "0.2.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" ++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" + dependencies = [ +- "once_cell", +- "thiserror", +- "toml 0.5.8", ++ "zerocopy 0.8.23", + ] + + [[package]] + name = "proc-macro2" +-version = "1.0.78" ++version = "1.0.94" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" ++checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" + dependencies = [ + "unicode-ident", + ] + + [[package]] + name = "quote" +-version = "1.0.35" ++version = "1.0.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" ++checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" + dependencies = [ + "proc-macro2", + ] + ++[[package]] ++name = "r-efi" ++version = "5.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" ++ + [[package]] + name = "rand" + version = "0.8.5" +@@ -1743,7 +1667,7 @@ version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + dependencies = [ +- "getrandom", ++ "getrandom 0.2.15", + ] + + [[package]] +@@ -1758,62 +1682,49 @@ dependencies = [ + + [[package]] + name = "rayon" +-version = "1.5.3" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" ++checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" + dependencies = [ +- "autocfg", +- "crossbeam-deque", + "either", + "rayon-core", + ] + + [[package]] + name = "rayon-core" +-version = "1.9.3" ++version = "1.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" ++checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" + dependencies = [ +- "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", +- "num_cpus", +-] +- +-[[package]] +-name = "redox_syscall" +-version = "0.2.16" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +-dependencies = [ +- "bitflags 1.3.2", + ] + + [[package]] + name = "redox_syscall" +-version = "0.4.1" ++version = "0.5.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" ++checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.9.0", + ] + + [[package]] + name = "redox_users" +-version = "0.4.3" ++version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" ++checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" + dependencies = [ +- "getrandom", +- "redox_syscall 0.2.16", +- "thiserror", ++ "getrandom 0.2.15", ++ "libredox", ++ "thiserror 1.0.69", + ] + + [[package]] + name = "regex" +-version = "1.9.5" ++version = "1.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" ++checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" + dependencies = [ + "aho-corasick", + "memchr", +@@ -1823,9 +1734,9 @@ dependencies = [ + + [[package]] + name = "regex-automata" +-version = "0.3.8" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" ++checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" + dependencies = [ + "aho-corasick", + "memchr", +@@ -1834,53 +1745,66 @@ dependencies = [ + + [[package]] + name = "regex-syntax" +-version = "0.7.5" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" ++checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + + [[package]] + name = "resctrlfs" +-version = "0.8.1" ++version = "0.9.0" + dependencies = [ + "maplit", +- "nix 0.25.0", ++ "nix", + "openat", + "paste", + "serde", + "tempfile", +- "thiserror", ++ "thiserror 2.0.12", + ] + + [[package]] + name = "rustc-demangle" +-version = "0.1.23" ++version = "0.1.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" ++checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + + [[package]] + name = "rustix" +-version = "0.38.21" ++version = "0.38.44" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" ++checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.9.0", + "errno", + "libc", +- "linux-raw-sys", +- "windows-sys 0.48.0", ++ "linux-raw-sys 0.4.15", ++ "windows-sys 0.59.0", ++] ++ ++[[package]] ++name = "rustix" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825" ++dependencies = [ ++ "bitflags 2.9.0", ++ "errno", ++ "libc", ++ "linux-raw-sys 0.9.3", ++ "windows-sys 0.59.0", + ] + + [[package]] + name = "rustversion" +-version = "1.0.9" ++version = "1.0.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" ++checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" + + [[package]] + name = "ryu" +-version = "1.0.11" ++version = "1.0.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" ++checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + + [[package]] + name = "same-file" +@@ -1893,47 +1817,24 @@ dependencies = [ + + [[package]] + name = "scopeguard" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +- +-[[package]] +-name = "scratch" +-version = "1.0.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +- +-[[package]] +-name = "scroll" +-version = "0.11.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +- +-[[package]] +-name = "scroll_derive" +-version = "0.11.0" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn 1.0.109", +-] ++checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + + [[package]] + name = "semver" +-version = "1.0.14" ++version = "1.0.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" ++checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" + dependencies = [ + "serde", + ] + + [[package]] + name = "serde" +-version = "1.0.188" ++version = "1.0.219" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" ++checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" + dependencies = [ + "serde_derive", + ] +@@ -1950,35 +1851,42 @@ dependencies = [ + + [[package]] + name = "serde_derive" +-version = "1.0.188" ++version = "1.0.219" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" ++checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.100", + ] + + [[package]] + name = "serde_json" +-version = "1.0.100" ++version = "1.0.140" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" ++checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" + dependencies = [ + "itoa", ++ "memchr", + "ryu", + "serde", + ] + + [[package]] + name = "serde_spanned" +-version = "0.6.4" ++version = "0.6.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" ++checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" + dependencies = [ + "serde", + ] + ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ + [[package]] + name = "signal-hook" + version = "0.3.17" +@@ -1991,29 +1899,30 @@ dependencies = [ + + [[package]] + name = "signal-hook-mio" +-version = "0.2.3" ++version = "0.2.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" ++checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" + dependencies = [ + "libc", +- "mio", ++ "mio 0.8.11", ++ "mio 1.0.3", + "signal-hook", + ] + + [[package]] + name = "signal-hook-registry" +-version = "1.4.0" ++version = "1.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" ++checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" + dependencies = [ + "libc", + ] + + [[package]] + name = "slab" +-version = "0.4.7" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" ++checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" + dependencies = [ + "autocfg", + ] +@@ -2029,11 +1938,11 @@ dependencies = [ + + [[package]] + name = "slog-term" +-version = "2.9.0" ++version = "2.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "87d29185c55b7b258b4f120eab00f48557d4d9bc814f41713f449d35b0f8977c" ++checksum = "b6e022d0b998abfe5c3782c1f03551a596269450ccd677ea51c56f8b214610e8" + dependencies = [ +- "atty", ++ "is-terminal", + "slog", + "term", + "thread_local", +@@ -2042,15 +1951,15 @@ dependencies = [ + + [[package]] + name = "smallvec" +-version = "1.10.0" ++version = "1.14.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" ++checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" + + [[package]] + name = "socket2" +-version = "0.5.6" ++version = "0.5.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" ++checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" + dependencies = [ + "libc", + "windows-sys 0.52.0", +@@ -2070,22 +1979,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + + [[package]] + name = "strsim" +-version = "0.11.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +- +-[[package]] +-name = "strum_macros" +-version = "0.24.3" ++version = "0.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +-dependencies = [ +- "heck 0.4.0", +- "proc-macro2", +- "quote", +- "rustversion", +- "syn 1.0.109", +-] ++checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + + [[package]] + name = "syn" +@@ -2100,9 +1996,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.52" ++version = "2.0.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" ++checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" + dependencies = [ + "proc-macro2", + "quote", +@@ -2111,9 +2007,9 @@ dependencies = [ + + [[package]] + name = "tar" +-version = "0.4.40" ++version = "0.4.44" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" ++checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" + dependencies = [ + "filetime", + "libc", +@@ -2122,15 +2018,15 @@ dependencies = [ + + [[package]] + name = "tempfile" +-version = "3.8.1" ++version = "3.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" ++checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600" + dependencies = [ +- "cfg-if", + "fastrand", +- "redox_syscall 0.4.1", +- "rustix", +- "windows-sys 0.48.0", ++ "getrandom 0.3.2", ++ "once_cell", ++ "rustix 1.0.2", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -2145,60 +2041,62 @@ dependencies = [ + ] + + [[package]] +-name = "termcolor" +-version = "1.1.3" ++name = "terminal_size" ++version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" ++checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed" + dependencies = [ +- "winapi-util", ++ "rustix 1.0.2", ++ "windows-sys 0.59.0", + ] + + [[package]] +-name = "terminal_size" +-version = "0.1.17" ++name = "thiserror" ++version = "1.0.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" + dependencies = [ +- "libc", +- "winapi", ++ "thiserror-impl 1.0.69", + ] + + [[package]] +-name = "terminal_size" +-version = "0.3.0" ++name = "thiserror" ++version = "2.0.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" ++checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" + dependencies = [ +- "rustix", +- "windows-sys 0.48.0", ++ "thiserror-impl 2.0.12", + ] + + [[package]] +-name = "thiserror" +-version = "1.0.57" ++name = "thiserror-impl" ++version = "1.0.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" + dependencies = [ +- "thiserror-impl", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.57" ++version = "2.0.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" ++checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.100", + ] + + [[package]] + name = "thread_local" +-version = "1.1.4" ++version = "1.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" ++checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" + dependencies = [ ++ "cfg-if", + "once_cell", + ] + +@@ -2213,13 +2111,16 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.16" ++version = "0.3.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fab5c8b9980850e06d92ddbe3ab839c062c801f3927c0fb8abd6fc8e918fbca" ++checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618" + dependencies = [ ++ "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -2227,64 +2128,55 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.0" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" ++checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + + [[package]] + name = "time-macros" +-version = "0.2.5" ++version = "0.2.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "65bb801831d812c562ae7d2bfb531f26e66e4e1f6b17307ba4149c5064710e5b" ++checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04" + dependencies = [ ++ "num-conv", + "time-core", + ] + + [[package]] + name = "tokio" +-version = "1.37.0" ++version = "1.44.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" ++checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" + dependencies = [ + "backtrace", + "bytes", + "libc", +- "mio", +- "num_cpus", ++ "mio 1.0.3", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "tokio-macros" +-version = "2.2.0" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" ++checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", +-] +- +-[[package]] +-name = "toml" +-version = "0.5.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +-dependencies = [ +- "serde", ++ "syn 2.0.100", + ] + + [[package]] + name = "toml" +-version = "0.8.6" ++version = "0.8.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" ++checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" + dependencies = [ + "serde", + "serde_spanned", +@@ -2294,18 +2186,18 @@ dependencies = [ + + [[package]] + name = "toml_datetime" +-version = "0.6.5" ++version = "0.6.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" ++checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + dependencies = [ + "serde", + ] + + [[package]] + name = "toml_edit" +-version = "0.20.7" ++version = "0.22.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" ++checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" + dependencies = [ + "indexmap", + "serde", +@@ -2316,9 +2208,9 @@ dependencies = [ + + [[package]] + name = "tracing" +-version = "0.1.40" ++version = "0.1.41" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" ++checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" + dependencies = [ + "pin-project-lite", + "tracing-core", +@@ -2326,61 +2218,54 @@ dependencies = [ + + [[package]] + name = "tracing-core" +-version = "0.1.32" ++version = "0.1.33" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" ++checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" + dependencies = [ + "once_cell", + ] + + [[package]] + name = "unicase" +-version = "2.6.0" ++version = "2.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +-dependencies = [ +- "version_check", +-] ++checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" + + [[package]] + name = "unicode-ident" +-version = "1.0.5" ++version = "1.0.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" ++checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + + [[package]] + name = "unicode-segmentation" +-version = "1.10.0" ++version = "1.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" ++checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + + [[package]] + name = "unicode-width" +-version = "0.1.10" ++version = "0.1.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" ++checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + + [[package]] +-name = "utf8parse" +-version = "0.2.1" ++name = "unicode-width" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" ++checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + + [[package]] +-name = "uzers" +-version = "0.11.3" ++name = "utf8parse" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "76d283dc7e8c901e79e32d077866eaf599156cbf427fffa8289aecc52c5c3f63" +-dependencies = [ +- "libc", +- "log", +-] ++checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + + [[package]] + name = "version_check" +-version = "0.9.4" ++version = "0.9.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" ++checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + + [[package]] + name = "vsprintf" +@@ -2394,12 +2279,11 @@ dependencies = [ + + [[package]] + name = "walkdir" +-version = "2.3.2" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" ++checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" + dependencies = [ + "same-file", +- "winapi", + "winapi-util", + ] + +@@ -2409,36 +2293,46 @@ version = "0.11.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + ++[[package]] ++name = "wasi" ++version = "0.14.2+wasi-0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" ++dependencies = [ ++ "wit-bindgen-rt", ++] ++ + [[package]] + name = "wasm-bindgen" +-version = "0.2.83" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" ++checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" + dependencies = [ + "cfg-if", ++ "once_cell", ++ "rustversion", + "wasm-bindgen-macro", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.83" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" ++checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" + dependencies = [ + "bumpalo", + "log", +- "once_cell", + "proc-macro2", + "quote", +- "syn 1.0.109", ++ "syn 2.0.100", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.83" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" ++checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -2446,22 +2340,35 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.83" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" ++checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.109", ++ "syn 2.0.100", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.83" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" ++checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "web-time" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] + + [[package]] + name = "winapi" +@@ -2481,11 +2388,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" +-version = "0.1.5" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" + dependencies = [ +- "winapi", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -2495,27 +2402,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] +-name = "windows-sys" +-version = "0.42.0" ++name = "windows-core" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" ++checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" + dependencies = [ +- "windows_aarch64_gnullvm 0.42.2", +- "windows_aarch64_msvc 0.42.2", +- "windows_i686_gnu 0.42.2", +- "windows_i686_msvc 0.42.2", +- "windows_x86_64_gnu 0.42.2", +- "windows_x86_64_gnullvm 0.42.2", +- "windows_x86_64_msvc 0.42.2", ++ "windows-targets 0.52.6", + ] + ++[[package]] ++name = "windows-link" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" ++ + [[package]] + name = "windows-sys" + version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" + dependencies = [ +- "windows-targets 0.48.0", ++ "windows-targets 0.48.5", + ] + + [[package]] +@@ -2524,181 +2431,165 @@ version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" + dependencies = [ +- "windows-targets 0.52.4", ++ "windows-targets 0.52.6", + ] + + [[package]] +-name = "windows-targets" +-version = "0.48.0" ++name = "windows-sys" ++version = "0.59.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" ++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" + dependencies = [ +- "windows_aarch64_gnullvm 0.48.0", +- "windows_aarch64_msvc 0.48.0", +- "windows_i686_gnu 0.48.0", +- "windows_i686_msvc 0.48.0", +- "windows_x86_64_gnu 0.48.0", +- "windows_x86_64_gnullvm 0.48.0", +- "windows_x86_64_msvc 0.48.0", ++ "windows-targets 0.52.6", + ] + + [[package]] + name = "windows-targets" +-version = "0.52.4" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" ++checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" + dependencies = [ +- "windows_aarch64_gnullvm 0.52.4", +- "windows_aarch64_msvc 0.52.4", +- "windows_i686_gnu 0.52.4", +- "windows_i686_msvc 0.52.4", +- "windows_x86_64_gnu 0.52.4", +- "windows_x86_64_gnullvm 0.52.4", +- "windows_x86_64_msvc 0.52.4", ++ "windows_aarch64_gnullvm 0.48.5", ++ "windows_aarch64_msvc 0.48.5", ++ "windows_i686_gnu 0.48.5", ++ "windows_i686_msvc 0.48.5", ++ "windows_x86_64_gnu 0.48.5", ++ "windows_x86_64_gnullvm 0.48.5", ++ "windows_x86_64_msvc 0.48.5", + ] + + [[package]] +-name = "windows_aarch64_gnullvm" +-version = "0.42.2" ++name = "windows-targets" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.6", ++ "windows_aarch64_msvc 0.52.6", ++ "windows_i686_gnu 0.52.6", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc 0.52.6", ++ "windows_x86_64_gnu 0.52.6", ++ "windows_x86_64_gnullvm 0.52.6", ++ "windows_x86_64_msvc 0.52.6", ++] + + [[package]] + name = "windows_aarch64_gnullvm" +-version = "0.48.0" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" ++checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + + [[package]] + name = "windows_aarch64_gnullvm" +-version = "0.52.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +- +-[[package]] +-name = "windows_aarch64_msvc" +-version = "0.42.2" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + + [[package]] + name = "windows_aarch64_msvc" +-version = "0.48.0" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" ++checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + + [[package]] + name = "windows_aarch64_msvc" +-version = "0.52.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +- +-[[package]] +-name = "windows_i686_gnu" +-version = "0.42.2" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + + [[package]] + name = "windows_i686_gnu" +-version = "0.48.0" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" ++checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + + [[package]] + name = "windows_i686_gnu" +-version = "0.52.4" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + + [[package]] +-name = "windows_i686_msvc" +-version = "0.42.2" ++name = "windows_i686_gnullvm" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + + [[package]] + name = "windows_i686_msvc" +-version = "0.48.0" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" ++checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + + [[package]] + name = "windows_i686_msvc" +-version = "0.52.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +- +-[[package]] +-name = "windows_x86_64_gnu" +-version = "0.42.2" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + + [[package]] + name = "windows_x86_64_gnu" +-version = "0.48.0" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" ++checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + + [[package]] + name = "windows_x86_64_gnu" +-version = "0.52.4" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + + [[package]] + name = "windows_x86_64_gnullvm" +-version = "0.42.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +- +-[[package]] +-name = "windows_x86_64_gnullvm" +-version = "0.48.0" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" ++checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + + [[package]] + name = "windows_x86_64_gnullvm" +-version = "0.52.4" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + + [[package]] + name = "windows_x86_64_msvc" +-version = "0.42.2" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" ++checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + + [[package]] + name = "windows_x86_64_msvc" +-version = "0.48.0" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + + [[package]] +-name = "windows_x86_64_msvc" +-version = "0.52.4" ++name = "winnow" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" ++checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" ++dependencies = [ ++ "memchr", ++] + + [[package]] +-name = "winnow" +-version = "0.5.18" ++name = "wit-bindgen-rt" ++version = "0.39.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" ++checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" + dependencies = [ +- "memchr", ++ "bitflags 2.9.0", + ] + + [[package]] + name = "xattr" +-version = "1.0.1" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" ++checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e" + dependencies = [ + "libc", ++ "rustix 1.0.2", + ] + + [[package]] +@@ -2707,29 +2598,69 @@ version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + ++[[package]] ++name = "zerocopy" ++version = "0.7.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" ++dependencies = [ ++ "zerocopy-derive 0.7.35", ++] ++ ++[[package]] ++name = "zerocopy" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6" ++dependencies = [ ++ "zerocopy-derive 0.8.23", ++] ++ ++[[package]] ++name = "zerocopy-derive" ++version = "0.7.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "zerocopy-derive" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ + [[package]] + name = "zstd" +-version = "0.13.0" ++version = "0.13.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" ++checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" + dependencies = [ + "zstd-safe", + ] + + [[package]] + name = "zstd-safe" +-version = "7.0.0" ++version = "7.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" ++checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722" + dependencies = [ + "zstd-sys", + ] + + [[package]] + name = "zstd-sys" +-version = "2.0.9+zstd.1.5.5" ++version = "2.0.14+zstd.1.5.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" ++checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5" + dependencies = [ + "cc", + "pkg-config", diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix index 58f068425009..cc1097687bee 100644 --- a/pkgs/by-name/be/benthos/package.nix +++ b/pkgs/by-name/be/benthos/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "benthos"; - version = "4.44.1"; + version = "4.45.1"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "benthos"; tag = "v${version}"; - hash = "sha256-gOx//AZ3fnz6f4BH+Dpc0jovW1LSSpr10T/j8S6Stvs="; + hash = "sha256-pbbeVNpGCjLxhesq88aoeTnaawMgDTCx0wDA6Y2sXsM="; }; proxyVendor = true; @@ -22,7 +22,7 @@ buildGoModule rec { "cmd/benthos" ]; - vendorHash = "sha256-tYsRq355W3ZPfcSWOQyF87isq14/qdR72ZfhzberTz0="; + vendorHash = "sha256-1XEIZemPo8IuSpakTr7Zy4Jqd/vukL5ORuW/5tA6otw="; # doCheck = false; diff --git a/pkgs/by-name/bi/bitbox-bridge/package.nix b/pkgs/by-name/bi/bitbox-bridge/package.nix new file mode 100644 index 000000000000..3da2739e3df4 --- /dev/null +++ b/pkgs/by-name/bi/bitbox-bridge/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + libudev-zero, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "bitbox-bridge"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "BitBoxSwiss"; + repo = "bitbox-bridge"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-+pMXWXGHyyBx3N0kiro9NS0mPmSQzzBmp+pkoBLH7z0="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-6vD0XjGH1PXjiRjgnHWSZSixXOc2Yecui8U5FAGefBU="; + + postPatch = '' + rm .cargo/config.toml + ''; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libudev-zero + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' + mkdir -p $out/lib/systemd/user + substitute bitbox-bridge/release/linux/bitbox-bridge.service $out/lib/systemd/user/bitbox-bridge.service \ + --replace-fail /opt/bitbox-bridge/bin/bitbox-bridge $out/bin/bitbox-bridge + install -Dm644 bitbox-bridge/release/linux/hid-digitalbitbox.rules $out/lib/udev/rules.d/50-hid-digitalbitbox.rules + ''; + + meta = { + description = "A bridge service that connects web wallets like Rabby to BitBox02"; + homepage = "https://github.com/BitBoxSwiss/bitbox-bridge"; + downloadPage = "https://bitbox.swiss/download/"; + changelog = "https://github.com/BitBoxSwiss/bitbox-bridge/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + izelnakri + tensor5 + ]; + mainProgram = "bitbox-bridge"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 9053b614d712..9f7da212c2c1 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -51,7 +51,7 @@ buildNpmPackage rec { npmFlags = [ "--legacy-peer-deps" ]; npmRebuildFlags = [ - # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 + # we'll run npm rebuild manually later "--ignore-scripts" ]; @@ -60,6 +60,11 @@ buildNpmPackage rec { shopt -s globstar rm -r node_modules/**/prebuilds shopt -u globstar + + # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 + rm -r node_modules/esbuild node_modules/vite/node_modules/esbuild + + npm rebuild --verbose ''; postBuild = '' diff --git a/pkgs/by-name/bl/blend2d/package.nix b/pkgs/by-name/bl/blend2d/package.nix index dd5867950e9c..6963e12f5b9d 100644 --- a/pkgs/by-name/bl/blend2d/package.nix +++ b/pkgs/by-name/bl/blend2d/package.nix @@ -8,16 +8,13 @@ stdenv.mkDerivation { pname = "blend2d"; - # Note: this is an outdated version for pdf4qt, but vcpkg also uses it - # See 'Commit Hashes' in https://blend2d.com/download.html for newest - # If the newest version is needed, we can rename this package. - version = "0.10"; + version = "0.12"; src = fetchFromGitHub { owner = "blend2d"; repo = "blend2d"; - rev = "452d549751188b04367b5af46c040cb737f5f76c"; - hash = "sha256-LDhnXsp/V1A3YqVyjBVaL7/V6Nhts/1E9hRhl2P293o="; + rev = "717cbf4bc0f2ca164cf2f0c48f0497779241b6c5"; + hash = "sha256-L3wDsjy0cocncZqKLy8in2yirrFJoqU3tFBfeBxlhs0="; }; outputs = [ diff --git a/pkgs/by-name/bl/blobfuse/package.nix b/pkgs/by-name/bl/blobfuse/package.nix index 6ec9a31943f4..2eb2b7b2a6ba 100644 --- a/pkgs/by-name/bl/blobfuse/package.nix +++ b/pkgs/by-name/bl/blobfuse/package.nix @@ -5,22 +5,23 @@ fuse3, testers, blobfuse, + nix-update-script, }: let - version = "2.1.2"; + version = "2.4.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-fuse"; rev = "blobfuse2-${version}"; - sha256 = "sha256-KzpD+6g1WwviydYE0v5pSH35zC41MrPlk5MitwAIgnE="; + sha256 = "sha256-QCrBsEh8o4GblCWNcJssm9c6uSQYVs+qrdzfmI9l278="; }; in buildGoModule { pname = "blobfuse"; inherit version src; - vendorHash = "sha256-+Z+mkTs/8qCtYcWZIMzsW9MQsC08KDJUHNbxyc6Ro5Y="; + vendorHash = "sha256-ZzpstCTABL9x5NM5tTiWZqOfI+BSKGZfb+ahbFUmcdo="; buildInputs = [ fuse3 ]; @@ -28,7 +29,10 @@ buildGoModule { # https://github.com/NixOS/nixpkgs/pull/201196/files#diff-e669dbe391f8856f4564f26023fe147a7b720aeefe6869ab7a218f02a8247302R20 doCheck = false; - passthru.tests.version = testers.testVersion { package = blobfuse; }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = blobfuse; }; + }; meta = with lib; { description = "Mount an Azure Blob storage as filesystem through FUSE"; diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix index cfc172cf4832..b794a28a68c0 100644 --- a/pkgs/by-name/bl/bloop/package.nix +++ b/pkgs/by-name/bl/bloop/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "2.0.8"; + version = "2.0.9"; platform = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then - "sha256-ItPt5qjfRgtPNg6a/Zlc0ASfdvGXMMKV7SqNEOQ9u28=" + "sha256-mslCzvJ+z5VNQkVa9HXjw2bUBprMgs3bAy3RmEt8OlI=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then - "sha256-zUSDUwZY1id/WFuC87Wa4eB48X4rmXvVC1/b2v5bhw4=" + "sha256-XdMPo9O7ADhInmGFIOHihl1z4yPKAyDjCH7m3tCtKNo=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then - "sha256-1wsGL1G8/+xMvYNwe7EOyqEuEKDKiwA7yyyjfbGgxJQ=" + "sha256-sJM00f2KBI6fnVj3U/h/pYAFT7QjZkfJ7ubDfFlRJ0Q=" else throw "unsupported platform"; }; diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix index 061b22ce330a..8a617c992502 100644 --- a/pkgs/by-name/bl/bluespec/package.nix +++ b/pkgs/by-name/bl/bluespec/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { src/comp/wrapper.sh substituteInPlace src/comp/Makefile \ - --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils' + --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules' # For darwin # ld: library not found for -ltcl8.5 @@ -172,12 +172,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/B-Lang-org/bsc"; license = lib.licenses.bsd3; platforms = [ + "aarch64-linux" "x86_64-linux" - "aarch64-darwin" - ]; + ] ++ lib.platforms.darwin; mainProgram = "bsc"; - # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 - # aarch64 fails, as GHC fails with "ghc: could not execute: opt" maintainers = with lib.maintainers; [ jcumming thoughtpolice diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index 6b3a1d35b2b7..fa8533ecc983 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -87,14 +87,14 @@ in let bolt = stdenv.mkDerivation (finalAttrs: { pname = "bolt-launcher"; - version = "0.9.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "AdamCake"; repo = "bolt"; - rev = finalAttrs.version; + tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-LIlRDcUWbQwIhFjtqYF+oVpTOPZ7IT0vMgysEVyJ1k8="; + hash = "sha256-fNCi2Wu+oOL6p8IBm6bHZ/rcaFmqoKs2DnXQ+ZA9McE="; }; nativeBuildInputs = [ @@ -154,8 +154,8 @@ let desktopName = "Bolt Launcher"; genericName = finalAttrs.pname; comment = "An alternative launcher for RuneScape"; - exec = "${finalAttrs.pname}-${finalAttrs.version}"; - icon = finalAttrs.pname; + exec = "bolt-launcher"; + icon = "bolt-launcher"; categories = [ "Game" ]; }) ]; diff --git a/pkgs/by-name/bo/bonmin/package.nix b/pkgs/by-name/bo/bonmin/package.nix index a38f3a6b4de5..8104e34ad4bd 100644 --- a/pkgs/by-name/bo/bonmin/package.nix +++ b/pkgs/by-name/bo/bonmin/package.nix @@ -57,12 +57,6 @@ stdenv.mkDerivation rec { "--with-asl-lib=-lipoptamplinterface -lamplsolver" ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - # Fix doc install. Should not be necessary after next release # ref https://github.com/coin-or/Bonmin/commit/4f665bc9e489a73cb867472be9aea518976ecd28 sourceRoot = "${src.name}/Bonmin"; diff --git a/pkgs/by-name/bo/bootil/package.nix b/pkgs/by-name/bo/bootil/package.nix index a3157202b36d..55c9d5bc5680 100644 --- a/pkgs/by-name/bo/bootil/package.nix +++ b/pkgs/by-name/bo/bootil/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, premake4, + zlib, }: stdenv.mkDerivation { @@ -16,12 +17,18 @@ stdenv.mkDerivation { sha256 = "1njdj6nvmwf7j2fwqbyvd1cf5l52797vk2wnsliylqdzqcjmfpij"; }; + enableParallelBuilding = true; + # Avoid guessing where files end up. Just use current directory. postPatch = '' substituteInPlace projects/premake4.lua \ - --replace 'location ( os.get() .. "/" .. _ACTION )' 'location ( ".." )' + --replace-fail 'location ( os.get() .. "/" .. _ACTION )' 'location ( ".." )' substituteInPlace projects/bootil.lua \ - --replace 'targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )' 'targetdir ( ".." )' + --replace-fail 'targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )' 'targetdir ( ".." )' + + rm src/3rdParty/zlib -rf + mkdir src/3rdParty/zlib + cp -r ${zlib.dev}/include/z{conf,lib}.h src/3rdParty/zlib ''; nativeBuildInputs = [ premake4 ]; diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index 475edb9ad0c1..6456f44e3e6e 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { [ flexmock pytestCheckHook - pytest-cov + pytest-cov-stub ] ++ optional-dependencies.apprise; @@ -40,11 +40,6 @@ python3Packages.buildPythonApplication rec { "test_borgmatic_version_matches_news_version" ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '--cov-fail-under=100' "" - ''; - nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/bp/bpftune/package.nix b/pkgs/by-name/bp/bpftune/package.nix index c2ccdd2d2825..8f3ca13e6329 100644 --- a/pkgs/by-name/bp/bpftune/package.nix +++ b/pkgs/by-name/bp/bpftune/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-03-20"; src = fetchFromGitHub { owner = "oracle"; repo = "bpftune"; - rev = "744bd48eccb536d6e9c782f635130dbf322e8a32"; - hash = "sha256-pjFqq5KeG1ptTEo8ENiqC/QkDPqQG4VPR2GDvcBPwH8="; + rev = "8c6a3ffc09265bd44ed89b75c400ef97959d1aff"; + hash = "sha256-TQ8WaGvMcvyeZC4B9gSjJ2k5NOxpTaV4n7Qi36aA78Q="; }; postPatch = '' diff --git a/pkgs/by-name/br/brev-cli/package.nix b/pkgs/by-name/br/brev-cli/package.nix index ba7099c14194..56b073b39a32 100644 --- a/pkgs/by-name/br/brev-cli/package.nix +++ b/pkgs/by-name/br/brev-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.306"; + version = "0.6.307"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EzLEaLNbFyVaFMwjCvwyScdh62HG+3ZiCjVBnWzaLzk="; + sha256 = "sha256-GGrhe+fdu6wiZCWo6tn6qdRgRGLnJmsuGmg9M6iFF5w="; }; vendorHash = "sha256-DMkBRya1Dxn8mcpuG/vtIt+v/9iVmb58iNe3fPY/xv4="; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 04e735ba0feb..225a17ac89bf 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.44.7"; + version = "1.45.0"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; rev = "v${version}"; - hash = "sha256-GaOPC1lIu48qFo99AQ99f49e8qH/TEQubpluptLc0jY="; + hash = "sha256-Hif+ynwOxiZBAiNdbaU5SpI9s0yNxtH0qXXMfGO21H0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-J7zc1aTH62nL96cSb9CiIk8uJdR7nk9EnERiAfMvqNM="; + cargoHash = "sha256-Cw0Bh8S04oUlbbn3O3+uBoHEgh82XIcGQSGqkZFOc78="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index cec8d5f38c60..2590dbd75854 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -17,20 +17,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "1.39.1"; + version = "1.40.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-WPbiQWfGE4rFxb/Xazxm+nu+RINLTQk7PnrLuY6giX0="; + hash = "sha256-8Uo3eGF555yoBQxpq1cF9JLK9jkYVMHG+6eFFX1NO3U="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-SIx2qIWqR1K9K2eUHo5tADdz4vk5ySdSWDBAjBFIVVc="; + npmDepsHash = "sha256-6L/SFdHykhBQgB7bi4w+y4Lc+uLIdM4WSmGS0H6Dz4U="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = diff --git a/pkgs/by-name/bs/bsc/package.nix b/pkgs/by-name/bs/bsc/package.nix index 1b3870af5a1b..274e258dba34 100644 --- a/pkgs/by-name/bs/bsc/package.nix +++ b/pkgs/by-name/bs/bsc/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bsc"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "IlyaGrebnov"; repo = "libbsc"; tag = "v${finalAttrs.version}"; - hash = "sha256-k+uGPcr5LNxKAtIICLJU1uIWDP/tvT05v/Oc0NHUQ+E="; + hash = "sha256-iUFKTDSAg2/57TPvR0nlmfVN2Z6O9kZKIg+BQQKvr/o="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/bt/btanks/package.nix b/pkgs/by-name/bt/btanks/package.nix index 95c58f9ef018..795733f2a24b 100644 --- a/pkgs/by-name/bt/btanks/package.nix +++ b/pkgs/by-name/bt/btanks/package.nix @@ -6,7 +6,9 @@ fetchpatch, fetchurl, libGL, + libGLU, libvorbis, + libX11, lua, pkg-config, scons, @@ -62,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: { SDL_image expat libGL + libGLU + libX11 libvorbis lua smpeg diff --git a/pkgs/by-name/bu/buffybox/package.nix b/pkgs/by-name/bu/buffybox/package.nix index 4d5e8b7f1c63..734edca31ddc 100644 --- a/pkgs/by-name/bu/buffybox/package.nix +++ b/pkgs/by-name/bu/buffybox/package.nix @@ -1,5 +1,6 @@ { fetchFromGitLab, + fetchpatch2, inih, lib, libdrm, @@ -15,17 +16,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "buffybox"; - version = "3.2.0-unstable-2025-03-12"; + version = "3.2.0-unstable-2025-03-16"; src = fetchFromGitLab { domain = "gitlab.postmarketos.org"; owner = "postmarketOS"; repo = "buffybox"; fetchSubmodules = true; # to use its vendored lvgl - rev = "3196e47d519c78b56a8d4b75ad7a280c92c91d23"; - hash = "sha256-Zl/QmOJbY/lxoCYD6SpUHiiTTDOStUSn3+6xOuiGGBo="; + rev = "56a9867e90ece88596e330774da64cf277069b59"; + hash = "sha256-4lSgswcvvV6W1KN6QhsjeHY8MMXXC4fRYBmPE/hb0vA="; }; + patches = [ + (fetchpatch2 { + # https://gitlab.postmarketos.org/postmarketOS/buffybox/-/merge_requests/42 + url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/1f0c30e88dc61b8b508696cd890393c3b7911b58.patch?full_index=1"; + hash = "sha256-hQ6Hjfyj059j2cRfrFz9Se6xRowIGW1HVHULLYtHcS8="; + }) + ]; + depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix index 5fe645989999..f114e89fed58 100644 --- a/pkgs/by-name/bu/buildpack/package.nix +++ b/pkgs/by-name/bu/buildpack/package.nix @@ -7,7 +7,7 @@ let pname = "pack"; - version = "0.36.4"; + version = "0.37.0"; in buildGoModule { inherit pname version; @@ -16,10 +16,10 @@ buildGoModule { owner = "buildpacks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6cWmBNlmPnNszmv6zaHlyd8GqncMtttKOMfQxxJGJ18="; + hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0="; }; - vendorHash = "sha256-9fO/jwTpVvCdHIy1GrE2YZr7jN7Oyw64EbS2w08VOVI="; + vendorHash = "sha256-W8FTk2eJYaTE9gCRwrT+mDhda/ZZeCytqQ9vvVZZHSQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/bu/bump-my-version/package.nix b/pkgs/by-name/bu/bump-my-version/package.nix new file mode 100644 index 000000000000..5c20bae0a3bb --- /dev/null +++ b/pkgs/by-name/bu/bump-my-version/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication bump-my-version diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 2da9223144ec..2481b5a236b7 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2025.1.4"; + version = "2025.1.5"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-NpWqrdUaxPvU4O2MplLTRfnqOB2yC/zQJx7o9stjKCU="; + hash = "sha256-QTYeiM2hyZpvSu5oE2wrNrF3qFkp4JJnQftOg3BJqZA="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-jLwI9r1l/bf2R7BOImEnbW3iLgsF+/1n0/N55Jx8Lzw="; + hash = "sha256-vIcBRsylS+ftSq5x0HDe6Zb8dtVUtWw6hENBITYmzyQ="; }; src = fetchurl { diff --git a/pkgs/by-name/c-/c-intro-and-ref/package.nix b/pkgs/by-name/c-/c-intro-and-ref/package.nix index b1b212e1c765..bdc17ec47a98 100644 --- a/pkgs/by-name/c-/c-intro-and-ref/package.nix +++ b/pkgs/by-name/c-/c-intro-and-ref/package.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "c-intro-and-ref"; - version = "0.0-unstable-2024-08-31"; + version = "0-unstable-2025-03-09"; src = fetchFromSavannah { repo = "c-intro-and-ref"; - rev = "62962013107481127176ef04d69826e41f51313c"; - hash = "sha256-Fmli3x8zvPntvCvV/wbEkxWzW9uDMZgCElPkKo9TS6Y="; + rev = "11723f5d07331708985dfd3eb9b05163dde990e5"; + hash = "sha256-quTeOQKTX/Aq78vMJPsjVQyisADzWm9mtLE1HoJByl4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index d7f9d0046e02..2f23bf695f38 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2025-03-10"; + version = "0-unstable-2025-03-19"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "4dcd20e615ef370c5dfc63c1386c9ee7fe666d83"; - hash = "sha256-4vu3Im0vXYfpfPIXDIKmd6rSqZPnC9CUMdW5fZBejfY="; + rev = "085b88f6f44902b9905569b783630b9ed28fbc1e"; + hash = "sha256-Ma2cK431EyrfhsF6xpCEr6DkeqoxoQclO1iRNMcF9i4="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix index ee39c2207230..9334d336e364 100644 --- a/pkgs/by-name/ca/capnproto/package.nix +++ b/pkgs/by-name/ca/capnproto/package.nix @@ -1,13 +1,34 @@ { + binutils, lib, - stdenv, + clangStdenv, fetchFromGitHub, cmake, openssl, zlib, }: -stdenv.mkDerivation rec { +let + # HACK: work around https://github.com/NixOS/nixpkgs/issues/177129 + # Though this is an issue between Clang and GCC, + # so it may not get fixed anytime soon... + empty-libgcc_eh = clangStdenv.mkDerivation { + pname = "empty-libgcc_eh"; + version = "0"; + dontUnpack = true; + installPhase = '' + mkdir -p "$out"/lib + "${binutils}"/bin/ar r "$out"/lib/libgcc_eh.a + ''; + }; +in + +# NOTE: This must be `clang` because `gcc` is known to miscompile or ICE while +# compiling `capnproto` coroutines. +# +# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102051 +# See: https://gerrit.lix.systems/c/lix/+/1874 +clangStdenv.mkDerivation rec { pname = "capnproto"; version = "1.1.0"; @@ -23,8 +44,27 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl zlib + ] ++ lib.optional (clangStdenv.cc.isClang && clangStdenv.targetPlatform.isStatic) empty-libgcc_eh; + + # FIXME: separate the binaries from the stuff that user systems actually use + # This runs into a terrible UX issue in Lix and I just don't want to debug it + # right now for the couple MB of closure size: + # https://git.lix.systems/lix-project/lix/issues/551 + # outputs = [ "bin" "dev" "out" ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + # Take optimization flags from CXXFLAGS rather than cmake injecting them + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None") ]; + env = { + # Required to build the coroutine library + CXXFLAGS = "-std=c++20"; + }; + + separateDebugInfo = true; + meta = with lib; { homepage = "https://capnproto.org/"; description = "Cap'n Proto cerealization protocol"; @@ -35,6 +75,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; platforms = platforms.all; - maintainers = [ ]; + maintainers = lib.teams.lix.members; }; } diff --git a/pkgs/by-name/ca/caprice32/package.nix b/pkgs/by-name/ca/caprice32/package.nix index a5dde1c577e3..0b173cbe4af3 100644 --- a/pkgs/by-name/ca/caprice32/package.nix +++ b/pkgs/by-name/ca/caprice32/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, desktop-file-utils, + libGLU, libpng, pkg-config, SDL, @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { pkg-config ]; buildInputs = [ + libGLU libpng SDL freetype diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index d31854978aa9..a26dd2a00038 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -8,19 +8,19 @@ buildGoModule rec { pname = "carapace-bridge"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bridge"; tag = "v${version}"; - hash = "sha256-RMItv9HAPsxnb0NGlDjqY8Of4cxf8xU1c8ZE8Ajz0ao="; + hash = "sha256-/HjoE6yaawo1hCemnvtfK3wj4SBSW91D4oyuZ5qxV4M="; }; # buildGoModule try to run `go mod vendor` instead of `go work vendor` on the # workspace if proxyVendor is off proxyVendor = true; - vendorHash = "sha256-R2sk5yqhF+5pVWxCnEx+EKTvNPzg32/JguLMu6R3ETM="; + vendorHash = "sha256-zfV5IcpwtK3n76jWs4ldMlpEqbyNmmXZWDj+fh66luw="; postPatch = '' substituteInPlace cmd/carapace-bridge/main.go \ diff --git a/pkgs/by-name/ca/cargo-3ds/package.nix b/pkgs/by-name/ca/cargo-3ds/package.nix index 3fa0edd168bd..01bd90334b72 100644 --- a/pkgs/by-name/ca/cargo-3ds/package.nix +++ b/pkgs/by-name/ca/cargo-3ds/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "cargo-3ds"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "rust3ds"; repo = "cargo-3ds"; tag = "v${version}"; - hash = "sha256-G1XSpvE94gcamvyKKzGZgj5QSwkBNbYWYdZ17ScwW90="; + hash = "sha256-APi1K5LtdHFI5kjPfZUOFcsZ/xoQixjKq5xZxwlW9CE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-X2n7htrvRPLJkQKONz26hbgXmB8JYafdG1/a0LRGEgs="; + cargoHash = "sha256-2JpBm0ahgiL4KSM4J/nQRbdo3MDZgZj6EDg7Jr5ZanA="; # Integration tests do not run in Nix build environment due to needing to # create and build Cargo workspaces. diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix index 2f1f78038bb1..6495652b190b 100644 --- a/pkgs/by-name/ca/cargo-about/package.nix +++ b/pkgs/by-name/ca/cargo-about/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.6.6"; + version = "0.7.1"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-6jza0IHdX7vyjZt1lknoVhlu7RONF5SnTdn7EDsj2oo="; + sha256 = "sha256-h5+Fp6+yGa1quJENsCv6WE4NC2A+ceIGMXVWyeTPPLQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-MXUfldlAu+SezlNi0QbqKJ/ddJiKCrs4bi4ryG68EPU="; + cargoHash = "sha256-JTcRYdBZdXxM7r+XZSbFaAeWrJ5HULM1YE3p3smRW/Q="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index a9b9f7f2f5ad..e82557f33b24 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.12.0"; + version = "1.12.2"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-EAJUscywbxYucqZEJ147FiNOHTO5umAwm5YHKC0g6yw="; + hash = "sha256-mGb6ZHi6XGYiVe0NHcBx7MWtcSDK2/wXpM4j0GiczEk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jOrnfJUxyrBfAKW/khc3w5eFauuCjN6c5GMns1eGUag="; + cargoHash = "sha256-rtDV1wAoUfZOTBSvCjqhGlyDVXJiZ+Wopgu21zJWDfw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix index bcb683354db5..df9814680e37 100644 --- a/pkgs/by-name/ca/cargo-hack/package.nix +++ b/pkgs/by-name/ca/cargo-hack/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.35"; + version = "0.6.36"; src = fetchCrate { inherit pname version; - hash = "sha256-6C3YiPgoszEvJBkaOg7URYxnEl17oGLYzl0P+m3VAAI="; + hash = "sha256-AO4bB+aqAzGxFyPhuwaEQDAbL+fCIWY2rv3QFdBAq7s="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pRZ6mmCQCaio7aW55dKSAEHeGNJoFJNUnnUGoBlmZ6w="; + cargoHash = "sha256-fWKrHo5WdeEhnPxATbZ9Cjv+aiSxOh0pRDeeHHDk8u4="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index a2fc16b7021f..1ad5df27c772 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -45,7 +45,7 @@ let }; in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { inherit pname version; # Use `fetchFromGitHub` instead of `fetchCrate` because the latter does not @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage { # Upstream doesn't include the lockfile so we need to add it back postUnpack = '' - cp ${cargoLock} source/Cargo.lock + cp ${cargoLock} ${finalAttrs.src.name}/Cargo.lock ''; useFetchCargoVendor = true; @@ -103,4 +103,4 @@ rustPlatform.buildRustPackage { # The profiler runtime is (currently) disabled on non-Linux platforms broken = !(stdenv.hostPlatform.isLinux && !stdenv.targetPlatform.isRedox); }; -} +}) diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index bbe6bd0a23e5..bb3837d4514d 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.1.9"; + version = "1.1.11"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-+FScGNBLEHO12i4szKqIU+8eYQHz3m16FeoYIuT5XDo="; + hash = "sha256-2M0C4BCDWxcLz3X1exBjGqv5Ep/XKkGEuR5fBvusShU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6qHUbfx3ej8Srp/BivuLXjQKZcCN1mNOi+aVa0Q7wtY="; + cargoHash = "sha256-ADbB5KvT0TlHAffFZiJpJDmEzwogfQi1SuA9UKL2H/U="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix index ac5ca4bc71ae..e253a5be5d1c 100644 --- a/pkgs/by-name/ca/cargo-spellcheck/package.nix +++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.15.2"; + version = "0.15.5"; src = fetchFromGitHub { owner = "drahnr"; repo = "cargo-spellcheck"; tag = "v${version}"; - hash = "sha256-KiulbQhSg5CCZlts8FLsfOrN7nz16u3gRnQrWTFAzdc="; + hash = "sha256-saRr1xEBefLoCgCxU/pyQOmmt/di+DOQHMoVc4LgRm0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-iDulfKsw3Ui5b1v7QakIcf7HXNEBlMbhbzqLekuSsUU="; + cargoHash = "sha256-MGjyoHejsUd6HCoZVlw1NDG6TE9Anh05IeObHmcnwg0="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index 159fc0b0ca04..2dc1c2ca2082 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "16.2.0"; + version = "16.2.1"; src = fetchCrate { inherit pname version; - hash = "sha256-dO8A4XAFms31hWVpZelMnDmn0sPpCh4S4byEVRYjOTI="; + hash = "sha256-Vl5ClzS3OULsd+3dlaN5iZPw2YZeBSPHWFOS+izmr7Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-DxY03sqr/upJbNm8EkoIN96SOhZr1jm/6dgtKwyDFEU="; + cargoHash = "sha256-Yq2jT8YnWPsNe7akShsj0nWxXXpgNvX1A95x7O8LOes="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/cascadia-code/package.nix b/pkgs/by-name/ca/cascadia-code/package.nix index 0451f431f1be..6537e3a013be 100644 --- a/pkgs/by-name/ca/cascadia-code/package.nix +++ b/pkgs/by-name/ca/cascadia-code/package.nix @@ -2,14 +2,15 @@ lib, stdenvNoCC, fetchzip, + useVariableFont ? false, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "cascadia-code"; version = "2407.24"; src = fetchzip { - url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; + url = "https://github.com/microsoft/cascadia-code/releases/download/v${finalAttrs.version}/CascadiaCode-${finalAttrs.version}.zip"; stripRoot = false; hash = "sha256-bCQzGCvjSQ1TXFVC3w9VPXNtjM4h7lRvljVjX/w1TJ4="; }; @@ -17,8 +18,17 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 otf/static/*.otf -t $out/share/fonts/opentype - install -Dm644 ttf/static/*.ttf -t $out/share/fonts/truetype + ${ + if useVariableFont then + '' + install -Dm644 ttf/*.ttf -t $out/share/fonts/truetype + '' + else + '' + install -Dm644 otf/static/*.otf -t $out/share/fonts/opentype + install -Dm644 ttf/static/*.ttf -t $out/share/fonts/truetype + '' + } runHook postInstall ''; @@ -31,4 +41,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ ryanccn ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 3f23e9ce702b..0aa1e5f5bf58 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.9"; + version = "1.1.11"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-p03OQAA/6WX2RJfnpFi9PYvVTBwBJX2bWxbDg+anybI="; + hash = "sha256-sCTVDz9dqlTJ7MoJfFYmEnA2KkpWzu6qune90SXmgN4="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; diff --git a/pkgs/by-name/cd/cdogs-sdl/package.nix b/pkgs/by-name/cd/cdogs-sdl/package.nix index 10fb8f13f28a..068f34472e34 100644 --- a/pkgs/by-name/cd/cdogs-sdl/package.nix +++ b/pkgs/by-name/cd/cdogs-sdl/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs-sdl"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { repo = "cdogs-sdl"; owner = "cxong"; rev = version; - sha256 = "sha256-uZPCki9G62nSrf8YfdyCfY1qgWlPT9BB2FqPicw32FM="; + sha256 = "sha256-I4v13CPdA2KYwhlIJjz+qgKe2EoXUtV6iWeadrg4Usc="; }; postPatch = '' diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix index 3cc37833a80b..d2b6324d92c4 100644 --- a/pkgs/by-name/cf/cfitsio/package.nix +++ b/pkgs/by-name/cf/cfitsio/package.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation (finalAttrs: { "--enable-reentrant" ]; + env = lib.optionalAttrs stdenv.hostPlatform.isFreeBSD { + # concerning. upstream defines XOPEN_SOURCE=700 which makes FreeBSD very insistent on + # not showing us gethostbyname() + NIX_CFLAGS_COMPILE = "-D__BSD_VISIBLE=1"; + }; + hardeningDisable = [ "format" ]; # Shared-only build @@ -58,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: { xbreak hjones2199 ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 072f6f6d1493..981ca21ecb6d 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.382"; + version = "3.2.390"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-OsLKLRjMJuDe/NH1Ttip4FjBAWo7n9GaM5CoGFvVJhI="; + hash = "sha256-sti0ufgNCsEDef4BcINJ58l25BT4xpGcpU/gGUbe5yw="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 3a7398b62182..6f32c17dbe1e 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -1,29 +1,26 @@ { lib, - stdenv, stdenvNoCC, fetchFromGitHub, cacert, yarn-berry, - nodejs, electron, makeWrapper, writableTmpDirAsHomeHook, makeDesktopItem, copyDesktopItems, - nix-update-script, commandLineArgs ? "", }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.0.1"; + version = "1.1.8"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-C8D0XCwIFWG+5WakAK+TmI4VVuIYJBSgkv5ynM2Ewkc="; + hash = "sha256-zZwweJso4KaJMXNUJ+kEvbkHOkhvvPv/IYu/evXzsWs="; }; yarnOfflineCache = stdenvNoCC.mkDerivation { @@ -36,30 +33,13 @@ stdenv.mkDerivation (finalAttrs: { writableTmpDirAsHomeHook ]; - postConfigure = - let - supportedArchitectures = builtins.toJSON { - os = [ - "darwin" - "linux" - ]; - cpu = [ - "x64" - "ia32" - "arm64" - ]; - libc = [ - "glibc" - "musl" - ]; - }; - in - '' - yarn config set enableTelemetry false - yarn config set enableGlobalCache false - yarn config set supportedArchitectures --json '${supportedArchitectures}' - yarn config set cacheFolder $out - ''; + postConfigure = '' + yarn config set enableTelemetry false + yarn config set enableGlobalCache false + yarn config set --json supportedArchitectures.os '[ "linux", "darwin" ]' + yarn config set --json supportedArchitectures.cpu '["arm", "arm64", "ia32", "x64"]' + yarn config set cacheFolder $out + ''; buildPhase = '' runHook preBuild @@ -70,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { ''; outputHashMode = "recursive"; - outputHash = "sha256-DrEkaXkbaY40uYH7niT10OFJH+PD7ip3A4OCwbKmtz8="; + outputHash = "sha256-HKtd+zdP7e/6vmlL4NS8X8gZ8AhxThtOS7taQ+iAnK0="; }; nativeBuildInputs = [ @@ -80,11 +60,7 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems ]; - env = { - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - npm_config_build_from_source = "true"; - npm_config_nodedir = nodejs; - }; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; postConfigure = '' yarn config set enableTelemetry false @@ -126,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/lib/cherry-studio cp -r dist/linux-unpacked/{resources,LICENSE*} $out/lib/cherry-studio install -Dm644 build/icon.png $out/share/pixmaps/cherry-studio.png - makeWrapper "${lib.getExe electron}" $out/bin/cherry-studio \ + makeWrapper ${lib.getExe electron} $out/bin/cherry-studio \ --inherit-argv0 \ --add-flags $out/lib/cherry-studio/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ @@ -135,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = ./update.sh; meta = { description = "Desktop client that supports for multiple LLM providers"; diff --git a/pkgs/by-name/ch/cherry-studio/update.sh b/pkgs/by-name/ch/cherry-studio/update.sh new file mode 100755 index 000000000000..78609183ed43 --- /dev/null +++ b/pkgs/by-name/ch/cherry-studio/update.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused jq nix bash coreutils nix-update + +set -eou pipefail + +latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/CherryHQ/cherry-studio/releases/latest | jq --raw-output .tag_name) +latestVersion=$(echo "$latestTag" | sed 's/^v//') + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; cherry-studio.version or (lib.getVersion cherry-studio)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +nix-update cherry-studio --version "$latestVersion" diff --git a/pkgs/by-name/ch/chglog/package.nix b/pkgs/by-name/ch/chglog/package.nix index 468ac4b66711..ddaffe0765e0 100644 --- a/pkgs/by-name/ch/chglog/package.nix +++ b/pkgs/by-name/ch/chglog/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chglog"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = "chglog"; tag = "v${version}"; - hash = "sha256-A6PqsyYfhIu3DF1smD5NRLRwISUB806hMQNtDq0G/8Y="; + hash = "sha256-i7KJB5EWq1khP4oxxXGH2tYLJ9s6MAWd1Ndfk7LV0Vc="; }; - vendorHash = "sha256-CbpSlAQLHRyT5Uo9rY/gr+F2jAcqA9M8E8+l3PncdXE="; + vendorHash = "sha256-EyA440J3QLQI+NvSZrksjIlmNOIOt1YO/5ZZMTV/GIs="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 539e6333419d..61b8766d6501 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -1,22 +1,31 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, fetchpatch2 -, cmake -, ninja -, ffmpeg -, darwin -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + fetchpatch2, + fetchurl, + cmake, + ninja, + ffmpeg-headless, + darwin, + zlib, + testers, + validatePkgConfig, + nix-update-script, + withExamples ? true, + withTools ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chromaprint"; version = "1.5.1"; - src = fetchurl { - url = "https://github.com/acoustid/chromaprint/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-oarY+juLGLeNN1Wzdn+v+au2ckLgG0eOyaZOGQ8zXhw="; + src = fetchFromGitHub { + owner = "acoustid"; + repo = "chromaprint"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bFplHaqXYvGbl8E8b/HUNFO4X+B/HPZjGTmuVFPjS3g="; }; patches = [ @@ -40,18 +49,64 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + validatePkgConfig + ]; - buildInputs = [ ffmpeg ] ++ lib.optionals stdenv.hostPlatform.isDarwin - (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]); + buildInputs = + [ ffmpeg-headless ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Accelerate + CoreGraphics + CoreVideo + zlib + ] + ); - cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_EXAMPLES" withExamples) + (lib.cmakeBool "BUILD_TOOLS" withTools) + ]; - meta = with lib; { - homepage = "https://acoustid.org/chromaprint"; - description = "AcoustID audio fingerprinting library"; - mainProgram = "fpcalc"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + passthru = { + updateScript = nix-update-script { }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; -} + + doCheck = true; + checkPhase = + let + exampleAudio = fetchurl { + name = "Dvorak_Symphony_9_1.mp3"; + url = "https://archive.org/download/Dvorak_Symphony_9/01.Adagio-Allegro_Molto.mp3"; + hash = "sha256-I+Ve3/OpL+3Joc928F8M21LhCH2eQfRtaJVx9mNOLW0="; + meta.license = lib.licenses.publicDomain; + }; + + # sha256 because actual output of fpcalc is quite long + expectedHash = "c47ae40e02caf798ff5ab4d91ff00cfdca8f6786c581662436941d3e000c9aac"; + in + '' + runHook preCheck + tests/all_tests + ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"} + runHook postCheck + ''; + + meta = + { + changelog = "https://github.com/acoustid/chromaprint/releases/tag/v${finalAttrs.version}"; + homepage = "https://acoustid.org/chromaprint"; + description = "AcoustID audio fingerprinting library"; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; + pkgConfigModules = [ "libchromaprint" ]; + } + // lib.attrsets.optionalAttrs withTools { + mainProgram = "fpcalc"; + }; +}) diff --git a/pkgs/by-name/ci/cifs-utils/package.nix b/pkgs/by-name/ci/cifs-utils/package.nix index b19c104f9904..40dd41d46524 100644 --- a/pkgs/by-name/ci/cifs-utils/package.nix +++ b/pkgs/by-name/ci/cifs-utils/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "cifs-utils"; - version = "7.2"; + version = "7.3"; src = fetchurl { url = "https://download.samba.org/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ElZKM+1nwkHYyEeSTq8Epa4LrxkoiDcJTasVc51UAX4="; + sha256 = "sha256-xOHrX0rYgNluFtlaHNvH7JeKtRxbbYogrgnaxjjzbdU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 03797ab35eb0..a14407547d41 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.138.3"; + version = "0.139.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-Fc3f3hVHuwO0hhH5ZDoQBKPPfxnt3TOWMRgefZa7bJU="; + hash = "sha256-JuOx1O2JcxfrZN6JBbuG+aFOnqgVUR4BLbJYoJ08kbQ="; }; - vendorHash = "sha256-GjCwH0Xe9wyacfokI5EzF2TKUnSMKCdOljahChPBlso="; + vendorHash = "sha256-NVB31L9IFr4/HQK9hOeeKzVNl/+sCIsABTJqjY8itx4="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index 66b9dc84160d..ed9da0b7ac82 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "civo"; - version = "1.1.97"; + version = "1.1.98"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-0BIvKzG+ePN4VyXPj4VfCoZiq/pDZb9/7k/kTIa4Fqs="; + hash = "sha256-gxqVWnhlLYizoij6L9/ThM9T7K7++nGZwgFP3OzBqOY="; }; - vendorHash = "sha256-V1R5MQ3y8mcm8ffc2INKk6BTYUROEvr8lHBs6MvbpkQ="; + vendorHash = "sha256-LN6rzZXw7YoHMyPCujPiyjs8tG+nN2fxwQnEenohw1c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ck/ckbcomp/package.nix b/pkgs/by-name/ck/ckbcomp/package.nix index 5a75bb7e570c..4633015eca5a 100644 --- a/pkgs/by-name/ck/ckbcomp/package.nix +++ b/pkgs/by-name/ck/ckbcomp/package.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.234"; + version = "1.235"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-Sd2/bSBv7kb7CiPYGdK/3AkZQtIY0bCVSN7pGZzyvfM="; + sha256 = "sha256-EGUPj5MesEhC+W6E+8Cute3HtpurwZk0TlcLBReepvI="; }; buildInputs = [ perl ]; diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix index 57a76a0ad9e5..d7366c96a0a0 100644 --- a/pkgs/by-name/cl/clap/package.nix +++ b/pkgs/by-name/cl/clap/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clap"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = finalAttrs.version; - hash = "sha256-st8K6hmU2qa01qvHCe6NNnjXwx5k0ABZKZBjp5II7B8="; + hash = "sha256-QyIuuiwFg5DP2Ao/LOKYiBXxKHQ0FbFhssIIUnEQz+c="; }; postPatch = '' diff --git a/pkgs/by-name/cl/clatd/package.nix b/pkgs/by-name/cl/clatd/package.nix index fc5e9a792cee..4e2d2742096b 100644 --- a/pkgs/by-name/cl/clatd/package.nix +++ b/pkgs/by-name/cl/clatd/package.nix @@ -7,19 +7,21 @@ perlPackages, tayga, iproute2, - iptables, + nftables, + systemd, nixosTests, }: -stdenv.mkDerivation rec { +assert (lib.assertMsg systemd.withNetworkd "systemd for clatd must be built with networkd support"); +stdenv.mkDerivation (finalAttrs: { pname = "clatd"; - version = "1.6"; + version = "2.1.0"; src = fetchFromGitHub { owner = "toreanderson"; repo = "clatd"; - rev = "v${version}"; - hash = "sha256-ZUGWQTXXgATy539NQxkZSvQA7HIWkIPsw1NJrz0xKEg="; + rev = "v${finalAttrs.version}"; + hash = "sha256-hNFuS6pdaA/FTIUeuwjGovlHcPh248Au1VXCzMuYwLU="; }; strictDeps = true; @@ -33,6 +35,7 @@ stdenv.mkDerivation rec { perl NetIP NetDNS + JSON ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -47,9 +50,10 @@ stdenv.mkDerivation rec { --set PERL5LIB $PERL5LIB \ --prefix PATH : ${ lib.makeBinPath [ - tayga - iproute2 - iptables + tayga # tayga + iproute2 # ip + nftables # nft + systemd # networkctl ] } ''; @@ -64,4 +68,4 @@ stdenv.mkDerivation rec { mainProgram = "clatd"; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index c07af011cace..1cfca599fc7f 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -5,13 +5,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^0.2.48" + "@anthropic-ai/claude-code": "^0.2.53" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "0.2.48", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.48.tgz", - "integrity": "sha512-Av9EC7oBGSgNzJ8IFyYQnzCURtzmUZb1fRL+4vKJunCF33nCkTW82DEOKsfcj+Z268/Pf8WhXuI/vLbwpMdymw==", + "version": "0.2.53", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.53.tgz", + "integrity": "sha512-DKXGjSsu2+rc1GaAdOjRqD7fMLvyQgwi/sqf6lLHWQAarwYxR/ahbSheu7h1Ub0wm0htnuIqgNnmNZUM43w/3Q==", "hasInstallScript": true, "license": "SEE LICENSE IN README.md", "bin": { diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 9aabc9bc9115..50b2b1fd24ac 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "claude-code"; - version = "0.2.48"; + version = "0.2.53"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-zocgUMHWAPhA9ebqfeVCMHuJ1QBX3q8Y/dDjsxKhPv4="; + hash = "sha256-oWXtIGJwVe/LwAlIWfpA5Jn9zZWQtjw03DkyQ/Sg08c="; }; - npmDepsHash = "sha256-kwq08sKDZDH0eM5gAj+HllQkadDqgyNxMd2xmiTZvq8="; + npmDepsHash = "sha256-3igDt1N77LJu5Dq9uK3bd90sfYZkjBOt5ArvoRibFeo="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/cl/cli11/package.nix b/pkgs/by-name/cl/cli11/package.nix index c47724390a69..b9a807ce0e7a 100644 --- a/pkgs/by-name/cl/cli11/package.nix +++ b/pkgs/by-name/cl/cli11/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cli11"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${finalAttrs.version}"; - hash = "sha256-BLjGKN/UQIPVFlZaJ2VxTLFfY6otpJZ6HqfLtt5+r88="; + hash = "sha256-73dfpZDnKl0cADM4LTP3/eDFhwCdiHbEaGRF7ZyWsdQ="; }; buildInputs = [ catch2 ]; diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index 616ea1ca0590..816a234c9270 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clorinde"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "halcyonnouveau"; repo = "clorinde"; tag = "clorinde-v${finalAttrs.version}"; - hash = "sha256-rjpNeRrRiLIWcKvkmnyGF6hhm1CLBEKovvLaMKwtKmk="; + hash = "sha256-C9oxdvZKQTZQYQmMpcyxRH9+o2pv3gVpSEmwxYn2E+g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-kyRhBDG4QRC6UcDqn+yzCLGuZHbNpKhl9QegTma6qDI="; + cargoHash = "sha256-Arp/5lgccSNblrRrK7oVrsQe3h6sQz3sHITMoN8Ehzc="; cargoBuildFlags = [ "--package=clorinde" ]; diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix index d3f1fa80f571..c8f616d565a6 100644 --- a/pkgs/by-name/cl/cloud-nuke/package.nix +++ b/pkgs/by-name/cl/cloud-nuke/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.38.2"; + version = "0.39.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; tag = "v${version}"; - hash = "sha256-hQFuHEIxsvyCmP4DR9MsrWmPbo3BFU3k5nYNsQVNy/U="; + hash = "sha256-r9/5A1f6GSDgF5/GM4UKxoCYUsc5xsZpTwDGDUySDfQ="; }; - vendorHash = "sha256-ExZZHCGmU9r1DrJ3alN6Y39P6rfFymQSpK8b+ZD7h0s="; + vendorHash = "sha256-AiPy/lmqrNeDWM7/pXmzHCbSWZdqdXnZNATlyi6oAGc="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/cl/cloudflare-cli/package.nix b/pkgs/by-name/cl/cloudflare-cli/package.nix new file mode 100644 index 000000000000..6e1ad3be90b0 --- /dev/null +++ b/pkgs/by-name/cl/cloudflare-cli/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cloudflare-cli"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "danielpigott"; + repo = "cloudflare-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-cT+cMekXhHKfFi+dH1dCA/YNBSyYePJIZBSkDMPZZ14="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-0SFXgaLQE/MkqC9id7DAiP422tEyTt2gpgpIdXViFBI="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnInstallHook + nodejs + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/cfcli --help >/dev/null + + runHook postInstallCheck + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI for interacting with Cloudflare"; + homepage = "https://github.com/danielpigott/cloudflare-cli"; + changelog = "https://github.com/danielpigott/cloudflare-cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "cfcli"; + }; +}) diff --git a/pkgs/by-name/cl/cloudfoundry-cli/package.nix b/pkgs/by-name/cl/cloudfoundry-cli/package.nix index fb6525acaa82..4e7815a6ad79 100644 --- a/pkgs/by-name/cl/cloudfoundry-cli/package.nix +++ b/pkgs/by-name/cl/cloudfoundry-cli/package.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.10.2"; + version = "8.11.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-+1+EXcbGs2e1kqvHF5kK1yQGNPkw0ZA6djJeDFtMsDs="; + sha256 = "sha256-1OJWkhXw/VYerQgaYFgX6mPIAtD3GKDhI+/a8TJS5Yg="; }; - vendorHash = "sha256-IyPTsVQSHXiMsF3N0b6udnV4EY5nTIyBx4zGM/2SL/c="; + vendorHash = "sha256-c0RThHxnT/OU+sFZlACKoFYmFM1P3XItvF0XiGKBVZ8="; subPackages = [ "." ]; diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index dd1b1d0010bd..ac81adcf2569 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-4n+7/4ZMD0VzlD4PzEWVDut+rt8/4Vz3gAgCDAj+SVs="; + hash = "sha256-XXtVGIpoR2JfkR7urfHuh6xKoIvsF42NV+4yjxb8nls="; }; vendorHash = "sha256-SdLeME6EFraGUXE1zUdEfxTETUKLDmecYpWEg5DE4PQ="; diff --git a/pkgs/by-name/cn/cns11643-kai/package.nix b/pkgs/by-name/cn/cns11643-kai/package.nix new file mode 100644 index 000000000000..04befdc176fd --- /dev/null +++ b/pkgs/by-name/cn/cns11643-kai/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: + +stdenvNoCC.mkDerivation rec { + pname = "cns11643-kai"; + version = "0-unstable-2025-01-13"; + + src = fetchFromGitHub { + owner = "rypervenche"; + repo = "cns11643-fonts"; + rev = "refs/tags/${version}"; + hash = "sha256-A/4iwNvyzOYEpBzxKeq1xM/6aU6EOCATAr0lQlyckKQ="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 TW-Kai*.ttf -t $out/share/fonts/truetype/ + + runHook postInstall + ''; + + meta = { + description = "Chinese TrueType Kai font by Ministry of Education of Taiwan government"; + homepage = "https://www.cns11643.gov.tw/"; + license = lib.licenses.ofl; + maintainers = [ lib.maintainers.rypervenche ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index a2ef11f6fb43..c95d906d22c9 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -10,18 +10,18 @@ }: rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; - version = "0.4.7"; + version = "0.4.9"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Aviac"; repo = "codeberg-cli"; rev = "v${version}"; - hash = "sha256-GFUBMriBHKWjgT10Vvpa8FMqB6CvksSPoFBBr3uwrrg="; + hash = "sha256-uifLgXwKcdZ8Q2GjVIa/EA5iq+T9pm821aKsXPbPL34="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZOPfCrWlJXL+XipEngLSIqryEAou5A8mTtZgA5gabc4="; + cargoHash = "sha256-nKI0bIKocTjodZ6O1VTTTrlzeeueaH6crF9jdTnx5lI="; nativeBuildInputs = [ pkg-config installShellFiles diff --git a/pkgs/by-name/co/codechecker/package.nix b/pkgs/by-name/co/codechecker/package.nix index 26a7f6279945..f09011e8e68b 100644 --- a/pkgs/by-name/co/codechecker/package.nix +++ b/pkgs/by-name/co/codechecker/package.nix @@ -113,7 +113,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/Ericsson/codechecker"; changelog = "https://github.com/Ericsson/codechecker/releases/tag/v${version}"; description = "Analyzer tooling, defect database and viewer extension for the Clang Static Analyzer and Clang Tidy"; - license = licenses.asl20-llvm; + license = with licenses; [ + asl20 + llvm-exception + ]; maintainers = with maintainers; [ zebreus felixsinger diff --git a/pkgs/by-name/co/codefresh/package.nix b/pkgs/by-name/co/codefresh/package.nix index cfba4df8298d..347573bd2d32 100644 --- a/pkgs/by-name/co/codefresh/package.nix +++ b/pkgs/by-name/co/codefresh/package.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "codefresh"; - version = "0.87.3"; + version = "0.88.5"; src = fetchFromGitHub { owner = "codefresh-io"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-SUwt0oWls823EeLxT4CW+LDdsjAtSxxxKkllhMJXCtM="; + hash = "sha256-u0K3I65JDu6v4mE0EU6Rv6uJOmC6VuZbIVyreHPH9QE="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-tzsHbvoQ59MwE4TYdPweLaAv9r4V8oyTQyvdeyPCsHY="; + hash = "sha256-cMCJ/ANpHsEuO0SNtvf7zlS0HXp328oBP5aXnHSbpDI="; }; nativeBuildInputs = [ yarnConfigHook diff --git a/pkgs/by-name/co/comet-gog/package.nix b/pkgs/by-name/co/comet-gog/package.nix index c5676da76151..49b5e7c4f2dd 100644 --- a/pkgs/by-name/co/comet-gog/package.nix +++ b/pkgs/by-name/co/comet-gog/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "comet-gog"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "imLinguin"; repo = "comet"; tag = "v${version}"; - hash = "sha256-LAEt2i/SRABrz+y2CTMudrugifLgHNxkMSdC8PXYF0E="; + hash = "sha256-oJSP/zqr4Jp09Rh15a3o1GWsTA0y22+Zu2mU0HXHLHY="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-SvDE+QqaSK0+4XgB3bdmqOtwxBDTlf7yckTR8XjmMXc="; + cargoHash = "sha256-VY9+5QUJYYifLokf69laapCCBRYFo1BOd6kQpxO2wkc="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix index 77dd1020902a..e99832d91214 100644 --- a/pkgs/by-name/co/conda/package.nix +++ b/pkgs/by-name/co/conda/package.nix @@ -43,7 +43,7 @@ # $ conda-shell # $ conda install spyder let - version = "25.1.1"; + version = "25.1.1-2"; src = let @@ -57,10 +57,10 @@ let }; in fetchurl { - url = "https://repo.anaconda.com/miniconda/Miniconda3-py312_${version}-0-Linux-${arch}.sh"; + url = "https://repo.anaconda.com/miniconda/Miniconda3-py312_${version}-Linux-${arch}.sh"; hash = selectSystem { - x86_64-linux = "sha256-gy3ielo1t5Y/DYNGarraPrE45RmFJV8ZDg3DUEJ6ndE="; - aarch64-linux = "sha256-rp0+qD35fnj9UcRS0Lx1AFoo1QTCLbbxAAgiKT+Ra1Q="; + x86_64-linux = "sha256-R2bYW199I1ziUOmY67WoqCEMvU8rD+pNIXez7Z6oeIQ="; + aarch64-linux = "sha256-bQW5+bfzJ7kHl6TPVtaMgVeLqy9jJXo+eotyyw8OS10="; }; }; diff --git a/pkgs/by-name/co/conduit/package.nix b/pkgs/by-name/co/conduit/package.nix index 22c208d18637..62100ccf20b4 100644 --- a/pkgs/by-name/co/conduit/package.nix +++ b/pkgs/by-name/co/conduit/package.nix @@ -7,6 +7,7 @@ # passthru conduit, + python3Packages, nix-update-script, mpiSupport ? false, @@ -50,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { withMpi = conduit.override { mpiSupport = true; }; + pythonModule = python3Packages.conduit; + pythonModuleWithMpi = python3Packages.conduit-mpi; }; updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix index d277ce30b3ff..52c9167111fb 100644 --- a/pkgs/by-name/co/containerd/package.nix +++ b/pkgs/by-name/co/containerd/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { pname = "containerd"; - version = "2.0.3"; + version = "2.0.4"; outputs = [ "out" @@ -27,7 +27,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; tag = "v${version}"; - hash = "sha256-MPzC7X4r3zrDM6Ej8lICDIB29X+s6jQ1sHQmnk9Zc10="; + hash = "sha256-KW2fKdsJ590UPGcu2O3IGyJ+/iY0c8GQLirL8zK3F14="; }; postPatch = "patchShebangs ."; diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 6d83b52f11fa..a45cbf962503 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage rec { pname = "cook-cli"; - version = "0.7.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${version}"; - hash = "sha256-3gLVsk6GCxOG24Md7E9fk28Vnc4kVDdwyZUD/GtSwFE="; + hash = "sha256-1m2+etJG+33fPTxBF8qT/U9WiZGcSn9r0WlK5PDL6/Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EoTCKpH8G3SsXkhQVsr9aX4Cupm+fzPtXHpoM1knqss="; + cargoHash = "sha256-3tWVCP80a6odmi9C0klLbfO5UmdFczyUY8KQSaMIyw4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index 7921fde702fd..5229e6b2b011 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -28,11 +28,11 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.280.0"; + version = "1.290.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-native-${finalAttrs.version}.zip"; - hash = "sha256-s47WaWH0ov/UazQCOFBUAO6ZYgCmCpQ1o79KjAVJFh4="; + hash = "sha256-ELOSeb3Z7AI8pjDhtUIRoaf+4UXjXKEu/OJ2CLQno6A="; stripRoot = false; }; diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix index 7a008e67f448..7569bdb81082 100644 --- a/pkgs/by-name/co/copycat/package.nix +++ b/pkgs/by-name/co/copycat/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "ccat"; - version = "003"; + version = "004"; src = fetchFromGitHub { owner = "DeeKahy"; repo = "CopyCat"; tag = version; - hash = "sha256-BNXWubJ6eRnuK7+0kE9yHQzjJci5miTSG3dwWE2XDwc="; + hash = "sha256-HLT88ghyT9AwvBTf7NrFkSPqMAh90GrBqZVXN5aaG3w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-2SI4h5RqzWKWnRmQ2t/eDAOK1ql7jlZKIgPlSiiB6Dg="; + cargoHash = "sha256-gjFVvP2h+HJdDdNVtqTT1E1s4ZYXfWuhtMBRJkWRcDw="; buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk_11_0.frameworks.AppKit diff --git a/pkgs/by-name/co/copywrite/package.nix b/pkgs/by-name/co/copywrite/package.nix index 90eb96f4a8ff..c692d52735ac 100644 --- a/pkgs/by-name/co/copywrite/package.nix +++ b/pkgs/by-name/co/copywrite/package.nix @@ -9,18 +9,18 @@ }: let - commitHash = "9d021bf61a094a5eac6ae3084ceed2dda4700a73"; # matches tag release + commitHash = "d5bc935e4801a02fdbd953f8f0ae7989eaef50cf"; # matches tag release shortCommitHash = builtins.substring 0 7 commitHash; in buildGoModule rec { pname = "copywrite"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "copywrite"; tag = "v${version}"; - hash = "sha256-TGis7rreRen+vk3tUDehRkyas4xrBBxKlA70+VqoGWY="; + hash = "sha256-gPVlHgFlLxoAj4pkg3OxD4CGQaLdAL312/Zn/pJ+7fg="; }; vendorHash = "sha256-Qxp6BwN/Y6Xb1BwFGT/T8WYsXGPgN27mzoTE0i6cS1Q="; diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index d3245d55e056..8f6978c13b87 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "coroot-node-agent"; - version = "1.23.12"; + version = "1.23.14"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${version}"; - hash = "sha256-LIDb3kMaJzYqAo2RR1pVtNwu7WPh5+2U/D27ZiRUMrI="; + hash = "sha256-3GnKcoEAJVRywtXSXGcP/odmXa4/tD8Y4nZqUTh701w="; }; vendorHash = "sha256-SxyIlyDHuu8Ls1+/rujWE9elZiTfSYWIrV8vP5xsqTU="; diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 5a4a0522f8ba..d43c222385b8 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -3,48 +3,50 @@ stdenv, fetchFromGitHub, rustPlatform, + libcosmicAppHook, just, pkg-config, - udev, util-linuxMinimal, dbus, glib, libinput, - libxkbcommon, pulseaudio, - wayland, + udev, + xkeyboard_config, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; - rev = "epoch-${version}"; - hash = "sha256-4KaMG7sKaiJDIlP101/6YDHDwKRqJXHdqotNZlPhv8Q="; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-kRj2hEtE8FYky9Fn8hgHBo+UwWjOoS7/ROh9qz/0Vzs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-f5OV//qzWQqIvq8BNtd2H1dWl7aqR0WJwmdimL4wcKQ="; + cargoHash = "sha256-jADtvhMzWdJydT1T14PSk4ggZpWIcXiOK0TW2llKeos="; nativeBuildInputs = [ just pkg-config util-linuxMinimal + libcosmicAppHook ]; + buildInputs = [ dbus glib libinput - libxkbcommon pulseaudio - wayland udev ]; dontUseJustBuild = true; + dontUseJustCheck = true; justFlags = [ "--set" @@ -55,23 +57,31 @@ rustPlatform.buildRustPackage rec { "${stdenv.hostPlatform.rust.cargoShortTarget}/release" ]; - # Force linking to libwayland-client, which is always dlopen()ed. - "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - map (a: "-C link-arg=${a}") - [ - "-Wl,--push-state,--no-as-needed" - "-lwayland-client" - "-Wl,--pop-state" - ]; + preFixup = '' + libcosmicAppWrapperArgs+=( + --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml + --set-default X11_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.extras.xml + ) + ''; - meta = with lib; { + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; + + meta = { homepage = "https://github.com/pop-os/cosmic-applets"; description = "Applets for the COSMIC Desktop Environment"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ qyliss nyabinary + HeitorAugustoLN ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 1c0bf7489aef..90fb1c30c203 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -3,102 +3,85 @@ stdenv, rustPlatform, fetchFromGitHub, - makeBinaryWrapper, - pixman, + libcosmicAppHook, pkg-config, - libinput, - libglvnd, - libxkbcommon, + libdisplay-info, libgbm, + libinput, + pixman, seatd, udev, - xwayland, - wayland, - xorg, - useXWayland ? true, systemd, + xwayland, + nix-update-script, + + useXWayland ? true, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; - rev = "epoch-${version}"; - hash = "sha256-IbGMp+4nRg4v5yRvp3ujGx7+nJ6wJmly6dZBXbQAnr8="; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-CygtVtzO8JJQv+G3yx/OCCy8BlPqyNqcmf3Mv1gFuT4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4ahdQ0lQbG+lifGlsJE0yci4j8pR7tYVsMww9LyYyAA="; + cargoHash = "sha256-bfVsfrxGi0Lq/YRddCVhfqXL8kPGL9p4bqSNPsmjx0o="; separateDebugInfo = true; nativeBuildInputs = [ - makeBinaryWrapper + libcosmicAppHook pkg-config ]; + buildInputs = [ - libglvnd - libinput - libxkbcommon + libdisplay-info libgbm + libinput pixman seatd udev - wayland ] ++ lib.optional useSystemd systemd; # Only default feature is systemd buildNoDefaultFeatures = !useSystemd; - # Force linking to libEGL, which is always dlopen()ed, and to - # libwayland-client, which is always dlopen()ed except by the - # obscure winit backend. - RUSTFLAGS = map (a: "-C link-arg=${a}") [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-lwayland-client" - "-Wl,--pop-state" - ]; - makeFlags = [ - "prefix=$(out)" + "prefix=${placeholder "out"}" "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; dontCargoInstall = true; - # These libraries are only used by the X11 backend, which will not - # be the common case, so just make them available, don't link them. - postInstall = - '' - wrapProgramArgs=(--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - ] - }) - '' - + lib.optionalString useXWayland '' - wrapProgramArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]}) - '' - + '' - wrapProgram $out/bin/cosmic-comp "''${wrapProgramArgs[@]}" - ''; + preFixup = lib.optionalString useXWayland '' + libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]}) + ''; - meta = with lib; { + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; + + meta = { homepage = "https://github.com/pop-os/cosmic-comp"; description = "Compositor for the COSMIC Desktop Environment"; mainProgram = "cosmic-comp"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ qyliss nyabinary + HeitorAugustoLN ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index b6c1d204c40e..90ca350a82c2 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -3,50 +3,48 @@ stdenv, fetchFromGitHub, rustPlatform, + libcosmicAppHook, cmake, - coreutils, just, libinput, - libxkbcommon, linux-pam, - pkg-config, udev, - wayland, + coreutils, + xkeyboard_config, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-greeter"; - rev = "epoch-${version}"; - hash = "sha256-5BSsiGgL369/PePS0FmuE42tktK2bpgJziYuUEnZ2jY="; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-K6kCBtlmFfav8UP4zorzDJBzHt4CoSaFFAufrW1DPrw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5TXFE/pIeIOvy8x8c5sR3YaI8R2RTA8fzloguIpE4TM="; + cargoHash = "sha256-nmkM/Jm2P5ftZFfzX+O1Fe6eobRbgBkajZsbyI67Zfw="; - cargoBuildFlags = [ - "--all" - ]; + cargoBuildFlags = [ "--all" ]; nativeBuildInputs = [ rustPlatform.bindgenHook cmake just - pkg-config + libcosmicAppHook ]; + buildInputs = [ libinput - libxkbcommon linux-pam udev - wayland ]; dontUseJustBuild = true; + dontUseJustCheck = true; justFlags = [ "--set" @@ -64,12 +62,31 @@ rustPlatform.buildRustPackage rec { substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}' ''; - meta = with lib; { + preFixup = '' + libcosmicAppWrapperArgs+=( + --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml + --set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml + ) + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; + + meta = { homepage = "https://github.com/pop-os/cosmic-greeter"; description = "Greeter for the COSMIC Desktop Environment"; mainProgram = "cosmic-greeter"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ nyabinary ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 951c3ef3869f..279addbd48b7 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -1,24 +1,22 @@ { lib, stdenv, - fetchFromGitHub, - just, - pkg-config, rustPlatform, - libglvnd, - libxkbcommon, - wayland, + fetchFromGitHub, + libcosmicAppHook, + just, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.0-alpha.5.1"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; - tag = "epoch-${version}"; - hash = "sha256-nO7Y1SpwvfHhL0OSy7Ti+e8NPzfknW2SGs7IYoF1Jow="; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-6lt9Rig1pM37B7+nRrR+eYke8umSfYlg8aLB45Q1X+4="; }; useFetchCargoVendor = true; @@ -26,15 +24,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ just - pkg-config - ]; - buildInputs = [ - libglvnd - libxkbcommon - wayland + libcosmicAppHook ]; dontUseJustBuild = true; + dontUseJustCheck = true; justFlags = [ "--set" @@ -45,24 +39,25 @@ rustPlatform.buildRustPackage rec { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" ]; - # Force linking to libEGL, which is always dlopen()ed. - "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - map (a: "-C link-arg=${a}") - [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-Wl,--pop-state" - ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-panel"; description = "Panel for the COSMIC Desktop Environment"; mainProgram = "cosmic-panel"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ qyliss nyabinary + HeitorAugustoLN ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index 192b83393042..b954c13a8895 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -1,32 +1,43 @@ { lib, - fetchFromGitHub, stdenv, + fetchFromGitHub, wayland-scanner, + nix-update-script, }: stdenv.mkDerivation { pname = "cosmic-protocols"; - version = "0-unstable-2024-07-31"; + version = "0-unstable-2025-03-05"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-protocols"; - rev = "de2fead49d6af3a221db153642e4d7c2235aafc4"; - hash = "sha256-qgo8FMKo/uCbhUjfykRRN8KSavbyhZpu82M8npLcIPI="; + rev = "6b05c2a157118979cb472a38455ba78ca9729196"; + hash = "sha256-ozyReur1jjMl8fDUrdWbgcKedf+RDH5xCRsmEcnPQ9U="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; nativeBuildInputs = [ wayland-scanner ]; - meta = with lib; { + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=HEAD" + ]; + }; + + meta = { homepage = "https://github.com/pop-os/cosmic-protocols"; description = "Additional wayland-protocols used by the COSMIC desktop environment"; - license = [ - licenses.mit - licenses.gpl3Only + license = with lib.licenses; [ + mit + gpl3Only ]; - maintainers = with maintainers; [ nyabinary ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index 389ca1560a9b..92f8bc2b56e4 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -8,19 +8,20 @@ stdenv, xdg-desktop-portal-cosmic, }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-session"; - rev = "epoch-${version}"; - hash = "sha256-rkzcu5lXKVQ5RfilcKQjTzeKZv+FpqrtARZgGGlYKK4="; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-2EKkVdZ7uNNJ/E/3knmeH3EBa+tkYmIxP3t9d6yacww="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rK0tWckPvp31BT+K0pfs/mk/Z4XkwlOIwJEZwpYphJE="; + cargoHash = "sha256-iYObxjWJUKgZKGTkqtYgQK4758k0EYZGhIAM/oLxxso="; postPatch = '' substituteInPlace Justfile \ @@ -41,21 +42,25 @@ rustPlatform.buildRustPackage rec { "--set" "prefix" (placeholder "out") + "--set" + "cosmic_dconf_profile" + "cosmic" ]; env.XDP_COSMIC = "${xdg-desktop-portal-cosmic}/libexec/xdg-desktop-portal-cosmic"; passthru.providedSessions = [ "cosmic" ]; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-session"; description = "Session manager for the COSMIC desktop environment"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = "cosmic-session"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ a-kenji nyabinary + thefossguy ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index d750cff7e77f..598ad84c8a36 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -1,64 +1,68 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, + libcosmicAppHook, pkg-config, - libxkbcommon, libinput, - libglvnd, libgbm, udev, - wayland, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.0.0-alpha.5.1"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-workspaces-epoch"; - rev = "epoch-${version}"; - hash = "sha256-lAK7DZWwNMr30u6Uopew9O/6FIG6e2SgcdA+cD/K5Ok="; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-3jivE0EaSddPxMYn9DDaYUMafPf60XeCwVeQegbt++c="; }; useFetchCargoVendor = true; - cargoHash = "sha256-w1lQdzy2mJ5NfqngvOLqFCxyhWgvIySDDXCCtCCtTjg="; + cargoHash = "sha256-l5y9bOG/h24EfiAFfVKjtzYCzjxU2TI8wh6HBUwoVcE="; separateDebugInfo = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + libcosmicAppHook + ]; + buildInputs = [ - libxkbcommon libinput - libglvnd libgbm udev - wayland ]; - postInstall = '' - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} - cp data/*.desktop $out/share/applications/ - cp data/*.svg $out/share/icons/hicolor/scalable/apps/ - ''; + dontCargoInstall = true; - # Force linking to libEGL, which is always dlopen()ed, and to - # libwayland-client, which is always dlopen()ed except by the - # obscure winit backend. - RUSTFLAGS = map (a: "-C link-arg=${a}") [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-lwayland-client" - "-Wl,--pop-state" + makeFlags = [ + "prefix=${placeholder "out"}" + "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; + + meta = { homepage = "https://github.com/pop-os/cosmic-workspaces-epoch"; description = "Workspaces Epoch for the COSMIC Desktop Environment"; mainProgram = "cosmic-workspaces"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ nyabinary ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/countryfetch/package.nix b/pkgs/by-name/co/countryfetch/package.nix new file mode 100644 index 000000000000..f3ebd1d9e532 --- /dev/null +++ b/pkgs/by-name/co/countryfetch/package.nix @@ -0,0 +1,55 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + yq, + pkg-config, + openssl, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "countryfetch"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "nik-rev"; + repo = "countryfetch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KdFgY54vXLmq6IZfJzZ1IeZ2eQuNJoCRZUV3rVuPpcY="; + }; + + postPatch = '' + tomlq -ti '.dependencies.openssl.features[] |= select(.!="vendored")' countryfetch/Cargo.toml + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-XJI9k/5hdak8p0/J/x9u6lqJu/DIbX93Wwm3LALkAAw="; + + env.RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + pkg-config + yq # for `tomlq` + ]; + + buildInputs = [ openssl ]; + + cargoBuildFlags = [ "--package=countryfetch" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command-line tool similar to Neofetch for obtaining information about your country"; + homepage = "https://github.com/nik-rev/countryfetch"; + changelog = "https://github.com/nik-rev/countryfetch/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "countryfetch"; + }; +}) diff --git a/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch b/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch deleted file mode 100644 index 7c115a66ac90..000000000000 --- a/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/mkcramfs.c b/mkcramfs.c -index a2ef018959d..bec83c112d1 100644 ---- a/mkcramfs.c -+++ b/mkcramfs.c -@@ -22,6 +22,7 @@ - * If you change the disk format of cramfs, please update fs/cramfs/README. - */ - -+#include - #include - #include - #include diff --git a/pkgs/by-name/cr/cramfsprogs/package.nix b/pkgs/by-name/cr/cramfsprogs/package.nix index f626203c0bfa..46f24eae1326 100644 --- a/pkgs/by-name/cr/cramfsprogs/package.nix +++ b/pkgs/by-name/cr/cramfsprogs/package.nix @@ -1,23 +1,21 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cramfsprogs"; - version = "1.1"; + version = "2.1-unstable-2025-01-27"; - src = fetchurl { - url = "mirror://debian/pool/main/c/cramfs/cramfs_${version}.orig.tar.gz"; - sha256 = "0s13sabykbkbp0pcw8clxddwzxckyq7ywm2ial343ip7qjiaqg0k"; + src = fetchFromGitHub { + owner = "npitre"; + repo = "cramfs-tools"; + rev = "13ad7ee1df5ce42cf9758053186554d7cb15e2cc"; + sha256 = "sha256-JlDOowJYJJNB1opNabJgYfdt0khQFsdDvzbtY/bJwRI="; }; - # CramFs is unmaintained upstream: https://tracker.debian.org/pkg/cramfs. - # So patch the "missing include" bug ourselves. - patches = [ ./include-sysmacros.patch ]; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; @@ -30,9 +28,12 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools to create, check, and extract content of CramFs images"; - homepage = "https://packages.debian.org/jessie/cramfsprogs"; + homepage = "https://github.com/npitre/cramfs-tools"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ pamplemousse ]; + maintainers = with maintainers; [ + pamplemousse + blitz + ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/cr/creek/build.zig.zon.nix b/pkgs/by-name/cr/creek/build.zig.zon.nix new file mode 100644 index 000000000000..551c0489363f --- /dev/null +++ b/pkgs/by-name/cr/creek/build.zig.zon.nix @@ -0,0 +1,110 @@ +# generated by zon2nix (https://github.com/Cloudef/zig2nix) +{ + lib, + linkFarm, + fetchurl, + fetchgit, + runCommandLocal, + zig, + name ? "zig-packages", +}: +let + unpackZigArtifact = + { + name, + artifact, + }: + runCommandLocal name { nativeBuildInputs = [ zig ]; } '' + hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" + mv "$TMPDIR/p/$hash" "$out" + chmod 755 "$out" + ''; + + fetchZig = + { + name, + url, + hash, + }: + let + artifact = fetchurl { inherit url hash; }; + in + unpackZigArtifact { inherit name artifact; }; + + fetchGitZig = + { + name, + url, + hash, + }: + let + parts = lib.splitString "#" url; + url_base = builtins.elemAt parts 0; + url_without_query = builtins.elemAt (lib.splitString "?" url_base) 0; + rev_base = builtins.elemAt parts 1; + rev = + if builtins.match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}"; + in + fetchgit { + inherit name rev hash; + url = url_without_query; + deepClone = false; + }; + + fetchZigArtifact = + { + name, + url, + hash, + }: + let + parts = lib.splitString "://" url; + proto = builtins.elemAt parts 0; + path = builtins.elemAt parts 1; + fetcher = { + "git+http" = fetchGitZig { + inherit name hash; + url = "http://${path}"; + }; + "git+https" = fetchGitZig { + inherit name hash; + url = "https://${path}"; + }; + http = fetchZig { + inherit name hash; + url = "http://${path}"; + }; + https = fetchZig { + inherit name hash; + url = "https://${path}"; + }; + }; + in + fetcher.${proto}; +in +linkFarm name [ + { + name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56"; + path = fetchZigArtifact { + name = "zig-pixman"; + url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz"; + hash = "sha256-CYgFIOR9H5q8UUpFglaixOocCMT6FGpcKQQBUVWpDKQ="; + }; + } + { + name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; + path = fetchZigArtifact { + name = "zig-wayland"; + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; + hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA="; + }; + } + { + name = "1220a4029ee3ee70d3175c69878e2b70dccd000c4324bc74ba800d8a143b7250fb38"; + path = fetchZigArtifact { + name = "zig-fcft"; + url = "https://git.sr.ht/~novakane/zig-fcft/archive/1.1.0.tar.gz"; + hash = "sha256-osL/zsXqa8tC/Qvzf0/wXeNCzw02F2viCo+d8Gh2S7U="; + }; + } +] diff --git a/pkgs/by-name/cr/creek/package.nix b/pkgs/by-name/cr/creek/package.nix new file mode 100644 index 000000000000..c9971a1e6bad --- /dev/null +++ b/pkgs/by-name/cr/creek/package.nix @@ -0,0 +1,58 @@ +{ + callPackage, + lib, + zig_0_13, + stdenv, + fetchFromGitHub, + fcft, + pixman, + pkg-config, + wayland, + wayland-scanner, + wayland-protocols, +}: +let + zig = zig_0_13; +in +stdenv.mkDerivation (finalAttrs: { + pname = "creek"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "nmeum"; + repo = "creek"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3Q690DEMgPqURTHKzJwH5iVyTLvgYqNpxuwAEV+/Lyw="; + }; + + nativeBuildInputs = [ + zig.hook + pkg-config + wayland + wayland-scanner + ]; + + buildInputs = [ + fcft + pixman + wayland-protocols + ]; + + deps = callPackage ./build.zig.zon.nix { + inherit zig; + }; + + zigBuildFlags = [ + "--system" + "${finalAttrs.deps}" + ]; + + meta = { + homepage = "https://git.8pit.net/creek"; + description = "Malleable and minimalist status bar for the River compositor"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ alexandrutocar ]; + mainProgram = "creek"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix index 773898277627..f4cab7ae2ba3 100644 --- a/pkgs/by-name/cr/crocoddyl/package.nix +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "crocoddyl"; - version = "2.2.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "loco-3d"; repo = "crocoddyl"; rev = "v${finalAttrs.version}"; - hash = "sha256-j3TL5TpIdTkTO32Fuu+LyiieiXoOMvShi/LbBL5YYzA="; + hash = "sha256-oWcclzzuswiR1SaQJd6GnMltJ2vgt7AgJPT0FJzD1Gs="; }; outputs = [ diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix index 8c35acda3e72..3e2b74a4d588 100644 --- a/pkgs/by-name/cr/cryptsetup/package.nix +++ b/pkgs/by-name/cr/cryptsetup/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ++ (lib.mapAttrsToList (lib.flip lib.enableFeature)) programs; nativeBuildInputs = [ pkg-config ] ++ lib.optionals rebuildMan [ asciidoctor ]; - buildInputs = [ + propagatedBuildInputs = [ lvm2 json_c openssl @@ -106,7 +106,10 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/cryptsetup/cryptsetup/-/raw/v${version}/docs/v${version}-ReleaseNotes"; license = lib.licenses.gpl2Plus; mainProgram = "cryptsetup"; - maintainers = with lib.maintainers; [ raitobezarius ]; + maintainers = with lib.maintainers; [ + numinit + raitobezarius + ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix index 65c6bdcbb2ee..c2f832e33062 100644 --- a/pkgs/by-name/ct/ctlptl/package.nix +++ b/pkgs/by-name/ct/ctlptl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.39"; + version = "0.8.40"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-RZdS1Gl8CGzvgRiPKie+Pv4kCHdRmGp1DbCjswhLAxg="; + hash = "sha256-O6oAkYzkBUecwAcLjPIR7D/k4REWND8TWdstPNVJ0MU="; }; - vendorHash = "sha256-NAL6O5042cWE56vDONyIfuKSfi1hWuRr4C7Dwfz7PzE="; + vendorHash = "sha256-1BrohvN3Eefuy2y7pjdwhzFQG9YLr9X/CLbOeTBZkjY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index c11906017ffe..a0fb267941f0 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -27,17 +27,17 @@ let self = buildRustPackage' { pname = "czkawka"; - version = "8.0.0"; + version = "9.0.0"; src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; tag = self.version; - hash = "sha256-Uxko2TRIjqQvd7n9C+P7oMUrm3YY5j7TVzvijEjDwOM="; + hash = "sha256-ePiHDfQ1QC3nff8uWE0ggiTuulBomuoZ3ta0redUYXY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lYS/G3mHNqKcI6XRAtESzgBiUHnNfV0ct0W6E75a7J4="; + cargoHash = "sha256-Djvb5Hen6XPm6aJuwa6cGPojz9+kXXidysr3URDwDFM="; nativeBuildInputs = [ gobject-introspection diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 3d936718a372..6a4dfd8729ba 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -22,15 +22,15 @@ let ''; }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dash-mpd-cli"; - version = "0.2.24"; + version = "0.2.25"; src = fetchFromGitHub { owner = "emarsden"; repo = "dash-mpd-cli"; - tag = "v${version}"; - hash = "sha256-Q4zzKdp8GROL8vHi8XETErqufSqgZH/zf/mqEH2lIzE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-xC/U48QyVn9K8Do1909XS7j9aY+ia0gd5cMdfipIds4="; }; patches = [ @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-yXLA/JVD/4jbeVWOhs74Rdlc/drFFjQ52x5IMwUg4jY="; + cargoHash = "sha256-QHfon0795XNtG3jCVv56EIA1pPToWUiopKWI3cA7Vg0="; nativeBuildInputs = [ makeWrapper @@ -52,8 +52,8 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/dash-mpd-cli \ --prefix PATH : ${ lib.makeBinPath [ - ffmpeg.bin - libxslt.bin + (lib.getBin ffmpeg) + (lib.getBin libxslt) shaka-packager-wrapped ] } @@ -73,4 +73,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ al3xtjames ]; mainProgram = "dash-mpd-cli"; }; -} +}) diff --git a/pkgs/by-name/db/dbvisualizer/package.nix b/pkgs/by-name/db/dbvisualizer/package.nix index 3722b2454239..a5101267901f 100644 --- a/pkgs/by-name/db/dbvisualizer/package.nix +++ b/pkgs/by-name/db/dbvisualizer/package.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "24.3.3"; + version = "25.1"; src = let @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "https://www.dbvis.com/product_download/dbvis-${finalAttrs.version}/media/dbvis_linux_${underscoreVersion}.tar.gz"; - hash = "sha256-RDmakZJ7mjTzx4QaKwT6H25dDvQANbLhd2+f8EYbmDA="; + hash = "sha256-Se2d5S8nXKmNJ1UoYNGJyvHC20THShjzGh2T98NhFv4="; }; strictDeps = true; diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index bcdb45698681..e1604260e3c5 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20250220"; + version = "20250320"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "sha256-QSz9zPgLoFlskeltD8bvtNdNEmXNW7ZBh7GA4CQCa7k="; + sha256 = "sha256-KhZp0gGGK27hAtfAwuff7VI9Z3D4MtMxkNW6l6B56Xw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch b/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch new file mode 100644 index 000000000000..3dcc79124ec3 --- /dev/null +++ b/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch @@ -0,0 +1,58 @@ +From 3b1bcc92389e8468cd3790dfd223cb653b5f753f Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Sun, 16 Mar 2025 19:56:39 +0100 +Subject: [PATCH] Make findPath & its calls behave well with store + +- images is a cache of downloaded card images. + put that into ~/.cache/ddm/images and allow it to be created. +- campaigns, cubes & constructed are user-downloaded files that set up possible game styles. + create & populate them for the game, and tell it to not try to create them on its own. +--- + index.js | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/index.js b/index.js +index 738bfca..3ac32e8 100755 +--- a/index.js ++++ b/index.js +@@ -75,16 +75,16 @@ app.on('ready', () => { + const isDir = fs.statSync(fullPath).isDirectory(); + if (containsDanger(fullPath)) throw new Error ("Dangerous files detected"); + if (isDir) return fullPath; +- } catch (err) { throw new Error("Bad path Error 1", err); } ++ } catch (err) { throw new Error(`Bad path Error 1: ${err.message}`, err); } + + else try { //dev +- const fullPath = path.join(__dirname, folderName); ++ const fullPath = path.join(allowFolderCreation ? (process.env.HOME + "/.cache/ddm") : __dirname, folderName); + if (!fs.existsSync(fullPath) && allowFolderCreation) fs.mkdirSync(fullPath, {recursive: true}); + const isDir = fs.statSync(fullPath).isDirectory(); + console.log(fullPath) + if (containsDanger(fullPath)) throw new Error (`DDM refused entry to path: ${fullPath}`); + if (isDir) return fullPath; +- } catch (err) { throw new Error("Bad path Error 2", err); } ++ } catch (err) { throw new Error(`Bad path Error 2: ${err.message}`, err); } + + } + +@@ -108,7 +108,7 @@ app.on('ready', () => { + + try { + if (!["campaigns", "cubes", "constructed"].includes(folderName)) throw new Error(`bad folder name ${folderName}`); +- const folderPath = findPath(folderName, true); ++ const folderPath = findPath(folderName, false); + if (!fs.existsSync(folderPath)) fs.mkdirSync(folderPath); + const files = fs.readdirSync(folderPath); + if (folderName === "campaigns" ) return files.filter(file => fs.statSync (path.join(folderPath, file)).isDirectory()); +@@ -127,7 +127,7 @@ app.on('ready', () => { + + ipcMain.handle('open-local-folder', async (event, folderName) => { + if (!["campaigns", "cubes", "constructed"].includes(folderName)) throw new Error(`bad folder name ${constructed}`); +- const folderPath = findPath(folderName, true); ++ const folderPath = findPath(folderName, false); + try { shell.openPath(folderPath); } + catch (error) { console.error(error); } + }); +-- +2.48.1 + diff --git a/pkgs/by-name/dd/ddm/package.nix b/pkgs/by-name/dd/ddm/package.nix index ca3cc7af51ec..5443a7b4beec 100644 --- a/pkgs/by-name/dd/ddm/package.nix +++ b/pkgs/by-name/dd/ddm/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, requireFile, + asar, copyDesktopItems, electron, makeDesktopItem, @@ -10,21 +11,23 @@ campaigns ? [ ], cubes ? [ ], + constructed ? [ ], }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "ddm"; - version = "3.0.2"; + version = "4.0.0"; src = requireFile { name = "DungeonDuelMonsters-linux-x64.zip"; - hash = "sha256-APIFQC5k6J0K5Q/e5poW8wKGL67NUbqKTJL4Ohd1K18="; + hash = "sha256-Ycy5Cbd4NR/TptVnl5wV154uA0JU0UzIRHTAi/xm0cs="; url = "https://mikaygo.itch.io/ddm"; }; strictDeps = true; nativeBuildInputs = [ + asar copyDesktopItems makeWrapper unzip @@ -39,14 +42,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/{bin,share/icons/hicolor/512x512/apps,share/ddm} - mv -t $out/share/ddm/ ./resources/app/* + asar extract ./resources/app.asar $out/share/ddm/ + + patch -d $out/share/ddm/ -p1 < ${./0001-Make-findPath-its-calls-behave-well-with-store.patch} + ln -s $out/share/ddm/icon.png $out/share/icons/hicolor/512x512/apps/ddm.png makeWrapper ${lib.getExe electron} $out/bin/ddm \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags "$out/share/ddm" - # Install externally-downloaded campaign packs & cube lists + # Install externally-downloaded campaign packs and cube & constructed lists + mkdir $out/share/ddm/{campaigns,cubes,constructed} '' + lib.concatMapStringsSep "\n" (campaignZip: '' unzip "${campaignZip}" -d $out/share/ddm/campaigns/ @@ -54,6 +61,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { + lib.concatMapStringsSep "\n" (cubeFile: '' cp "${cubeFile}" $out/share/ddm/cubes/ '') cubes + + lib.concatMapStringsSep "\n" (constructedFile: '' + cp "${constructedFile}" $out/share/ddm/constructed/ + '') constructed + '' runHook postInstall diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix index 229d80ceb3c0..378c3ddfe77a 100644 --- a/pkgs/by-name/dd/ddns-go/package.nix +++ b/pkgs/by-name/dd/ddns-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.9.0"; + version = "6.9.1"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-eHJVd7PHUrswF1j4MrsUmle0vB8/CtH43p5ILZGljrs="; + hash = "sha256-QGvXUYeT01+P843gBX+IJWTyPg0cPI9jZWh3tAcmEqE="; }; vendorHash = "sha256-5XrwVIaQ2dMizx3Pj0dmLkpYwypUVnfxLNxmNsVhVzY="; diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 90e01174ddc2..46417136de16 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -19,17 +19,17 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "1.156.2"; + version = "1.157.3"; src = fetchFromGitHub { - owner = "deltachat"; - repo = "deltachat-core-rust"; + owner = "chatmail"; + repo = "core"; tag = "v${version}"; - hash = "sha256-CpFnO8stLLTH/XOZZS3j9nVrf2FRekjkQ/R1pmw5o9A="; + hash = "sha256-J9Tm35xuyIbHH2HGcctENYbArIlRWe7xzKyF3hGbwNA="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-jrsGMNgKglk+Rq/ZGiZgSZrT4uSA5RjbTYaDtW0Ijyg="; + hash = "sha256-BX0TpyG2OJkD5BUIPCij5/g3aRf6FuF9E8y9GM12o7U="; }; }; electron = electron_34; @@ -37,18 +37,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "1.54.2"; + version = "1.56.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-KN8VO03/f143qMBv9Z6K75Mb3S1QQjgzt0psTnBFLyw="; + hash = "sha256-XkA1WOMLe0+Fz0wE54KSZWeN+rRqT0TE1PXDppPm6SI="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-dRnmu5tEqrWn2AizLvd/ZMsiQJP4qtq/+SOSidpzLbY="; + hash = "sha256-4VvJNpuO7P6m6BBxBWFebtRsXvqkjdAjmnBwxG+qNns="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/dep-tree/package.nix b/pkgs/by-name/de/dep-tree/package.nix index 51da169f80a6..3b63c653b10e 100644 --- a/pkgs/by-name/de/dep-tree/package.nix +++ b/pkgs/by-name/de/dep-tree/package.nix @@ -32,7 +32,7 @@ let }; }; pname = "dep-tree"; - version = "0.23.3"; + version = "0.23.4"; in buildGoModule { inherit pname version; @@ -41,7 +41,7 @@ buildGoModule { owner = "gabotechs"; repo = pname; rev = "v${version}"; - hash = "sha256-xS/8ech4ZhkMMyXbMQmCg+4oKg/jULhqgiNooYf5y8k="; + hash = "sha256-m+afcnwVvPrD+S7c/kfE8mqlD7kO+VPI6sSXCCjXWZM="; }; vendorHash = "sha256-KoVOjZq+RrJ2gzLnANHPPtbEY1ztC0rIXWD9AXAxqMg="; diff --git a/pkgs/by-name/di/diffoci/package.nix b/pkgs/by-name/di/diffoci/package.nix index 26ef0709ec25..7f3a5aa322e6 100644 --- a/pkgs/by-name/di/diffoci/package.nix +++ b/pkgs/by-name/di/diffoci/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "diffoci"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "reproducible-containers"; repo = "diffoci"; rev = "v${version}"; - hash = "sha256-ZVWnfg5uWYuqsNd4X6t1gWBGMfdcirSp7QZZDhqAfaI="; + hash = "sha256-rCSLHlHUWS0wEnN8R2v1h+kQ7K62VQPfZmySHGSFZlQ="; }; - vendorHash = "sha256-qb4HvK4UbJbtP/ypeptV/MMbhOu5UZDaGartq/RGpDM="; + vendorHash = "sha256-udVigglpCgdYzJe9vdGZiQepZeOplQjqKB4Za8a+u6k="; ldflags = [ "-s" diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index b88373a23fc9..3c181f50deb4 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE="; }) ] - ++ lib.optionals (lib.versionOlder version "2.110.0") [ + ++ [ (fetchpatch { url = "https://github.com/dlang/dmd/commit/fdd25893e0ac04893d6eba8652903d499b7b0dfc.patch"; stripLen = 1; diff --git a/pkgs/by-name/dm/dmd/package.nix b/pkgs/by-name/dm/dmd/package.nix index b5268b7db8e6..69a9f75c3fc5 100644 --- a/pkgs/by-name/dm/dmd/package.nix +++ b/pkgs/by-name/dm/dmd/package.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "2.109.1"; - dmdHash = "sha256-3nCDPZnb4eQZmhYYxcH6qOmsP8or0KYuzAa5g/C9xdU="; - phobosHash = "sha256-73I0k7tCBwe5tl4K6uMs3/nT2JTZ2SppFYzmokS4W5Y="; + version = "2.110.0"; + dmdHash = "sha256-icXp9xWF2AI2gp7z/lQFAChmXfQePe9b5pbpQ9Mn19Y="; + phobosHash = "sha256-CmJpcHM+sIsaYBlpALCFoQFG+93s8gUyWmM0tYqjXkk="; } diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index 61e586a834ea..724c016a474d 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.75.0"; + version = "0.75.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-kaGMudHELG7ggYXvAL1Yz03ZXDnzrVNj+9QN8jDnS3g="; + hash = "sha256-lxrb6DIYompvLX3R7HI63C7ZbNW76J28Xnt7AHTVwmQ="; }; - vendorHash = "sha256-d1WrUfE31Gvgz8tw7cVdPhWf4OHsuuyEHDSn9bETCjI="; + vendorHash = "sha256-PIj91tN9LbNaBE5gLTYD7p9dgcRaFe1i7PnWNJ5H580="; ldflags = [ "-s" diff --git a/pkgs/by-name/do/docker-color-output/package.nix b/pkgs/by-name/do/docker-color-output/package.nix index 5b6f643eb9dc..9008d9ac70f1 100644 --- a/pkgs/by-name/do/docker-color-output/package.nix +++ b/pkgs/by-name/do/docker-color-output/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "docker-color-output"; - version = "2.5.1"; + version = "2.6.1"; src = fetchFromGitHub { owner = "devemio"; repo = "docker-color-output"; tag = version; - hash = "sha256-rnCZ+6t6iOiLBynp1EPshO+/otAdtu8yy1FqFkYB07w="; + hash = "sha256-r11HNRXnmTC1CJR871sX7xW9ts9KAu1+azwIwXH09qg="; }; vendorHash = null; diff --git a/pkgs/by-name/do/doing/Gemfile b/pkgs/by-name/do/doing/Gemfile index 2706a85e9d89..0c9173d93143 100644 --- a/pkgs/by-name/do/doing/Gemfile +++ b/pkgs/by-name/do/doing/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gem 'doing', '1.0.10pre' +gem 'doing' diff --git a/pkgs/by-name/do/doing/Gemfile.lock b/pkgs/by-name/do/doing/Gemfile.lock index 1b969869f76c..285a38250cfd 100644 --- a/pkgs/by-name/do/doing/Gemfile.lock +++ b/pkgs/by-name/do/doing/Gemfile.lock @@ -1,25 +1,85 @@ GEM remote: https://rubygems.org/ specs: + base64 (0.2.0) chronic (0.10.2) - deep_merge (1.2.1) - doing (1.0.10pre) + csv (3.3.2) + deep_merge (1.2.2) + doing (2.1.88) + base64 (~> 0.2) chronic (~> 0.10, >= 0.10.2) - deep_merge - gli (~> 2.17.1) - haml (= 4.0.3) - json (~> 1.8.1) - gli (2.17.1) - haml (4.0.3) + csv (~> 3.3) + deep_merge (~> 1.2, >= 1.2.1) + gli (~> 2.20, >= 2.20.1) + haml (~> 5.0.0, >= 5.0.0) + logger (~> 1.4, >= 1.4.2) + ostruct (~> 0.6) + parslet (~> 2.0, >= 2.0.0) + plist (~> 3.6, >= 3.6.0) + reline (~> 0.6) + safe_yaml (~> 1.0) + tty-link (~> 0.1, >= 0.1.1) + tty-markdown (~> 0.7, >= 0.7.0) + tty-progressbar (~> 0.18, >= 0.18.2) + tty-reader (~> 0.9, >= 0.9.0) + tty-screen (~> 0.8, >= 0.8.1) + tty-which (~> 0.5, >= 0.5.0) + gli (2.22.2) + ostruct + haml (5.0.4) + temple (>= 0.8.0) tilt - json (1.8.6) - tilt (2.0.8) + io-console (0.8.0) + kramdown (2.5.1) + rexml (>= 3.3.9) + logger (1.6.6) + ostruct (0.6.1) + parslet (2.0.0) + pastel (0.8.0) + tty-color (~> 0.5) + plist (3.7.2) + reline (0.6.0) + io-console (~> 0.5) + rexml (3.4.1) + rouge (4.5.1) + safe_yaml (1.0.5) + strings (0.2.1) + strings-ansi (~> 0.2) + unicode-display_width (>= 1.5, < 3.0) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + temple (0.10.3) + tilt (2.6.0) + tty-color (0.6.0) + tty-cursor (0.7.1) + tty-link (0.2.0) + tty-markdown (0.7.2) + kramdown (>= 1.16.2, < 3.0) + pastel (~> 0.8) + rouge (>= 3.14, < 5.0) + strings (~> 0.2.0) + tty-color (~> 0.5) + tty-screen (~> 0.8) + tty-progressbar (0.18.3) + strings-ansi (~> 0.2) + tty-cursor (~> 0.7) + tty-screen (~> 0.8) + unicode-display_width (>= 1.6, < 3.0) + tty-reader (0.9.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.2) + tty-which (0.5.0) + unicode-display_width (2.6.0) + unicode_utils (1.4.0) + wisper (2.0.1) PLATFORMS ruby DEPENDENCIES - doing (= 1.0.10pre) + doing BUNDLED WITH - 2.1.4 + 2.5.22 diff --git a/pkgs/by-name/do/doing/gemset.nix b/pkgs/by-name/do/doing/gemset.nix index 99db704ef42b..a7afc6c23117 100644 --- a/pkgs/by-name/do/doing/gemset.nix +++ b/pkgs/by-name/do/doing/gemset.nix @@ -1,5 +1,17 @@ { + base64 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; chronic = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -7,60 +19,366 @@ }; version = "0.10.2"; }; - deep_merge = { + csv = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q3picw7zx1xdkybmrnhmk2hycxzaa0jv4gqrby1s90dy5n7fmsb"; + sha256 = "0kmx36jjh2sahd989vcvw74lrlv07dqc3rnxchc5sj2ywqsw3w3g"; type = "gem"; }; - version = "1.2.1"; + version = "3.3.2"; + }; + deep_merge = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3"; + type = "gem"; + }; + version = "1.2.2"; }; doing = { dependencies = [ + "base64" "chronic" + "csv" "deep_merge" "gli" "haml" - "json" + "logger" + "ostruct" + "parslet" + "plist" + "reline" + "safe_yaml" + "tty-link" + "tty-markdown" + "tty-progressbar" + "tty-reader" + "tty-screen" + "tty-which" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1y42yc7h45sz9hqj3g1dd77ipx58l7v64i7mrsj3is2f5rszd1rv"; + sha256 = "1ssnswvwyhszc63b7mkrb7scjlh4j96z101ln1qwjlljic0h0yjp"; type = "gem"; }; - version = "1.0.10pre"; + version = "2.1.88"; }; gli = { + dependencies = [ "ostruct" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g7g3lxhh2b4h4im58zywj9vcfixfgndfsvp84cr3x67b5zm4kaq"; + sha256 = "1c2x5wh3d3mz8vg5bs7c5is0zvc56j6a2b4biv5z1w5hi1n8s3jq"; type = "gem"; }; - version = "2.17.1"; + version = "2.22.2"; }; haml = { - dependencies = [ "tilt" ]; + dependencies = [ + "temple" + "tilt" + ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1l9zhfdk9z7xjfdp108r9fw4xa55hflin7hh3lpafbf9bdz96knr"; + sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac"; type = "gem"; }; - version = "4.0.3"; + version = "5.0.4"; }; - json = { + io-console = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd"; type = "gem"; }; - version = "1.8.6"; + version = "0.8.0"; + }; + kramdown = { + dependencies = [ "rexml" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7"; + type = "gem"; + }; + version = "2.5.1"; + }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + type = "gem"; + }; + version = "1.6.6"; + }; + ostruct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; + parslet = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01pnw6ymz6nynklqvqxs4bcai25kcvnd5x4id9z3vd1rbmlk0lfl"; + type = "gem"; + }; + version = "2.0.0"; + }; + pastel = { + dependencies = [ "tty-color" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; + type = "gem"; + }; + version = "0.8.0"; + }; + plist = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk"; + type = "gem"; + }; + version = "3.7.2"; + }; + reline = { + dependencies = [ "io-console" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp"; + type = "gem"; + }; + version = "0.6.0"; + }; + rexml = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + type = "gem"; + }; + version = "3.4.1"; + }; + rouge = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a"; + type = "gem"; + }; + version = "4.5.1"; + }; + safe_yaml = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56"; + type = "gem"; + }; + version = "1.0.5"; + }; + strings = { + dependencies = [ + "strings-ansi" + "unicode-display_width" + "unicode_utils" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yynb0qhhhplmpzavfrrlwdnd1rh7rkwzcs4xf0mpy2wr6rr6clk"; + type = "gem"; + }; + version = "0.2.1"; + }; + strings-ansi = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; + type = "gem"; + }; + version = "0.2.0"; + }; + temple = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fwia5hvc1xz9w7vprzjnsym3v9j5l9ggdvy70jixbvpcpz4acfz"; + type = "gem"; + }; + version = "0.10.3"; }; tilt = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.0.8"; + version = "2.6.0"; + }; + tty-color = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; + type = "gem"; + }; + version = "0.6.0"; + }; + tty-cursor = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-link = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rdzvkyn6z2a9fnb6glw09y4c5qp94nhzvzy20z0q98cj6235yl2"; + type = "gem"; + }; + version = "0.2.0"; + }; + tty-markdown = { + dependencies = [ + "kramdown" + "pastel" + "rouge" + "strings" + "tty-color" + "tty-screen" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04f599zn5rfndq4d9l0acllfpc041bzdkkz2h6x0dl18f2wivn0y"; + type = "gem"; + }; + version = "0.7.2"; + }; + tty-progressbar = { + dependencies = [ + "strings-ansi" + "tty-cursor" + "tty-screen" + "unicode-display_width" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1xm5sk1sqp7v16akqpxza672qza6dbml68ah1lcajx2ywmh45fvc"; + type = "gem"; + }; + version = "0.18.3"; + }; + tty-reader = { + dependencies = [ + "tty-cursor" + "tty-screen" + "wisper" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6"; + type = "gem"; + }; + version = "0.9.0"; + }; + tty-screen = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l4vh6g333jxm9lakilkva2gn17j6gb052626r1pdbmy2lhnb460"; + type = "gem"; + }; + version = "0.8.2"; + }; + tty-which = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rpljdwlfm4qgps2xvq6306w86fm057m89j4gizcji371mgha92q"; + type = "gem"; + }; + version = "0.5.0"; + }; + unicode-display_width = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; + type = "gem"; + }; + version = "2.6.0"; + }; + unicode_utils = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; + type = "gem"; + }; + version = "1.4.0"; + }; + wisper = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf"; + type = "gem"; + }; + version = "2.0.1"; }; } diff --git a/pkgs/by-name/do/doing/package.nix b/pkgs/by-name/do/doing/package.nix index 5136966d40c4..a1cb929a74ce 100644 --- a/pkgs/by-name/do/doing/package.nix +++ b/pkgs/by-name/do/doing/package.nix @@ -1,20 +1,18 @@ { lib, - bundlerEnv, - ruby, + bundlerApp, bundlerUpdateScript, }: -bundlerEnv { +bundlerApp { pname = "doing"; - version = (import ./gemset.nix).doing.version; + exes = lib.singleton "doing"; - inherit ruby; gemdir = ./.; passthru.updateScript = bundlerUpdateScript "doing"; - meta = with lib; { + meta = { description = "Command line tool for keeping track of what you’re doing and tracking what you’ve done"; longDescription = '' doing is a basic CLI for adding and listing "what was I doing" reminders @@ -22,12 +20,12 @@ bundlerEnv { sections/categories and flexible output formatting. ''; homepage = "https://brettterpstra.com/projects/doing/"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ktf nicknovitski ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "doing"; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix similarity index 64% rename from pkgs/applications/emulators/dolphin-emu/primehack.nix rename to pkgs/by-name/do/dolphin-emu-primehack/package.nix index 66200efda720..cddbe407e301 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix @@ -2,123 +2,125 @@ lib, stdenv, fetchFromGitHub, + + # nativeBuildInputs pkg-config, cmake, - wrapQtAppsHook, - qtbase, - qtsvg, - bluez, + qt6, + + # buildInputs + curl, + enet, ffmpeg, - libao, - libGLU, - libGL, - pcre, + fmt, gettext, - libXrandr, - libusb1, - libpthreadstubs, - libXext, - libXxf86vm, - libXinerama, + libGL, + libGLU, libSM, libXdmcp, - readline, - openal, - udev, - libevdev, - portaudio, - curl, - alsa-lib, - miniupnpc, - enet, - mbedtls_2, - soundtouch, - sfml, - fmt, - xz, - vulkan-loader, + libXext, + libXinerama, + libXrandr, + libXxf86vm, + libao, + libpthreadstubs, libpulseaudio, - - # - Inputs used for Darwin - CoreBluetooth, - ForceFeedback, - IOKit, - OpenGL, - libpng, + libusb1, + mbedtls_2, + miniupnpc, + openal, + pcre, + portaudio, + readline, + sfml, + soundtouch, + xz, + # linux-only + alsa-lib, + bluez, + libevdev, + udev, + vulkan-loader, + # darwin-only hidapi, + libpng, + + # passthru + testers, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu-primehack"; version = "1.0.7a"; src = fetchFromGitHub { owner = "shiiion"; repo = "dolphin"; - rev = version; - hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc="; + tag = finalAttrs.version; fetchSubmodules = true; + hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc="; }; - nativeBuildInputs = [ - pkg-config - cmake - ] ++ lib.optional stdenv.hostPlatform.isLinux wrapQtAppsHook; + nativeBuildInputs = + [ + pkg-config + cmake + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qt6.wrapQtAppsHook + ]; buildInputs = [ curl + enet ffmpeg - libao - libGLU - libGL - pcre + fmt gettext + libGL + libGLU + libSM + libXdmcp + libXext + libXinerama + libXrandr + libXxf86vm + libao libpthreadstubs libpulseaudio - libXrandr - libXext - libXxf86vm - libXinerama - libSM - readline - openal - libXdmcp - portaudio libusb1 - libpng - hidapi - miniupnpc - enet mbedtls_2 - soundtouch + miniupnpc + openal + pcre + portaudio + qt6.qtbase + qt6.qtsvg + readline sfml - fmt + soundtouch xz - qtbase - qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - bluez - udev - libevdev alsa-lib + bluez + libevdev + udev vulkan-loader ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreBluetooth - OpenGL - ForceFeedback - IOKit + ++ lib.optionals stdenv.hostPlatform.isLinux [ + hidapi + libpng ]; cmakeFlags = [ - "-DUSE_SHARED_ENET=ON" - "-DENABLE_LTO=ON" + (lib.cmakeBool "USE_SHARED_ENET" true) + (lib.cmakeBool "ENABLE_LTO" true) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + (lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true) ]; qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ @@ -131,11 +133,13 @@ stdenv.mkDerivation rec { # - Allow Dolphin to use nix-provided libraries instead of building them postPatch = '' - substituteInPlace CMakeLists.txt --replace 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"' + substituteInPlace CMakeLists.txt \ + --replace-fail 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"' '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace CMakeLists.txt --replace 'if(NOT APPLE)' 'if(true)' - substituteInPlace CMakeLists.txt --replace 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)' + substituteInPlace CMakeLists.txt \ + --replace-fail 'if(NOT APPLE)' 'if(true)' \ + --replace-fail 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)' ''; postInstall = @@ -144,19 +148,31 @@ stdenv.mkDerivation rec { mv $out/bin/dolphin-emu-nogui $out/bin/dolphin-emu-primehack-nogui mv $out/share/applications/dolphin-emu.desktop $out/share/applications/dolphin-emu-primehack.desktop mv $out/share/icons/hicolor/256x256/apps/dolphin-emu.png $out/share/icons/hicolor/256x256/apps/dolphin-emu-primehack.png - substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'dolphin-emu' 'dolphin-emu-primehack' - substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'Dolphin Emulator' 'PrimeHack' + substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop \ + --replace-fail 'dolphin-emu' 'dolphin-emu-primehack' \ + --replace-fail 'Dolphin Emulator' 'PrimeHack' '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules ''; - meta = with lib; { + passthru = { + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "dolphin-emu-primehack-nogui --version"; + version = "v${finalAttrs.version}"; + }; + }; + updateScript = nix-update-script { }; + }; + + meta = { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ Madouura ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ Madouura ]; broken = stdenv.hostPlatform.isDarwin; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix new file mode 100644 index 000000000000..22e4d03fcd5d --- /dev/null +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -0,0 +1,185 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + cmake, + pkg-config, + qt6, + # darwin-only + xcbuild, + + # buildInputs + bzip2, + cubeb, + curl, + enet, + ffmpeg, + fmt_10, + gtest, + hidapi, + libXdmcp, + libpulseaudio, + libspng, + libusb1, + lz4, + lzo, + mbedtls_2, + miniupnpc, + minizip-ng, + openal, + pugixml, + SDL2, + sfml, + xxHash, + xz, + # linux-only + alsa-lib, + bluez, + libGL, + libXext, + libXrandr, + libevdev, + udev, + vulkan-loader, + # darwin-only + moltenvk, + + # passthru + testers, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dolphin-emu"; + version = "2503"; + + src = fetchFromGitHub { + owner = "dolphin-emu"; + repo = "dolphin"; + tag = finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs="; + }; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + pkg-config + qt6.wrapQtAppsHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xcbuild # for plutil + ]; + + buildInputs = + [ + bzip2 + cubeb + curl + enet + ffmpeg + fmt_10 + gtest + hidapi + libXdmcp + libpulseaudio + libspng + libusb1 + lz4 + lzo + mbedtls_2 + miniupnpc + minizip-ng + openal + pugixml + qt6.qtbase + qt6.qtsvg + SDL2 + sfml + xxHash + xz + # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838 + #zlib-ng + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + bluez + libGL + libXext + libXrandr + libevdev + # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version + #mgba # Derivation doesn't support Darwin + udev + vulkan-loader + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + moltenvk + ]; + + cmakeFlags = + [ + (lib.cmakeFeature "DISTRIBUTOR" "NixOS") + (lib.cmakeFeature "DOLPHIN_WC_REVISION" finalAttrs.src.rev) + (lib.cmakeFeature "DOLPHIN_WC_DESCRIBE" finalAttrs.version) + (lib.cmakeFeature "DOLPHIN_WC_BRANCH" "master") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true) + (lib.cmakeBool "USE_BUNDLED_MOLTENVK" false) + (lib.cmakeBool "MACOS_CODE_SIGNING" false) + # Bundles the application folder into a standalone executable, so we cannot devendor libraries + (lib.cmakeBool "SKIP_POSTPROCESS_BUNDLE" true) + # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. + # Note: The updater isn't available on linux, so we don't need to disable it there. + (lib.cmakeBool "ENABLE_AUTOUPDATE" false) + ]; + + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" + # https://bugs.dolphin-emu.org/issues/11807 + # The .desktop file should already set this, but Dolphin may be launched in other ways + "--set QT_QPA_PLATFORM xcb" + ]; + + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Only gets installed automatically if the standalone executable is used + mkdir -p $out/Applications + cp -r ./Binaries/Dolphin.app $out/Applications + ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin + ''; + + passthru = { + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "dolphin-emu-nogui --version"; + inherit (finalAttrs) version; + }; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "([0-9]+)" + ]; + }; + }; + + meta = { + homepage = "https://dolphin-emu.org"; + description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; + mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; + branch = "master"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ pbsds ]; + }; +}) diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index aaac1d4d40a5..c1e5796fb5d0 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.72.0"; + version = "3.73.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - hash = "sha256-cwH1j/acp5j90P6drKefunGFSrPTjBkbqXNNE44E63I="; + hash = "sha256-CHPaY8Z8ov+loIViQceD4ZW26MtXN1hpkY00p3Yy1n4="; }; - vendorHash = "sha256-K98cb1AF82jXm5soILO3MQy2LwOGREt8OwGySK299hA="; + vendorHash = "sha256-w3P/VbQrOJ9BMVw2thX/nU4loi4x8Nn/R2AJV5LzZBY="; ldflags = [ "-s -w" diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index 7650e3ed41f4..150b1574f17d 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-euGyTaufL8Ifsy1RT4jcqlz8XZfCN7GfvFFvo85f/3c="; + hash = "sha256-EFcfkj0NOmQrWgLJpWHdIX7iitqfZwgTmkMvueJPS/c="; }; # https://github.com/NixOS/nixpkgs/issues/318830 diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix index 07584ad7db11..aaca7b41c30c 100644 --- a/pkgs/by-name/do/dotnet-ef/package.nix +++ b/pkgs/by-name/do/dotnet-ef/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "dotnet-ef"; - version = "9.0.2"; + version = "9.0.3"; - nugetHash = "sha256-aevR1w8IDXrRLnrR5ax2BaAjGpjOWuBKJ9TzI43p7mc="; + nugetHash = "sha256-oRBN6Qh5PuVofmboqCpFJR3hUD+MruRYp4whjd9Yu9g="; meta = { description = "The Entity Framework Core tools help with design-time development tasks."; diff --git a/pkgs/by-name/do/dotnet-repl/package.nix b/pkgs/by-name/do/dotnet-repl/package.nix index 746819980117..3941b45926fa 100644 --- a/pkgs/by-name/do/dotnet-repl/package.nix +++ b/pkgs/by-name/do/dotnet-repl/package.nix @@ -6,12 +6,12 @@ buildDotnetGlobalTool { pname = "dotnet-repl"; - version = "0.3.230"; + version = "0.3.239"; dotnet-sdk = dotnetCorePackages.sdk_9_0; dotnet-runtime = dotnetCorePackages.runtime_9_0; - nugetHash = "sha256-FtITkDZ0Qbjo0XvQ8psRlIsbEZhMjIhk8mVrHmUxlIg="; + nugetHash = "sha256-wn4i0zC56gxnjsgjdiMxLinmUsSROhmimu0lmBZo1hA="; meta = { description = "A polyglot REPL built on .NET Interactive"; diff --git a/pkgs/by-name/dp/dpp/package.nix b/pkgs/by-name/dp/dpp/package.nix index 544c34beb13d..888b6e5bbd5e 100644 --- a/pkgs/by-name/dp/dpp/package.nix +++ b/pkgs/by-name/dp/dpp/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dpp"; - version = "10.1.1"; + version = "10.1.2"; src = fetchFromGitHub { owner = "brainboxdotcc"; repo = "DPP"; rev = "v${finalAttrs.version}"; - hash = "sha256-DHsHmAvL22aC4g5MzY2x793IKB9XHCDrNabQwIbfZn8="; + hash = "sha256-Xdd/ULMddwe0C9KHi0NxxRPotF66ljGH7WItJeexzkk="; }; nativeBuildInputs = [ @@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/brainboxdotcc/DPP/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ xbz ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index bb0f04ba2f5c..a54dc2af687a 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.49.0"; + version = "0.49.1"; # Prefer repository rather than crate here # - They have Cargo.lock in the repository @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec { owner = "dprint"; repo = "dprint"; tag = version; - hash = "sha256-IhxtHOf4IY95B7UQPSOyLj4LqvcD2I9RxEu8B+OjtCE="; + hash = "sha256-6ye9FqOGW40TqoDREQm6pZAQaSuO2o9SY5RSfpmwKV4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OdtUzlvbezeNk06AB6mzR3Rybh08asJJ3roNX0WOg54="; + cargoHash = "sha256-OHRXujyewiDlY4AQEEqmcnmdec1lbWH/y6tPW1nNExE="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles diff --git a/pkgs/by-name/dr/druid/package.nix b/pkgs/by-name/dr/druid/package.nix index 76101c55a26b..c2709adddccd 100644 --- a/pkgs/by-name/dr/druid/package.nix +++ b/pkgs/by-name/dr/druid/package.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "apache-druid"; - version = "31.0.0"; + version = "32.0.1"; src = fetchurl { url = "mirror://apache/druid/${finalAttrs.version}/apache-druid-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-xppAoKNS/qB8WVMwBPxxHbOy5uDGl3IxrCWV1T+YQkE="; + hash = "sha256-Tfu2BEAbwlVnjpF3FtS7w0kXfH0LVtyVLSVTNLo4Ny4="; }; dontBuild = true; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir $out mv * $out - ${optionalString mysqlSupport "ln -s ${mysql_jdbc}/share/java/mysql-connector-java.jar $out/extensions/mysql-metadata-storage"} + ${optionalString mysqlSupport "ln -s ${mysql_jdbc}/share/java/mysql-connector-j.jar $out/extensions/mysql-metadata-storage"} ${finalAttrs.loadExtensions} ${finalAttrs.loadJars} runHook postInstall diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index 7951dc3842de..a1176888b5a0 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "dumbpipe"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = "dumbpipe"; rev = "v${version}"; - hash = "sha256-nYM/QAG57491NqTAkqF1p3DeuVKDPvh6MUqYP/gAWyc="; + hash = "sha256-xQHVEJ+EgsrboXbPg7pGXXMjyedSLooqkTt/yYZACSo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lg/FmeCYL9WVvvEMnkQj1WaxFH+7rBBxgL9zfwSdaVE="; + cargoHash = "sha256-uuY0nh4VHzyM7+cbgyycr5I3IjE0OeQ0eg12qVXe4BQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index a28e1823d129..0d5af34a54b6 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwarfs"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-wQ+6jSf/RWAI7cSRMb1zG09kOiyMM5xiy8yS6tl1ybI="; + hash = "sha256-UOIHtyOGKG0WPwKS1z0agMTvI0RF5sapJ5GoJ7a8+Vs="; }; cmakeFlags = [ diff --git a/pkgs/by-name/dx/dxvk_2/package.nix b/pkgs/by-name/dx/dxvk_2/package.nix index 463024944792..7490ff83e73b 100644 --- a/pkgs/by-name/dx/dxvk_2/package.nix +++ b/pkgs/by-name/dx/dxvk_2/package.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dxvk"; - version = "2.5.3"; + version = "2.6"; src = fetchFromGitHub { owner = "doitsujin"; repo = "dxvk"; rev = "v${finalAttrs.version}"; - hash = "sha256-/dXU5x+YdOHF2mpUy5wykibShQuIfo3OHS4DzXUymIs="; + hash = "sha256-1/9XFqVGW5izlP3rggfB+PK3ewFiOQoGcB/Vjn9MYOQ="; fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info }; diff --git a/pkgs/by-name/dy/dynamodb-local/package.nix b/pkgs/by-name/dy/dynamodb-local/package.nix index 6abdc22cae50..177950548dc2 100644 --- a/pkgs/by-name/dy/dynamodb-local/package.nix +++ b/pkgs/by-name/dy/dynamodb-local/package.nix @@ -27,11 +27,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "dynamodb-local"; - version = "2.5.4"; + version = "2.6.0"; src = fetchurl { - url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-12-23.tar.gz"; - hash = "sha256-YLFWH6YUFkLb062at1pjFclId/b0LmBVESWxHqimLJc="; + url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2025-03-13.tar.gz"; + hash = "sha256-mAXZX+L17+z9f3/sMq+O+zLcg7YKGKL72BhhTtS2xuw="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ec/eclib/package.nix b/pkgs/by-name/ec/eclib/package.nix index 17765450dd38..8eb4a1f0bab0 100644 --- a/pkgs/by-name/ec/eclib/package.nix +++ b/pkgs/by-name/ec/eclib/package.nix @@ -41,13 +41,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - doCheck = true; meta = with lib; { description = "Elliptic curve tools"; diff --git a/pkgs/by-name/ed/editline/package.nix b/pkgs/by-name/ed/editline/package.nix index c8f7558f62f7..7df7fe83936e 100644 --- a/pkgs/by-name/ed/editline/package.nix +++ b/pkgs/by-name/ed/editline/package.nix @@ -5,15 +5,23 @@ autoreconfHook, nix-update-script, fetchpatch, + ncurses ? null, + + # Enable `termcap` (`ncurses`) support. + enableTermcap ? false, }: -stdenv.mkDerivation rec { +assert lib.assertMsg ( + enableTermcap -> ncurses != null +) "`ncurses` must be provided when `enableTermcap` is enabled"; + +stdenv.mkDerivation (finalAttrs: { pname = "editline"; version = "1.17.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "editline"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-0FeDUVCUahbweH24nfaZwa7j7lSfZh1TnQK7KYqO+3g="; }; @@ -31,12 +39,31 @@ stdenv.mkDerivation rec { url = "https://github.com/troglobit/editline/commit/f444a316f5178b8e20fe31e7b2d979e651da077e.patch"; hash = "sha256-m3jExTkPvE+ZBwHzf/A+ugzzfbLmeWYn726l7Po7f10="; }) + + # Recognize `Alt-Left` and `Alt-Right` for navigating by words in more + # terminals/shells/platforms. + # + # See: https://github.com/troglobit/editline/pull/70 + (fetchpatch { + name = "alt-left-alt-right-word-navigation.patch"; + url = "https://github.com/troglobit/editline/commit/fb4d7268de024ed31ad2417f533cc0cbc2cd9b29.diff"; + hash = "sha256-5zMsmpU5zFoffRUwFhI/vP57pEhGotcMPgn9AfI1SNg="; + }) ]; - configureFlags = [ (lib.enableFeature true "sigstop") ]; + configureFlags = [ + # Enable SIGSTOP (Ctrl-Z) behavior. + (lib.enableFeature true "sigstop") + # Enable ANSI arrow keys. + (lib.enableFeature true "arrow-keys") + # Use termcap library to query terminal size. + (lib.enableFeature enableTermcap "termcap") + ]; nativeBuildInputs = [ autoreconfHook ]; + propagatedBuildInputs = lib.optional enableTermcap ncurses; + outputs = [ "out" "dev" @@ -53,4 +80,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ oxalica ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/by-name/eg/egl-wayland/package.nix b/pkgs/by-name/eg/egl-wayland/package.nix index 5c04c83accc5..160f204b2b1f 100644 --- a/pkgs/by-name/eg/egl-wayland/package.nix +++ b/pkgs/by-name/eg/egl-wayland/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.17"; + version = "1.1.18"; outputs = [ "out" "dev" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "Nvidia"; repo = "egl-wayland"; rev = version; - hash = "sha256-/lj52qCbv07NDYDdF8SEjCIWWPAMcwXNvYXiU8IoC/A="; + hash = "sha256-Vu0XPcFKQJ+nypNMX1tw17whVWceZ0YlqvEEmEbTQaU="; }; postPatch = '' diff --git a/pkgs/by-name/el/elfx86exts/package.nix b/pkgs/by-name/el/elfx86exts/package.nix index f5b13ed106b3..f249e1bca6d6 100644 --- a/pkgs/by-name/el/elfx86exts/package.nix +++ b/pkgs/by-name/el/elfx86exts/package.nix @@ -4,19 +4,19 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "elfx86exts"; - version = "unstable-2023-04-20"; + version = "0.6.2"; src = fetchFromGitHub { owner = "pkgw"; repo = "elfx86exts"; - rev = "26bf98cf1fc773196e594c48bfe808d7151076f6"; - hash = "sha256-xNmaKGbMN92CPIQQRbdmeePk5Wt9XcIsB/2vbk5NJzg="; + tag = "elfx86exts@${finalAttrs.version}"; + hash = "sha256-lqaOnZxuiip1HPDpQraXlpUBYeJuBCRTaNARZVEV5UY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-FB2mEI1ZXR0f1+eRcEc8hzlTQZNygU4R5L6qyEl6tLw="; + cargoHash = "sha256-7FVcLvbZQK5M90ofoBpK2V/1+vWlBI/Z2x3ydbCwVbM="; meta = with lib; { description = "Decode x86 binaries and print out which instruction set extensions they use"; @@ -30,4 +30,4 @@ rustPlatform.buildRustPackage { license = with licenses; [ mit ]; mainProgram = "elfx86exts"; }; -} +}) diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix index 551df15ae747..f84373144a36 100644 --- a/pkgs/by-name/en/ente-web/package.nix +++ b/pkgs/by-name/en/ente-web/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ente-web"; - version = "0.9.98"; + version = "0.9.99"; src = fetchFromGitHub { owner = "ente-io"; @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { sparseCheckout = [ "web" ]; tag = "photos-v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-JEVz02FfPRhTolZMXOSmYzvLJTm0ImCuf912MAk2EmM="; + hash = "sha256-/dWnaVll/kaKHTJ5gH18BR6JG5E6pF7/j+SgvE66b7M="; }; sourceRoot = "${finalAttrs.src.name}/web"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/web/yarn.lock"; - hash = "sha256-GIgvHfQc9qz06267lfiDo/WQhxBgS7vMCocMf6PWCHc="; + hash = "sha256-Wu0/YHqkqzrmA5hpVk0CX/W1wJUh8uZSjABuc+DPxMA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index c9401596663a..9872a0f77d2a 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -44,6 +44,9 @@ llvmPackages.stdenv.mkDerivation rec { description = "High-performance automatic differentiation of LLVM and MLIR"; maintainers = with lib.maintainers; [ kiranshila ]; platforms = lib.platforms.all; - license = lib.licenses.asl20-llvm; + license = with lib.licenses; [ + asl20 + llvm-exception + ]; }; } diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix index 958a2314713a..7861ad96ceb3 100644 --- a/pkgs/by-name/ep/epson-escpr2/package.nix +++ b/pkgs/by-name/ep/epson-escpr2/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.27"; + version = "1.2.28"; src = fetchurl { # To find the most recent version go to # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php # and retrieve the download link for source package for arm CPU for the tar.gz (the x86 link targets to rpm source files) - url = "https://download3.ebz.epson.net/dsc/f/03/00/16/77/53/1540531c6f47c62d3846d9a8943b1ecec7f825a1/epson-inkjet-printer-escpr2-1.2.27-1.tar.gz"; - hash = "sha256-h1RaqkN+hdVGVy0ancqfYoeNp/TTfJYy5oRxhPizO2Q="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/80/15/8bd63ccd14a1966e9c3658d374686c5bb104bb04/epson-inkjet-printer-escpr2-1.2.28-1.tar.gz"; + hash = "sha256-lv8Hgo7JzT4igY8ek7EXdyFO34l735dpMC+gWkO5rvY="; }; buildInputs = [ cups ]; diff --git a/pkgs/by-name/er/eresi/package.nix b/pkgs/by-name/er/eresi/package.nix index 1fa56cc97bcd..817cd76ef664 100644 --- a/pkgs/by-name/er/eresi/package.nix +++ b/pkgs/by-name/er/eresi/package.nix @@ -31,6 +31,13 @@ stdenv.mkDerivation rec { url = "https://github.com/thorkill/eresi/commit/bc5b9a75c326f277e5f89e01a3b8f7f0519a99f6.patch"; sha256 = "0lqwrnkkhhd3vi1r8ngvziyqkk09h98h93rrs3ndqi048a898ys1"; }) + + # Fix compilation for gcc14 and newer + # https://github.com/thorkill/eresi/pull/167 + (fetchpatch { + url = "https://github.com/thorkill/eresi/commit/f85397c4dce633764fab29b0642f59fc4764658a.patch"; + sha256 = "sha256-mKmJHjyWwCNh/pueB94Ndhj/3uZLBZNn/m9gXenP5ns="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index d106725a4067..1450966030a1 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -13,15 +13,15 @@ let "linux-${arch}-unknown-linux-gnu"; hashes = { - linux-aarch64-unknown-linux-gnu = "sha256-Fte7oZD5+aFph5xGrKtbSimb3aHewkjsJRXB+64IW5A="; - linux-x86_64-unknown-linux-gnu = "sha256-slnXUEtHJjq6wRQTt1EwqlOO/2zIGmGwa/HCi3F0YMA="; - macos-aarch64-apple-darwin = "sha256-3K3sPizBR/+DJIX67GsYqm2X5k7kq3kBRg8P2WALTZs="; - macos-x86_64-apple-darwin = "sha256-j+AVmLfe/yCvKvYhL5ikhXA1g+zQ1CDlMl1FYO6q1yA="; + linux-aarch64-unknown-linux-gnu = "sha256-i6XsOK8csrJ/9TDzltA7mGjdutLZONFiYGV5tqSCy8o="; + linux-x86_64-unknown-linux-gnu = "sha256-gBIzG0LaP9qxivkr47JpBu1z9km7o/1Wppk/6k2WslE="; + macos-aarch64-apple-darwin = "sha256-8e5duQYDVFyZejMjuZPuWhg1on3CBku9eBuilG5p1BY="; + macos-x86_64-apple-darwin = "sha256-dnouUBUUAkMr1h+IJWYamxmk8IC7JdeIUS9/YI0GzOU="; }; in stdenv.mkDerivation rec { pname = "erlang-language-platform"; - version = "2025-01-21"; + version = "2025-02-13"; src = fetchurl { url = "https://github.com/WhatsApp/erlang-language-platform/releases/download/${version}/elp-${release}-otp-26.2.tar.gz"; diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index 32d0ba0f81fe..b4897125f0b1 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -6,10 +6,12 @@ pkg-config, fuse, util-linux, + xxHash, lz4, xz, zlib, zstd, + libdeflate, libselinux, fuseSupport ? stdenv.hostPlatform.isLinux, selinuxSupport ? false, @@ -23,6 +25,9 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; + enableParallelBuilding = true; + strictDeps = true; + src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; hash = "sha256-zYYRJw6chv4GL2RxA8pq2p7XEORDD91ZYNUUd3kZIA0="; @@ -35,16 +40,22 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ util-linux + xxHash lz4 zlib xz zstd + libdeflate ] ++ lib.optionals fuseSupport [ fuse ] ++ lib.optionals selinuxSupport [ libselinux ]; configureFlags = - [ "MAX_BLOCK_SIZE=4096" ] + [ + "MAX_BLOCK_SIZE=4096" + "--enable-multithreading" + "--with-libdeflate" + ] ++ lib.optional fuseSupport "--enable-fuse" ++ lib.optional selinuxSupport "--with-selinux"; diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix index efe54775925e..9070e0a778ff 100644 --- a/pkgs/by-name/er/errands/package.nix +++ b/pkgs/by-name/er/errands/package.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { owner = "mrvladus"; repo = "Errands"; tag = version; - hash = "sha256-zFI3+U40zzQL3lPPYwL/ekWA1ugOkORlJui4QT6pgQI="; + hash = "sha256-Gs3/DPMsoPTxH+fR7H3gPJr8ITrQDPlmw236vDnmBaA"; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/et/etterna/fix-download-manager.patch b/pkgs/by-name/et/etterna/fix-download-manager.patch new file mode 100644 index 000000000000..432eaa73db1e --- /dev/null +++ b/pkgs/by-name/et/etterna/fix-download-manager.patch @@ -0,0 +1,16 @@ +diff --git a/src/Etterna/Singletons/DownloadManager.cpp b/src/Etterna/Singletons/DownloadManager.cpp +index b42ccd30..3606107d 100644 +--- a/src/Etterna/Singletons/DownloadManager.cpp ++++ b/src/Etterna/Singletons/DownloadManager.cpp +@@ -6265,7 +6265,10 @@ Download::Install() + { + Core::Platform::requestUserAttention(); + Message* msg; +- if (!SongManager::InstallSmzip(m_TempFileName)) ++ ++ auto path = FILEMAN->ResolvePath(m_TempFileName); ++ ++ if (!SongManager::InstallSmzip(path)) + msg = new Message("DownloadFailed"); + else + msg = new Message("PackDownloaded"); diff --git a/pkgs/by-name/et/etterna/package.nix b/pkgs/by-name/et/etterna/package.nix new file mode 100644 index 000000000000..7221ced0f88d --- /dev/null +++ b/pkgs/by-name/et/etterna/package.nix @@ -0,0 +1,109 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeDesktopItem, + copyDesktopItems, + # deps + cmake, + pkg-config, + openssl, + libGLU, + xorg, + alsa-lib, + libjack2, + libpulseaudio, + libogg, + sse2neon, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "etterna"; + version = "0.74.3"; + + src = fetchFromGitHub { + owner = "etternagame"; + repo = "etterna"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zzCk6axISswfTAk7rRha5HFzIHQ0AjpAZyAWzH+Cn1s="; + }; + + patches = [ ./fix-download-manager.patch ]; + + nativeBuildInputs = [ + cmake + pkg-config + + copyDesktopItems + ]; + + buildInputs = [ + openssl + alsa-lib + libjack2 + libpulseaudio + libGLU + libogg + sse2neon + xorg.libXinerama + xorg.libXrandr + xorg.libX11 + xorg.libXext # Needed for DPMS + xorg.libXvMC + ]; + + desktopItems = [ + (makeDesktopItem { + name = "etterna"; + desktopName = "Etterna"; + genericName = "Rhythm and dance game"; + icon = "etterna"; + tryExec = "etterna"; + exec = "etterna"; + categories = [ + "Application" + "Game" + "ArcadeGame" + ]; + comment = "A cross-platform rhythm video game."; + terminal = false; + }) + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/etterna} + mkdir -p $out/share/applications + # copy select necessary game files into virtual fs + cp -r /build/source/{Announcers,Assets,BGAnimations,BackgroundEffects,BackgroundTransitions,Data,GameTools,NoteSkins,Scripts,Themes} "$out/share/etterna" + + # copy binary + cp /build/source/Etterna $out/bin/.etterna-unwrapped + + # Install the Icon + install -Dm644 /build/source/Docs/images/etterna-logo-light.svg "$out/share/icons/hicolor/scalable/apps/etterna.svg" + + # wacky insertion of wrapper directly into phase, so that $out is set + cat > $out/bin/etterna << EOF + #!${stdenv.shell} + export ETTERNA_ROOT_DIR="\$HOME/.local/share/etterna" + export ETTERNA_ADDITIONAL_ROOT_DIRS="$out/share/etterna" + echo "HOME: \$HOME" + echo "PWD: \$(pwd)" + echo "ETTERNA_ADDITIONAL_ROOT_DIRS: \$ETTERNA_ADDITIONAL_ROOT_DIRS" + exec $out/bin/.etterna-unwrapped "\$@" + EOF + chmod +x $out/bin/etterna + runHook postInstall + ''; + + cmakeFlags = [ "-D WITH_CRASHPAD=OFF" ]; + + meta = { + description = "Advanced cross-platform rhythm game focused on keyboard play"; + homepage = "https://etternaonline.com"; + changelog = "https://github.com/etternagame/etterna/release/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ alikindsys ]; + mainProgram = "etterna"; + }; +}) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 029308c6633f..ebda1afcdba1 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.201.0"; + version = "0.201.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-Hw2TIMcKkeSUEKtTwJezCRMUvicrZUjT9UmTvDgKy2s="; + hash = "sha256-nsA/tJXRuL1Ql0N1OR5DeFjXI0PUtSa65hXH6C0Uxds="; }; - vendorHash = "sha256-zWHysXjBNAAZfrVGzn39pdDqQrLUc1uYVLO/U7q0g04="; + vendorHash = "sha256-NUDGqBmRL7L7/RDy68YG+nAz9Sj1Ink0tAbx9or/h1Q="; commonMeta = with lib; { license = licenses.mit; @@ -52,7 +52,7 @@ buildGo124Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-IOpT7YH85iHCK9UqKoomdKQBsPFm4MJ0bbEFbIIxVTc="; + hash = "sha256-iaQNLbbNvklSAEGAveOqStruL+LOpHdmGQqtERkagWU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ev/evil-winrm/Gemfile.lock b/pkgs/by-name/ev/evil-winrm/Gemfile.lock index e85197171d00..63d93e828e22 100644 --- a/pkgs/by-name/ev/evil-winrm/Gemfile.lock +++ b/pkgs/by-name/ev/evil-winrm/Gemfile.lock @@ -2,30 +2,32 @@ GEM remote: https://rubygems.org/ specs: base64 (0.2.0) - bigdecimal (3.1.8) + bigdecimal (3.1.9) builder (3.3.0) - erubi (1.13.0) - ffi (1.17.0) - fileutils (1.7.2) + erubi (1.13.1) + ffi (1.17.1) + fileutils (1.7.3) gssapi (1.3.1) ffi (>= 1.0.1) gyoku (1.4.0) builder (>= 2.1.2) rexml (~> 3.0) - httpclient (2.8.3) + httpclient (2.9.0) + mutex_m little-plugger (1.1.4) - logger (1.6.1) + logger (1.6.6) logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) multi_json (1.15.0) + mutex_m (0.3.0) nori (2.7.1) bigdecimal - rexml (3.3.8) + rexml (3.4.1) rubyntlm (0.6.5) base64 - rubyzip (2.3.2) - stringio (3.1.1) + rubyzip (2.4.1) + stringio (3.1.5) winrm (2.3.9) builder (>= 2.1.2) erubi (~> 1.8) @@ -53,4 +55,4 @@ DEPENDENCIES winrm-fs BUNDLED WITH - 2.2.24 + 2.6.2 diff --git a/pkgs/by-name/ev/evil-winrm/gemset.nix b/pkgs/by-name/ev/evil-winrm/gemset.nix index e8323a6341e7..7eb90702fa47 100644 --- a/pkgs/by-name/ev/evil-winrm/gemset.nix +++ b/pkgs/by-name/ev/evil-winrm/gemset.nix @@ -14,10 +14,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; type = "gem"; }; - version = "3.1.8"; + version = "3.1.9"; }; builder = { groups = [ "default" ]; @@ -34,30 +34,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; + sha256 = "1naaxsqkv5b3vklab5sbb9sdpszrjzlfsbqpy7ncbnw510xi10m0"; type = "gem"; }; - version = "1.13.0"; + version = "1.13.1"; }; ffi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; + sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.1"; }; fileutils = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c86k3027r896wsgvjgdx27kg5d2x4479bc6ni93w9hq88rgp81n"; + sha256 = "1nmmbvqxssmn9cav5x5sxcw9ab3vqpskdy3nbmsqfjk99f2iw9sp"; type = "gem"; }; - version = "1.7.2"; + version = "1.7.3"; }; gssapi = { dependencies = [ "ffi" ]; @@ -85,14 +85,15 @@ version = "1.4.0"; }; httpclient = { + dependencies = [ "mutex_m" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b"; type = "gem"; }; - version = "2.8.3"; + version = "2.9.0"; }; little-plugger = { groups = [ "default" ]; @@ -109,10 +110,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.6"; }; logging = { dependencies = [ @@ -138,6 +139,16 @@ }; version = "1.15.0"; }; + mutex_m = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; + type = "gem"; + }; + version = "0.3.0"; + }; nori = { dependencies = [ "bigdecimal" ]; groups = [ "default" ]; @@ -154,10 +165,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.3.8"; + version = "3.4.1"; }; rubyntlm = { dependencies = [ "base64" ]; @@ -175,20 +186,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; stringio = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; + sha256 = "1j1mgvrgkxhadi6nb6pz1kcff7gsb5aivj1vfhsia4ssa5hj9adw"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.5"; }; winrm = { dependencies = [ diff --git a/pkgs/by-name/ev/evil-winrm/package.nix b/pkgs/by-name/ev/evil-winrm/package.nix index 81acdce03071..6662e55906e1 100644 --- a/pkgs/by-name/ev/evil-winrm/package.nix +++ b/pkgs/by-name/ev/evil-winrm/package.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , makeWrapper , bundlerEnv +, bundlerUpdateScript }: stdenv.mkDerivation rec { @@ -36,6 +37,8 @@ stdenv.mkDerivation rec { cp evil-winrm.rb $out/bin/evil-winrm ''; + passthru.updateScript = bundlerUpdateScript "evil-winrm"; + meta = with lib; { description = "WinRM shell for hacking/pentesting"; mainProgram = "evil-winrm"; diff --git a/pkgs/by-name/ex/exabgp/package.nix b/pkgs/by-name/ex/exabgp/package.nix index 28128bc5b102..a604c08427c2 100644 --- a/pkgs/by-name/ex/exabgp/package.nix +++ b/pkgs/by-name/ex/exabgp/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "exabgp"; - version = "4.2.22"; + version = "4.2.25"; format = "pyproject"; src = fetchFromGitHub { owner = "Exa-Networks"; repo = "exabgp"; tag = version; - hash = "sha256-PrdCAmefKCBmbBFp04KiQGSsZZ4KNFk/ZtMedh9oow4="; + hash = "sha256-YBxRDcm4Qt44W3lBHDwdvZq2pXEujbqJDh24JbXthMg="; }; nativeBuildInputs = with python3.pkgs; [ @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "BGP swiss army knife of networking"; homepage = "https://github.com/Exa-Networks/exabgp"; - changelog = "https://github.com/Exa-Networks/exabgp/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/Exa-Networks/exabgp/blob/${src.tag}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ hexa diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix index 4b649a847156..35483310bff3 100644 --- a/pkgs/by-name/ex/example-robot-data/package.nix +++ b/pkgs/by-name/ex/example-robot-data/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "example-robot-data"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "Gepetto"; repo = "example-robot-data"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-IRmqeaN0EaIjYaibTEAR8KhixoNQsl6YydbGQRinP6w="; + hash = "sha256-702+hR8YzxfHBZYF2Q//4gRF/cx4kdQ1oNHtnYL5xp0="; }; outputs = [ diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 7be657f58d96..20c3cd6617b6 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-11-26"; + version = "2025-03-23"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-o95B9zqKGlI1zpknw1yXhiaPIos3DoMCQXmSranf83c="; + hash = "sha256-ga1dRfOPZr6bQmI9nEfrN6bfCBQ9+fMIF4bnMTMM2J4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix index 03033aab3788..9997e115f631 100644 --- a/pkgs/by-name/ex/expr/package.nix +++ b/pkgs/by-name/ex/expr/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "expr"; - version = "1.16.9"; + version = "1.17.0"; src = fetchFromGitHub { owner = "expr-lang"; repo = "expr"; rev = "v${version}"; - hash = "sha256-AyFL+XHxitueAadx1M/xWqeittDCQ/hzsE/fUzt75yI="; + hash = "sha256-D5hMnihKcSXQUII9L0UmC/fMuFuyqBrgR4yXbYvakn0="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-FiXxplt4w7M0cZz46kdjYuKHailW2cnLOj0jkA9w1RM="; + vendorHash = "sha256-YtYeAJI7J1nalVt4Phl06Xe/8YdU6egbMjYfbo91b/0="; ldflags = [ "-s" diff --git a/pkgs/by-name/ex/extension-manager/package.nix b/pkgs/by-name/ex/extension-manager/package.nix deleted file mode 100644 index 405dbd32d725..000000000000 --- a/pkgs/by-name/ex/extension-manager/package.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - appstream, - blueprint-compiler, - desktop-file-utils, - meson, - ninja, - pkg-config, - wrapGAppsHook4, - gettext, - gtk4, - json-glib, - libadwaita, - libbacktrace, - libsoup_3, - libxml2, - nix-update-script, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "extension-manager"; - version = "0.6.1"; - - src = fetchFromGitHub { - owner = "mjakeman"; - repo = "extension-manager"; - tag = "v${finalAttrs.version}"; - hash = "sha256-0AK7wU04gQCS/3FvoAwAEmaP/jC23EduOSRncLjt4l8="; - }; - - nativeBuildInputs = [ - appstream - blueprint-compiler - desktop-file-utils - meson - ninja - pkg-config - wrapGAppsHook4 - ]; - - buildInputs = [ - gettext - gtk4 - json-glib - libadwaita - libbacktrace - libsoup_3 - libxml2 - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Utility for browsing and installing GNOME Shell Extensions"; - homepage = "https://github.com/mjakeman/extension-manager"; - changelog = "https://github.com/mjakeman/extension-manager/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ arthsmn ]; - mainProgram = "extension-manager"; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/fa/faad2/package.nix b/pkgs/by-name/fa/faad2/package.nix index 328e06960eb5..d4fa16c7f68c 100644 --- a/pkgs/by-name/fa/faad2/package.nix +++ b/pkgs/by-name/fa/faad2/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "faad2"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "knik0"; repo = "faad2"; rev = version; - hash = "sha256-E6oe7yjYy1SJo8xQkyUk1sSucKDMPxwUFVSAyrf4Pd8="; + hash = "sha256-JvmblrmE3doUMUwObBN2b+Ej+CDBWNemBsyYSCXGwo8="; }; outputs = [ diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index 62f03ab0100f..7a708681c53a 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage rec { pname = "factoriolab"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "factoriolab"; repo = "factoriolab"; tag = "v${version}"; - hash = "sha256-4J7WDYvKAAb6If/dRDED1BOiqpBEugIrNRPLwuWjh8Q="; + hash = "sha256-EhCxeZ1rxdYl3JejUiE+Ss02hm91tmXuyJ/2UgS+ZIw="; }; buildInputs = [ vips ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/fa/fake-gcs-server/package.nix b/pkgs/by-name/fa/fake-gcs-server/package.nix index 62f9401562a7..b0fdb2b1547f 100644 --- a/pkgs/by-name/fa/fake-gcs-server/package.nix +++ b/pkgs/by-name/fa/fake-gcs-server/package.nix @@ -18,6 +18,11 @@ buildGoModule rec { vendorHash = "sha256-oTJ4DCsDazo58ozsAKI0BG7rxfF8oeiIl6vQpRng+LM="; + # Unit tests fail to start the emulator server in some environments (e.g. Hydra) for some reason. + # + # Disabling to avoid flakiness. + doCheck = false; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/fa/fanbox-dl/package.nix b/pkgs/by-name/fa/fanbox-dl/package.nix index 4f1b0eb3e822..d3d0e7050960 100644 --- a/pkgs/by-name/fa/fanbox-dl/package.nix +++ b/pkgs/by-name/fa/fanbox-dl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "fanbox-dl"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "hareku"; repo = "fanbox-dl"; rev = "v${version}"; - hash = "sha256-qsuYsAXlMuNvGxtrisqqr2E9OgiXsYneBx+CnVOyU2g="; + hash = "sha256-el9+pusnqui7G+x05lJsLjnZ4OymvBVSCa7ReJTgqLw="; }; - vendorHash = "sha256-l/mgjCqRzidJ1QxH8bKGa7ZnRZVOqkuNifgEyFVU7fA="; + vendorHash = "sha256-BZebo50HEKIk1z0LJg8kE1adovyAk67L6jsiaNcpeDY="; # pings websites during testing doCheck = false; diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index edebd6278d60..9ecdb4239114 100644 --- a/pkgs/by-name/fa/fast-float/package.nix +++ b/pkgs/by-name/fa/fast-float/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fast-float"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-shP+me3iqTRrsPGYrvcbnJNRZouQbW62T24xfkEgGSE="; + hash = "sha256-Y13JdBk8pZyg748fEOj+O/6gMAaqNXIE2fLY5tsMGB0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/fa/fastcdr/package.nix b/pkgs/by-name/fa/fastcdr/package.nix index 15c47c0339af..7f66c051cc95 100644 --- a/pkgs/by-name/fa/fastcdr/package.nix +++ b/pkgs/by-name/fa/fastcdr/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastcdr"; - version = "2.2.6"; + version = "2.3.0"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-CDR"; rev = "v${finalAttrs.version}"; - hash = "sha256-kraflUsnsUBCwCN8vEVaPExSBF0cMdser2UwXpAGhlw="; + hash = "sha256-wPhXVQyVtAcMrgeF9diHlyp10SAYfRn67Ly3aFyM/Zc="; }; patches = [ diff --git a/pkgs/by-name/fa/fastddsgen/package.nix b/pkgs/by-name/fa/fastddsgen/package.nix index 8f7e23079ae4..3ac2a2b050ec 100644 --- a/pkgs/by-name/fa/fastddsgen/package.nix +++ b/pkgs/by-name/fa/fastddsgen/package.nix @@ -9,7 +9,7 @@ let pname = "fastddsgen"; - version = "4.0.3"; + version = "4.0.4"; gradle = gradle_7; @@ -22,7 +22,7 @@ stdenv.mkDerivation { repo = "Fast-DDS-Gen"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-jim6Yqo0Gw8oj7AFzI7BEkvS2WZiT1KawbclIFyPpac="; + hash = "sha256-5M1N0f1kVaIC5dkLb5ft0Da8CqzVRQlyr1otQdMvtow="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index c660d923c7df..f769b0a9966f 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.38.0"; + version = "2.39.1"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-9ph6Zp1x/MP0apB39L+HFUCl7qQ9UfIU89/78+qy6Vc="; + hash = "sha256-7ukbYmfhfdjzooHA9J/AixfkZrzJZvnoHGg4z2jCZPI="; }; outputs = [ diff --git a/pkgs/by-name/fa/faustPhysicalModeling/package.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix index 4ffa2d799996..a2e928592842 100644 --- a/pkgs/by-name/fa/faustPhysicalModeling/package.nix +++ b/pkgs/by-name/fa/faustPhysicalModeling/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.77.3"; + version = "2.79.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-CADiJXyB4FivQjbh1nhpAVgCkTi1pW/vtXKXfL7o7xU="; + sha256 = "sha256-j5ADlKZriwLARpEJ/4xgvyAhF5ld9Hl2gXZS3NPJJj8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcft/package.nix b/pkgs/by-name/fc/fcft/package.nix index 7c60607f2f0c..be0327dcc688 100644 --- a/pkgs/by-name/fc/fcft/package.nix +++ b/pkgs/by-name/fc/fcft/package.nix @@ -33,14 +33,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.2.0"; + version = "3.3.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - hash = "sha256-VMNjTOil50/GslSzZnBPkSoy0Vg0729ndaEAeXk00GI="; + hash = "sha256:08fr6zcqk4qp1k3r0di6v60qfyd3q5k9jnxzlsx2p1lh0nils0xa"; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/by-name/fe/feedbackd/package.nix b/pkgs/by-name/fe/feedbackd/package.nix index 092ac7cc6dc5..61c409dfb4b2 100644 --- a/pkgs/by-name/fe/feedbackd/package.nix +++ b/pkgs/by-name/fe/feedbackd/package.nix @@ -34,7 +34,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "feedbackd"; - version = "0.7.0"; + version = "0.8.0"; outputs = [ "out" @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Librem5"; repo = "feedbackd"; rev = "v${finalAttrs.version}"; - hash = "sha256-qwyq1v+20Gotpk0CbUe6MdDJ5bmKmTHOen+rxWljjeA="; + hash = "sha256-Hn850+bRSNDe8ZgDRu52N7AR/yLNbV6zGROBYtetOZg="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/fe/fend/package.nix b/pkgs/by-name/fe/fend/package.nix index 3099793d8755..f27ea5128db4 100644 --- a/pkgs/by-name/fe/fend/package.nix +++ b/pkgs/by-name/fe/fend/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "printfn"; repo = "fend"; rev = "v${version}"; - hash = "sha256-yRNfkP6DgXK1pLq50D9dMbbJaOX4ouQACJrfP5XrAJs="; + hash = "sha256-FaPP7344rb5789CeDv9L4lysiTrK+7UoEbH8IK/6N3k="; }; useFetchCargoVendor = true; - cargoHash = "sha256-A/NqG5hrtTmbC3cpiRr16hQ6qyqfRhbrMGtB8KFcr1o="; + cargoHash = "sha256-BFWk91FPJaHccr9LeLq5NQlVrkglMz1W0MPTz0HzOfI="; nativeBuildInputs = [ pandoc diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index be5f8d6be4e9..e9821fa90db2 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -6,10 +6,10 @@ let pname = "fflogs"; - version = "8.16.11"; + version = "8.16.19"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-a+d9rLGJZCjrNH+Q7Vi2W26kh5xZJWMRGqB4Heg7qZE="; + hash = "sha256-qP/WpW1AYKrB0Cx/LpUlV1gw06mcFutxfGJybsAw1EQ="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix new file mode 100644 index 000000000000..0e6010b3b92d --- /dev/null +++ b/pkgs/by-name/fi/firezone-gateway/package.nix @@ -0,0 +1,45 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "firezone-gateway"; + version = "1.4.5"; + src = fetchFromGitHub { + owner = "firezone"; + repo = "firezone"; + tag = "gateway-${version}"; + hash = "sha256-2MDQyMCQIqV1Kbem53jnE8DGUZ6SrZqp2LpGJXvLBgA="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Yz9xuH8Eph1pzv0siTpvdSXZLj/AjS5PR06CitK9NdE="; + sourceRoot = "${src.name}/rust"; + buildAndTestSubdir = "gateway"; + RUSTFLAGS = "--cfg system_certs"; + + # Required to remove profiling arguments which conflict with this builder + postPatch = '' + rm .cargo/config.toml + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "gateway-(.*)" + ]; + }; + + meta = { + description = "WireGuard tunnel server for the Firezone zero-trust access platform"; + homepage = "https://github.com/firezone/firezone"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + oddlama + patrickdag + ]; + mainProgram = "firezone-gateway"; + }; +} diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix new file mode 100644 index 000000000000..61e865305dcc --- /dev/null +++ b/pkgs/by-name/fi/firezone-gui-client/package.nix @@ -0,0 +1,166 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + stdenvNoCC, + pkg-config, + openssl, + dbus, + zenity, + cargo-tauri, + gdk-pixbuf, + glib, + gobject-introspection, + gtk3, + kdePackages, + libsoup_3, + libayatana-appindicator, + webkitgtk_4_1, + wrapGAppsHook3, + pnpm_9, + nodejs, + makeDesktopItem, + copyDesktopItems, +}: +let + version = "1.4.9"; + src = fetchFromGitHub { + owner = "firezone"; + repo = "firezone"; + tag = "gui-client-${version}"; + hash = "sha256-nOf7+48WUzQ7VmP7PFo07ZhtgyG7VOI/Hb/rXyBU5o0="; + }; + + frontend = stdenvNoCC.mkDerivation rec { + pname = "firezone-gui-client-frontend"; + inherit version src; + + pnpmDeps = pnpm_9.fetchDeps { + inherit pname version; + src = "${src}/rust/gui-client"; + hash = "sha256-9ywC920EF6UxkXHs+0WWaU8fr5J35/C+0nNGbSVHESE="; + }; + pnpmRoot = "rust/gui-client"; + + nativeBuildInputs = [ + pnpm_9.configHook + nodejs + ]; + + buildPhase = '' + runHook preBuild + + cd $pnpmRoot + cp node_modules/flowbite/dist/flowbite.min.js src/ + pnpm tailwindcss -i src/input.css -o src/output.css + node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; + }; +in +rustPlatform.buildRustPackage rec { + pname = "firezone-gui-client"; + inherit version src; + + useFetchCargoVendor = true; + cargoHash = "sha256-ltxyI3Xoute0/HHXYU4XdFjcQ9zSLx6ZzAZFEjDk6zw="; + sourceRoot = "${src.name}/rust"; + buildAndTestSubdir = "gui-client"; + RUSTFLAGS = "--cfg system_certs"; + + nativeBuildInputs = [ + cargo-tauri.hook + pkg-config + wrapGAppsHook3 + copyDesktopItems + ]; + + buildInputs = [ + openssl + dbus + gdk-pixbuf + glib + gobject-introspection + gtk3 + libsoup_3 + + libayatana-appindicator + webkitgtk_4_1 + ]; + + # Required to remove profiling arguments which conflict with this builder + postPatch = '' + rm .cargo/config.toml + ln -s ${frontend} gui-client/dist + ''; + + # Tries to compile apple specific crates due to workspace dependencies, + # not sure if this can be worked around + doCheck = false; + + desktopItems = [ + # Additional desktop item to associate deep-links + (makeDesktopItem { + name = "firezone-client-gui-deep-link"; + exec = "firezone-client-gui open-deep-link %U"; + icon = "firezone-client-gui"; + comment = meta.description; + desktopName = "Firezone GUI Client"; + categories = [ "Network" ]; + noDisplay = true; + mimeTypes = [ + "x-scheme-handler/firezone-fd0020211111" + ]; + }) + ]; + + preFixup = '' + gappsWrapperArgs+=( + # Otherwise blank screen, see https://github.com/tauri-apps/tauri/issues/9304 + --set WEBKIT_DISABLE_DMABUF_RENDERER 1 + --prefix PATH ":" ${ + lib.makeBinPath [ + zenity + kdePackages.kdialog + ] + } + --prefix LD_LIBRARY_PATH ":" ${ + lib.makeLibraryPath [ + libayatana-appindicator + ] + } + ) + ''; + + passthru = { + inherit frontend; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "gui-client-(.*)" + ]; + }; + }; + + meta = { + description = "GUI client for the Firezone zero-trust access platform"; + homepage = "https://github.com/firezone/firezone"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + oddlama + patrickdag + ]; + mainProgram = "firezone-gui-client"; + }; +} diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix new file mode 100644 index 000000000000..459411058d54 --- /dev/null +++ b/pkgs/by-name/fi/firezone-headless-client/package.nix @@ -0,0 +1,50 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "firezone-headless-client"; + version = "1.4.5"; + src = fetchFromGitHub { + owner = "firezone"; + repo = "firezone"; + tag = "headless-client-${version}"; + hash = "sha256-IVbMdRtb6cu4obTFYPAYQXu9sXH7vT7K9j79IXg0KXk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-8//Gg45iJw9rfEn08FW+wDbg7Dz2MyKFGf3p2Td7kHA="; + sourceRoot = "${src.name}/rust"; + buildAndTestSubdir = "headless-client"; + RUSTFLAGS = "--cfg system_certs"; + + # Required to remove profiling arguments which conflict with this builder + postPatch = '' + rm .cargo/config.toml + ''; + + # Required to run tests + preCheck = '' + export XDG_RUNTIME_DIR=$(mktemp -d) + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "headless-client-(.*)" + ]; + }; + + meta = { + description = "CLI client for the Firezone zero-trust access platform"; + homepage = "https://github.com/firezone/firezone"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + oddlama + patrickdag + ]; + mainProgram = "firezone-headless-client"; + }; +} diff --git a/pkgs/by-name/fi/firezone-relay/package.nix b/pkgs/by-name/fi/firezone-relay/package.nix new file mode 100644 index 000000000000..45dac6e2415a --- /dev/null +++ b/pkgs/by-name/fi/firezone-relay/package.nix @@ -0,0 +1,37 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "firezone-relay"; + version = "0-unstable-2025-03-15"; + src = fetchFromGitHub { + owner = "firezone"; + repo = "firezone"; + rev = "09fb5f927410503b0d6e7fc6cf6a2ba06cb5a281"; + hash = "sha256-qDeXAzOeTenL6OIsun/rEfPMo62mQT7RhJEmqemzMsM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-uqy4GgYaSX2kM4a37093lHmhvOtNUhkEs6/ZS1bjuYo="; + sourceRoot = "${src.name}/rust"; + buildAndTestSubdir = "relay"; + RUSTFLAGS = "--cfg system_certs"; + + # Required to remove profiling arguments which conflict with this builder + postPatch = '' + rm .cargo/config.toml + ''; + + meta = { + description = "STUN/TURN server for the Firezone zero-trust access platform"; + homepage = "https://github.com/firezone/firezone"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + oddlama + patrickdag + ]; + mainProgram = "firezone-relay"; + }; +} diff --git a/pkgs/by-name/fi/firezone-server-api/package.nix b/pkgs/by-name/fi/firezone-server-api/package.nix new file mode 100644 index 000000000000..010269382da8 --- /dev/null +++ b/pkgs/by-name/fi/firezone-server-api/package.nix @@ -0,0 +1,4 @@ +{ firezone-server }: +firezone-server.override { + mixReleaseName = "api"; +} diff --git a/pkgs/by-name/fi/firezone-server-domain/package.nix b/pkgs/by-name/fi/firezone-server-domain/package.nix new file mode 100644 index 000000000000..bba7de68004e --- /dev/null +++ b/pkgs/by-name/fi/firezone-server-domain/package.nix @@ -0,0 +1,4 @@ +{ firezone-server }: +firezone-server.override { + mixReleaseName = "domain"; +} diff --git a/pkgs/by-name/fi/firezone-server-web/package.nix b/pkgs/by-name/fi/firezone-server-web/package.nix new file mode 100644 index 000000000000..79d430b356b1 --- /dev/null +++ b/pkgs/by-name/fi/firezone-server-web/package.nix @@ -0,0 +1,4 @@ +{ firezone-server }: +firezone-server.override { + mixReleaseName = "web"; +} diff --git a/pkgs/by-name/fi/firezone-server/0000-add-mua.patch b/pkgs/by-name/fi/firezone-server/0000-add-mua.patch new file mode 100644 index 000000000000..68d8a9ba47ab --- /dev/null +++ b/pkgs/by-name/fi/firezone-server/0000-add-mua.patch @@ -0,0 +1,67 @@ +diff --git a/elixir/apps/domain/lib/domain/config/definitions.ex b/elixir/apps/domain/lib/domain/config/definitions.ex +index 8cd2e8d0f..92e18b10b 100644 +--- a/elixir/apps/domain/lib/domain/config/definitions.ex ++++ b/elixir/apps/domain/lib/domain/config/definitions.ex +@@ -584,6 +590,7 @@ defmodule Domain.Config.Definitions do + Swoosh.Adapters.Mailgun, + Swoosh.Adapters.Mailjet, + Swoosh.Adapters.Mandrill, ++ Swoosh.Adapters.Mua, + Swoosh.Adapters.Postmark, + Swoosh.Adapters.ProtonBridge, + Swoosh.Adapters.SMTP, +diff --git a/elixir/config/runtime.exs b/elixir/config/runtime.exs +index 15037e0a3..475c4ddfb 100644 +--- a/elixir/config/runtime.exs ++++ b/elixir/config/runtime.exs +@@ -226,8 +228,15 @@ if config_env() == :prod do + config :domain, + Domain.Mailer, + [ +- adapter: compile_config!(:outbound_email_adapter), +- from_email: compile_config!(:outbound_email_from) ++ adapter: compile_config!(:outbound_email_adapter), ++ from_email: compile_config!(:outbound_email_from), ++ protocol: String.to_atom(System.get_env("OUTBOUND_EMAIL_SMTP_PROTOCOL")), ++ relay: System.get_env("OUTBOUND_EMAIL_SMTP_HOST"), ++ port: String.to_integer(System.get_env("OUTBOUND_EMAIL_SMTP_PORT")), ++ auth: [ ++ username: System.get_env("OUTBOUND_EMAIL_SMTP_USERNAME"), ++ password: System.get_env("OUTBOUND_EMAIL_SMTP_PASSWORD") ++ ] + ] ++ compile_config!(:outbound_email_adapter_opts) + + config :workos, WorkOS.Client, +diff --git a/elixir/mix.exs b/elixir/mix.exs +index 12782d631..dee1245d2 100644 +--- a/elixir/mix.exs ++++ b/elixir/mix.exs +@@ -47,7 +47,9 @@ defmodule Firezone.MixProject do + # Formatter doesn't track dependencies of children applications + {:phoenix, "~> 1.7.0"}, + {:phoenix_live_view, "~> 1.0.0-rc.0"}, +- {:floki, "~> 0.37.0"} ++ {:floki, "~> 0.37.0"}, ++ {:mua, "~> 0.2.0"}, ++ {:mail, "~> 0.3.0"} + ] + end + +diff --git a/elixir/mix.lock b/elixir/mix.lock +index 8c4b65959..3d2f9faca 100644 +--- a/elixir/mix.lock ++++ b/elixir/mix.lock +@@ -50,11 +50,13 @@ + "junit_formatter": {:hex, :junit_formatter, "3.4.0", "d0e8db6c34dab6d3c4154c3b46b21540db1109ae709d6cf99ba7e7a2ce4b1ac2", [:mix], [], "hexpm", "bb36e2ae83f1ced6ab931c4ce51dd3dbef1ef61bb4932412e173b0cfa259dacd"}, + "libcluster": {:hex, :libcluster, "3.3.3", "a4f17721a19004cfc4467268e17cff8b1f951befe428975dd4f6f7b84d927fe0", [:mix], [{:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "7c0a2275a0bb83c07acd17dab3c3bfb4897b145106750eeccc62d302e3bdfee5"}, + "logger_json": {:hex, :logger_json, "6.2.0", "13e2e9f5f7b195865c5c3ef3d296c3ad50e7ecb038d899433702a79e979b91d7", [:mix], [{:ecto, "~> 3.11", [hex: :ecto, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "98366d02bedbb56e41b25a6d248d566d4f4bc224bae2b1e982df00ed04ba9219"}, ++ "mail": {:hex, :mail, "0.3.1", "cb0a14e4ed8904e4e5a08214e686ccf6f9099346885db17d8c309381f865cc5c", [:mix], [], "hexpm", "1db701e89865c1d5fa296b2b57b1cd587587cca8d8a1a22892b35ef5a8e352a6"}, + "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"}, + "mime": {:hex, :mime, "2.0.6", "8f18486773d9b15f95f4f4f1e39b710045fa1de891fada4516559967276e4dc2", [:mix], [], "hexpm", "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"}, + "mimerl": {:hex, :mimerl, "1.3.0", "d0cd9fc04b9061f82490f6581e0128379830e78535e017f7780f37fea7545726", [:rebar3], [], "hexpm", "a1e15a50d1887217de95f0b9b0793e32853f7c258a5cd227650889b38839fe9d"}, + "mint": {:hex, :mint, "1.6.2", "af6d97a4051eee4f05b5500671d47c3a67dac7386045d87a904126fd4bbcea2e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "5ee441dffc1892f1ae59127f74afe8fd82fda6587794278d924e4d90ea3d63f9"}, + "mix_audit": {:hex, :mix_audit, "2.1.4", "0a23d5b07350cdd69001c13882a4f5fb9f90fbd4cbf2ebc190a2ee0d187ea3e9", [:make, :mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}], "hexpm", "fd807653cc8c1cada2911129c7eb9e985e3cc76ebf26f4dd628bb25bbcaa7099"}, ++ "mua": {:hex, :mua, "0.2.4", "a9172ab0a1ac8732cf2699d739ceac3febcb9b4ffc540260ad2e32c0b6632af9", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "e7e4dacd5ad65f13e3542772e74a159c00bd2d5579e729e9bb72d2c73a266fb7"}, + "multipart": {:hex, :multipart, "0.4.0", "634880a2148d4555d050963373d0e3bbb44a55b2badd87fa8623166172e9cda0", [:mix], [{:mime, "~> 1.2 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}], "hexpm", "3c5604bc2fb17b3137e5d2abdf5dacc2647e60c5cc6634b102cf1aef75a06f0a"}, + "nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"}, + "nimble_options": {:hex, :nimble_options, "1.1.1", "e3a492d54d85fc3fd7c5baf411d9d2852922f66e69476317787a7b2bb000a61b", [:mix], [], "hexpm", "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"}, diff --git a/pkgs/by-name/fi/firezone-server/package.nix b/pkgs/by-name/fi/firezone-server/package.nix new file mode 100644 index 000000000000..3e09361bf1bb --- /dev/null +++ b/pkgs/by-name/fi/firezone-server/package.nix @@ -0,0 +1,90 @@ +{ + lib, + nixosTests, + fetchFromGitHub, + beamPackages, + gitMinimal, + pnpm_9, + nodejs, + tailwindcss_3, + esbuild, + + mixReleaseName ? "domain", # "domain" "web" or "api" +}: + +beamPackages.mixRelease rec { + pname = "firezone-server-${mixReleaseName}"; + version = "0-unstable-2025-03-15"; + + src = "${ + fetchFromGitHub { + owner = "firezone"; + repo = "firezone"; + rev = "09fb5f927410503b0d6e7fc6cf6a2ba06cb5a281"; + hash = "sha256-1CZBFhOwX0DfXykPQ9tzn4tHg2tSnByXEPtlZleHK5k="; + + # This is necessary to allow sending mails via SMTP, as the default + # SMTP adapter is current broken: https://github.com/swoosh/swoosh/issues/785 + postFetch = '' + ${lib.getExe gitMinimal} -C $out apply ${./0000-add-mua.patch} + ''; + } + }/elixir"; + + pnpmDeps = pnpm_9.fetchDeps { + inherit pname version; + src = "${src}/apps/web/assets"; + hash = "sha256-ejyBppFtKeyVhAWmssglbpLleOnbw9d4B+iM5Vtx47A="; + }; + pnpmRoot = "apps/web/assets"; + + preBuild = '' + cat >> config/config.exs <> config/runtime.exs < +Date: Wed, 19 Mar 2025 09:39:04 +0100 +Subject: [PATCH] Fix concurrent setlocale() in string escape tests + +In our C++ implementation, these tests were run serially. As pointed out in +https://github.com/fish-shell/fish-shell/issues/11254#issuecomment-2735623229 +we run them in parallel now, which means that one test could be changing +the global locale used by another. + +In theory this could be fine because all tests are setting setting the +global locale to the same thing but the existence of a lock suggests that +setlocale() is not guaranteed to be atomic, so it's possible that another +thread uses a temporarily-invalid locale. + +Fixes #11254 +--- + src/tests/string_escape.rs | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/src/tests/string_escape.rs b/src/tests/string_escape.rs +index ba8ee7534ebf..4428d679cd35 100644 +--- a/src/tests/string_escape.rs ++++ b/src/tests/string_escape.rs +@@ -1,3 +1,5 @@ ++use std::sync::MutexGuard; ++ + use crate::common::{ + escape_string, str2wcstring, unescape_string, wcs2string, EscapeFlags, EscapeStringStyle, + UnescapeStringStyle, ENCODE_DIRECT_BASE, ENCODE_DIRECT_END, +@@ -10,21 +12,21 @@ use rand::{Rng, RngCore}; + + /// wcs2string is locale-dependent, so ensure we have a multibyte locale + /// before using it in a test. +-fn setlocale() { +- let _guard = LOCALE_LOCK.lock().unwrap(); ++fn setlocale() -> MutexGuard<'static, ()> { ++ let guard = LOCALE_LOCK.lock().unwrap(); + + #[rustfmt::skip] + const UTF8_LOCALES: &[&str] = &[ + "C.UTF-8", "en_US.UTF-8", "en_GB.UTF-8", "de_DE.UTF-8", "C.utf8", "UTF-8", + ]; + if crate::libc::MB_CUR_MAX() > 1 { +- return; ++ return guard; + } + for locale in UTF8_LOCALES { + let locale = std::ffi::CString::new(locale.to_owned()).unwrap(); + unsafe { libc::setlocale(libc::LC_CTYPE, locale.as_ptr()) }; + if crate::libc::MB_CUR_MAX() > 1 { +- return; ++ return guard; + } + } + panic!("No UTF-8 locale found"); +@@ -100,7 +102,7 @@ fn test_escape_var() { + } + + fn escape_test(escape_style: EscapeStringStyle, unescape_style: UnescapeStringStyle) { +- setlocale(); ++ let _locale_guard = setlocale(); + let seed: u128 = 92348567983274852905629743984572; + let mut rng = get_seeded_rng(seed); + +@@ -174,7 +176,7 @@ fn str2hex(input: &[u8]) -> String { + /// string comes back through double conversion. + #[test] + fn test_convert() { +- setlocale(); ++ let _locale_guard = setlocale(); + let seed = get_rng_seed(); + let mut rng = get_seeded_rng(seed); + let mut origin = Vec::new(); diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index c26c23de32ff..d0255f5dd6f1 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -188,6 +188,10 @@ stdenv.mkDerivation (finalAttrs: { # * # * ./nix-darwin-path.patch + + # remove 4.0.2 + # https://github.com/fish-shell/fish-shell/issues/11254 + ./1d78c8bd4295262a3118f478e6b3a7c7536fa282.patch ]; # Fix FHS paths in tests @@ -317,16 +321,12 @@ stdenv.mkDerivation (finalAttrs: { darwin.system_cmds ]; + # we target the top-level make target which runs all the cmake/ctest + # tests, including test_cargo-test checkTarget = "fish_run_tests"; preCheck = '' export TERMINFO="${ncurses}/share/terminfo" ''; - checkFlags = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # thread 'tests::string_escape::test_escape_random_url' panicked at src/tests/string_escape.rs:122:9: - # assertion `left == right` failed: Escaped and then unescaped string ... but got back a different string ... - # https://github.com/fish-shell/fish-shell/issues/11254 - "--skip=tests::string_escape::test_escape_random_url" - ]; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index be41bb6d0c21..affa56aaedea 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashmq"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; tag = "v${finalAttrs.version}"; - hash = "sha256-JvR03keUJkqVdjPC8q3DCFoDWzqHNozj4rZq9rnuexM="; + hash = "sha256-/nSNWmSR16V1+nXOMIx+TtxtNS9Xk3BJSY4ps+6TwG8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/flite/package.nix b/pkgs/by-name/fl/flite/package.nix index 514ded67728a..641697bf286a 100644 --- a/pkgs/by-name/fl/flite/package.nix +++ b/pkgs/by-name/fl/flite/package.nix @@ -31,14 +31,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Tq5pyg3TiQt8CPqGXTyLOaGgaeLTmPp+Duw3+2VAF9g="; }; - # https://github.com/festvox/flite/pull/60. - # Replaces `ar` with `$(AR)` in config/common_make_rules. - # Improves cross-compilation compatibility. patches = [ + # https://github.com/festvox/flite/pull/60. + # Replaces `ar` with `$(AR)` in config/common_make_rules. + # Improves cross-compilation compatibility. (fetchpatch { url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch"; hash = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8="; }) + # patch missing bsd conditions in configure + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/0d316feccaf89c1bd804d6001274426a7135c93a/audio/flite/files/patch-configure"; + hash = "sha256-D2wOtmHFcuA8JRtIds03yPrBGtMuhLJHuufEQdpcB58="; + extraPrefix = ""; + }) ]; buildInputs = lib.optional stdenv.hostPlatform.isLinux ( diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index 416e886a3db0..d023bbdd6e08 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.58.0"; + version = "0.58.1"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-nneE2qE7k89gg8aBscyRHRD5jpNmQxwdxQmKlX1w/KA="; + sha256 = "sha256-YD0H6t5Qj6k8jUfjuMzgY3K2iAN+u4kvcjaqMANkrsw="; }; dontUnpack = true; diff --git a/pkgs/by-name/fl/fluent-bit/macos-11-sdk-compat.patch b/pkgs/by-name/fl/fluent-bit/macos-11-sdk-compat.patch deleted file mode 100644 index 5063e028e656..000000000000 --- a/pkgs/by-name/fl/fluent-bit/macos-11-sdk-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git i/src/flb_utils.c w/src/flb_utils.c -index 87637f1331d7..7a0036566438 100644 ---- i/src/flb_utils.c -+++ w/src/flb_utils.c -@@ -1424,11 +1424,11 @@ int flb_utils_get_machine_id(char **out_id, size_t *out_size) - return 0; - } - #elif defined (FLB_SYSTEM_MACOS) - bool bret; - CFStringRef serialNumber; -- io_service_t platformExpert = IOServiceGetMatchingService(kIOMainPortDefault, -+ io_service_t platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, - IOServiceMatching("IOPlatformExpertDevice")); - - if (platformExpert) { - CFTypeRef serialNumberAsCFString = - IORegistryEntryCreateCFProperty(platformExpert, diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 48ffdd8618a0..941a006b6161 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -1,81 +1,145 @@ { lib, stdenv, - fetchFromGitHub, - cmake, - flex, + arrow-glib, bison, - systemd, + c-ares, + cmake, + curl, + fetchFromGitHub, + flex, + jemalloc, + libbacktrace, + libbpf, + libnghttp2, libpq, - openssl, libyaml, - darwin, + luajit, + nix-update-script, + nixosTests, + openssl, + pkg-config, + rdkafka, + systemd, + versionCheckHook, + zlib, + zstd, }: stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.2.8"; + version = "3.2.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; - rev = "v${finalAttrs.version}"; - hash = "sha256-E+y8lZ5fgJORFkig6aSVMYGk0US1b4xwjO9qnGu4R/Y="; + tag = "v${finalAttrs.version}"; + hash = "sha256-10L+w9SLfblE9Ok9lvZdU1i63NRtw/pT5ePk+zJwvHQ="; }; - # optional only to avoid linux rebuild - patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macos-11-sdk-compat.patch ]; + # The source build documentation covers some dependencies and CMake options. + # + # - Linux: https://docs.fluentbit.io/manual/installation/sources/build-and-install + # - Darwin: https://docs.fluentbit.io/manual/installation/macos#compile-from-source + # + # Unfortunately, fluent-bit vends many dependencies (e.g. luajit) as source files and tries to compile them by + # default, with none of their dependencies and CMake options documented. + # + # Fortunately, there's the undocumented `FLB_PREFER_SYSTEM_LIBS` CMake option to link against system libraries for + # some dependencies. + # + # See https://github.com/fluent/fluent-bit/blob/v3.2.6/CMakeLists.txt#L211-L218. + # + # Like `FLB_PREFER_SYSTEM_LIBS`, several CMake options aren't documented. + # + # See https://github.com/fluent/fluent-bit/blob/v3.2.6/CMakeLists.txt#L111-L157. + # + # The CMake options may differ across target platforms. We'll stick to the minimum. + # + # See https://github.com/fluent/fluent-bit/tree/v3.2.6/packaging/distros. + + strictDeps = true; nativeBuildInputs = [ + bison cmake flex - bison + pkg-config ]; buildInputs = [ - openssl - libyaml + arrow-glib + c-ares + # Needed by rdkafka. + curl + jemalloc + libbacktrace + libnghttp2 libpq + libyaml + luajit + openssl + rdkafka + # Needed by rdkafka. + zlib + # Needed by rdkafka. + zstd ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.IOKit - darwin.apple_sdk_11_0.frameworks.Foundation + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # libbpf doesn't build for Darwin yet. + libbpf + systemd ]; - cmakeFlags = [ - "-DFLB_RELEASE=ON" - "-DFLB_METRICS=ON" - "-DFLB_HTTP_SERVER=ON" - "-DFLB_OUT_PGSQL=ON" - ]; + cmakeFlags = + [ + (lib.cmakeBool "FLB_RELEASE" true) + (lib.cmakeBool "FLB_PREFER_SYSTEM_LIBS" true) + ] + ++ lib.optionals stdenv.cc.isClang [ + # `FLB_SECURITY` causes bad linker options for Clang to be set. + (lib.cmakeBool "FLB_SECURITY" false) + ]; - env.NIX_CFLAGS_COMPILE = toString ( - # Assumes GNU version of strerror_r, and the posix version has an - # incompatible return type. - lib.optionals (!stdenv.hostPlatform.isGnu) [ "-Wno-int-conversion" ] - ); + # `src/CMakeLists.txt` installs fluent-bit's systemd unit files at the path in the `SYSTEMD_UNITDIR` CMake variable. + # + # The initial value of `SYSTEMD_UNITDIR` is set in `cmake/FindJournald` which uses pkg-config to find the systemd + # unit directory in the systemd package's `systemdsystemunitdir` pkg-config variable. `src/CMakeLists.txt` only + # sets `SYSTEMD_UNITDIR` to `/lib/systemd/system` if it's unset. + # + # By default, this resolves to systemd's Nix store path which is immutable. Consequently, CMake fails when trying + # to install fluent-bit's systemd unit files to the systemd Nix store path. + # + # We fix this by setting the systemd package's `systemdsystemunitdir` pkg-config variable. + # + # https://man.openbsd.org/pkg-config.1#PKG_CONFIG_$PACKAGE_$VARIABLE + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${builtins.placeholder "out"}/lib/systemd/system"; outputs = [ "out" "dev" ]; - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace /lib/systemd $out/lib/systemd - ''; + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + + passthru = { + tests = lib.optionalAttrs stdenv.isLinux { + inherit (nixosTests) fluent-bit; + }; + + updateScript = nix-update-script { }; + }; meta = { - changelog = "https://github.com/fluent/fluent-bit/releases/tag/v${finalAttrs.version}"; - description = "Log forwarder and processor, part of Fluentd ecosystem"; + description = "Fast and lightweight logs and metrics processor for Linux, BSD, OSX and Windows"; homepage = "https://fluentbit.io"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - samrose - fpletz - ]; - platforms = lib.platforms.unix; + mainProgram = "fluent-bit"; + maintainers = with lib.maintainers; [ arianvp ]; }; }) diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index 6b88e3dd929c..ee82e71dbcf9 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -8,10 +8,10 @@ }: let - version = "2.5.0"; - srcHash = "sha256-PhApozD/oWmT4PjzDRKBitE23V3KC40o17AwbmzzPdI="; - vendorHash = "sha256-J8tgcNRc2m+6wcBM/iRizyOTO7OvKinl4Ojc8InQoKk="; - manifestsHash = "sha256-mU0rnbb63ATjf2Q7TzbsQJcbRBUb2QCeC8WKaKmpxOo="; + version = "2.5.1"; + srcHash = "sha256-BuFylOWR30aK7d1eN+9getR5amtAtkkhHNAPfdfASHs="; + vendorHash = "sha256-2fThvz/5A1/EyS6VTUQQa5Unx1BzYfsVRE18xOHtLHE="; + manifestsHash = "sha256-bIIK8igtx0gUcn3hlBohE0MG9PMhyThz4a71pkonBpE="; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 8b84708ad24e..34c198aaef88 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.87"; + version = "0.3.89"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-zFRNOXk2Yw+AjUt6yNdJ5YYG5xwBYhgpI7M9GZAZOpc="; + hash = "sha256-sAgN45f+RS2uLLP6biym2oT7pW+nyA0lIIpm/pFAPuU="; }; vendorHash = "sha256-HWSNZQxIR9GnBHpJVkCj+5iIrwqAI3GKYLEmq0GP9lU="; diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix index fed49a03069b..c942a2e62d71 100644 --- a/pkgs/by-name/fo/follow/package.nix +++ b/pkgs/by-name/fo/follow/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "follow"; - version = "0.2.0-beta.2"; + version = "0.3.7"; src = fetchFromGitHub { owner = "RSSNext"; repo = "Follow"; rev = "v${version}"; - hash = "sha256-7KSPZj9QG6zksji/eY8jczBDHr/9tStlw26LKVqXTAw="; + hash = "sha256-TPzrQo6214fXQmF45p5agQ1zqLYzpmMpYb89ASPsWio="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-FzMjN0rIjYxexf6tix4qi3mnuPkadjKihhN0Pj5y2nU="; + hash = "sha256-xNGLYzEz1G5sZSqmji+ItJ9D1vvZcwkkygnDeuypcIM="; }; env = { @@ -38,11 +38,10 @@ stdenv.mkDerivation rec { # This environment variables inject the production Vite config at build time. # Copy from: - # 1. https://github.com/RSSNext/Follow/blob/v0.2.0-beta.2/.github/workflows/build.yml#L18 + # 1. https://github.com/RSSNext/Follow/blob/v0.3.7/.github/workflows/build.yml#L18 # 2. And logs in the corresponding GitHub Actions: https://github.com/RSSNext/Follow/actions/workflows/build.yml VITE_WEB_URL = "https://app.follow.is"; VITE_API_URL = "https://api.follow.is"; - VITE_IMGPROXY_URL = "https://thumbor.follow.is"; VITE_SENTRY_DSN = "https://e5bccf7428aa4e881ed5cb713fdff181@o4507542488023040.ingest.us.sentry.io/4507570439979008"; VITE_OPENPANEL_CLIENT_ID = "0e477ab4-d92d-4d6e-b889-b09d86ab908e"; VITE_OPENPANEL_API_URL = "https://openpanel.follow.is/api"; @@ -57,6 +56,8 @@ stdenv.mkDerivation rec { }; }; + dontCheckForBrokenSymlinks = true; + desktopItem = makeDesktopItem { name = "follow"; desktopName = "Follow"; diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index 6c61b9d94392..b667d212b46b 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -27,7 +27,7 @@ }: let - version = "1.20.2"; + version = "1.21.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -104,7 +104,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ="; + hash = "sha256:19hkw4g2l00wasmk5dn34rf3bhqh6zbwwhvz98bdcv90p761jws4"; }; separateDebugInfo = true; diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index eaa5ae612c62..846ff4c7eb11 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -17,17 +17,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "6.2.2"; + version = "6.3.0"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-vyJ5Fr38YvR8jjw/Tnih6c+GoctnVpgiaX7Bl+YNti0="; + hash = "sha256-fBpNWxQtej75/oVaHat/H/4Ge9rbjf6FZ/Dw+LBZjcI="; }; - vendorHash = "sha256-KITZV8U4Hhdg9nXYd83p0joYOXulCsJ0sakiP2Q8gi0="; + vendorHash = "sha256-mHvAkVdUAyS4KP6S61IRF2j37XgNMgCFbyZ+WpqqjjA="; ldflags = [ "-s" diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 2a851e523d54..4e475c733c22 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -119,12 +119,11 @@ buildGoModule rec { checkFlags = let skippedTests = [ - "Test_SSHParsePublicKey/dsa-1024/SSHKeygen" # dsa-1024 is deprecated in openssh and requires opting-in at compile time - "Test_calcFingerprint/dsa-1024/SSHKeygen" # dsa-1024 is deprecated in openssh and requires opting-in at compile time "TestPassword" # requires network: api.pwnedpasswords.com "TestCaptcha" # requires network: hcaptcha.com "TestDNSUpdate" # requires network: release.forgejo.org "TestMigrateWhiteBlocklist" # requires network: gitlab.com (DNS) + "TestURLAllowedSSH/Pushmirror_URL" # requires network git.gay (DNS) ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index f3fcd44fbb28..5b42631ffce4 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "7.0.13"; - hash = "sha256-mqpqxr5HE0CoDZkTIdZQEcWFywVw4HVwvPfrdXKp8tk="; + version = "7.0.14"; + hash = "sha256-DtGJStiXuJl0m4K6+DNxsBBaj9dB4bEmMqpGS3WGPD4="; npmDepsHash = "sha256-R78/L6HS8pUNccrctBJ2E8ndS/RBHd+mTvl0JPoxr8Q="; - vendorHash = "sha256-FyFmuJQqe+MUjhXEoB5VlSmTLSsCVbigz4H3jaQhKrE="; + vendorHash = "sha256-18tJJ3dBVR9d7PFBRFtOVVtZAcdKucmbOTXHdk7U89s="; lts = true; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index bfc56b506978..23f9dcd54ef8 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "10.0.1"; - hash = "sha256-JLy/edAkbsOqQTQqqoyxc0UX9fPnP8HD54IUzcsyGe4="; + version = "10.0.2"; + hash = "sha256-UxjhJA6o1LS/7/s0BzcaTSkXSsnKfjIMIjL6ASSot6k="; npmDepsHash = "sha256-e3SE6cu1xCBdoMRqp2Gcjcay/EwjF+bTdPOlpL1STvw="; - vendorHash = "sha256-fqHwqpIetX2jTAWAonRWqF1tArL7Ik/XXURY51jGOn0="; + vendorHash = "sha256-ceV73QmxYEthjsA50ylojwC4dcTYAbE2UgxuxFqvi24="; lts = false; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/fo/fortran-fpm/package.nix b/pkgs/by-name/fo/fortran-fpm/package.nix index 7e80dd9a62a6..225684d8cd45 100644 --- a/pkgs/by-name/fo/fortran-fpm/package.nix +++ b/pkgs/by-name/fo/fortran-fpm/package.nix @@ -1,31 +1,33 @@ { lib, - fetchurl, - pkgs, stdenv, + fetchurl, + gfortran, + versionCheckHook, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fortran-fpm"; version = "0.11.0"; src = fetchurl { - url = "https://github.com/fortran-lang/fpm/releases/download/v${version}/fpm-${version}.F90"; - sha256 = "sha256-mIozF+4kSO5yB9CilBDwinnIa92sMxSyoXWAGpz1jSc="; + url = "https://github.com/fortran-lang/fpm/releases/download/v${finalAttrs.version}/fpm-${finalAttrs.version}.F90"; + hash = "sha256-mIozF+4kSO5yB9CilBDwinnIa92sMxSyoXWAGpz1jSc="; }; dontUnpack = true; - nativeBuildInputs = with pkgs; [ gfortran ]; + nativeBuildInputs = [ gfortran ]; buildPath = "build/bootstrap"; buildPhase = '' runHook preBuild - mkdir -p ${buildPath} - gfortran -J ${buildPath} -o ${buildPath}/${pname} $src + mkdir -p ${finalAttrs.buildPath} + gfortran -J ${finalAttrs.buildPath} -o ${finalAttrs.buildPath}/fortran-fpm $src runHook postBuild ''; @@ -34,17 +36,27 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin - cp ${buildPath}/${pname} $out/bin + cp ${finalAttrs.buildPath}/fortran-fpm $out/bin runHook postInstall ''; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Fortran Package Manager (fpm)"; homepage = "https://fpm.fortran-lang.org"; - maintainers = [ maintainers.proofconstruction ]; - license = licenses.mit; - platforms = platforms.all; + maintainers = [ lib.maintainers.proofconstruction ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; mainProgram = "fortran-fpm"; }; -} +}) diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch new file mode 100644 index 000000000000..059bb5a520c2 --- /dev/null +++ b/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch @@ -0,0 +1,13 @@ +diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp +--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp 2023-09-28 19:34:45.524031668 +0200 ++++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp 2023-09-28 19:34:47.717009813 +0200 +@@ -301,6 +301,9 @@ LoadStandardIcon(FreeImageIO *io, fi_han + int width = bmih.biWidth; + int height = bmih.biHeight / 2; // height == xor + and mask + unsigned bit_count = bmih.biBitCount; ++ if (bit_count != 1 && bit_count != 2 && bit_count != 4 && bit_count != 8 && bit_count != 16 && bit_count != 24 && bit_count != 32) { ++ return NULL; ++ } + unsigned line = CalculateLine(width, bit_count); + unsigned pitch = CalculatePitch(line); + diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch new file mode 100644 index 000000000000..d457ae51fe07 --- /dev/null +++ b/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch @@ -0,0 +1,14 @@ +diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp +--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.287014100 +0200 ++++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.832008666 +0200 +@@ -780,6 +780,10 @@ int psdThumbnail::Read(FreeImageIO *io, + FreeImage_Unload(_dib); + } + ++ if (_WidthBytes != _Width * _BitPerPixel / 8) { ++ throw "Invalid PSD image"; ++ } ++ + if(_Format == 1) { + // kJpegRGB thumbnail image + _dib = FreeImage_LoadFromHandle(FIF_JPEG, io, handle); diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch new file mode 100644 index 000000000000..2f3bac236737 --- /dev/null +++ b/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch @@ -0,0 +1,21 @@ +diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp +--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.936007630 +0200 ++++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.940007590 +0200 +@@ -1466,6 +1466,7 @@ FIBITMAP* psdParser::ReadImageData(FreeI + const unsigned dstBpp = (depth == 1) ? 1 : FreeImage_GetBPP(bitmap)/8; + const unsigned dstLineSize = FreeImage_GetPitch(bitmap); + BYTE* const dst_first_line = FreeImage_GetScanLine(bitmap, nHeight - 1);//<*** flipped ++ const unsigned dst_buffer_size = dstLineSize * nHeight; + + BYTE* line_start = new BYTE[lineSize]; //< fileline cache + +@@ -1481,6 +1482,9 @@ FIBITMAP* psdParser::ReadImageData(FreeI + const unsigned channelOffset = GetChannelOffset(bitmap, c) * bytes; + + BYTE* dst_line_start = dst_first_line + channelOffset; ++ if (channelOffset + lineSize > dst_buffer_size) { ++ throw "Invalid PSD image"; ++ } + for(unsigned h = 0; h < nHeight; ++h, dst_line_start -= dstLineSize) {//<*** flipped + io->read_proc(line_start, lineSize, 1, handle); + ReadImageLine(dst_line_start, line_start, lineSize, dstBpp, bytes); diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch b/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch new file mode 100644 index 000000000000..655a8e7f70cc --- /dev/null +++ b/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch @@ -0,0 +1,19 @@ +diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp +--- freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp 2023-09-28 19:34:45.003036859 +0200 ++++ freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp 2023-09-28 19:34:47.505011926 +0200 +@@ -770,8 +770,13 @@ jpeg_read_exif_dir(FIBITMAP *dib, const + // + + const WORD entriesCount0th = ReadUint16(msb_order, ifd0th); +- +- DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th)); ++ ++ const BYTE* de_addr = DIR_ENTRY_ADDR(ifd0th, entriesCount0th); ++ if(de_addr+4 >= (BYTE*)(dwLength + ifd0th - tiffp)) { ++ return TRUE; //< no thumbnail ++ } ++ ++ DWORD next_offset = ReadUint32(msb_order, de_addr); + if((next_offset == 0) || (next_offset >= dwLength)) { + return TRUE; //< no thumbnail + } diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch b/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch new file mode 100644 index 000000000000..11681c372be3 --- /dev/null +++ b/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch @@ -0,0 +1,15 @@ +diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp +--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.713009853 +0200 ++++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:48.043006563 +0200 +@@ -2142,6 +2142,11 @@ Load(FreeImageIO *io, fi_handle handle, + uint32_t tileRowSize = (uint32_t)TIFFTileRowSize(tif); + uint32_t imageRowSize = (uint32_t)TIFFScanlineSize(tif); + ++ if (width / tileWidth * tileRowSize * 8 > bitspersample * samplesperpixel * width) { ++ free(tileBuffer); ++ throw "Corrupted tiled TIFF file"; ++ } ++ + + // In the tiff file the lines are saved from up to down + // In a DIB the lines must be saved from down to up diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch b/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch new file mode 100644 index 000000000000..8526f9814851 --- /dev/null +++ b/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch @@ -0,0 +1,14 @@ +diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp +--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.501011966 +0200 ++++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.610010879 +0200 +@@ -372,6 +372,10 @@ static void + ReadPalette(TIFF *tiff, uint16_t photometric, uint16_t bitspersample, FIBITMAP *dib) { + RGBQUAD *pal = FreeImage_GetPalette(dib); + ++ if (!pal) { ++ return; ++ } ++ + switch(photometric) { + case PHOTOMETRIC_MINISBLACK: // bitmap and greyscale image types + case PHOTOMETRIC_MINISWHITE: diff --git a/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch b/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch new file mode 100644 index 000000000000..ccd623b81fa1 --- /dev/null +++ b/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch @@ -0,0 +1,14 @@ +diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp +--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp 2024-03-10 14:22:17.818579271 +0100 ++++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp 2024-03-10 14:22:18.776573816 +0100 +@@ -1086,6 +1086,10 @@ Load(FreeImageIO *io, fi_handle handle, + + jpeg_read_header(&cinfo, TRUE); + ++ if (cinfo.image_width > JPEG_MAX_DIMENSION || cinfo.image_height > JPEG_MAX_DIMENSION) { ++ throw FI_MSG_ERROR_DIB_MEMORY; ++ } ++ + // step 4: set parameters for decompression + + unsigned int scale_denom = 1; // fraction by which to scale image diff --git a/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch b/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch new file mode 100644 index 000000000000..2969c738c509 --- /dev/null +++ b/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch @@ -0,0 +1,16 @@ +diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp +--- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2024-03-10 14:22:18.669574426 +0100 ++++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2024-03-10 14:22:18.673574403 +0100 +@@ -1484,6 +1484,12 @@ Load(FreeImageIO *io, fi_handle handle, + (int)bitspersample, (int)samplesperpixel, (int)photometric); + throw (char*)NULL; + } ++ if (planar_config == PLANARCONFIG_SEPARATE && bitspersample < 8) { ++ FreeImage_OutputMessageProc(s_format_id, ++ "Unable to handle this format: bitspersample = 8, TIFFTAG_PLANARCONFIG = PLANARCONFIG_SEPARATE" ++ ); ++ throw (char*)NULL; ++ } + + // --------------------------------------------------------------------------------- + diff --git a/pkgs/development/libraries/freeimage/libtiff-4.4.0.diff b/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff similarity index 100% rename from pkgs/development/libraries/freeimage/libtiff-4.4.0.diff rename to pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/by-name/fr/freeimage/package.nix similarity index 66% rename from pkgs/development/libraries/freeimage/default.nix rename to pkgs/by-name/fr/freeimage/package.nix index cd58f37d4937..bb8f8bb2ea9c 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/by-name/fr/freeimage/package.nix @@ -14,17 +14,16 @@ jxrlib, pkg-config, fixDarwinDylibNames, - autoSignDarwinBinariesHook, }: stdenv.mkDerivation (finalAttrs: { pname = "freeimage"; - version = "unstable-2021-11-01"; + version = "3.18.0-unstable-2024-04-18"; src = fetchsvn { url = "svn://svn.code.sf.net/p/freeimage/svn/"; - rev = "1900"; - sha256 = "rWoNlU/BWKZBPzRb1HqU6T0sT7aK6dpqKPe88+o/4sA="; + rev = "1911"; + hash = "sha256-JznVZUYAbsN4FplnuXxCd/ITBhH7bfGKWXep2A6mius="; }; sourceRoot = "${finalAttrs.src.name}/FreeImage/trunk"; @@ -33,9 +32,23 @@ stdenv.mkDerivation (finalAttrs: { prePatch = '' rm -rf Source/Lib* Source/OpenEXR Source/ZLib ''; + + # Tell patch to work with trailing carriage returns + patchFlags = [ + "-p1" + "--binary" + ]; + patches = [ ./unbundle.diff - ./libtiff-4.4.0.diff + ./CVE-2020-24292.patch + ./CVE-2020-24293.patch + ./CVE-2020-24295.patch + ./CVE-2021-33367.patch + ./CVE-2021-40263.patch + ./CVE-2021-40266.patch + ./CVE-2023-47995.patch + ./CVE-2023-47997.patch ]; postPatch = @@ -58,10 +71,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - autoSignDarwinBinariesHook ]; + buildInputs = [ libtiff libtiff.dev_private @@ -107,18 +118,50 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://freeimage.sourceforge.net/"; license = "GPL"; knownVulnerabilities = [ - "CVE-2021-33367" - "CVE-2021-40262" - "CVE-2021-40263" - "CVE-2021-40264" - "CVE-2021-40265" - "CVE-2021-40266" - - "CVE-2023-47992" - "CVE-2023-47993" - "CVE-2023-47994" - "CVE-2023-47995" + "CVE-2024-31570" + "CVE-2024-28584" + "CVE-2024-28583" + "CVE-2024-28582" + "CVE-2024-28581" + "CVE-2024-28580" + "CVE-2024-28579" + "CVE-2024-28578" + "CVE-2024-28577" + "CVE-2024-28576" + "CVE-2024-28575" + "CVE-2024-28574" + "CVE-2024-28573" + "CVE-2024-28572" + "CVE-2024-28571" + "CVE-2024-28570" + "CVE-2024-28569" + "CVE-2024-28568" + "CVE-2024-28567" + "CVE-2024-28566" + "CVE-2024-28565" + "CVE-2024-28564" + "CVE-2024-28563" + "CVE-2024-28562" + "CVE-2024-9029" + # "CVE-2023-47997" "CVE-2023-47996" + # "CVE-2023-47995" + "CVE-2023-47994" + "CVE-2023-47993" + "CVE-2023-47992" + # "CVE-2021-40266" + "CVE-2021-40265" + "CVE-2021-40264" + # "CVE-2021-40263" + "CVE-2021-40262" + # "CVE-2021-33367" + # "CVE-2020-24295" + "CVE-2020-24294" + # "CVE-2020-24293" + # "CVE-2020-24292" + "CVE-2020-21426" + "CVE-2019-12214" + "CVE-2019-12212" ]; maintainers = with lib.maintainers; [ l-as ]; platforms = with lib.platforms; unix; diff --git a/pkgs/development/libraries/freeimage/unbundle.diff b/pkgs/by-name/fr/freeimage/unbundle.diff similarity index 83% rename from pkgs/development/libraries/freeimage/unbundle.diff rename to pkgs/by-name/fr/freeimage/unbundle.diff index 99a7cfb4ca35..66df1176bca9 100644 --- a/pkgs/development/libraries/freeimage/unbundle.diff +++ b/pkgs/by-name/fr/freeimage/unbundle.diff @@ -192,7 +192,7 @@ index 692c6e56..212195b2 100644 VER_MAJOR = 3 VER_MINOR = 19.0 -SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c --INCLS = ./Dist/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/jerror.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/jpegint.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/transupp.h ./Source/LibJXR/common/include/guiddef.h ./Source/LibJXR/common/include/wmsal.h ./Source/LibJXR/common/include/wmspecstring.h ./Source/LibJXR/common/include/wmspecstrings_adt.h ./Source/LibJXR/common/include/wmspecstrings_strict.h ./Source/LibJXR/common/include/wmspecstrings_undef.h ./Source/LibJXR/image/decode/decode.h ./Source/LibJXR/image/encode/encode.h ./Source/LibJXR/image/sys/ansi.h ./Source/LibJXR/image/sys/common.h ./Source/LibJXR/image/sys/perfTimer.h ./Source/LibJXR/image/sys/strcodec.h ./Source/LibJXR/image/sys/strTransform.h ./Source/LibJXR/image/sys/windowsmediaphoto.h ./Source/LibJXR/image/sys/xplatform_image.h ./Source/LibJXR/image/x86/x86.h ./Source/LibJXR/jxrgluelib/JXRGlue.h ./Source/LibJXR/jxrgluelib/JXRMeta.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/cidx_manager.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/dwt.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/function_list.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/indexbox_manager.h ./Source/LibOpenJPEG/invert.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/opj_clock.h ./Source/LibOpenJPEG/opj_codec.h ./Source/LibOpenJPEG/opj_config.h ./Source/LibOpenJPEG/opj_config_private.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/opj_intmath.h ./Source/LibOpenJPEG/opj_inttypes.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/opj_stdint.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/tcd.h ./Source/LibOpenJPEG/tgt.h ./Source/LibPNG/png.h ./Source/LibPNG/pngconf.h ./Source/LibPNG/pngdebug.h ./Source/LibPNG/pnginfo.h ./Source/LibPNG/pnglibconf.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngstruct.h ./Source/LibRawLite/internal/dcraw_defs.h ./Source/LibRawLite/internal/dcraw_fileio_defs.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/dmp_include.h ./Source/LibRawLite/internal/libraw_cameraids.h ./Source/LibRawLite/internal/libraw_cxx_defs.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/x3f_tools.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibTIFF4/t4.h ./Source/LibTIFF4/tiff.h ./Source/LibTIFF4/tiffconf.h ./Source/LibTIFF4/tiffconf.vc.h ./Source/LibTIFF4/tiffconf.wince.h ./Source/LibTIFF4/tiffio.h ./Source/LibTIFF4/tiffiop.h ./Source/LibTIFF4/tiffvers.h ./Source/LibTIFF4/tif_config.h ./Source/LibTIFF4/tif_config.vc.h ./Source/LibTIFF4/tif_config.wince.h ./Source/LibTIFF4/tif_dir.h ./Source/LibTIFF4/tif_fax3.h ./Source/LibTIFF4/tif_predict.h ./Source/LibTIFF4/uvcode.h ./Source/LibWebP/src/dec/alphai_dec.h ./Source/LibWebP/src/dec/common_dec.h ./Source/LibWebP/src/dec/vp8i_dec.h ./Source/LibWebP/src/dec/vp8li_dec.h ./Source/LibWebP/src/dec/vp8_dec.h ./Source/LibWebP/src/dec/webpi_dec.h ./Source/LibWebP/src/dsp/common_sse2.h ./Source/LibWebP/src/dsp/common_sse41.h ./Source/LibWebP/src/dsp/dsp.h ./Source/LibWebP/src/dsp/lossless.h ./Source/LibWebP/src/dsp/lossless_common.h ./Source/LibWebP/src/dsp/mips_macro.h ./Source/LibWebP/src/dsp/msa_macro.h ./Source/LibWebP/src/dsp/neon.h ./Source/LibWebP/src/dsp/quant.h ./Source/LibWebP/src/dsp/yuv.h ./Source/LibWebP/src/enc/backward_references_enc.h ./Source/LibWebP/src/enc/cost_enc.h ./Source/LibWebP/src/enc/histogram_enc.h ./Source/LibWebP/src/enc/vp8i_enc.h ./Source/LibWebP/src/enc/vp8li_enc.h ./Source/LibWebP/src/mux/animi.h ./Source/LibWebP/src/mux/muxi.h ./Source/LibWebP/src/utils/bit_reader_inl_utils.h ./Source/LibWebP/src/utils/bit_reader_utils.h ./Source/LibWebP/src/utils/bit_writer_utils.h ./Source/LibWebP/src/utils/color_cache_utils.h ./Source/LibWebP/src/utils/endian_inl_utils.h ./Source/LibWebP/src/utils/filters_utils.h ./Source/LibWebP/src/utils/huffman_encode_utils.h ./Source/LibWebP/src/utils/huffman_utils.h ./Source/LibWebP/src/utils/quant_levels_dec_utils.h ./Source/LibWebP/src/utils/quant_levels_utils.h ./Source/LibWebP/src/utils/random_utils.h ./Source/LibWebP/src/utils/rescaler_utils.h ./Source/LibWebP/src/utils/thread_utils.h ./Source/LibWebP/src/utils/utils.h ./Source/LibWebP/src/webp/decode.h ./Source/LibWebP/src/webp/demux.h ./Source/LibWebP/src/webp/encode.h ./Source/LibWebP/src/webp/format_constants.h ./Source/LibWebP/src/webp/mux.h ./Source/LibWebP/src/webp/mux_types.h ./Source/LibWebP/src/webp/types.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/Half/halfExport.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/toFloat.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexExport.h ./Source/OpenEXR/Iex/IexForward.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/IexNamespace.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/IexMath/IexMathFloatExc.h ./Source/OpenEXR/IexMath/IexMathFpu.h ./Source/OpenEXR/IexMath/IexMathIeeeExc.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/dwaLookups.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfDeepCompositing.h ./Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfDeepImageState.h ./Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressor.h ./Source/OpenEXR/IlmImf/ImfDwaCompressorSimd.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfExport.h ./Source/OpenEXR/IlmImf/ImfFastHuf.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfForward.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfGenericInputFile.h ./Source/OpenEXR/IlmImf/ImfGenericOutputFile.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfInputPart.h ./Source/OpenEXR/IlmImf/ImfInputPartData.h ./Source/OpenEXR/IlmImf/ImfInputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfMultiPartInputFile.h ./Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfNamespace.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfOptimizedPixelReading.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfOutputPart.h ./Source/OpenEXR/IlmImf/ImfOutputPartData.h ./Source/OpenEXR/IlmImf/ImfOutputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfPartHelper.h ./Source/OpenEXR/IlmImf/ImfPartType.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfRle.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfSimd.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfSystemSpecific.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfZip.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadExport.h ./Source/OpenEXR/IlmThread/IlmThreadForward.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadNamespace.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathExport.h ./Source/OpenEXR/Imath/ImathForward.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathFrustumTest.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathNamespace.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./Source/ZLib/crc32.h ./Source/ZLib/deflate.h ./Source/ZLib/gzguts.h ./Source/ZLib/inffast.h ./Source/ZLib/inffixed.h ./Source/ZLib/inflate.h ./Source/ZLib/inftrees.h ./Source/ZLib/trees.h ./Source/ZLib/zconf.h ./Source/ZLib/zlib.h ./Source/ZLib/zutil.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h +-INCLS = ./Dist/x64/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/jerror.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/jpegint.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/transupp.h ./Source/LibJXR/common/include/guiddef.h ./Source/LibJXR/common/include/wmsal.h ./Source/LibJXR/common/include/wmspecstring.h ./Source/LibJXR/common/include/wmspecstrings_adt.h ./Source/LibJXR/common/include/wmspecstrings_strict.h ./Source/LibJXR/common/include/wmspecstrings_undef.h ./Source/LibJXR/image/decode/decode.h ./Source/LibJXR/image/encode/encode.h ./Source/LibJXR/image/sys/ansi.h ./Source/LibJXR/image/sys/common.h ./Source/LibJXR/image/sys/perfTimer.h ./Source/LibJXR/image/sys/strcodec.h ./Source/LibJXR/image/sys/strTransform.h ./Source/LibJXR/image/sys/windowsmediaphoto.h ./Source/LibJXR/image/sys/xplatform_image.h ./Source/LibJXR/image/x86/x86.h ./Source/LibJXR/jxrgluelib/JXRGlue.h ./Source/LibJXR/jxrgluelib/JXRMeta.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/cidx_manager.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/dwt.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/function_list.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/indexbox_manager.h ./Source/LibOpenJPEG/invert.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/opj_clock.h ./Source/LibOpenJPEG/opj_codec.h ./Source/LibOpenJPEG/opj_config.h ./Source/LibOpenJPEG/opj_config_private.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/opj_intmath.h ./Source/LibOpenJPEG/opj_inttypes.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/opj_stdint.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/tcd.h ./Source/LibOpenJPEG/tgt.h ./Source/LibPNG/png.h ./Source/LibPNG/pngconf.h ./Source/LibPNG/pngdebug.h ./Source/LibPNG/pnginfo.h ./Source/LibPNG/pnglibconf.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngstruct.h ./Source/LibRawLite/internal/dcraw_defs.h ./Source/LibRawLite/internal/dcraw_fileio_defs.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/dmp_include.h ./Source/LibRawLite/internal/libraw_cameraids.h ./Source/LibRawLite/internal/libraw_cxx_defs.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/x3f_tools.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibTIFF4/t4.h ./Source/LibTIFF4/tiff.h ./Source/LibTIFF4/tiffconf.h ./Source/LibTIFF4/tiffconf.vc.h ./Source/LibTIFF4/tiffconf.wince.h ./Source/LibTIFF4/tiffio.h ./Source/LibTIFF4/tiffiop.h ./Source/LibTIFF4/tiffvers.h ./Source/LibTIFF4/tif_config.h ./Source/LibTIFF4/tif_config.vc.h ./Source/LibTIFF4/tif_config.wince.h ./Source/LibTIFF4/tif_dir.h ./Source/LibTIFF4/tif_fax3.h ./Source/LibTIFF4/tif_predict.h ./Source/LibTIFF4/uvcode.h ./Source/LibWebP/src/dec/alphai_dec.h ./Source/LibWebP/src/dec/common_dec.h ./Source/LibWebP/src/dec/vp8i_dec.h ./Source/LibWebP/src/dec/vp8li_dec.h ./Source/LibWebP/src/dec/vp8_dec.h ./Source/LibWebP/src/dec/webpi_dec.h ./Source/LibWebP/src/dsp/common_sse2.h ./Source/LibWebP/src/dsp/common_sse41.h ./Source/LibWebP/src/dsp/dsp.h ./Source/LibWebP/src/dsp/lossless.h ./Source/LibWebP/src/dsp/lossless_common.h ./Source/LibWebP/src/dsp/mips_macro.h ./Source/LibWebP/src/dsp/msa_macro.h ./Source/LibWebP/src/dsp/neon.h ./Source/LibWebP/src/dsp/quant.h ./Source/LibWebP/src/dsp/yuv.h ./Source/LibWebP/src/enc/backward_references_enc.h ./Source/LibWebP/src/enc/cost_enc.h ./Source/LibWebP/src/enc/histogram_enc.h ./Source/LibWebP/src/enc/vp8i_enc.h ./Source/LibWebP/src/enc/vp8li_enc.h ./Source/LibWebP/src/mux/animi.h ./Source/LibWebP/src/mux/muxi.h ./Source/LibWebP/src/utils/bit_reader_inl_utils.h ./Source/LibWebP/src/utils/bit_reader_utils.h ./Source/LibWebP/src/utils/bit_writer_utils.h ./Source/LibWebP/src/utils/color_cache_utils.h ./Source/LibWebP/src/utils/endian_inl_utils.h ./Source/LibWebP/src/utils/filters_utils.h ./Source/LibWebP/src/utils/huffman_encode_utils.h ./Source/LibWebP/src/utils/huffman_utils.h ./Source/LibWebP/src/utils/quant_levels_dec_utils.h ./Source/LibWebP/src/utils/quant_levels_utils.h ./Source/LibWebP/src/utils/random_utils.h ./Source/LibWebP/src/utils/rescaler_utils.h ./Source/LibWebP/src/utils/thread_utils.h ./Source/LibWebP/src/utils/utils.h ./Source/LibWebP/src/webp/decode.h ./Source/LibWebP/src/webp/demux.h ./Source/LibWebP/src/webp/encode.h ./Source/LibWebP/src/webp/format_constants.h ./Source/LibWebP/src/webp/mux.h ./Source/LibWebP/src/webp/mux_types.h ./Source/LibWebP/src/webp/types.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/Half/halfExport.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/toFloat.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexExport.h ./Source/OpenEXR/Iex/IexForward.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/IexNamespace.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/IexMath/IexMathFloatExc.h ./Source/OpenEXR/IexMath/IexMathFpu.h ./Source/OpenEXR/IexMath/IexMathIeeeExc.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/dwaLookups.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfDeepCompositing.h ./Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfDeepImageState.h ./Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressor.h ./Source/OpenEXR/IlmImf/ImfDwaCompressorSimd.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfExport.h ./Source/OpenEXR/IlmImf/ImfFastHuf.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfForward.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfGenericInputFile.h ./Source/OpenEXR/IlmImf/ImfGenericOutputFile.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfInputPart.h ./Source/OpenEXR/IlmImf/ImfInputPartData.h ./Source/OpenEXR/IlmImf/ImfInputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfMultiPartInputFile.h ./Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfNamespace.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfOptimizedPixelReading.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfOutputPart.h ./Source/OpenEXR/IlmImf/ImfOutputPartData.h ./Source/OpenEXR/IlmImf/ImfOutputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfPartHelper.h ./Source/OpenEXR/IlmImf/ImfPartType.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfRle.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfSimd.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfSystemSpecific.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfZip.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadExport.h ./Source/OpenEXR/IlmThread/IlmThreadForward.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadNamespace.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathExport.h ./Source/OpenEXR/Imath/ImathForward.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathFrustumTest.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathNamespace.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./Source/ZLib/crc32.h ./Source/ZLib/deflate.h ./Source/ZLib/gzguts.h ./Source/ZLib/inffast.h ./Source/ZLib/inffixed.h ./Source/ZLib/inflate.h ./Source/ZLib/inftrees.h ./Source/ZLib/trees.h ./Source/ZLib/zconf.h ./Source/ZLib/zlib.h ./Source/ZLib/zutil.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/dist/x64/FreeImagePlus.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h +SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp +INCLS = ./Dist/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h diff --git a/pkgs/by-name/fr/freeradius/package.nix b/pkgs/by-name/fr/freeradius/package.nix index c06d322e2b25..b92ab190284a 100644 --- a/pkgs/by-name/fr/freeradius/package.nix +++ b/pkgs/by-name/fr/freeradius/package.nix @@ -38,13 +38,13 @@ assert withRest -> withJson; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.2.5"; + version = "3.2.7"; src = fetchFromGitHub { owner = "FreeRADIUS"; repo = "freeradius-server"; tag = "release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-1n447BpTqmkg5tyXe9yPzjfDoh7wMLZhwouUEzkwxKM="; + hash = "sha256-FG0/quBB5Q/bdYQqkFaZc/BhcIC/n2uVstlIGe4EPvE="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json index 91734cfd331b..06ca973f58f2 100644 --- a/pkgs/by-name/fs/fsautocomplete/deps.json +++ b/pkgs/by-name/fs/fsautocomplete/deps.json @@ -86,8 +86,8 @@ }, { "pname": "FSharp.Analyzers.SDK", - "version": "0.29.0", - "hash": "sha256-hhyLzVyNO7lAm9RbQao15+d8gt9yYK2+Rem3yAoA+zw=" + "version": "0.29.1", + "hash": "sha256-bhkxMzJs1eOdrgWsiyUxJy3D9nKe1w3ajSCn1AVCggw=" }, { "pname": "FSharp.Compiler.Service", diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix index a2365303b99a..ea691b24a768 100644 --- a/pkgs/by-name/fs/fsautocomplete/package.nix +++ b/pkgs/by-name/fs/fsautocomplete/package.nix @@ -9,13 +9,13 @@ buildDotnetModule (finalAttrs: { pname = "fsautocomplete"; - version = "0.77.2"; + version = "0.77.4"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${finalAttrs.version}"; - hash = "sha256-rCfiWzVsK9lvo4uMNrgWdXsjrvBQDZOyFpKxKdbT/3g="; + hash = "sha256-QTLaaztZghcQRQSE/GXQGpo7W7bHNNXGwYNIaV41PvY="; }; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix index fdfbea77693e..b01e0f8185cc 100644 --- a/pkgs/by-name/fs/fselect/package.nix +++ b/pkgs/by-name/fs/fselect/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-oZnA033/gKg5qppEvP+miNTTTwDpOlhUz8OOnKt5cx0="; + sha256 = "sha256-9JSyPNXiBMwPxhVWL5M6o/nnzDJv5MmWYqC1veinZuI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4NpyHcTJhLO0xeva/qcKE5WiS15hHvQ9HO8ENgplfvo="; + cargoHash = "sha256-cRF/drfdmUccb9Y/RKB3Bs748Y5dJUCgsFJxklAZB9Q="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix index d855111a6805..a668e248d34c 100644 --- a/pkgs/by-name/ga/gancio/package.nix +++ b/pkgs/by-name/ga/gancio/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "gancio"; - version = "1.24.0"; + version = "1.24.4"; src = fetchFromGitLab { domain = "framagit.org"; owner = "les"; repo = "gancio"; rev = "v${finalAttrs.version}"; - hash = "sha256-PczJFh4tODwtocDSY0UHok8tgBmVvSVHDRjLG6Cor5s="; + hash = "sha256-LbXTzptkAYQ/86DtHHJvZP45YMVcqyrK4RD7AYvwGoM="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/ga/garmindb/package.nix b/pkgs/by-name/ga/garmindb/package.nix index b7093d52b441..c5f19b89e90c 100644 --- a/pkgs/by-name/ga/garmindb/package.nix +++ b/pkgs/by-name/ga/garmindb/package.nix @@ -17,10 +17,18 @@ python3Packages.buildPythonApplication rec { hash = "sha256-JAUDAYf9CH/BxwV88ziF5Zy+3ibcbieEfHrZpHSU8m0="; }; - build-system = [ - python3Packages.setuptools + pythonRelaxDeps = [ + "sqlalchemy" + "cached-property" + "garth" + "tqdm" + "fitfile" + "tcxfile" + "idbutils" ]; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ sqlalchemy python-dateutil @@ -33,15 +41,6 @@ python3Packages.buildPythonApplication rec { tornado ]; - pythonRelaxDeps = [ - "sqlalchemy" - "cached-property" - "tqdm" - "fitfile" - "tcxfile" - "idbutils" - ]; - # require data files disabledTestPaths = [ "test/test_activities_db.py" @@ -64,9 +63,12 @@ python3Packages.buildPythonApplication rec { writableTmpDirAsHomeHook ]; + pythonImportsCheck = [ "garmindb" ]; + meta = { description = "Download and parse data from Garmin Connect or a Garmin watch"; homepage = "https://github.com/tcgoetz/GarminDB"; + changelog = "https://github.com/tcgoetz/GarminDB/releases/tag/${src.tag}"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ethancedwards8 ]; diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index a5201493364f..050d1db2b80c 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gatus"; - version = "5.16.0"; + version = "5.17.0"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${version}"; - hash = "sha256-xfuq/+jZy8mfXU16WXaI7e+AEr+3bICvna2OQZHu73M="; + hash = "sha256-/YOC13ut1k48vx/LapcShNfi83LxbC62yxKuanlUI9k="; }; - vendorHash = "sha256-MMKfypk6nPiaPvarYcZ1TdHcu9RKKLoXpz5qoZC3C4Y="; + vendorHash = "sha256-gr/GmZaaNwp/jQwnDiU/kfDWaciQloxP9vNlVTwMQjE="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gb/gbsplay/package.nix b/pkgs/by-name/gb/gbsplay/package.nix index 6a115a37aa42..cf77782b3646 100644 --- a/pkgs/by-name/gb/gbsplay/package.nix +++ b/pkgs/by-name/gb/gbsplay/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gbsplay"; - version = "0.0.98"; + version = "0.0.99"; src = fetchFromGitHub { owner = "mmitch"; repo = "gbsplay"; rev = finalAttrs.version; - hash = "sha256-IgTDkN8EUh1gM5FehAPzlqb1tF9+LSM/Q1ccdyGUUgM="; + hash = "sha256-I2T77HGuzp6IYQOd8RSaWYCXy8fwz7PtMxtO5IoAzdw="; }; configureFlags = [ diff --git a/pkgs/by-name/gc/gci/package.nix b/pkgs/by-name/gc/gci/package.nix index 28eeee22e6cf..a4a587971c0e 100644 --- a/pkgs/by-name/gc/gci/package.nix +++ b/pkgs/by-name/gc/gci/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "gci"; - version = "0.13.5"; + version = "0.13.6"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jtDqaUko0So/VwY3NF5NyPFu1jxt4nIbUkJxILc+iTs="; + sha256 = "sha256-BlR7lQnp9WMjSN5IJOK2HIKXIAkn5Pemf8qbMm83+/w="; }; vendorHash = "sha256-/8fggERlHySyimrGOHkDERbCPZJWqojycaifNPF6MjE="; diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index 8109ecb2a89f..08b4444c0ba6 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -5,14 +5,14 @@ appimageTools, }: let - version = "5.5.225"; + version = "5.5.226"; pname = "gdevelop"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - sha256 = "sha256-ACNmO5hYfLEaJV6wntH4PZoHcB2T/+WFe2E5Ir/5c4U="; + sha256 = "sha256-58P/9QZOpk327gPM/gDLSchmuXpOR5kBf7U8xksFWUQ="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/gd/gdmap/package.nix b/pkgs/by-name/gd/gdmap/package.nix index 8e64fad0d086..0704b6ae8dc9 100644 --- a/pkgs/by-name/gd/gdmap/package.nix +++ b/pkgs/by-name/gd/gdmap/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "gdmap"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitLab { owner = "sjohannes"; repo = "gdmap"; - tag = "v1.2.0"; - sha256 = "1p96pps4yflj6a42g61pcqpllx7vcjlh417kwjy0b4mqp16vmrzr"; + tag = "v1.3.1"; + sha256 = "sha256-dgZ+EDk7O+nuqrBsTPVW7BHufvkqLnWbXrIOOn7YlW4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ge/genealogos-cli/package.nix b/pkgs/by-name/ge/genealogos-cli/package.nix new file mode 100644 index 000000000000..b4335cb7f497 --- /dev/null +++ b/pkgs/by-name/ge/genealogos-cli/package.nix @@ -0,0 +1,55 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + + pkg-config, + openssl, + crate ? "cli", +}: + +rustPlatform.buildRustPackage rec { + pname = "genealogos-${crate}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "tweag"; + repo = "genealogos"; + tag = "v${version}"; + hash = "sha256-EQrKInsrqlpjySX6duylo++2qwglB3EqGfLFJucOQM8="; + # Genealogos' fixture tests contain valid nix store paths, and are thus incompatible with a fixed-output-derivation. + # To avoid this, we just remove the tests + postFetch = '' + rm -r $out/genealogos/tests/ + ''; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-R3HQXPpTtqgXfc7nLNdJp5zUMEpfccKWOQtS5Y786Jc="; + + cargoBuildFlags = [ + "-p" + "genealogos-${crate}" + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + # Since most tests were removed, just skip testing + doCheck = false; + + meta = { + description = "Nix sbom generator"; + homepage = "https://github.com/tweag/genealogos"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ erin ]; + changelog = "https://github.com/tweag/genealogos/blob/${src.tag}/CHANGELOG.md"; + mainProgram = + { + api = "genealogos-api"; + cli = "genealogos"; + } + .${crate}; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 0604441b1a11..4d27294ce455 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.68.1"; + version = "2.69.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${version}"; - hash = "sha256-yJwRC25QQKWeRrp0ItovuBCrTla3dezArzFvnkZchFg="; + hash = "sha256-T5H84RH5uBXXNCiyd27ZjDu4g5UBK4yUjZWQAFp3cH0="; }; - vendorHash = "sha256-QmZBdnxcVywCGpaBAZZRO0LDr6WidaFXGpaAkWfn+gs="; + vendorHash = "sha256-BJK8XzCdbbyzj1rEJtnE6hKOy7Q9xSrkicBPzxz9gkw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index ed65c1e152cc..ac576ccbc115 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.143.0"; + version = "2.146.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-jOIt8JJghXaKsfwgR6aMfaXEHgIalc/gtwkGJ831bWI="; + hash = "sha256-8YZjstzpun+Vbc1ETBf5AwNAOFGyJFftSdyyGsyh6pY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-K+SOl7wuxLhEOoM1A7QG3tB1Xiuz+hstiePIDjmzWVA="; + npmDepsHash = "sha256-6aOmDntqp3RPDkgwNwlRgVxoQygIBxMU3VIfYjvG3ho="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index d54d17a64433..9e0990ba3aab 100644 --- a/pkgs/by-name/gh/ghostscript/package.nix +++ b/pkgs/by-name/gh/ghostscript/package.nix @@ -63,11 +63,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.04.0"; + version = "10.05.0"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${lib.replaceStrings ["."] [""] version}/ghostscript-${version}.tar.xz"; - hash = "sha256-Un7vC2zQTs8cjXoReWxppS00/+Nq/KhqQAcpovwByIc="; + hash = "sha256-qsnE/fYYBadvYiABJzXBroMoE3iDFL/AQFXMDIlZuaM="; }; patches = [ diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix index 0f350cdbbd62..0401fedd1290 100644 --- a/pkgs/by-name/gi/gi-docgen/package.nix +++ b/pkgs/by-name/gi/gi-docgen/package.nix @@ -9,13 +9,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2024.1"; + version = "2025.3"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; - hash = "sha256-hwx3+WIEYszknjVUKkLcFhL8hYcz6D274kjFNUWK7B4="; + hash = "sha256-iomli8D3ffw+iioONJf8OfVBOuNeVZfp7GFgq/juFNg="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index 0341f051d14a..cf218da403a0 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -106,12 +106,6 @@ stdenv.mkDerivation rec { substituteInPlace src/global.cc --replace 'browser="mozilla"' 'browser="xdg-open"' ''; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - nativeBuildInputs = [ autoreconfHook texliveSmall diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix index d2902ee8cc99..b7403ce96b37 100644 --- a/pkgs/by-name/gi/ginkgo/package.nix +++ b/pkgs/by-name/gi/ginkgo/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.23.0"; + version = "2.23.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-ku3pB9LLlDjwEEzJEVgCK+ar+L+beyMrjDtASfBWqLM="; + sha256 = "sha256-yQnkKh5RXzUIff4gSKDo79GZuRvjkT1vK0IUbvKdVjk="; }; vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI="; diff --git a/pkgs/by-name/gi/git-dumper/package.nix b/pkgs/by-name/gi/git-dumper/package.nix new file mode 100644 index 000000000000..4b6148ea20ae --- /dev/null +++ b/pkgs/by-name/gi/git-dumper/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "git-dumper"; + version = "1.0.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "arthaud"; + repo = "git-dumper"; + tag = version; + hash = "sha256-XU+6Od+mC8AV+w7sd8JaMB2Lc81ekeDLDiGGNu6bU0A="; + }; + + build-system = [ + python3Packages.setuptools + ]; + + dependencies = with python3Packages; [ + beautifulsoup4 + dulwich + pysocks + requests + requests-pkcs12 + ]; + + pythonImportsCheck = [ + "git_dumper" + ]; + + meta = { + description = "Tool to dump a git repository from a website"; + homepage = "https://github.com/arthaud/git-dumper"; + changelog = "https://github.com/arthaud/git-dumper/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yechielw ]; + mainProgram = "git-dumper"; + }; +} diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index a45fc205e6e2..5f0667366036 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -1,25 +1,25 @@ { lib, stdenv, - buildGo123Module, + buildGo124Module, fetchFromGitHub, git, nix-update-script, installShellFiles, }: -buildGo123Module rec { +buildGo124Module rec { pname = "git-spice"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${version}"; - hash = "sha256-1EWuKjvDeOV6W+nntdevUI/SO68ssYgoxJ5QIy5jkFM="; + hash = "sha256-ew0ehaYXJgc1ePdQCxxfahBdTs5zsiHDfB4SdS2WZ8A="; }; - vendorHash = "sha256-F9CyhUtdkwvEsmQ+T5zt2n+TBRhVgyr2CEOvIzcXpug="; + vendorHash = "sha256-jlCNcjACtms9kI4Lo8AtUfxqODyv4U2nJITGpBNxk9I="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gi/git-who/package.nix b/pkgs/by-name/gi/git-who/package.nix new file mode 100644 index 000000000000..5c6b63157ce8 --- /dev/null +++ b/pkgs/by-name/gi/git-who/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: +buildGoModule rec { + pname = "git-who"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "sinclairtarget"; + repo = "git-who"; + rev = "v${version}"; + hash = "sha256-/MCvFmZNEVnSrSezTiwH3uWPbh/a7mVxmKduc63E3LA="; + }; + + vendorHash = "sha256-VdQw0mBCALeQfPMjQ4tp3DcLAzmHvW139/COIXSRT0s="; + # some automated tests require submodule to clone and will fail. + # see project readme + doCheck = false; + + meta = { + description = "Git blame for file trees"; + homepage = "https://github.com/sinclairtarget/git-who"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mcparland ]; + }; +} diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index e71b1b73a078..baab91b9de33 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.24.0"; + version = "8.24.2"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-4LkM65njb2L8aCLBmKo18gNXX93zXCGh/e/+xdS+wek="; + hash = "sha256-5Bx+suC24r2v9WaBzhkGJTAnh1TeQyjkVj+YVCviYOc="; }; - vendorHash = "sha256-J9cQUXVDqSTykoUOCaKGgyYzkcv7Uss6tNra42Sofw8="; + vendorHash = "sha256-MSF9N9kXsIM2WKsjKAVztYypwGPng2EElHx7p6vADqc="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index bb551f266dac..ecc7126929d0 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -1,24 +1,24 @@ { lib, - buildGo123Module, + buildGoModule, fetchFromGitLab, installShellFiles, stdenv, nix-update-script, }: -buildGo123Module rec { +buildGoModule rec { pname = "glab"; - version = "1.53.0"; + version = "1.54.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-QbXc249DKRrLdDwH3R7ZWXh2izLe97jc/WcjC8z1mv8="; + hash = "sha256-CtzTZ4PryY2zDCvoAp/cf0E0jpFPGH7SzFDaCwf48gg="; }; - vendorHash = "sha256-wwWKxdAIlZw5s/kp08mZf8x10ujht9xbSoYWlGT4sPk="; + vendorHash = "sha256-r9HRDKf4EOjAeHo9rT69+nAf8zGZFWtXVo9nHuBOgaQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 8b396f77343f..681a27a30fb6 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -22,7 +22,7 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" "-w" - "-X github.com/glanceapp/glance/internal/glance.buildVersion=${finalAttrs.version}" + "-X github.com/glanceapp/glance/internal/glance.buildVersion=v${finalAttrs.version}" ]; excludedPackages = [ "scripts/build-and-ship" ]; diff --git a/pkgs/by-name/gl/gle/package.nix b/pkgs/by-name/gl/gle/package.nix index b1b064fdb17c..b2aa72fb03ac 100644 --- a/pkgs/by-name/gl/gle/package.nix +++ b/pkgs/by-name/gl/gle/package.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "Tubing and extrusion library"; + homepage = "https://www.linas.org/gle/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 5556e85f8566..04a4a43e6b96 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.82.4"; + version = "2.82.5"; outputs = [ "bin" @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-N90Id/6WTNFemicQsEShgw+xvZNlKm0Mtriy3/GHxwk="; + hash = "sha256-BcIDH5vfa1q6egbKhPC0rO0osZvxtQxqslzGdSd8vD8="; }; patches = @@ -249,7 +249,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dlibelf=disabled" ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ - "-Db_lundef=false" "-Dxattr=false" "-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD ]; diff --git a/pkgs/by-name/gl/globalarrays/package.nix b/pkgs/by-name/gl/globalarrays/package.nix index f7dd20e07688..c0fafce47561 100644 --- a/pkgs/by-name/gl/globalarrays/package.nix +++ b/pkgs/by-name/gl/globalarrays/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "globalarrays"; - version = "5.9"; + version = "5.9.1"; src = fetchFromGitHub { owner = "GlobalArrays"; repo = "ga"; rev = "v${version}"; - sha256 = "sha256-p4BNwj269FdNXY2rHfJiv5AbB3YB4v+YHXQRXTNnFnE="; + sha256 = "sha256-bMX538yen9cINPCtgf7SUGGsNRJugMrveqXtChHzPkk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 826b124403f5..3886d04d19c8 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.18.10"; + version = "1.18.13"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-q3/BU5KyC8V4osTsL6S9KRGXl4Sf41TuzyNdhxmsESE="; + hash = "sha256-qn4hQKl3E36q7HsgOVWz+eRceKGysyy5rHXzQnOc7JY="; }; vendorHash = "sha256-lcnsmeZ2XobBE95KqIhUZCKmevg2WEGuZC4qUVkdafM="; diff --git a/pkgs/by-name/gl/glusterfs/package.nix b/pkgs/by-name/gl/glusterfs/package.nix index f14002019a28..efe75a0f89cc 100644 --- a/pkgs/by-name/gl/glusterfs/package.nix +++ b/pkgs/by-name/gl/glusterfs/package.nix @@ -159,12 +159,6 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - nativeBuildInputs = [ autoconf automake diff --git a/pkgs/by-name/gn/gnujump/package.nix b/pkgs/by-name/gn/gnujump/package.nix index d490033e08ac..1997e6d04db2 100644 --- a/pkgs/by-name/gn/gnujump/package.nix +++ b/pkgs/by-name/gn/gnujump/package.nix @@ -4,6 +4,8 @@ makeDesktopItem, copyDesktopItems, fetchurl, + libGL, + libGLU, SDL, SDL_image, SDL_mixer, @@ -19,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ + libGL + libGLU SDL SDL_image SDL_mixer diff --git a/pkgs/by-name/go/go-crx3/package.nix b/pkgs/by-name/go/go-crx3/package.nix new file mode 100644 index 000000000000..27767d059e11 --- /dev/null +++ b/pkgs/by-name/go/go-crx3/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "go-crx3"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "mmadfox"; + repo = "go-crx3"; + tag = "v${finalAttrs.version}"; + hash = "sha256-J3v3/Rz6rPTJnIEahWvJO6KGIC6idqJ/39wPC4zApbE="; + }; + + vendorHash = "sha256-LEIB/VZA3rqTeH9SesZ/jrfVddl6xtmoRWHP+RwGmCk="; + + ldflags = [ + "-s" + "-w" + ]; + + checkFlags = [ + # requires network access + "-skip=^TestDownloadFromWebStore(|Negative)$" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd crx3 \ + --bash <($out/bin/crx3 completion bash) \ + --fish <($out/bin/crx3 completion fish) \ + --zsh <($out/bin/crx3 completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/crx3 --help >/dev/null + + runHook postInstallCheck + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Chrome browser extension tools"; + homepage = "https://github.com/mmadfox/go-crx3"; + changelog = "https://github.com/mmadfox/go-crx3/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "crx3"; + }; +}) diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix index d6a09c18b27e..09631bd5fdc5 100644 --- a/pkgs/by-name/go/go-ios/package.nix +++ b/pkgs/by-name/go/go-ios/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "go-ios"; - version = "1.0.175"; + version = "1.0.176"; src = fetchFromGitHub { owner = "danielpaulus"; repo = "go-ios"; rev = "v${version}"; - sha256 = "sha256-V+/FYLv4EVvTjZgTEbgpNqSO365LPS+1PV28Sal2DQQ="; + sha256 = "sha256-YThPGxKtGEv/jTlvtWvdJFjk+1+GLuKAtH0ivNlmr6A="; }; proxyVendor = true; diff --git a/pkgs/by-name/go/go-jet/package.nix b/pkgs/by-name/go/go-jet/package.nix index 4519fa55af63..e4e3e054ab96 100644 --- a/pkgs/by-name/go/go-jet/package.nix +++ b/pkgs/by-name/go/go-jet/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go-jet"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = pname; repo = "jet"; rev = "v${version}"; - sha256 = "sha256-lS/oo0jD/kYKVDJly96Y/iRupPXueoOOYJsEYu1+Jdk="; + sha256 = "sha256-abk/mcukxIgAD9Oxh3H4+xrSoY30aW7EXZxEXXlriHA="; }; - vendorHash = "sha256-f2oeGERwnqMPPwV+ZUJ+Mss9ZmlQRg/xllofDR9aa4M="; + vendorHash = "sha256-KheXtpbmW8GoD7nHE7vg8qOsg5sRXfrFuBJbDEXOTBs="; subPackages = [ "cmd/jet" ]; diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix index f23086ee7a7c..f368a95fa11b 100644 --- a/pkgs/by-name/go/gocryptfs/package.nix +++ b/pkgs/by-name/go/gocryptfs/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yTZD4Q/krl6pW6EdtU+sdCWOOo9LHJqHCuNubAoEIyo="; + sha256 = "sha256-H3J+1a4Y6/BqgU7D9j/PNtP6Ci3EjrtO/ADx3GpJMgI="; }; - vendorHash = "sha256-bzhwYiTqI3MV0KxDT5j9TVnWJxM0BuLgEC8/r+2aQjI="; + vendorHash = "sha256-WfTJ8TuFupEa391XQMDl3hKTjrmRHJqvYb1haAGHW/U="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/go/gol/package.nix b/pkgs/by-name/go/gol/package.nix index f1d8eafc1deb..2ce3bfd8e370 100644 --- a/pkgs/by-name/go/gol/package.nix +++ b/pkgs/by-name/go/gol/package.nix @@ -8,16 +8,16 @@ maven.buildMavenPackage rec { pname = "gol"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "clarisma"; repo = "gol-tool"; - rev = version; - hash = "sha256-F/tMRD+nWn/fRPX7cTan371zlOTxh7oR98wREmokULo="; + tag = version; + hash = "sha256-jAkBFrtdVsK67n8Oo+/MGPL/JKRsu/6tbqy711exlwo="; }; - mvnHash = "sha256-6EX+y7/lGdB5LgW9MIER+KgvtPjvMCDjgq89f1g2GlY="; + mvnHash = "sha256-GCyTk/Lmh41qpCeex/qrN7cgPoNCsmmOKeBYllbtTZk"; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/go/golangci-lint-langserver/package.nix b/pkgs/by-name/go/golangci-lint-langserver/package.nix index 515ed00b4eec..6e9c47172656 100644 --- a/pkgs/by-name/go/golangci-lint-langserver/package.nix +++ b/pkgs/by-name/go/golangci-lint-langserver/package.nix @@ -1,29 +1,36 @@ { lib, buildGoModule, + golangci-lint, + writableTmpDirAsHomeHook, fetchFromGitHub, }: buildGoModule rec { pname = "golangci-lint-langserver"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "nametake"; repo = "golangci-lint-langserver"; - rev = "v${version}"; - sha256 = "sha256-jNRDqg2a5dXo7QI4CBRw0MLwhfpdGuhygpMoSKNcgC0="; + tag = "v${version}"; + hash = "sha256-wNofr/s8K+vbvNZWrQ97g2V0fNAS2P/Zf7tsOmly+gc="; }; - vendorHash = "sha256-tAcl6P+cgqFX1eMYdS8vnfdNyb+1QNWwWdJsQU6Fpgg="; + vendorHash = "sha256-SsGw26y/ZIBFp9dBk55ebQgJiLWOFRNe21h6huYE84I="; subPackages = [ "." ]; - meta = with lib; { + nativeCheckInputs = [ + golangci-lint + writableTmpDirAsHomeHook + ]; + + meta = { description = "Language server for golangci-lint"; homepage = "https://github.com/nametake/golangci-lint-langserver"; - license = licenses.mit; - maintainers = with maintainers; [ kirillrdy ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kirillrdy ]; mainProgram = "golangci-lint-langserver"; }; } diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 2959f3f41f8d..69fb5537baf2 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,13 +7,13 @@ buildGo124Module rec { pname = "golangci-lint"; - version = "1.64.7"; + version = "1.64.8"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-nxJ+b491qdtT2pSznYPhKZtLZENsmQj8zYCd3KRSqRc="; + hash = "sha256-H7IdXAleyzJeDFviISitAVDNJmiwrMysYcGm6vAoWso="; }; vendorHash = "sha256-i7ec4U4xXmRvHbsDiuBjbQ0xP7xRuilky3gi+dT1H10="; diff --git a/pkgs/by-name/go/gomi/package.nix b/pkgs/by-name/go/gomi/package.nix index 51a3f85ddd1e..82f16f3de703 100644 --- a/pkgs/by-name/go/gomi/package.nix +++ b/pkgs/by-name/go/gomi/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gomi"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "b4b4r07"; repo = "gomi"; tag = "v${version}"; - hash = "sha256-JTmbToVzxFEQLwGVvDKdgKA4dBn6O+L6hDQJvAvvdwA="; + hash = "sha256-FZCvUG6lQH8CFivV/hbIgGQx4FCk1UtreiWXTQVi4+4="; }; - vendorHash = "sha256-znyk+ffDUo1nOWeM5k/WE2EE9FVvLxXyM/dV8KUSioU="; + vendorHash = "sha256-8aw81DKBmgNsQzgtHCsUkok5e5+LeAC8BUijwKVT/0s="; subPackages = [ "." ]; diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index ae355551d6c5..35feec1bf524 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -8,13 +8,13 @@ }: let - version = "1.6.10"; + version = "1.6.11"; src = fetchFromGitHub { owner = "GopeedLab"; repo = "gopeed"; tag = "v${version}"; - hash = "sha256-sTKPSgy1jDavEd/IM8F6dxojp8oOQTo3/w/YV21JR/Q="; + hash = "sha256-ayPqLRWYSa0rSHqGFS4xp3wUVAl4tfsSPs/SQcUQD60="; }; metaCommon = { @@ -45,14 +45,17 @@ let }; in flutter324.buildFlutterApplication { - inherit version src libgopeed; + inherit version src; pname = "gopeed"; sourceRoot = "${src.name}/ui/flutter"; pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes.permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA="; + gitHashes = { + install_plugin = "sha256-3FM08D2pbtWmitf8R4pAylVqum7IfbWh6pOIEhJdySk="; + permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA="; + }; nativeBuildInputs = [ autoPatchelfHook ]; @@ -61,7 +64,7 @@ flutter324.buildFlutterApplication { preBuild = '' mkdir -p linux/bundle/lib cp ${libgopeed}/lib/libgopeed.so linux/bundle/lib/libgopeed.so - cp ${libgopeed}/bin/host assets/host/host + cp ${libgopeed}/bin/host assets/exec/host ''; postInstall = '' @@ -75,7 +78,10 @@ flutter324.buildFlutterApplication { --add-rpath $out/app/gopeed/lib $out/app/gopeed/gopeed ''; - passthru.updateScript = ./update.sh; + passthru = { + inherit libgopeed; + updateScript = ./update.sh; + }; meta = metaCommon // { mainProgram = "gopeed"; diff --git a/pkgs/by-name/go/gopeed/pubspec.lock.json b/pkgs/by-name/go/gopeed/pubspec.lock.json index 62e21f14af5c..1c46402df193 100644 --- a/pkgs/by-name/go/gopeed/pubspec.lock.json +++ b/pkgs/by-name/go/gopeed/pubspec.lock.json @@ -337,7 +337,7 @@ "version": "0.3.4+2" }, "crypto": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "crypto", "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", @@ -680,6 +680,17 @@ "source": "hosted", "version": "4.3.0" }, + "install_plugin": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "cf08af829f4a4145634f8a047108f505fdbe5eaa", + "resolved-ref": "cf08af829f4a4145634f8a047108f505fdbe5eaa", + "url": "https://github.com/hui-z/flutter_install_plugin.git" + }, + "source": "git", + "version": "2.1.0" + }, "intl": { "dependency": "transitive", "description": { diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index e2d42755fc9b..378505b14764 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,13 +10,13 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${version}"; - hash = "sha256-dyGOfcUlMXqrKSosxT+SbI8JPkDgw7fE/ZDBjC+mqjw="; + hash = "sha256-ecVI4TC3P4c8iXzDKiV9dcZoXizNiKDnVX+D2uiHYTA="; }; vendorHash = "sha256-lwiU8O+19ONyB9oqMOuutbIr4w8NY2OstE67p/E+UjY="; diff --git a/pkgs/by-name/go/gose/package.nix b/pkgs/by-name/go/gose/package.nix index fe03ebb95994..f61f3d1c8c64 100644 --- a/pkgs/by-name/go/gose/package.nix +++ b/pkgs/by-name/go/gose/package.nix @@ -7,13 +7,13 @@ lib, }: let - version = "0.9.0"; + version = "0.10.2"; src = fetchFromGitHub { repo = "gose"; owner = "stv0g"; tag = "v${version}"; - hash = "sha256-Vcp9gMJ296KS8OFOIcWvvYrS+LrOVlN3KN20yJxoo5U="; + hash = "sha256-xyAOag2/GaIVttTLnx/6ljkpWbJmsOfyYyWzOAHOQ2I="; }; frontend = buildNpmPackage { @@ -37,7 +37,7 @@ buildGoModule { inherit version; inherit src; - vendorHash = "sha256-U/umJ6McCuD0HARVMj1JXHOpVxcph16z7Y7i47Nf3cg="; + vendorHash = "sha256-/Drb5Mxz37rNYfHdydl3z+xvFtjGwuzSsG4gkbx/h1o="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index 47cd46c5f620..4fb6e3e9a0b7 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gosmee"; - version = "0.22.4"; + version = "0.23.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "gosmee"; rev = "v${version}"; - hash = "sha256-e+Mkhkk+PTeTipWFnjiJ8jLMYB7D+/FCWaOuaKe1jr4="; + hash = "sha256-4Y5aExRjR2JPa9iTJPQE7qCRnQpqLBYVPLf6v7Z07a8="; }; vendorHash = null; diff --git a/pkgs/by-name/go/gotools/package.nix b/pkgs/by-name/go/gotools/package.nix index 51bfc88b689c..ab00c3f10ef6 100644 --- a/pkgs/by-name/go/gotools/package.nix +++ b/pkgs/by-name/go/gotools/package.nix @@ -2,6 +2,8 @@ lib, buildGoModule, fetchFromGitHub, + makeWrapper, + go, }: buildGoModule rec { @@ -16,16 +18,19 @@ buildGoModule rec { hash = "sha256-yUkdZSe/GV0w1qK8aQjcFE4tNKYC8f4JeFgPiv8GlQc="; }; + allowGoReference = true; + doCheck = false; + + vendorHash = "sha256-+jhCNi7bGkRdI1Ywfe3q4i+zcm3UJ0kbQalsDD3WkS4="; + + nativeBuildInputs = [ makeWrapper ]; + postPatch = '' # The gopls folder contains a Go submodule which causes a build failure # and lives in its own package named gopls. rm -r gopls ''; - vendorHash = "sha256-+jhCNi7bGkRdI1Ywfe3q4i+zcm3UJ0kbQalsDD3WkS4="; - - doCheck = false; - # Set GOTOOLDIR for derivations adding this to buildInputs postInstall = '' mkdir -p $out/nix-support @@ -33,6 +38,11 @@ buildGoModule rec { --subst-var-by bin $out ''; + postFixup = '' + wrapProgram $out/bin/goimports \ + --suffix PATH : ${lib.makeBinPath [ go ]} + ''; + meta = with lib; { description = "Additional tools for Go development"; longDescription = '' diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix index 37d103925059..6a6f48c67f6d 100644 --- a/pkgs/by-name/go/gotosocial/package.nix +++ b/pkgs/by-name/go/gotosocial/package.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.18.2"; + version = "0.18.3"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-36UwUhf3FZ+/DMI0L/g88prbEwyj2ApoRdMK8f57KCU="; + hash = "sha256-60aSiWHHHDxZggreqTVHip2Ld/PyN9T4k+NGjX/ONQc="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; tag = "v${version}"; - hash = "sha256-GHUHtTE8KQtm+sWr5K+WmOr3KY7gA9hDINIBTioXNlw="; + hash = "sha256-fn3QrfTrKYWABRMF3imyoeVEpARl13fcq6Fu2GwsrcE="; }; vendorHash = null; diff --git a/pkgs/by-name/gp/gpodder/package.nix b/pkgs/by-name/gp/gpodder/package.nix index adad02f16cb7..738983a6322f 100644 --- a/pkgs/by-name/gp/gpodder/package.nix +++ b/pkgs/by-name/gp/gpodder/package.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, gitUpdater, - glibcLocales, adwaita-icon-theme, gobject-introspection, gtk3, @@ -35,7 +34,6 @@ python311Packages.buildPythonApplication rec { nativeBuildInputs = [ intltool wrapGAppsHook3 - glibcLocales gobject-introspection ]; @@ -73,10 +71,6 @@ python311Packages.buildPythonApplication rec { "share/dbus-1/services/org.gpodder.service" ]; - preBuild = '' - export LC_ALL="en_US.UTF-8" - ''; - installCheckPhase = '' LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix index 9e258b2e5de9..ebc91e8e9d7f 100644 --- a/pkgs/by-name/gp/gpu-viewer/package.nix +++ b/pkgs/by-name/gp/gpu-viewer/package.nix @@ -29,14 +29,14 @@ python3Packages.buildPythonApplication rec { pname = "gpu-viewer"; - version = "3.10"; + version = "3.12"; pyproject = false; src = fetchFromGitHub { owner = "arunsivaramanneo"; repo = "gpu-viewer"; tag = "v${version}"; - hash = "sha256-0rbg3T9OXnSZ5+2cjgfNitAv1LgdO0N90wWJifzHcsg="; + hash = "sha256-wVgAAKqlf5mtj2u+DsRPvYeVta7wAr+eCXVM1c/l6bo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix index 1339b6dfdcf6..510d676a1549 100644 --- a/pkgs/by-name/gr/granted/package.nix +++ b/pkgs/by-name/gr/granted/package.nix @@ -31,6 +31,7 @@ buildGoModule rec { "-X github.com/common-fate/granted/internal/build.Commit=${src.rev}" "-X github.com/common-fate/granted/internal/build.Date=1970-01-01-00:00:01" "-X github.com/common-fate/granted/internal/build.BuiltBy=Nix" + "-X github.com/common-fate/granted/internal/build.ConfigFolderName=.granted" ]; subPackages = [ diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index f112ab875183..dca93be00694 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -18,13 +18,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "0.1-unstable-2025-03-11"; + version = "0.1-unstable-2025-03-17"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "e14d9c5e9aea4a84c3677e0a7c73268153b15327"; - hash = "sha256-SJrLVyoaQUg29fq3nNdRmYrLgiu9dtgcIVqpl8j/Teo="; + rev = "bd81329944be53b0ffb99e05864804b95f1d7c65"; + hash = "sha256-I8JVdQRu8eWvY5W8XWYZkdd5pojDHkxeqQV7mMIsbhs="; }; strictDeps = true; diff --git a/pkgs/by-name/gr/grip/package.nix b/pkgs/by-name/gr/grip/package.nix index eb11b33b668e..ffce916f7a0d 100644 --- a/pkgs/by-name/gr/grip/package.nix +++ b/pkgs/by-name/gr/grip/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK-based audio CD player/ripper"; - homepage = "http://nostatic.org/grip"; + homepage = "https://sourceforge.net/projects/grip/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ marcweber ]; diff --git a/pkgs/by-name/gr/grocy/0001-Define-configs-with-env-vars.patch b/pkgs/by-name/gr/grocy/0001-Define-configs-with-env-vars.patch index 75aa54f9c9c2..13efe8613693 100644 --- a/pkgs/by-name/gr/grocy/0001-Define-configs-with-env-vars.patch +++ b/pkgs/by-name/gr/grocy/0001-Define-configs-with-env-vars.patch @@ -1,17 +1,18 @@ -From 231ee836e357b83cc2fc0a3a977f74839308ec68 Mon Sep 17 00:00:00 2001 -From: Ember Keske -Date: Wed, 2 Aug 2023 06:36:02 +0200 +From b1df18da8735ed8c043e5e63753a6524cce620e1 Mon Sep 17 00:00:00 2001 +From: Chris Moultrie +Date: Tue, 4 Mar 2025 08:20:58 -0500 Subject: [PATCH 1/2] Define configs with env vars --- - app.php | 6 +++--- - services/DatabaseService.php | 2 +- - services/FilesService.php | 2 +- - services/StockService.php | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) + app.php | 8 ++++---- + controllers/BaseApiController.php | 2 +- + services/DatabaseService.php | 2 +- + services/FilesService.php | 2 +- + services/StockService.php | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app.php b/app.php -index bc5b1b3..26f7687 100644 +index 9cdd14e5..c0b30b6e 100644 --- a/app.php +++ b/app.php @@ -12,7 +12,7 @@ use Slim\Views\Blade; @@ -23,7 +24,16 @@ index bc5b1b3..26f7687 100644 require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones require_once __DIR__ . '/helpers/ConfigurationValidator.php'; -@@ -64,7 +64,7 @@ $app = AppFactory::create(); +@@ -52,7 +52,7 @@ catch (EInvalidConfig $ex) + } + + // Create data/viewcache folder if it doesn't exist +-$viewcachePath = GROCY_DATAPATH . '/viewcache'; ++$viewcachePath = getenv('GROCY_CACHE_DIR'); + if (!file_exists($viewcachePath)) + { + mkdir($viewcachePath); +@@ -85,7 +85,7 @@ $app = AppFactory::create(); $container = $app->getContainer(); $container->set('view', function (Container $container) { @@ -32,7 +42,7 @@ index bc5b1b3..26f7687 100644 }); $container->set('UrlManager', function (Container $container) -@@ -106,7 +106,7 @@ $errorMiddleware->setDefaultErrorHandler( +@@ -127,7 +127,7 @@ $errorMiddleware->setDefaultErrorHandler( $app->add(new CorsMiddleware($app->getResponseFactory())); @@ -42,7 +52,7 @@ index bc5b1b3..26f7687 100644 ob_clean(); // No response output before here $app->run(); diff --git a/controllers/BaseApiController.php b/controllers/BaseApiController.php -index 5941e348..e5b02af4 100644 +index 5941e348..9283ba93 100644 --- a/controllers/BaseApiController.php +++ b/controllers/BaseApiController.php @@ -162,7 +162,7 @@ class BaseApiController extends BaseController @@ -55,10 +65,10 @@ index 5941e348..e5b02af4 100644 $htmlPurifierConfig->set('Attr.EnableID', true); $htmlPurifierConfig->set('HTML.SafeIframe', true); diff --git a/services/DatabaseService.php b/services/DatabaseService.php -index ba79a73..12a851a 100644 +index c5914e49..c249a3bf 100644 --- a/services/DatabaseService.php +++ b/services/DatabaseService.php -@@ -137,6 +137,6 @@ class DatabaseService +@@ -145,6 +145,6 @@ class DatabaseService return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db'; } @@ -67,7 +77,7 @@ index ba79a73..12a851a 100644 } } diff --git a/services/FilesService.php b/services/FilesService.php -index 7d07035..a6dd4b0 100644 +index 113a6478..61568bc6 100644 --- a/services/FilesService.php +++ b/services/FilesService.php @@ -10,7 +10,7 @@ class FilesService extends BaseService @@ -80,18 +90,18 @@ index 7d07035..a6dd4b0 100644 { mkdir($this->StoragePath); diff --git a/services/StockService.php b/services/StockService.php -index 9f034a5..fd3c0b7 100644 +index 2261db4e..cd438942 100644 --- a/services/StockService.php +++ b/services/StockService.php -@@ -1707,7 +1707,7 @@ class StockService extends BaseService - throw new \Exception('No barcode lookup plugin defined'); - } +@@ -1752,7 +1752,7 @@ class StockService extends BaseService -- $path = GROCY_DATAPATH . "/plugins/$pluginName.php"; -+ $path = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php"; - if (file_exists($path)) + // User plugins take precedence + $standardPluginPath = __DIR__ . "/../plugins/$pluginName.php"; +- $userPluginPath = GROCY_DATAPATH . "/plugins/$pluginName.php"; ++ $userPluginPath = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php"; + if (file_exists($userPluginPath)) { - require_once $path; + require_once $userPluginPath; -- -2.42.0 +2.47.2 diff --git a/pkgs/by-name/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/pkgs/by-name/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch index 24050f782c48..fd3139ae936e 100644 --- a/pkgs/by-name/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch +++ b/pkgs/by-name/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch @@ -1,6 +1,6 @@ -From b532add2d1287489d4541e79c976bb77795696cd Mon Sep 17 00:00:00 2001 -From: Ember Keske -Date: Wed, 2 Aug 2023 06:36:46 +0200 +From f397d6e82d73761358d815a5ba880a05e7e281c3 Mon Sep 17 00:00:00 2001 +From: Chris Moultrie +Date: Tue, 4 Mar 2025 08:21:28 -0500 Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy --- @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy 1 file changed, 1 deletion(-) diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php -index 8e12a5c..37b433d 100644 +index 8e12a5c5..37b433db 100644 --- a/helpers/PrerequisiteChecker.php +++ b/helpers/PrerequisiteChecker.php @@ -18,7 +18,6 @@ class PrerequisiteChecker @@ -20,4 +20,5 @@ index 8e12a5c..37b433d 100644 self::checkForComposer(); self::checkForPhpExtensions(); -- -2.42.0 \ No newline at end of file +2.47.2 + diff --git a/pkgs/by-name/gr/grocy/package.nix b/pkgs/by-name/gr/grocy/package.nix index 18374dbac41a..a1b62e792432 100644 --- a/pkgs/by-name/gr/grocy/package.nix +++ b/pkgs/by-name/gr/grocy/package.nix @@ -10,20 +10,20 @@ php.buildComposerProject2 (finalAttrs: { pname = "grocy"; - version = "4.3.0"; + version = "4.4.2"; src = fetchFromGitHub { owner = "grocy"; repo = "grocy"; tag = "v${finalAttrs.version}"; - hash = "sha256-9Lc3NUZ7Huiyt887kCHL6lshow3+Pqrq8h1NV+CFHGs="; + hash = "sha256-jIlFQFXtxZ/rrPs9iSCn32scXPgi1ed4o8qXKm/WrrQ="; }; - vendorHash = "sha256-0Hn9dp5ASF0R2L0HTeQ9nSSN7dZgk1a4mv+ZkNMm+k8="; + vendorHash = "sha256-cKKJFsDoQqiW7qicZi2sZ6Fmymg/4oU45PWJ0NsjjtY="; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-l8uYMBMufbSHhxNxqqA0BqCLqUYubjIpgevaenzy5Ic="; + hash = "sha256-iym+kdnjkcQtIIe800Q4BYR7/vLl63XT62FtDJnjqkw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gr/grpc-client-cli/package.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix index 035186b63075..c1a9082d3262 100644 --- a/pkgs/by-name/gr/grpc-client-cli/package.nix +++ b/pkgs/by-name/gr/grpc-client-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grpc-client-cli"; - version = "1.21.3"; + version = "1.22.1"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${version}"; - sha256 = "sha256-c+mwQJczF8BG3NnpZpBZNGzGQxs8/ptApvESQhiUpfA="; + sha256 = "sha256-+Njo3cqqWhQMYsO7VLScPemmBMCf55khzLqBmODqEng="; }; - vendorHash = "sha256-1SRp5NmE+NbRtUZ3s4yL6CJUMs+dlm6oN00gKV9QY0U="; + vendorHash = "sha256-iZh/Ax9Gf3YNUgk2vNvTewuq97nUE3POaOb9/poVrCY="; meta = with lib; { description = "generic gRPC command line client"; diff --git a/pkgs/by-name/gt/gtk4-layer-shell/package.nix b/pkgs/by-name/gt/gtk4-layer-shell/package.nix index 237d40730aaa..8a7bca4cf7ae 100644 --- a/pkgs/by-name/gt/gtk4-layer-shell/package.nix +++ b/pkgs/by-name/gt/gtk4-layer-shell/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, meson, + mesonEmulatorHook, ninja, pkg-config, gtk-doc, @@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_43 vala wayland-scanner - ]; + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; buildInputs = [ gtk4 diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix index a26e7fc32de1..2ed1f19cf064 100644 --- a/pkgs/by-name/gu/gurk-rs/package.nix +++ b/pkgs/by-name/gu/gurk-rs/package.nix @@ -8,6 +8,7 @@ pkgsBuildHost, openssl, pkg-config, + writableTmpDirAsHomeHook, versionCheckHook, nix-update-script, gurk-rs, @@ -18,13 +19,13 @@ let in rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "boxdot"; repo = "gurk-rs"; tag = "v${version}"; - hash = "sha256-FSnKBSRhnHwjMzC8zGU/AHBuPX44EjMLS+3wHkf6IZw="; + hash = "sha256-6WU5epBnCPCkEYPZvWMOGOdkw8cL+nvHKs3RnsrhJO0="; }; postPatch = '' @@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; - cargoHash = "sha256-6+AFyQjbtxKHbMhYhfu9pUoz/cWGtl5o+IA6kFO4Zjk="; + cargoHash = "sha256-qW+9d2Etwh9sPxgy0mZtUFtkjlFTHU5uJYTW5jLcBlo="; nativeBuildInputs = [ protobuf @@ -53,6 +54,8 @@ rustPlatform.buildRustPackage rec { useNextest = true; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/gv/gvproxy/package.nix b/pkgs/by-name/gv/gvproxy/package.nix index 6db7531253c9..154d385cbba3 100644 --- a/pkgs/by-name/gv/gvproxy/package.nix +++ b/pkgs/by-name/gv/gvproxy/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - hash = "sha256-2Anh/jWnDCqGxsIz8/DMzQ5Jj9FpvxHgEk9MeqBPFms="; + hash = "sha256-rWZYwQ/wWYAbM0RRNcNboWzKUuNNPDigIFFbFdXDNuo="; }; vendorHash = null; diff --git a/pkgs/by-name/ha/habitat/Cargo.lock b/pkgs/by-name/ha/habitat/Cargo.lock deleted file mode 100644 index 71c5ab204a70..000000000000 --- a/pkgs/by-name/ha/habitat/Cargo.lock +++ /dev/null @@ -1,4675 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "actix-codec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-sink", - "log 0.4.20", - "memchr", - "pin-project-lite", - "tokio", - "tokio-util 0.7.8", -] - -[[package]] -name = "actix-http" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0070905b2c4a98d184c4e81025253cb192aa8a73827553f38e9410801ceb35bb" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-tls", - "actix-utils", - "ahash", - "base64 0.21.2", - "bitflags 1.3.2", - "bytes", - "bytestring", - "derive_more", - "encoding_rs", - "futures-core", - "h2", - "http", - "httparse", - "httpdate", - "itoa 1.0.1", - "language-tags", - "local-channel", - "mime", - "percent-encoding", - "pin-project-lite", - "rand 0.8.5", - "sha1", - "smallvec", - "tokio", - "tokio-util 0.7.8", - "tracing", -] - -[[package]] -name = "actix-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" -dependencies = [ - "quote", - "syn 1.0.104", -] - -[[package]] -name = "actix-router" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb60846b52c118f2f04a56cc90880a274271c489b2498623d58176f8ca21fa80" -dependencies = [ - "bytestring", - "firestorm", - "http", - "log 0.4.20", - "regex 1.7.3", - "serde", -] - -[[package]] -name = "actix-rt" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" -dependencies = [ - "actix-macros", - "futures-core", - "tokio", -] - -[[package]] -name = "actix-server" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824" -dependencies = [ - "actix-rt", - "actix-service", - "actix-utils", - "futures-core", - "futures-util", - "mio 0.8.8", - "num_cpus", - "socket2 0.4.9", - "tokio", - "tracing", -] - -[[package]] -name = "actix-service" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f5f9d66a8730d0fae62c26f3424f5751e5518086628a40b7ab6fca4a705034" -dependencies = [ - "futures-core", - "paste", - "pin-project-lite", -] - -[[package]] -name = "actix-tls" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-utils", - "futures-core", - "log 0.4.20", - "pin-project-lite", - "tokio-rustls", - "tokio-util 0.7.8", - "webpki-roots", -] - -[[package]] -name = "actix-utils" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e491cbaac2e7fc788dfff99ff48ef317e23b3cf63dbaf7aaab6418f40f92aa94" -dependencies = [ - "local-waker", - "pin-project-lite", -] - -[[package]] -name = "actix-web" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" -dependencies = [ - "actix-codec", - "actix-http", - "actix-router", - "actix-rt", - "actix-server", - "actix-service", - "actix-tls", - "actix-utils", - "ahash", - "bytes", - "bytestring", - "cfg-if 1.0.0", - "derive_more", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "itoa 1.0.1", - "language-tags", - "log 0.4.20", - "mime", - "once_cell", - "pin-project-lite", - "regex 1.7.3", - "serde", - "serde_json", - "serde_urlencoded", - "smallvec", - "socket2 0.4.9", - "time 0.3.11", - "url", -] - -[[package]] -name = "addr" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a93b8a41dbe230ad5087cc721f8d41611de654542180586b315d9f4cf6b72bef" -dependencies = [ - "psl", - "psl-types", -] - -[[package]] -name = "addr2line" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" -dependencies = [ - "getrandom 0.2.3", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" -dependencies = [ - "backtrace", -] - -[[package]] -name = "arc-swap" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "async-trait" -version = "0.1.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide 0.4.4", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "bimap" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "blake2b_simd" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" -dependencies = [ - "generic-array", -] - -[[package]] -name = "broadcast" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb214f702da3cc6aa1666520f40ea66f506644db5e1065be4bbc972f7ec3750b" - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "bytestring" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d" -dependencies = [ - "bytes", -] - -[[package]] -name = "caps" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" -dependencies = [ - "libc", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "time 0.1.43", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "clap" -version = "2.33.1" -source = "git+https://github.com/habitat-sh/clap.git?branch=v2-master#21690ba25d1ac5783f4fb413ff87e6d086d15b49" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "colosseum" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370c83b49aedf022ee27942e8ae1d9de1cf40dc9653ee6550e4455d08f6406f9" - -[[package]] -name = "configopt" -version = "0.1.0" -source = "git+https://github.com/habitat-sh/configopt.git#98e4041a9922d6ebb5e548c3241fb82c76c6a4c0" -dependencies = [ - "colosseum", - "configopt-derive", - "lazy_static 1.4.0", - "serde", - "structopt", - "toml 0.7.6", -] - -[[package]] -name = "configopt-derive" -version = "0.1.0" -source = "git+https://github.com/habitat-sh/configopt.git#98e4041a9922d6ebb5e548c3241fb82c76c6a4c0" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "proc_macro_roids", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "constant_time_eq" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cpu-time" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "cpufeatures" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" -dependencies = [ - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static 1.4.0", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "ctrlc" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" -dependencies = [ - "nix", - "windows-sys 0.48.0", -] - -[[package]] -name = "cxx" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.104", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "derive_more" -version = "0.99.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.3.3", - "syn 1.0.104", -] - -[[package]] -name = "destructure_traitobject" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" -dependencies = [ - "block-buffer 0.10.2", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "dns-lookup" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f332aa79f9e9de741ac013237294ef42ce2e9c6394dc7d766725812f1238812" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "socket2 0.5.3", - "windows-sys 0.48.0", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "ed25519" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" -dependencies = [ - "signature", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "encoding_rs" -version = "0.8.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "env" -version = "0.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876927d21ef1ae98001c8c35a1d8dfd682136914b23ef04276820fa6d43c3630" - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log 0.4.20", - "regex 1.7.3", - "termcolor", -] - -[[package]] -name = "env_proxy" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5019be18538406a43b5419a5501461f0c8b49ea7dfda0cfc32f4e51fc44be1" -dependencies = [ - "log 0.4.20", - "url", -] - -[[package]] -name = "equivalent" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" - -[[package]] -name = "erased-serde" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" -dependencies = [ - "serde", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" -dependencies = [ - "gcc", - "libc", -] - -[[package]] -name = "error-chain" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" - -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex 1.7.3", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "field-offset" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" -dependencies = [ - "memoffset 0.6.4", - "rustc_version 0.3.3", -] - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "firestorm" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5f6c2c942da57e2aaaa84b8a521489486f14e75e7fa91dab70aba913975f98" - -[[package]] -name = "fixedbitset" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" - -[[package]] -name = "flate2" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" -dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags 1.3.2", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - -[[package]] -name = "generator" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee" -dependencies = [ - "cc", - "libc", - "log 0.4.20", - "rustversion", - "winapi 0.3.9", -] - -[[package]] -name = "generic-array" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "h2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 1.9.2", - "slab", - "tokio", - "tokio-util 0.7.8", - "tracing", -] - -[[package]] -name = "hab" -version = "0.0.0" -dependencies = [ - "anyhow", - "atty", - "base64 0.21.2", - "bitflags 2.4.0", - "chrono", - "clap", - "configopt", - "ctrlc", - "dirs", - "env_logger", - "flate2", - "futures", - "glob", - "habitat-sup-client", - "habitat-sup-protocol", - "habitat_api_client", - "habitat_common", - "habitat_core", - "handlebars 0.29.1", - "lazy_static 1.4.0", - "libc", - "log 0.4.20", - "pbr", - "rants", - "reqwest", - "retry", - "rustls", - "same-file", - "serde", - "serde_json", - "serde_yaml 0.9.25", - "structopt", - "tabwriter", - "tar", - "tempfile", - "termcolor", - "thiserror", - "tokio", - "toml 0.7.6", - "url", - "uuid 1.2.2", - "walkdir", - "webpki", - "widestring 1.0.2", - "winapi 0.3.9", - "winreg 0.51.0", -] - -[[package]] -name = "habitat-launcher" -version = "0.0.0" -dependencies = [ - "anyhow", - "env_logger", - "habitat-launcher-protocol", - "habitat_common", - "habitat_core", - "ipc-channel", - "libc", - "log 0.4.20", - "nix", - "prost", - "semver 1.0.18", - "thiserror", - "winapi 0.3.9", -] - -[[package]] -name = "habitat-launcher-client" -version = "0.0.0" -dependencies = [ - "bincode", - "env_logger", - "habitat-launcher-protocol", - "habitat_common", - "habitat_core", - "ipc-channel", - "libc", - "log 0.4.20", - "prost", - "serde", - "thiserror", -] - -[[package]] -name = "habitat-launcher-protocol" -version = "0.0.0" -dependencies = [ - "bytes", - "prost", - "prost-build", - "serde", -] - -[[package]] -name = "habitat-rst-reader" -version = "0.0.0" -dependencies = [ - "clap", - "env_logger", - "habitat_butterfly", - "log 0.4.20", -] - -[[package]] -name = "habitat-sup-client" -version = "0.0.0" -dependencies = [ - "futures", - "habitat-sup-protocol", - "habitat_common", - "habitat_core", - "log 0.4.20", - "prost", - "rustls", - "termcolor", - "tokio", - "tokio-util 0.7.8", -] - -[[package]] -name = "habitat-sup-protocol" -version = "0.0.0" -dependencies = [ - "base64 0.21.2", - "bytes", - "habitat_core", - "lazy_static 1.4.0", - "log 0.4.20", - "prost", - "prost-build", - "rand 0.8.5", - "serde", - "tempfile", - "tokio", - "tokio-util 0.7.8", - "toml 0.7.6", -] - -[[package]] -name = "habitat_api_client" -version = "0.0.0" -dependencies = [ - "broadcast", - "bytes", - "chrono", - "env", - "futures", - "habitat_core", - "habitat_http_client", - "log 0.4.20", - "pbr", - "percent-encoding", - "rand 0.8.5", - "regex 1.7.3", - "reqwest", - "serde", - "serde_json", - "tee", - "tokio", - "tokio-util 0.7.8", - "url", -] - -[[package]] -name = "habitat_butterfly" -version = "0.1.0" -dependencies = [ - "byteorder", - "bytes", - "env_logger", - "habitat_common", - "habitat_core", - "lazy_static 1.4.0", - "log 0.4.20", - "mktemp", - "parking_lot", - "prometheus", - "prost", - "prost-build", - "rand 0.8.5", - "serde", - "serde_json", - "tempfile", - "threadpool", - "toml 0.7.6", - "uuid 1.2.2", - "winapi 0.3.9", - "zmq", -] - -[[package]] -name = "habitat_common" -version = "0.0.0" -dependencies = [ - "async-trait", - "bimap", - "bitflags 2.4.0", - "clap", - "dirs", - "glob", - "habitat_api_client", - "habitat_core", - "handlebars 0.28.3", - "lazy_static 1.4.0", - "libc", - "log 0.4.20", - "native-tls", - "nix", - "owning_ref", - "parking_lot", - "pbr", - "petgraph", - "regex 1.7.3", - "reqwest", - "retry", - "rustls", - "serde", - "serde-transcode", - "serde_json", - "serde_yaml 0.9.25", - "tempfile", - "termcolor", - "thiserror", - "tokio", - "toml 0.7.6", - "uuid 1.2.2", - "valico", - "winapi 0.3.9", -] - -[[package]] -name = "habitat_core" -version = "0.0.0" -dependencies = [ - "base64 0.21.2", - "blake2b_simd", - "caps", - "cc", - "chrono", - "ctrlc", - "dirs", - "dns-lookup", - "errno 0.3.2", - "glob", - "habitat_win_users", - "hex", - "lazy_static 1.4.0", - "libc", - "log 0.4.20", - "native-tls", - "nix", - "num_cpus", - "os_info", - "paste", - "pem 3.0.1", - "pin-project", - "rand 0.8.5", - "rcgen", - "regex 1.7.3", - "reqwest", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_test", - "sodiumoxide", - "tabwriter", - "tar", - "tempfile", - "thiserror", - "tokio", - "tokio-rustls", - "toml 0.7.6", - "url", - "webpki", - "widestring 1.0.2", - "winapi 0.3.9", - "windows-acl", - "xz2", -] - -[[package]] -name = "habitat_http_client" -version = "0.0.0" -dependencies = [ - "base64 0.21.2", - "env_proxy", - "habitat_core", - "httparse", - "log 0.4.20", - "native-tls", - "pem 3.0.1", - "reqwest", - "serde", - "serde_json", - "tempfile", - "url", -] - -[[package]] -name = "habitat_pkg_export_container" -version = "0.0.0" -dependencies = [ - "anyhow", - "base64 0.21.2", - "clap", - "env_logger", - "hab", - "habitat_common", - "habitat_core", - "handlebars 0.29.1", - "lazy_static 1.4.0", - "linked-hash-map", - "log 0.4.20", - "rusoto_core", - "rusoto_credential", - "rusoto_ecr", - "serde", - "serde_json", - "tempfile", - "termcolor", - "thiserror", - "tokio", - "url", -] - -[[package]] -name = "habitat_pkg_export_tar" -version = "0.0.0" -dependencies = [ - "anyhow", - "clap", - "env_logger", - "flate2", - "habitat_common", - "habitat_core", - "handlebars 0.29.1", - "lazy_static 1.4.0", - "log 0.4.20", - "mktemp", - "serde", - "serde_json", - "tar", - "tempfile", - "thiserror", - "tokio", - "url", -] - -[[package]] -name = "habitat_sup" -version = "0.0.0" -dependencies = [ - "actix-rt", - "actix-web", - "anyhow", - "byteorder", - "bytes", - "caps", - "clap", - "configopt", - "cpu-time", - "ctrlc", - "derivative", - "fs2", - "futures", - "glob", - "hab", - "habitat-launcher-client", - "habitat-launcher-protocol", - "habitat-sup-protocol", - "habitat_api_client", - "habitat_butterfly", - "habitat_common", - "habitat_core", - "habitat_http_client", - "hyper", - "lazy_static 1.4.0", - "libc", - "log 0.4.20", - "log4rs", - "mio 0.8.8", - "multimap 0.9.0", - "nix", - "notify", - "num_cpus", - "parking_lot", - "pin-project", - "prometheus", - "prost", - "prost-build", - "prost-types", - "rand 0.8.5", - "rants", - "regex 1.7.3", - "reqwest", - "rustls", - "rustls-pemfile", - "serde", - "serde-transcode", - "serde_derive", - "serde_json", - "serde_yaml 0.9.25", - "state", - "structopt", - "tempfile", - "termcolor", - "thiserror", - "tokio", - "tokio-rustls", - "tokio-util 0.7.8", - "toml 0.7.6", - "url", - "uuid 1.2.2", - "valico", - "winapi 0.3.9", -] - -[[package]] -name = "habitat_win_users" -version = "0.0.0" -dependencies = [ - "cc", - "log 0.4.20", - "widestring 1.0.2", - "winapi 0.3.9", -] - -[[package]] -name = "handlebars" -version = "0.28.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bed53dfb11098ec893ed54aa8b9828ffb98d28acbe56a49419935e5a8688ca9" -dependencies = [ - "lazy_static 0.2.11", - "log 0.3.9", - "pest 0.3.3", - "quick-error", - "regex 0.2.11", - "serde", - "serde_json", -] - -[[package]] -name = "handlebars" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb04af2006ea09d985fef82b81e0eb25337e51b691c76403332378a53d521edc" -dependencies = [ - "lazy_static 0.2.11", - "log 0.3.9", - "pest 0.3.3", - "quick-error", - "regex 0.2.11", - "serde", - "serde_json", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.1", -] - -[[package]] -name = "http-body" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 1.0.1", - "pin-project-lite", - "socket2 0.4.9", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown 0.14.0", -] - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "ipc-channel" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9b32d360ae2d4662212f1d29bc8a277256f49029cea20fd6c182b89819aea7" -dependencies = [ - "bincode", - "crossbeam-channel 0.4.4", - "fnv", - "lazy_static 1.4.0", - "libc", - "mio 0.6.23", - "rand 0.7.3", - "serde", - "tempfile", - "uuid 0.8.2", - "winapi 0.3.9", -] - -[[package]] -name = "ipnet" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" - -[[package]] -name = "is-terminal" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" -dependencies = [ - "hermit-abi 0.3.2", - "io-lifetimes", - "rustix 0.36.8", - "windows-sys 0.45.0", -] - -[[package]] -name = "itertools" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[package]] -name = "js-sys" -version = "0.3.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-pointer" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe841b94e719a482213cee19dd04927cf412f26d8dc84c5a446c081e49c2997" -dependencies = [ - "serde_json", -] - -[[package]] -name = "jsonway" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effcb749443c905fbaef49d214f8b1049c240e0adb7af9baa0e201e625e4f9de" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "kqueue" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[package]] -name = "lazy_static" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libsodium-sys" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b779387cd56adfbc02ea4a668e704f729be8d6a6abd2c27ca5ee537849a92fd" -dependencies = [ - "cc", - "libc", - "pkg-config", - "walkdir", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" - -[[package]] -name = "local-channel" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6246c68cf195087205a0512559c97e15eaf95198bf0e206d662092cdcb03fe9f" -dependencies = [ - "futures-core", - "futures-sink", - "futures-util", - "local-waker", -] - -[[package]] -name = "local-waker" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f9a2d3e27ce99ce2c3aad0b09b1a7b916293ea9b2bf624c13fe646fadd8da4" - -[[package]] -name = "lock_api" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.20", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -dependencies = [ - "serde", -] - -[[package]] -name = "log-mdc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" - -[[package]] -name = "log4rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd" -dependencies = [ - "anyhow", - "arc-swap", - "chrono", - "derivative", - "fnv", - "humantime", - "libc", - "log 0.4.20", - "log-mdc", - "parking_lot", - "serde", - "serde-value", - "serde_json", - "serde_yaml 0.8.26", - "thiserror", - "thread-id", - "typemap-ors", - "winapi 0.3.9", -] - -[[package]] -name = "loom" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2111607c723d7857e0d8299d5ce7a0bf4b844d3e44f8de136b13da513eaf8fc4" -dependencies = [ - "cfg-if 1.0.0", - "generator", - "scoped-tls", - "serde", - "serde_json", -] - -[[package]] -name = "lzma-sys" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e06754c4acf47d49c727d5665ca9fb828851cda315ed3bd51edd148ef78a8772" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "md-5" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "memchr" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" - -[[package]] -name = "memoffset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metadeps" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b122901b3a675fac8cecf68dcb2f0d3036193bc861d1ac0e1c337f7d5254c2" -dependencies = [ - "error-chain", - "pkg-config", - "toml 0.2.1", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log 0.4.20", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "log 0.4.20", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "mktemp" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bdc1f74dd7bb717d39f784f844e490d935b3aa7e383008006dbbf29c1f7820a" -dependencies = [ - "uuid 1.2.2", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "multimap" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70db9248a93dc36a36d9a47898caa007a32755c7ad140ec64eeeb50d5a730631" -dependencies = [ - "serde", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static 1.4.0", - "libc", - "log 0.4.20", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", -] - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.4.0", - "crossbeam-channel 0.5.8", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log 0.4.20", - "mio 0.8.8", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.2", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "object" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "openssl-probe" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - -[[package]] -name = "openssl-src" -version = "111.25.0+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-float" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039f02eb0f69271f26abe3202189275d7aa2258b903cb0281b5de710a2570ff3" -dependencies = [ - "num-traits", -] - -[[package]] -name = "os_info" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" -dependencies = [ - "log 0.4.20", - "serde", - "winapi 0.3.9", -] - -[[package]] -name = "owning_ref" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" -dependencies = [ - "backtrace", - "cfg-if 1.0.0", - "libc", - "petgraph", - "redox_syscall 0.2.10", - "smallvec", - "thread-id", - "windows-sys 0.34.0", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pbr" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514" -dependencies = [ - "crossbeam-channel 0.5.8", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64 0.21.2", - "serde", -] - -[[package]] -name = "pem" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3127afbfc30b4cad60c34aeb741fb562a808642b81142bcf4afb73142da960" -dependencies = [ - "base64 0.21.2", - "serde", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pest" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8" - -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.0.0", -] - -[[package]] -name = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -dependencies = [ - "phf_shared", - "rand 0.8.5", -] - -[[package]] -name = "phf_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "prettyplease" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" -dependencies = [ - "proc-macro2", - "syn 1.0.104", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.104", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proc_macro_roids" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06675fa2c577f52bcf77fbb511123927547d154faa08097cc012c66ec3c9611a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "prometheus" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" -dependencies = [ - "cfg-if 1.0.0", - "fnv", - "lazy_static 1.4.0", - "memchr", - "parking_lot", - "protobuf", - "thiserror", -] - -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck 0.4.0", - "itertools", - "lazy_static 1.4.0", - "log 0.4.20", - "multimap 0.8.3", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex 1.7.3", - "syn 1.0.104", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - -[[package]] -name = "protobuf" -version = "2.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020f86b07722c5c4291f7c723eac4676b3892d47d9a7708dc2779696407f039b" - -[[package]] -name = "psl" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac31add97d7c393248c273c9f862bcfd396e870db1ff5dec63e0e707db82ae4" -dependencies = [ - "psl-types", -] - -[[package]] -name = "psl-types" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rants" -version = "0.6.0" -source = "git+https://github.com/habitat-sh/rants.git#7fd1434ecaaf9af743ccab1840034f5d71329935" -dependencies = [ - "bytes", - "futures", - "log 0.4.20", - "native-tls", - "nom", - "owning_ref", - "pin-project", - "rand 0.8.5", - "serde", - "serde_json", - "tokio", - "tokio-native-tls", - "tokio-stream", - "tokio-util 0.7.8", - "uuid 1.2.2", -] - -[[package]] -name = "rcgen" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4954fbc00dcd4d8282c987710e50ba513d351400dbdd00e803a05172a90d8976" -dependencies = [ - "pem 2.0.1", - "ring", - "time 0.3.11", - "yasna", -] - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom 0.2.3", - "redox_syscall 0.2.10", -] - -[[package]] -name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -dependencies = [ - "aho-corasick 0.6.10", - "memchr", - "regex-syntax 0.5.6", - "thread_local", - "utf8-ranges", -] - -[[package]] -name = "regex" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" -dependencies = [ - "aho-corasick 0.7.18", - "memchr", - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -dependencies = [ - "ucd-util", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "reqwest" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525" -dependencies = [ - "base64 0.13.1", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static 1.4.0", - "log 0.4.20", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tokio-util 0.6.10", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.7.0", -] - -[[package]] -name = "retry" -version = "1.0.0" -source = "git+https://github.com/habitat-sh/retry#42c71e75aa231d8bf9befa7a0ec93dd570a21454" -dependencies = [ - "rand 0.8.5", - "tokio", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "rusoto_core" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db30db44ea73551326269adcf7a2169428a054f14faf9e1768f2163494f2fa2" -dependencies = [ - "async-trait", - "base64 0.13.1", - "bytes", - "crc32fast", - "futures", - "http", - "hyper", - "hyper-tls", - "lazy_static 1.4.0", - "log 0.4.20", - "rusoto_credential", - "rusoto_signature", - "rustc_version 0.4.0", - "serde", - "serde_json", - "tokio", - "xml-rs", -] - -[[package]] -name = "rusoto_credential" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee0a6c13db5aad6047b6a44ef023dbbc21a056b6dab5be3b79ce4283d5c02d05" -dependencies = [ - "async-trait", - "chrono", - "dirs-next", - "futures", - "hyper", - "serde", - "serde_json", - "shlex", - "tokio", - "zeroize", -] - -[[package]] -name = "rusoto_ecr" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2acfd092a618d37dbfb6f42e519c6e530a11115859a3e1f03d1daf8cc648d09" -dependencies = [ - "async-trait", - "bytes", - "futures", - "rusoto_core", - "serde", - "serde_json", -] - -[[package]] -name = "rusoto_signature" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ae95491c8b4847931e291b151127eccd6ff8ca13f33603eb3d0035ecb05272" -dependencies = [ - "base64 0.13.1", - "bytes", - "chrono", - "digest 0.9.0", - "futures", - "hex", - "hmac", - "http", - "hyper", - "log 0.4.20", - "md-5", - "percent-encoding", - "pin-project-lite", - "rusoto_credential", - "rustc_version 0.4.0", - "serde", - "sha2", - "tokio", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.18", -] - -[[package]] -name = "rustix" -version = "0.36.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" -dependencies = [ - "bitflags 1.3.2", - "errno 0.2.8", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.38.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" -dependencies = [ - "bitflags 2.4.0", - "errno 0.3.2", - "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log 0.4.20", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.2", -] - -[[package]] -name = "rustversion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static 1.4.0", - "winapi 0.3.9", -] - -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest 2.1.3", -] - -[[package]] -name = "serde" -version = "1.0.185" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-transcode" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590c0e25c2a5bb6e85bf5c1bce768ceb86b316e7a01bdf07d2cb4ec2271990e2" -dependencies = [ - "serde", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.185" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "serde_json" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" -dependencies = [ - "indexmap 2.0.0", - "itoa 1.0.1", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_test" -version = "1.0.176" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" -dependencies = [ - "form_urlencoded", - "itoa 0.4.7", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap 1.9.2", - "ryu", - "serde", - "yaml-rust", -] - -[[package]] -name = "serde_yaml" -version = "0.9.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" -dependencies = [ - "indexmap 2.0.0", - "itoa 1.0.1", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures 0.2.5", - "digest 0.10.3", -] - -[[package]] -name = "sha2" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures 0.1.5", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "shlex" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d" - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335" - -[[package]] -name = "siphasher" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729a25c17d72b06c68cb47955d44fda88ad2d3e7d77e025663fdd69b93dd71a1" - -[[package]] -name = "slab" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "socket2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "sodiumoxide" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26be3acb6c2d9a7aac28482586a7856436af4cfe7100031d219de2d2ecb0028" -dependencies = [ - "ed25519", - "libc", - "libsodium-sys", - "serde", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" -dependencies = [ - "loom", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.15" -source = "git+https://github.com/habitat-sh/structopt.git#63c56f42ae330b15f44a86c160b0cf6868b90a6f" -dependencies = [ - "clap", - "lazy_static 1.4.0", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.8" -source = "git+https://github.com/habitat-sh/structopt.git#63c56f42ae330b15f44a86c160b0cf6868b90a6f" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tabwriter" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tee" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c12559dba7383625faaff75be24becf35bfc885044375bcab931111799a3da" - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.38.4", - "windows-sys 0.48.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "test-probe" -version = "0.1.0" -dependencies = [ - "actix-rt", - "actix-web", - "clap", - "serde", - "serde_json", - "toml 0.7.6", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "thread-id" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f" -dependencies = [ - "libc", - "redox_syscall 0.2.10", - "winapi 0.3.9", -] - -[[package]] -name = "thread_local" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -dependencies = [ - "lazy_static 1.4.0", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217" -dependencies = [ - "itoa 1.0.1", - "libc", - "num_threads", -] - -[[package]] -name = "tinyvec" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio 0.8.8", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.3", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-stream" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util 0.7.8", -] - -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log 0.4.20", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hashbrown 0.12.3", - "pin-project-lite", - "slab", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4" - -[[package]] -name = "toml" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" -dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" -dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" - -[[package]] -name = "tracing" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" -dependencies = [ - "cfg-if 1.0.0", - "log 0.4.20", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "typemap-ors" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" -dependencies = [ - "unsafe-any-ors", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[package]] -name = "ucd-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unsafe-any-ors" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" -dependencies = [ - "destructure_traitobject", -] - -[[package]] -name = "unsafe-libyaml" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "uritemplate-next" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcde98d1fc3f528255b1ecb22fb688ee0d23deb672a8c57127df10b98b4bd18c" -dependencies = [ - "regex 1.7.3", -] - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf8-ranges" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "uuid" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "valico" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a0a4df97f827fcbcbe69c65364acddddf3a4bb50e6507f63361177a7ea7a4" -dependencies = [ - "addr", - "base64 0.21.2", - "chrono", - "downcast-rs", - "erased-serde", - "fancy-regex", - "json-pointer", - "jsonway", - "percent-encoding", - "phf", - "phf_codegen", - "serde", - "serde_json", - "uritemplate-next", - "url", - "uuid 1.2.2", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log 0.4.20", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" -dependencies = [ - "bumpalo", - "lazy_static 1.4.0", - "log 0.4.20", - "proc-macro2", - "quote", - "syn 1.0.104", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" - -[[package]] -name = "web-sys" -version = "0.3.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" -dependencies = [ - "webpki", -] - -[[package]] -name = "which" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" -dependencies = [ - "either", - "lazy_static 1.4.0", - "libc", -] - -[[package]] -name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-acl" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177b1723986bcb4c606058e77f6e8614b51c7f9ad2face6f6fd63dd5c8b3cec3" -dependencies = [ - "field-offset", - "libc", - "widestring 0.4.3", - "winapi 0.3.9", -] - -[[package]] -name = "windows-sys" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" -dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.1", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winnow" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winreg" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "xattr" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" -dependencies = [ - "libc", -] - -[[package]] -name = "xml-rs" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" - -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time 0.3.11", -] - -[[package]] -name = "zeroize" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd" - -[[package]] -name = "zmq" -version = "0.9.2" -source = "git+https://github.com/habitat-sh/rust-zmq?branch=v0.9.2-symlinks-removed#048f33ed4b9241a2c63b4c9b61fdf8bcd142ae00" -dependencies = [ - "bitflags 1.3.2", - "libc", - "log 0.4.20", - "zmq-sys", -] - -[[package]] -name = "zmq-sys" -version = "0.11.0" -source = "git+https://github.com/habitat-sh/rust-zmq?branch=v0.9.2-symlinks-removed#048f33ed4b9241a2c63b4c9b61fdf8bcd142ae00" -dependencies = [ - "libc", - "metadeps", -] diff --git a/pkgs/by-name/ha/habitat/package.nix b/pkgs/by-name/ha/habitat/package.nix index cfc5e8361f32..e33b1c62e48e 100644 --- a/pkgs/by-name/ha/habitat/package.nix +++ b/pkgs/by-name/ha/habitat/package.nix @@ -13,26 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "habitat"; - version = "1.6.848"; + version = "1.6.1243"; src = fetchFromGitHub { owner = "habitat-sh"; repo = "habitat"; rev = version; - hash = "sha256-oK9ZzENwpEq6W1qnhSgkr7Rhy7Fxt/BS4U5nxecyPu8="; + hash = "sha256-+5If4veDOGTTIhYxhAiq1cC4Sy6vAmjX5hrmUmpGlFU="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "clap-2.33.1" = "sha256-ixyNr91VNB2ce2cIr0CdPmvKYRlckhKLeaSbqxouIAY="; - "configopt-0.1.0" = "sha256-76MeSoRD796ZzBqX3CoDJnunekVo2XfctpxrpspxmAU="; - "rants-0.6.0" = "sha256-B8uDoiqddCki3j7aC8kilEcmJjvB4ICjZjjTun2UEkY="; - "retry-1.0.0" = "sha256-ZaHnzOCelV4V0+MTIbH3DXxdz8QZVgcMq2YeV0S6X6o="; - "structopt-0.3.15" = "sha256-0vIX7J7VktKytT3ZnOm45qPRMHDkdJg20eU6pZBIH+Q="; - "zmq-0.9.2" = "sha256-bsDCPYLb9hUr6htPQ7rSoasKAqoWBx5FiEY1gOOtdJQ="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-AI7Ij9F/K/chjxQUC0SnBsQQPLlVS6esa5LJAGRS9YI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 9eb75ce238e5..76b003e7697c 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.20.16"; + version = "2.20.17"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-wWn4GXcER1ialDVrBuceVC9KKiJYXWCYkYS+rwYTVaE="; + hash = "sha256-DBXtSA06MzhVySHZstRgML/CU8SSry9vVIbg30/Jo9g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index c1ba1c6100b4..ca90891d22e7 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-NuKBb2l/OJIzE33H7JVZ+qdwMkM5WtEprwkbY/Twmc8="; + hash = "sha256-IYUuSjdLuNmz3aXcg0r+ZVf0ItcCn0/j6sPDBfUSR2A="; }; buildInputs = diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 9b328fd7d951..256289802407 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-nH1DyWGJMYiisdS4YRw+kUIJLX4twB9ZJ7OWH+QLlIA="; + hash = "sha256-lPxmcBQxiCGLeF0TZ8wui/MmGWE/IgqwGI44zMs2+V8="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-C5+5cxsnyM6cZ724C2czuoCfmIE0nQJXCwYCjfW7sgE="; + cargoHash = "sha256-F0WMeUhXVgLkCIaGR5s5zcPWGySoCQXcdVXLmRbs4Ac="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index 215d6a45f1d0..f862f8d4a095 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -140,6 +140,10 @@ python3Packages.buildPythonApplication rec { # '...2-macosx_14_0_arm64.whl' "test_macos_archflags" "test_macos_max_compat" + + # https://github.com/pypa/hatch/issues/1942 + "test_features" + "test_sync_dynamic_dependencies" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_resolve" ]; diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 99acd92a8293..e7b26d6214b1 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "havn"; - version = "0.1.18"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; tag = "v${version}"; - hash = "sha256-G6nhWcrnMYysIHSocIeQsBGG51D1ozZPF/LGsDNG/+k="; + hash = "sha256-zZiBVuA6rjsCfn0Ih3Sum0VsmtyXbfPG9fwK2zkwJaA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LQAE/fgq2ixSrveTAKyd5zh1bl6znLhij04DD5wOTqw="; + cargoHash = "sha256-j84DF6LJ9q56u4QgMFk9c6089Ghk5K0EatvonGjImjU="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/hc/hcl2json/package.nix b/pkgs/by-name/hc/hcl2json/package.nix index 6b4b79bdc465..ac35066d23e1 100644 --- a/pkgs/by-name/hc/hcl2json/package.nix +++ b/pkgs/by-name/hc/hcl2json/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcl2json"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "tmccombs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LU74vm36NuA1ApJWtEf/ub3los6yVR8yiQTfM0Wnvyo="; + sha256 = "sha256-zd8+ZDuC+qBienADiTVhW8o+BH8spBTCDHIK2PwK3YY="; }; - vendorHash = "sha256-nm+KvpcOUTR9Nm0eQtqCWxMiFTvL5xKLhsPaJlsVpkQ="; + vendorHash = "sha256-GMy6jGXAjykg+61RbPbQ9ZI0odhPls6uLhtw2sKLUmY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index 89dae6c414f9..2df1e5aee578 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.53.4"; + version = "1.53.7"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-dDwz9bn5UZJ3aQYy2SJYKSSaZJzj/B+zRmfwxgsUjBc="; + hash = "sha256-wy69dT/Iyt1jZKMh8/yCGk7+Z/NQt8R2d8jHXOZSvgQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/he/hexio/package.nix b/pkgs/by-name/he/hexio/package.nix index da8bb23251ce..b4bb5997df3a 100644 --- a/pkgs/by-name/he/hexio/package.nix +++ b/pkgs/by-name/he/hexio/package.nix @@ -1,35 +1,35 @@ { lib, stdenv, - fetchFromGitHub, + fetchFromGitLab, pcsclite, pth, - python2, + python3Packages, }: - stdenv.mkDerivation rec { pname = "hexio"; - version = "1.0-RC1"; + version = "1.1"; - src = fetchFromGitHub { - sha256 = "08jxkdi0gjsi8s793f9kdlad0a58a0xpsaayrsnpn9bpmm5cgihq"; - rev = "version-${version}"; + src = fetchFromGitLab { owner = "vanrein"; repo = "hexio"; + tag = "v${version}"; + hash = "sha256-jp7VHT08Rhw5nUtNpqkRHDHT0R51PCBy0cKb1sI6zkg="; }; strictDeps = true; + nativeBuildInputs = [ python3Packages.wrapPython ]; + buildInputs = [ pcsclite pth - python2 ]; - patchPhase = '' + postPatch = '' substituteInPlace Makefile \ - --replace '-I/usr/local/include/PCSC/' '-I${lib.getDev pcsclite}/include/PCSC/' \ - --replace '-L/usr/local/lib/pth' '-I${pth}/lib/' + --replace-fail '-I/usr/local/include/PCSC/' '-I${lib.getDev pcsclite}/include/PCSC/' \ + --replace-fail '-L/usr/local/lib/pth' '-I${pth}/lib/' ''; installPhase = '' @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { make DESTDIR=$out PREFIX=/ install ''; + postFixup = '' + wrapPythonPrograms + ''; + meta = with lib; { description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on"; homepage = "https://github.com/vanrein/hexio"; diff --git a/pkgs/by-name/hh/hhexen/package.nix b/pkgs/by-name/hh/hhexen/package.nix index 4d994f472128..4223e1f722d1 100644 --- a/pkgs/by-name/hh/hhexen/package.nix +++ b/pkgs/by-name/hh/hhexen/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitHub, + libGL, + libGLU, SDL, SDL_mixer, autoreconfHook, @@ -25,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libGL + libGLU SDL SDL_mixer ]; diff --git a/pkgs/by-name/hi/hifiscan/package.nix b/pkgs/by-name/hi/hifiscan/package.nix index deedff446c16..3f8ad858d683 100644 --- a/pkgs/by-name/hi/hifiscan/package.nix +++ b/pkgs/by-name/hi/hifiscan/package.nix @@ -20,8 +20,6 @@ python3Packages.buildPythonApplication { pyqtgraph ]; - dontUseSetuptoolsCheck = true; - src = fetchPypi { inherit pname version hash; }; diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix index 8732fb834d00..60bdf77d2e81 100644 --- a/pkgs/by-name/hi/highs/package.nix +++ b/pkgs/by-name/hi/highs/package.nix @@ -8,15 +8,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "highs"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ERGO-Code"; repo = "HiGHS"; rev = "v${finalAttrs.version}"; - hash = "sha256-VUbYg1NRoRk0IzO6y+NaWnfjOuIYoM8pfPPqJcG7Bbo="; + hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac="; }; + # CMake Error in CMakeLists.txt: + # Imported target "highs::highs" includes non-existent path + # "/include" + # in its INTERFACE_INCLUDE_DIRECTORIES. + postPatch = '' + sed -i "/CMAKE_CUDA_PATH/d" src/CMakeLists.txt + ''; + strictDeps = true; outputs = [ "out" ]; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index d725a2d0d656..21ffcc21d962 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-03-08"; + version = "0-unstable-2025-03-18"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "26f6b862645ff281f3bada5d406e8c20de8d837c"; - hash = "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4="; + rev = "22a36aa709de7dd42b562a433b9cefecf104a6ee"; + hash = "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix similarity index 61% rename from pkgs/servers/homepage-dashboard/default.nix rename to pkgs/by-name/ho/homepage-dashboard/package.nix index 9efcf8e247da..0e45b05f6ed6 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -1,15 +1,16 @@ { - buildNpmPackage, fetchFromGitHub, nodePackages, + makeBinaryWrapper, + nodejs, + pnpm_10, python3, stdenv, cctools, - IOKit, + darwin, lib, nixosTests, enableLocalIcons ? false, - nix-update-script, }: let dashboardIcons = fetchFromGitHub { @@ -26,63 +27,68 @@ let cp ${dashboardIcons}/LICENSE $out/share/homepage/public/icons/ ''; in -buildNpmPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "homepage-dashboard"; - version = "0.10.9"; + version = "1.0.4"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; - rev = "v${version}"; - hash = "sha256-q8+uoikHMQVuTrVSH8tPsoI5655ZStMc/7tmoAfoZIY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-SwzgmVy3TBzEH+FJ/kY+iCo+pZhud1IZkfCh2DiSTsk="; }; - npmDepsHash = "sha256-N39gwct2U4UxlIL5ceDzzU7HpA6xh2WksrZNxGz04PU="; + # This patch ensures that the cache implementation respects the env + # variable `NIXPKGS_HOMEPAGE_CACHE_DIR`, which is set by default in the + # wrapper below. + # The patch is automatically generated by the `update.sh` script. + patches = [ ./prerender_cache_path.patch ]; - preBuild = '' - mkdir -p config - ''; + pnpmDeps = pnpm_10.fetchDeps { + inherit (finalAttrs) + pname + version + src + patches + ; + hash = "sha256-GUDSfAbBK+6Bbih5jBrkjiMYLOJM7gMfurXFeez1bSw="; + }; - postBuild = '' - # Add a shebang to the server js file, then patch the shebang. - sed -i '1s|^|#!/usr/bin/env node\n|' .next/standalone/server.js - patchShebangs .next/standalone/server.js - ''; - - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; + nativeBuildInputs = [ + makeBinaryWrapper + nodejs + pnpm_10.configHook + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ nodePackages.node-gyp-build - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; env.PYTHON = "${python3}/bin/python"; + buildPhase = '' + runHook preBuild + mkdir -p config + pnpm build + runHook postBuild + ''; + installPhase = '' runHook preInstall - mkdir -p $out/{share,bin} - + mkdir -p $out/{bin,share} cp -r .next/standalone $out/share/homepage/ cp -r public $out/share/homepage/public + chmod +x $out/share/homepage/server.js mkdir -p $out/share/homepage/.next cp -r .next/static $out/share/homepage/.next/static - chmod +x $out/share/homepage/server.js - - # This patch must be applied here, as it's patching the `dist` directory - # of NextJS. Without this, homepage-dashboard errors when trying to - # write its prerender cache. - # - # This patch ensures that the cache implementation respects the env - # variable `NIXPKGS_HOMEPAGE_CACHE_DIR`, which is set by default in the - # wrapper below. - (cd "$out" && patch -p1 <${./prerender_cache_path.patch}) - - makeWrapper $out/share/homepage/server.js $out/bin/homepage \ + makeWrapper "${lib.getExe nodejs}" $out/bin/homepage \ --set-default PORT 3000 \ --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard \ - --set-default NIXPKGS_HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard + --set-default NIXPKGS_HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard \ + --add-flags "$out/share/homepage/server.js" ${if enableLocalIcons then installLocalIcons else ""} @@ -95,12 +101,12 @@ buildNpmPackage rec { tests = { inherit (nixosTests) homepage-dashboard; }; - updateScript = nix-update-script { }; + updateScript = ./update.sh; }; meta = { description = "Highly customisable dashboard with Docker and service API integrations"; - changelog = "https://github.com/gethomepage/homepage/releases/tag/v${version}"; + changelog = "https://github.com/gethomepage/homepage/releases/tag/v${finalAttrs.version}"; mainProgram = "homepage"; homepage = "https://gethomepage.dev"; license = lib.licenses.gpl3; @@ -108,4 +114,4 @@ buildNpmPackage rec { platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch b/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch new file mode 100644 index 000000000000..6916c8ba8412 --- /dev/null +++ b/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch @@ -0,0 +1,89 @@ +diff --git c/package.json i/package.json +index 44fc1b35..4164abf3 100644 +--- c/package.json ++++ i/package.json +@@ -62,5 +62,10 @@ + }, + "optionalDependencies": { + "osx-temperature-sensor": "^1.0.8" ++ }, ++ "pnpm": { ++ "patchedDependencies": { ++ "next": "patches/next.patch" ++ } + } + } +diff --git c/patches/next.patch i/patches/next.patch +new file mode 100644 +index 00000000..6280dbfa +--- /dev/null ++++ i/patches/next.patch +@@ -0,0 +1,13 @@ ++diff --git a/dist/server/lib/incremental-cache/file-system-cache.js b/dist/server/lib/incremental-cache/file-system-cache.js ++index ac711f168d85032d43cfa2b6872655d571596a7b..ee1f79868d38ae623b0599e8cc3b9e03697833e5 100644 ++--- a/dist/server/lib/incremental-cache/file-system-cache.js +++++ b/dist/server/lib/incremental-cache/file-system-cache.js ++@@ -23,7 +23,7 @@ class FileSystemCache { ++ constructor(ctx){ ++ this.fs = ctx.fs; ++ this.flushToDisk = ctx.flushToDisk; ++- this.serverDistDir = ctx.serverDistDir; +++ this.serverDistDir = require("path").join((process.env.NIXPKGS_HOMEPAGE_CACHE_DIR || "/var/cache/homepage-dashboard"), "homepage"); ++ this.revalidatedTags = ctx.revalidatedTags; ++ this.debug = !!process.env.NEXT_PRIVATE_DEBUG_CACHE; ++ if (ctx.maxMemoryCacheSize) { +diff --git c/pnpm-lock.yaml i/pnpm-lock.yaml +index 6b5c5910..84712cd2 100644 +--- c/pnpm-lock.yaml ++++ i/pnpm-lock.yaml +@@ -4,6 +4,11 @@ settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + ++patchedDependencies: ++ next: ++ hash: 2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49 ++ path: patches/next.patch ++ + importers: + + .: +@@ -52,10 +57,10 @@ importers: + version: 1.2.2 + next: + specifier: ^15.1.7 +- version: 15.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ++ version: 15.1.7(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + next-i18next: + specifier: ^12.1.0 +- version: 12.1.0(next@15.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ++ version: 12.1.0(next@15.1.7(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + ping: + specifier: ^0.4.4 + version: 0.4.4 +@@ -4688,7 +4693,7 @@ snapshots: + + natural-compare@1.4.0: {} + +- next-i18next@12.1.0(next@15.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ++ next-i18next@12.1.0(next@15.1.7(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + dependencies: + '@babel/runtime': 7.26.9 + '@types/hoist-non-react-statics': 3.3.6 +@@ -4696,14 +4701,14 @@ snapshots: + hoist-non-react-statics: 3.3.2 + i18next: 21.10.0 + i18next-fs-backend: 1.2.0 +- next: 15.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ++ next: 15.1.7(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + react: 18.3.1 + react-i18next: 11.18.6(i18next@21.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + transitivePeerDependencies: + - react-dom + - react-native + +- next@15.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ++ next@15.1.7(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + dependencies: + '@next/env': 15.1.7 + '@swc/counter': 0.1.3 diff --git a/pkgs/by-name/ho/homepage-dashboard/update.sh b/pkgs/by-name/ho/homepage-dashboard/update.sh new file mode 100755 index 000000000000..e8f0ced770c5 --- /dev/null +++ b/pkgs/by-name/ho/homepage-dashboard/update.sh @@ -0,0 +1,66 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq git pnpm_10 sd +# shellcheck shell=bash +set -euo pipefail +nixpkgs="$(pwd)" +cd $(readlink -e $(dirname "${BASH_SOURCE[0]}")) + +# Generate the patch file that makes homepage-dashboard aware of the NIXPKGS_HOMEPAGE_CACHE_DIR environment variable. +# Generating the patch this way ensures that both the patch is included, and the lock file is updated. +generate_patch() { + local version; version="$1" + echo "Generating homepage-dashboard patch" + + git clone -b "v$version" https://github.com/gethomepage/homepage.git src + pushd src + + pnpm install + pnpm patch next + sd \ + 'this.serverDistDir = ctx.serverDistDir;' \ + 'this.serverDistDir = require("path").join((process.env.NIXPKGS_HOMEPAGE_CACHE_DIR || "/var/cache/homepage-dashboard"), "homepage");' \ + node_modules/.pnpm_patches/next*/dist/server/lib/incremental-cache/file-system-cache.js + pnpm patch-commit node_modules/.pnpm_patches/next* + + git add -A . + git diff -p --staged > ../prerender_cache_path.patch + + popd + rm -rf src +} + +# Update the hash of the homepage-dashboard source code in the Nix expression. +update_homepage_dashboard_source() { + local version; version="$1" + echo "Updating homepage-dashboard source" + + old_hash="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.src.outputHash" | jq -r)" + old_version="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.version" | jq -r)" + new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).homepage-dashboard.src; in (src.overrideAttrs or (f: src // f src)) (_: { version = \"$version\"; outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true + + sed -i "s|${old_hash}|${new_hash}|g" package.nix + sed -i "s|${old_version}|${version}|g" package.nix +} + +# Update the hash of the homepage-dashboard pnpm dependencies in the Nix expression. +update_pnpm_deps_hash() { + echo "Updating homepage-dashboard pnpm deps hash" + + old_hash="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.pnpmDeps.outputHash" | jq -r)" + new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).homepage-dashboard.pnpmDeps; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true + + sed -i "s|${old_hash}|${new_hash}|g" package.nix +} + +LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/gethomepage/homepage/releases/latest | jq -r '.tag_name')" +LATEST_VERSION="$(expr "$LATEST_TAG" : 'v\(.*\)')" +CURRENT_VERSION="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.version" | jq -r)" + +if [[ "$CURRENT_VERSION" == "$LATEST_VERSION" ]]; then + echo "homepage-dashboard is up to date: ${CURRENT_VERSION}" + exit 0 +fi + +update_homepage_dashboard_source "$LATEST_VERSION" +generate_patch "$LATEST_VERSION" +update_pnpm_deps_hash diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index 024369818c48..619478ad6b00 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/pkgs/by-name/hp/hplip/package.nix @@ -43,7 +43,7 @@ let }; plugin = fetchurl { - url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run"; + url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${pname}-${version}-plugin.run"; hash = "sha256-Hzxr3SVmGoouGBU2VdbwbwKMHZwwjWnI7P13Z6LQxao="; }; @@ -79,9 +79,20 @@ assert || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; python311Packages.buildPythonApplication { - inherit pname version src; + inherit pname version; format = "other"; + srcs = [ src ] ++ lib.optional withPlugin plugin; + + unpackCmd = lib.optionalString withPlugin '' + if ! [[ "$curSrc" =~ -plugin\.run$ ]]; then return 1; fi # fallback to regular unpackCmdHooks + + # Unpack plugin shar + sh "$curSrc" --noexec --keep + ''; + + sourceRoot = "${pname}-${version}"; + buildInputs = [ libjpeg @@ -247,8 +258,7 @@ python311Packages.buildPythonApplication { done '' + lib.optionalString withPlugin '' - sh ${plugin} --noexec --keep - cd plugin_tmp + pushd $NIX_BUILD_TOP/plugin_tmp cp plugin.spec $out/share/hplip/ @@ -284,6 +294,8 @@ python311Packages.buildPythonApplication { mkdir -p $out/var/lib/hp cp ${hplipState} $out/var/lib/hp/hplip.state + + popd ''; # The installed executables are just symlinks into $out/share/hplip, diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix index 71a81a35ad07..c1f26ab948cf 100644 --- a/pkgs/by-name/hu/hubstaff/package.nix +++ b/pkgs/by-name/hu/hubstaff/package.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE -, libXext , freetype, libXrender, fontconfig, libXft, libXinerama +, libXext , freetype, libXrender, fontconfig, libXft, libXinerama, libXcursor, cairo , libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 , curl, writeShellScript, common-updater-scripts, xmlstarlet }: let - url = "https://app.hubstaff.com/download/8792-standard-linux-1-6-29-release/sh"; - version = "1.6.29-7f771670"; - sha256 = "sha256:09vdpsmaj26bmnbsyxp76g3677lzi8p86gz66qbdvxly6a4x1hq9"; + url = "https://app.hubstaff.com/download/9353-standard-linux-1-6-31-release/sh"; + version = "1.6.31-a6da06ad"; + sha256 = "sha256:07x8di08ln15mv3x7vp01wgs8zcd1rrzvmzygrl9anhx9zhgsr3b"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft libXinerama stdenv.cc.cc libnotify glib gtk3 libappindicator-gtk3 - curl libXfixes libXScrnSaver ]; + curl libXfixes libXScrnSaver libXcursor cairo ]; in diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix index 5b29f0d554ad..0a89da534aec 100644 --- a/pkgs/by-name/hu/hurl/package.nix +++ b/pkgs/by-name/hu/hurl/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = "hurl"; tag = version; - hash = "sha256-zrZWYnXUuzf2cS3n56/hWDvyXVM4Y/34SOlMPrtAhJo="; + hash = "sha256-fj9OKS8IFKbxwzjhnta44hAXPy90fBOAV35K13YtaOs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sq0m6wkryfmthkPHMY0ZOXNhdNKnnsPLa/6tTsuWCS0="; + cargoHash = "sha256-aGj/vQCf1nBLmQYYxdR8437irLP+3W3z0F8tyVTrKZk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index fd1125591b87..6edf714d2919 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.392"; + version = "0.393"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-DjtPoPZZwFmVRZTOG4A+2KXI6zw68QEwq0iFRoV+5c4="; + hash = "sha256-RDp5NY9VYD0gylvzYpg9BytfRdQ6dim1jJtv32yeF3k="; }; configureFlags = [ "--datadir=${placeholder "out"}/share" ]; diff --git a/pkgs/by-name/hx/hxtools/package.nix b/pkgs/by-name/hx/hxtools/package.nix index cbb1950674b3..393ecbb93591 100644 --- a/pkgs/by-name/hx/hxtools/package.nix +++ b/pkgs/by-name/hx/hxtools/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "hxtools"; - version = "20231224"; + version = "20250309"; src = fetchurl { url = "https://inai.de/files/hxtools/hxtools-${finalAttrs.version}.tar.zst"; - hash = "sha256-TyT9bsp9qqGKQsSyWCfd2lH8ULjqJ5puMTw2TgWHV5c="; + hash = "sha256-2ItcEiMe0GzgJ3MxZ28wjmXGSbZtc7BHpkpKIAodAwA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hydra-check/package.nix b/pkgs/by-name/hy/hydra-check/package.nix index 6ea49fc8983f..10c3b31c195a 100644 --- a/pkgs/by-name/hy/hydra-check/package.nix +++ b/pkgs/by-name/hy/hydra-check/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "hydra-check"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "nix-community"; repo = "hydra-check"; tag = "v${version}"; - hash = "sha256-h8bs6oe8zkzEDCoC9F6IzTaTkNf4eAAjt663V0qn73I="; + hash = "sha256-TdMZC/EE52UiJ+gYQZHV4/ReRzMOdCGH+n7pg1vpCCQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aV4URx9bGAOLWRh/kFDU67GiXk7RdCqfahG+fZPfdUo="; + cargoHash = "sha256-G9M+1OWp2jlDeSDFagH/YOCdxGQbcru1KFyKEUcMe7g="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index a821386608bf..f4531c2c82e6 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.2.3"; + version = "3.3.1"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-iQL/xEyVgNfAeiz41sos8nbrGRxzQWR618EikPLS/Ig="; + hash = "sha256-CscQnbMCK+dAWQacKIRwHl1Dqpau5+EyuH1pZhLrJ/Q="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index 05e8cc9c7911..5ba0612fefe9 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -14,13 +14,13 @@ }: gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprcursor"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprcursor"; tag = "v${finalAttrs.version}"; - hash = "sha256-LOTmvTIxmaWtXF8OP6b6oENSdG/quWxhsO3dJQACBUw="; + hash = "sha256-IvneQb4YFlEXWjXaKeA0y6lL7Z6JqTAvSAlcMDWnjK4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 32a0404a26a5..f01f9233f05e 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.47.2-b", - "commit_hash": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", - "commit_message": "version: bump to 0.47.2", - "date": "2025-02-02", - "tag": "v0.47.2" + "branch": "main", + "commit_hash": "5ee35f914f921e5696030698e74fb5566a804768", + "commit_message": "version: bump to 0.48.0", + "date": "2025-03-23", + "tag": "v0.48.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index eca4e58f5761..59b7302af842 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -86,14 +86,14 @@ assert assertMsg (!hidpiXWayland) customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.47.2"; + version = "0.48.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-dSKR1VpjpdJVZ5dmLgIvAu3K+DYrSbohZkqxSQhjw8U="; + hash = "sha256-QfXnNrQSa9xDrlzl/dJvsFgMmPECveyU/7cKJ2YyIzI="; }; postPatch = '' @@ -176,7 +176,7 @@ customStdenv.mkDerivation (finalAttrs: { (optionals withSystemd [ systemd ]) ]; - mesonBuildType = if debug then "debugoptimized" else "release"; + mesonBuildType = if debug then "debug" else "release"; dontStrip = debug; strictDeps = true; @@ -186,6 +186,8 @@ customStdenv.mkDerivation (finalAttrs: { "xwayland" = enableXWayland; "legacy_renderer" = legacyRenderer; "systemd" = withSystemd; + "uwsm" = false; + "hyprpm" = false; }) (mapAttrsToList mesonBool { # PCH provides no benefits when building with Nix diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix index 6daeba8cdb09..d37a8e05b0c6 100644 --- a/pkgs/by-name/hy/hyprprop/package.nix +++ b/pkgs/by-name/hy/hyprprop/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "hyprprop"; - version = "0.1-unstable-2025-03-11"; + version = "0.1-unstable-2025-03-17"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "e14d9c5e9aea4a84c3677e0a7c73268153b15327"; - hash = "sha256-SJrLVyoaQUg29fq3nNdRmYrLgiu9dtgcIVqpl8j/Teo="; + rev = "bd81329944be53b0ffb99e05864804b95f1d7c65"; + hash = "sha256-I8JVdQRu8eWvY5W8XWYZkdd5pojDHkxeqQV7mMIsbhs="; }; sourceRoot = "${finalAttrs.src.name}/hyprprop"; diff --git a/pkgs/by-name/ii/iio-sensor-proxy/package.nix b/pkgs/by-name/ii/iio-sensor-proxy/package.nix index f726526d86a5..e8d95bba9f4e 100644 --- a/pkgs/by-name/ii/iio-sensor-proxy/package.nix +++ b/pkgs/by-name/ii/iio-sensor-proxy/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "iio-sensor-proxy"; - version = "3.6"; + version = "3.7"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "hadess"; repo = "iio-sensor-proxy"; rev = version; - hash = "sha256-X4vJ9zvMyYY9G7cslHMvXoexV/+39c9KctJBc+Ne114="; + hash = "sha256-MAfh6bgh39J5J3rlyPjyCkk5KcfWHMZLytZcBRPHaJE="; }; postPatch = '' diff --git a/pkgs/by-name/im/imgpkg/package.nix b/pkgs/by-name/im/imgpkg/package.nix index d366fca15d81..b6286b1fbc51 100644 --- a/pkgs/by-name/im/imgpkg/package.nix +++ b/pkgs/by-name/im/imgpkg/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "imgpkg"; - version = "0.44.2"; + version = "0.45.0"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "imgpkg"; rev = "v${version}"; - hash = "sha256-UZhmuSUqm8EPCSc0CONgpISINgMJh3uNUx0v52eQNIc="; + hash = "sha256-DuLxNH0fcVPvZYG4AYtaT8kJysTLRNX2tB6UBhQoP9Q="; }; vendorHash = null; diff --git a/pkgs/by-name/in/infnoise/makefile.patch b/pkgs/by-name/in/infnoise/makefile.patch deleted file mode 100644 index 871a6c508ce6..000000000000 --- a/pkgs/by-name/in/infnoise/makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/software/Makefile.linux b/software/Makefile.linux -index db48aa5..df8b3d2 100644 ---- a/software/Makefile.linux -+++ b/software/Makefile.linux -@@ -1,6 +1,6 @@ --GIT_VERSION := $(shell git --no-pager describe --tags --always) --GIT_COMMIT := $(shell git rev-parse --verify HEAD) --GIT_DATE := $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only)) -+GIT_VERSION ?= $(shell git --no-pager describe --tags --always) -+GIT_COMMIT ?= $(shell git rev-parse --verify HEAD) -+GIT_DATE ?= $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only)) - - PREFIX = $(DESTDIR)/usr/local - diff --git a/pkgs/by-name/in/infnoise/package.nix b/pkgs/by-name/in/infnoise/package.nix index c596f9e76c79..08ee53e739f1 100644 --- a/pkgs/by-name/in/infnoise/package.nix +++ b/pkgs/by-name/in/infnoise/package.nix @@ -9,29 +9,26 @@ stdenv.mkDerivation (finalAttrs: { pname = "infnoise"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "leetronics"; repo = "infnoise"; - rev = "e80ddd78085abf3d06df2e0d8c08fd33dade78eb"; - sha256 = "sha256-9MKG1InkV+yrQPBTgi2gZJ3y9Fokb6WbxuAnM7n7FyA="; + rev = "19bb69894724d87b32b7b9b86022bb4b26c919f8"; + sha256 = "sha256-O2P4uOwO7wKLYLufdW3KQeyuFBoQPdSepnTUeq0CSJY="; }; patches = [ - # Patch makefile so we can set defines from the command line instead of it depending on .git - ./makefile.patch - - # Fix getc return type + # Patch providing version info at compile time (fetchpatch { - url = "https://github.com/leetronics/infnoise/commit/7ed7014e14253311c07e530c8f89f1c8f4705c2b.patch"; - sha256 = "sha256-seB/fJaxQ/rXJp5iPtnobXXOccQ2KUAk6HFx31dhOhs="; + url = "https://github.com/leetronics/infnoise/commit/04d52a975bf78d2aff2bb4c176c286715e1948ba.patch"; + sha256 = "sha256-vtPAR6gCyny9UP+U6/7X8CPEUuMDl7RIyICIwiaWyfc="; }) ]; GIT_COMMIT = finalAttrs.src.rev; GIT_VERSION = finalAttrs.version; - GIT_DATE = "2019-08-12"; + GIT_DATE = "2023-02-14"; buildInputs = [ libftdi ]; @@ -44,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' make -C tools + # 2e6cfbe made findlongest executable, but it's a C file + chmod -x tools/*.c find ./tools/ -executable -type f -exec \ sh -c "install -Dm755 {} $out/bin/infnoise-\$(basename {})" \; ''; diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index d694b04af7b1..6de63ac9ddba 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.49.2"; + version = "0.49.6"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-vWqmcVF/gi0ubIF/NDnz0op1ss0t7A7O8NrOzszx7Gw="; + hash = "sha256-iLr7n+llvvIwS4JJMwZou4pDbT+sYOy6+un+g1YXrP4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5yG8iUW5BVHI2QcOl+9dN1c1b/wmrFCO4mDs4ZflhUM="; + cargoHash = "sha256-v0aMbaKoPL3wqcFHVcrGUGlvR5m3XhMTXD1k0YBz6OI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index bcccc4f6d899..ea453d6058f6 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.52.32224.5"; + version = "25.09.32961.5"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; - rev = version; - hash = "sha256-Unoh33bZFsMCqJ2hWEYVEdMF2V/aSIDynThz1pUyM7Q="; + tag = version; + hash = "sha256-oOafnYq4p0MubgsjV2kdW/pd7s0N5xmUnWVLg2JAIS8="; }; nativeBuildInputs = [ @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DSKIP_UNIT_TESTS=1" - "-DIGC_DIR=${intel-graphics-compiler}" - "-DOCL_ICD_VENDORDIR=${placeholder "out"}/etc/OpenCL/vendors" + (lib.cmakeBool "SKIP_UNIT_TESTS" true) + (lib.cmakeFeature "IGC_DIR" (builtins.toString intel-graphics-compiler)) + (lib.cmakeFeature "OCL_ICD_VENDORDIR" "${placeholder "out"}/etc/OpenCL/vendors") # The install script assumes this path is relative to CMAKE_INSTALL_PREFIX - "-DCMAKE_INSTALL_LIBDIR=lib" + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") ]; outputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL, supporting 12th Gen and newer"; + description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL, supporting 12th Gen and newer"; mainProgram = "ocloc"; homepage = "https://github.com/intel/compute-runtime"; changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}"; diff --git a/pkgs/by-name/in/intel-gmmlib/package.nix b/pkgs/by-name/in/intel-gmmlib/package.nix index 52996a2a554c..95fb72c33f73 100644 --- a/pkgs/by-name/in/intel-gmmlib/package.nix +++ b/pkgs/by-name/in/intel-gmmlib/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.7.0"; + version = "22.7.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; tag = "intel-gmmlib-${version}"; - hash = "sha256-SR66UaoPQYGz4Nda99ASZEfTtNlLQTqtZgDM5hlV/1w="; + hash = "sha256-Wm9bHe65ak7ERSEgrSO9x9hUV6ypRbODoY4eodebOVE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix index cd85c9f18f21..73e521dcfeba 100644 --- a/pkgs/by-name/in/intel-gpu-tools/package.nix +++ b/pkgs/by-name/in/intel-gpu-tools/package.nix @@ -43,14 +43,14 @@ stdenv.mkDerivation rec { pname = "intel-gpu-tools"; - version = "1.30"; + version = "2.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "drm"; repo = "igt-gpu-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-lZNDDWfySz7etxzN/28bo9qDE8SxK2vPAAOR3hxSoWY="; + hash = "sha256-568sgmP7HhrNv3nwhuokiPk/2qQtzPOC9aCsScKCI8A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index 851e5bac3bb5..b8e63635ac24 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -22,24 +22,33 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.19.0"; - hash = "sha256-vOK7xfOR+aDpdGd8oOFLJc1Ct1S5BCJmLN6Ubn5wlkQ="; + rev = "v0.22.1"; + hash = "sha256-dSK+kNEZoF4bBx24S0No9aZLZiHK0U9TR1jRyEBL+2U="; }; inherit (llvmPackages_14) lld llvm; inherit (if buildWithPatches then opencl-clang else llvmPackages_14) clang libclang; spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; -in + # Handholding the braindead build script + # cmake requires an absolute path + prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' + mkdir $out + ln -s ${clang}/bin/clang $out/ + ln -s ${opencl-clang}/lib/* $out/ + ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ + ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ + ''; +in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.17384.11"; + version = "2.8.3"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; - rev = "igc-${version}"; - hash = "sha256-O4uMaPauRv2aMgM2B7XdzCcjI5JghsjX5XbkeloLyck="; + tag = "v${version}"; + hash = "sha256-1YzvzVmMW5s4keQfa7r6xfyVg7RWSdKNgBtdTN6SADg="; }; postPatch = '' @@ -77,16 +86,6 @@ stdenv.mkDerivation rec { # testing is done via intel-compute-runtime doCheck = false; - # Handholding the braindead build script - # cmake requires an absolute path - prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' - mkdir $out - ln -s ${clang}/bin/clang $out/ - ln -s ${opencl-clang}/lib/* $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ - ''; - cmakeFlags = [ "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" "-DCCLANG_BUILD_PREBUILDS=ON" diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix index 06098f6caefd..86c0607965b8 100644 --- a/pkgs/by-name/in/intentrace/package.nix +++ b/pkgs/by-name/in/intentrace/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.4.2"; + version = "0.6.2"; in rustPlatform.buildRustPackage { inherit version; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage { owner = "sectordistrict"; repo = "intentrace"; tag = "v${version}"; - hash = "sha256-ZcGZK4GX78ls3nHb7SBKszmZXMAbCxS4osW3MLqgnHQ="; + hash = "sha256-hmQLedKyrk07RPloe39HKtZPJJjDUqLb/D4dvJfuWrM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Z3T4mupwUqOSP+iAmy7Ps1EZlyV9cDvnfXBZwH1NFaA="; + cargoHash = "sha256-XSo9XqO3DiW3PXUW8RxTWqIxN1jx8WJKw16soP7kM1s="; meta = { description = "Prettified Linux syscall tracing tool (like strace)"; diff --git a/pkgs/by-name/io/iozone/package.nix b/pkgs/by-name/io/iozone/package.nix index 9820881d4c46..c0f95bfed150 100644 --- a/pkgs/by-name/io/iozone/package.nix +++ b/pkgs/by-name/io/iozone/package.nix @@ -21,11 +21,11 @@ in stdenv.mkDerivation rec { pname = "iozone"; - version = "3.506"; + version = "3.507"; src = fetchurl { url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings [ "." ] [ "_" ] version}.tar"; - hash = "sha256-EUzlwHGHO5ose6bnPQXV735mVkOSrL/NwLMmHbEPy+c="; + hash = "sha256-HoCHraBW9dgBjuC8dmhtQW/CJR7QMDgFXb0K940eXOM="; }; license = fetchurl { @@ -38,7 +38,10 @@ stdenv.mkDerivation rec { buildFlags = target; - enableParallelBuilding = true; + # The makefile doesn't define a rule for e.g. libbif.o + # Make will try to evaluate implicit built-in rules for these outputs if building in parallel + # Build in serial so that the main rule builds everything before the implicit ones are attempted + enableParallelBuilding = false; installPhase = '' mkdir -p $out/{bin,share/doc,libexec,share/man/man1} diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index e2e44e50a13b..f69230e40899 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "irpf"; - version = "2024-1.6"; + version = "2025-1.0"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip"; - hash = "sha256-wYSfU6tkYuSns+RnSy2c3yRR05t/8iXLhRMqPQR+oO0="; + hash = "sha256-gDGDOthUbRmj68CHmHhaYlGs4tiQTNVlEmuyLZ5e0zY="; }; passthru.updateScript = writeScript "update-irpf" '' diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index d1c7a1903ec0..c710d94ffd30 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -6,7 +6,7 @@ , git , postgresql , postgresqlTestHook -, redis +, valkey }: let @@ -84,7 +84,7 @@ py.pkgs.buildPythonPackage rec { nativeCheckInputs = [ git - redis + valkey postgresql postgresqlTestHook ] ++ (with py.pkgs; [ diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix index 0bdd63b1c0a9..83c2880931db 100644 --- a/pkgs/by-name/ir/irust/package.nix +++ b/pkgs/by-name/ir/irust/package.nix @@ -21,17 +21,17 @@ rustPlatform.buildRustPackage rec { pname = "irust"; - version = "1.71.30"; + version = "1.72.0"; src = fetchFromGitHub { owner = "sigmaSd"; repo = "IRust"; rev = "irust@${version}"; - hash = "sha256-moYHi+hkL2I3jm3eBfaXuK4Zz84Pq2X50V5lKyIMecM="; + hash = "sha256-PRs6pG2aJQkmsZ1nRBaOTIrmjcYnaI9zZIHKJS/pueQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NUivVSIbyLCU5VP1F6VETMRwDNzuIUvoCI/bbJSxX1g="; + cargoHash = "sha256-oWMKJLVmJ/UQuTNUwZ7VWOFtFa/mJGgbRMQC3aNK3Y0="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/is/isisdl/package.nix b/pkgs/by-name/is/isisdl/package.nix index fc5286e99cad..be97db57636b 100644 --- a/pkgs/by-name/is/isisdl/package.nix +++ b/pkgs/by-name/is/isisdl/package.nix @@ -6,11 +6,11 @@ }: python3Packages.buildPythonApplication rec { pname = "isisdl"; - version = "1.3.20"; + version = "1.3.21"; src = fetchPypi { inherit pname version; - hash = "sha256-s0vGCJVSa6hf6/sIhzmaxpziP4izoRwcZfxvm//5inY="; + hash = "sha256-YyR0A7NqmUcR+hQnQlIgBdU6CxfHtDOjR3q5I21ROCI="; }; pyproject = true; diff --git a/pkgs/by-name/is/isrcsubmit/package.nix b/pkgs/by-name/is/isrcsubmit/package.nix index a679ecea7340..f22aa5f4f5d8 100644 --- a/pkgs/by-name/is/isrcsubmit/package.nix +++ b/pkgs/by-name/is/isrcsubmit/package.nix @@ -2,30 +2,47 @@ lib, fetchFromGitHub, python3Packages, + nix-update-script, + withKeyring ? true, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "isrcsubmit"; - version = "2.1.0"; + version = "2.1.0-unstable-2023-08-10"; src = fetchFromGitHub { owner = "JonnyJD"; repo = "musicbrainz-isrcsubmit"; - rev = "v${version}"; - sha256 = "1lqs4jl2xv1zxmf0xsihk9rxzx2awq87g51vd7y3cq1vhj1icxqa"; + rev = "8f4c3b9f9b8f983443d58fba381baaa3a74edad7"; + hash = "sha256-6SJt0wtXC49Eh6g7DBy73MeCueF7CRuCvYC27es1qAM="; }; - propagatedBuildInputs = with python3Packages; [ - musicbrainzngs - discid - ]; + postPatch = '' + # Change binary name to isrcsubmit so that `import isrcsubmit` in the wrapper doesn't fail + substituteInPlace setup.py --replace-fail "'isrcsubmit.py=isrcsubmit:main'," "'isrcsubmit=isrcsubmit:main'," + # Set default argument for main, which is set `if __name__ == '__main__'` upstream + substituteInPlace isrcsubmit.py --replace-fail "main(argv):" "main(argv=sys.argv):" + ''; - meta = with lib; { - # drutil is required on Darwin, which does not seem to be available in nixpkgs - broken = true; # 2022-11-16 + dependencies = + with python3Packages; + [ + musicbrainzngs + discid + ] + ++ lib.optional withKeyring [ + keyring + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { description = "Script to submit ISRCs from disc to MusicBrainz"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "http://jonnyjd.github.io/musicbrainz-isrcsubmit/"; maintainers = [ ]; + mainProgram = "isrcsubmit"; }; } diff --git a/pkgs/by-name/ja/jack_oscrolloscope/package.nix b/pkgs/by-name/ja/jack_oscrolloscope/package.nix index 82b8da7773a9..61f696842218 100644 --- a/pkgs/by-name/ja/jack_oscrolloscope/package.nix +++ b/pkgs/by-name/ja/jack_oscrolloscope/package.nix @@ -6,6 +6,7 @@ libjack2, libGLU, libGL, + libX11, pkg-config, }: @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { libjack2 libGLU libGL + libX11 ]; installPhase = '' diff --git a/pkgs/by-name/jb/jbigkit/package.nix b/pkgs/by-name/jb/jbigkit/package.nix index 92fc9d96d1ea..2834d246b87c 100644 --- a/pkgs/by-name/jb/jbigkit/package.nix +++ b/pkgs/by-name/jb/jbigkit/package.nix @@ -14,37 +14,40 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-3nEGtr+vSV1oZcfdesbKE4G9EuDYFAXqgefyFnJj2TI="; }; - patches = [ - # Archlinux patch: build shared object - (fetchpatch { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-shared_lib.patch"; - hash = "sha256-+efeeKg3FJ/TjSOj58kD+DwnaCm3zhGzKLfUes/d5rg="; - }) - (fetchpatch { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-ldflags.patch"; - hash = "sha256-ik3NifyuhDHnIMTrNLAKInPgu2F5u6Gvk9daqrn8ZhY="; - }) - # Archlinux patch: update coverity - (fetchpatch { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-coverity.patch"; - hash = "sha256-APm9A2f4sMufuY3cnL9HOcSCa9ov3pyzgQTTKLd49/E="; - }) - # Archlinux patch: fix build warnings - (fetchpatch { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-build_warnings.patch"; - hash = "sha256-lDEJ1bvZ+zR7K4CiTq+aXJ8PGjILE3W13kznLLlGOOg="; - }) - # Archlinux patch: this helps users to reduce denial-of-service risks, as in CVE-2017-9937 - (fetchpatch { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0013-new-jbig.c-limit-s-maxmem-maximum-decoded-image-size.patch"; - hash = "sha256-Yq5qCTF7KZTrm4oeWbpctb+QLt3shJUGEReZvd0ey9k="; - }) - # Archlinux patch: fix heap overflow - (fetchpatch { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0015-jbg_newlen-check-for-end-of-file-within-MARKER_NEWLE.patch"; - hash = "sha256-F3qA/btR9D9NfzrNY76X4Z6vG6NrisI36SjCDjS+F5s="; - }) - ]; + patches = + [ + # Archlinux patch: this helps users to reduce denial-of-service risks, as in CVE-2017-9937 + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0013-new-jbig.c-limit-s-maxmem-maximum-decoded-image-size.patch"; + hash = "sha256-Yq5qCTF7KZTrm4oeWbpctb+QLt3shJUGEReZvd0ey9k="; + }) + # Archlinux patch: fix heap overflow + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0015-jbg_newlen-check-for-end-of-file-within-MARKER_NEWLE.patch"; + hash = "sha256-F3qA/btR9D9NfzrNY76X4Z6vG6NrisI36SjCDjS+F5s="; + }) + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # Archlinux patch: build shared object + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-shared_lib.patch"; + hash = "sha256-+efeeKg3FJ/TjSOj58kD+DwnaCm3zhGzKLfUes/d5rg="; + }) + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-ldflags.patch"; + hash = "sha256-ik3NifyuhDHnIMTrNLAKInPgu2F5u6Gvk9daqrn8ZhY="; + }) + # Archlinux patch: update coverity + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-coverity.patch"; + hash = "sha256-APm9A2f4sMufuY3cnL9HOcSCa9ov3pyzgQTTKLd49/E="; + }) + # Archlinux patch: fix build warnings + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/jbigkit-2.1-build_warnings.patch"; + hash = "sha256-lDEJ1bvZ+zR7K4CiTq+aXJ8PGjILE3W13kznLLlGOOg="; + }) + ]; makeFlags = [ "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" @@ -61,26 +64,32 @@ stdenv.mkDerivation (finalAttrs: { done ''; - installPhase = '' - runHook preInstall + installPhase = + '' + runHook preInstall - install -vDm 644 libjbig/*.h -t "$out/include/" - install -vDm 755 pbmtools/{jbgtopbm{,85},pbmtojbg{,85}} -t "$out/bin/" - install -vDm 644 pbmtools/*.1* -t "$out/share/man/man1/" + install -vDm 644 libjbig/*.h -t "$out/include/" + install -vDm 755 pbmtools/{jbgtopbm{,85},pbmtojbg{,85}} -t "$out/bin/" + install -vDm 644 pbmtools/*.1* -t "$out/share/man/man1/" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + install -vDm 644 libjbig/libjbig*.a -t "$out/lib/" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + install -vDm 755 libjbig/*.so.* -t "$out/lib/" - install -vDm 755 libjbig/*.so.* -t "$out/lib/" - for lib in libjbig.so libjbig85.so; do - ln -sv "$lib.${finalAttrs.version}" "$out/lib/$lib" - ln -sv "$out/lib/$lib.${finalAttrs.version}" "$out/lib/$lib.0" - done - - runHook postInstall - ''; + for lib in libjbig.so libjbig85.so; do + ln -sv "$lib.${finalAttrs.version}" "$out/lib/$lib" + ln -sv "$out/lib/$lib.${finalAttrs.version}" "$out/lib/$lib.0" + done + '' + + '' + runHook postInstall + ''; doCheck = true; meta = { - broken = stdenv.hostPlatform.isDarwin; description = "Software implementation of the JBIG1 data compression standard"; homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/jo/jot/package.nix b/pkgs/by-name/jo/jot/package.nix index 66a5ef590a68..bb0312f0208c 100644 --- a/pkgs/by-name/jo/jot/package.nix +++ b/pkgs/by-name/jo/jot/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { version = "0.1.2"; src = fetchFromGitHub { - owner = "araekiel"; + owner = "shashwatah"; repo = "jot"; rev = "v${version}"; sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM="; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Rapid note management for the terminal"; - homepage = "https://github.com/araekiel/jot"; + homepage = "https://github.com/shashwatah/jot"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; mainProgram = "jt"; diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix new file mode 100644 index 000000000000..abc2c8aa05c2 --- /dev/null +++ b/pkgs/by-name/ju/julec/package.nix @@ -0,0 +1,110 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +let + irFile = + if stdenv.hostPlatform.system == "x86_64-linux" then + "linux-amd64.cpp" + else if stdenv.hostPlatform.system == "aarch64-linux" then + "linux-arm64.cpp" + else if stdenv.hostPlatform.system == "i686-linux" then + "linux-i386.cpp" + else if stdenv.hostPlatform.system == "x86_64-darwin" then + "darwin-amd64.cpp" + else if stdenv.hostPlatform.system == "aarch64-darwin" then + "darwin-arm64.cpp" + else + throw "Unsupported platform: ${stdenv.hostPlatform.system}"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "julec"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "julelang"; + repo = "jule"; + tag = "jule${finalAttrs.version}"; + name = "jule-${finalAttrs.version}"; + hash = "sha256-hFWoGeTmfXIPcICWXa5W36QDOk3yB7faORxFaM9shcQ="; + }; + + irSrc = fetchFromGitHub { + owner = "julelang"; + repo = "julec-ir"; + # revision determined by the upstream commit hash in julec-ir/README.md + rev = "a274782922e4275c4a036d63acffd3369dbc382f"; + name = "jule-ir-${finalAttrs.version}"; + hash = "sha256-TXMSXTGTzZntPUhT6QTmn3nD2k855ZoAW9aQWyhrE8s="; + }; + + dontConfigure = true; + + unpackPhase = '' + runHook preUnpack + + cp -R ${finalAttrs.src}/* . + cp "${finalAttrs.irSrc}/src/${irFile}" ./ir.cpp + + chmod +w -R . + + find ./*/* -type f -name '*.md' -exec rm -f {} + + + runHook postUnpack + ''; + + buildPhase = '' + runHook preBuild + + echo "Building ${finalAttrs.meta.mainProgram} v${finalAttrs.version} for ${stdenv.hostPlatform.system}..." + mkdir -p bin + ${stdenv.cc.targetPrefix}c++ ir.cpp \ + --std=c++17 \ + -Wno-everything \ + -O3 \ + -flto \ + -DNDEBUG \ + -fomit-frame-pointer \ + -o "bin/${finalAttrs.meta.mainProgram}" + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/jule + mkdir -p $out/bin + cp -R api $out/lib/jule/api + cp -R std $out/lib/jule/std + cp -R bin $out/lib/jule/bin + ln -s $out/lib/jule/bin/${finalAttrs.meta.mainProgram} $out/bin/${finalAttrs.meta.mainProgram} + + runHook postInstall + ''; + + meta = { + description = "Jule Programming Language Compiler"; + longDescription = '' + Jule is an effective programming language designed to build efficient, fast, reliable and safe software while maintaining simplicity. + It is a statically typed, compiled language with a syntax influenced by Go, Rust, and C++. + ''; + homepage = "https://jule.dev"; + changelog = "https://github.com/julelang/manual/releases/tag/jule${finalAttrs.version}"; + license = lib.licenses.bsd3; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "i686-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + mainProgram = "julec"; + maintainers = with lib.maintainers; [ + adamperkowski + sebaguardian + ]; + }; +}) diff --git a/pkgs/by-name/ju/jumppad/package.nix b/pkgs/by-name/ju/jumppad/package.nix index 72326c2c36e3..7fb20e5a272a 100644 --- a/pkgs/by-name/ju/jumppad/package.nix +++ b/pkgs/by-name/ju/jumppad/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "jumppad"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-SoiF5y0Vc2T8qT75cII3HqNSEZhWAzKEk3xw4BGICpo="; + hash = "sha256-V+FDPNNNP7HMg0Somoj3EhGuhhq/Du8JcCBE/Ut2V1s="; }; - vendorHash = "sha256-mJKawveIoDu2v+GxIoljmFbCwle9d1SQiHzsoerP66I="; + vendorHash = "sha256-BuXbizA/OJiP11kSIO476tWPYPzGTKmzPHeyIqs8pWc="; subPackages = [ "." ]; diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix index b88506805c47..590268b3dba6 100644 --- a/pkgs/by-name/jx/jx/package.nix +++ b/pkgs/by-name/jx/jx/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jx"; - version = "3.11.56"; + version = "3.11.66"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-zBv6j27UYRcMqDLINe8zEqANmlSks3OqwGzTSFisnP4="; + sha256 = "sha256-Ejm5Y1xyh9/d79PYYMeKQVtAhT9knFCVcwNAWoBk840="; }; vendorHash = "sha256-8I4yTzLAL7E0ozHcBZDNsJLHkTh+SjT0SjDSECGRYIc="; diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix index 8cace7c251b0..467c659471d9 100644 --- a/pkgs/by-name/ka/kafkactl/package.nix +++ b/pkgs/by-name/ka/kafkactl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kafkactl"; - version = "5.5.1"; + version = "5.6.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; tag = "v${version}"; - hash = "sha256-lsYdq3+hf+8EPLmLbgnzuVHfeZXrUlqYmHY4kJ6HzC4="; + hash = "sha256-hhFQbs7p3j8y845asZt6c+OcZ6WgpoTBttGG5IwT7Kc="; }; vendorHash = "sha256-0Kc8Z32YdmwhKMTBMBAK0ZdnXnH8/Ze1HcMDafosLvw="; diff --git a/pkgs/by-name/ka/kanidm/patches/1_3/recover-account.patch b/pkgs/by-name/ka/kanidm/patches/1_3/recover-account.patch index a344f5a2086f..5f676bdbc103 100644 --- a/pkgs/by-name/ka/kanidm/patches/1_3/recover-account.patch +++ b/pkgs/by-name/ka/kanidm/patches/1_3/recover-account.patch @@ -19,7 +19,8 @@ index 40c18777f..40d553b40 100644 #[instrument( level = "info", - skip(self, eventid), +- skip(self, eventid), ++ skip(self, password, eventid), fields(uuid = ?eventid) )] pub(crate) async fn handle_admin_recover_account( diff --git a/pkgs/by-name/ka/kanidm/patches/1_4/recover-account.patch b/pkgs/by-name/ka/kanidm/patches/1_4/recover-account.patch index 1ec61301f036..312c412809d8 100644 --- a/pkgs/by-name/ka/kanidm/patches/1_4/recover-account.patch +++ b/pkgs/by-name/ka/kanidm/patches/1_4/recover-account.patch @@ -19,7 +19,8 @@ index 420e72c6c..5c4353116 100644 #[instrument( level = "info", - skip(self, eventid), +- skip(self, eventid), ++ skip(self, password, eventid), fields(uuid = ?eventid) )] pub(crate) async fn handle_admin_recover_account( diff --git a/pkgs/by-name/ka/kanidm/patches/1_5/recover-account.patch b/pkgs/by-name/ka/kanidm/patches/1_5/recover-account.patch index 1ec61301f036..312c412809d8 100644 --- a/pkgs/by-name/ka/kanidm/patches/1_5/recover-account.patch +++ b/pkgs/by-name/ka/kanidm/patches/1_5/recover-account.patch @@ -19,7 +19,8 @@ index 420e72c6c..5c4353116 100644 #[instrument( level = "info", - skip(self, eventid), +- skip(self, eventid), ++ skip(self, password, eventid), fields(uuid = ?eventid) )] pub(crate) async fn handle_admin_recover_account( diff --git a/pkgs/by-name/ka/kapp/package.nix b/pkgs/by-name/ka/kapp/package.nix index 55c7e578c6ab..dddd3d2958a8 100644 --- a/pkgs/by-name/ka/kapp/package.nix +++ b/pkgs/by-name/ka/kapp/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.64.0"; + version = "0.64.1"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kapp"; rev = "v${version}"; - hash = "sha256-+kSZERC14IimUa6rwG6u6gHWheCPnk840Sowlv3tm8Q="; + hash = "sha256-vgb4VtMKYncO4TPlMj2HrgZvjoOsOc2cYy+EBDKnGcM="; }; vendorHash = null; diff --git a/pkgs/by-name/ka/karmor/package.nix b/pkgs/by-name/ka/karmor/package.nix index 432568dc32f2..20737002e2af 100644 --- a/pkgs/by-name/ka/karmor/package.nix +++ b/pkgs/by-name/ka/karmor/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "karmor"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-sn2Zpr/Z63MAf0d9FnT3GJW48DI/aynC1naAHsMYGR4="; + hash = "sha256-3WPelRhvK/9LY+TFDExcltszE1wVRr1MMY9Xjijj0so="; }; vendorHash = "sha256-HH3U1reZXG9w7uwnXbY33hsKlPCxbVb2yvw4KmBfOa0="; diff --git a/pkgs/by-name/ka/kata-runtime/package.nix b/pkgs/by-name/ka/kata-runtime/package.nix index 403ea76d21ba..fa06ba0ea733 100644 --- a/pkgs/by-name/ka/kata-runtime/package.nix +++ b/pkgs/by-name/ka/kata-runtime/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { hash = "sha256-Ir+/ZZJHm6E+044wczU3UvL+Py9Wprgw2QKJaYyDrKU="; }; - sourceRoot = "source/src/runtime"; + sourceRoot = "${src.name}/src/runtime"; vendorHash = null; diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index b3e1e45344a2..9dd569ba0296 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "kdlfmt"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "hougesen"; repo = "kdlfmt"; rev = "v${version}"; - hash = "sha256-90sGzc+UBy3Va/FYXHTVcwIkbx01avp4Z/aHiOxMj6w="; + hash = "sha256-nnr3QXEXQGbJKjVvQXqhJ+iFBgI++AKK3wKMt2OqIYc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ocH8o2prf+1POZknbl5+svo0JU7sX0k8NvOkkidhOqA="; + cargoHash = "sha256-VMjsTVJ9pyI1pdvkD5nAgFELK+o2tl5lu6peN87ssqs="; meta = { description = "Formatter for kdl documents"; diff --git a/pkgs/by-name/ke/keet/package.nix b/pkgs/by-name/ke/keet/package.nix index 49f8bb2b82d8..179a8207e52d 100644 --- a/pkgs/by-name/ke/keet/package.nix +++ b/pkgs/by-name/ke/keet/package.nix @@ -6,11 +6,11 @@ let pname = "keet"; - version = "2.2.0"; + version = "2.4.1"; src = fetchzip { url = "https://keet.io/downloads/${version}/Keet-x64.tar.gz"; - hash = "sha256-Sd2aCUvgxdbCb8MtWMcznX2efmL1h9wLT29GG7t3Gzc="; + hash = "sha256-Csr9M9t2brwfK0B8ldXgUQXX6lPH8z2QSkcBgCYSvaE="; }; appimageContents = appimageTools.extract { @@ -26,6 +26,7 @@ appimageTools.wrapType2 { extraPkgs = pkgs: with pkgs; [ gtk4 + graphene ]; extraInstallCommands = '' diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index 9f40451af78c..b4bde00978dc 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject2 (finalAttrs: { pname = "kimai"; - version = "2.29.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; tag = finalAttrs.version; - hash = "sha256-n62DE3MZjGAmE5FN66LVW4jOCQr8SHohHXNUmacDdPg="; + hash = "sha256-aVRqek8nMgos1V247ZmJenVFfAmqEpNGtYWScWHD/gg="; }; php = php.buildEnv { @@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { ''; }; - vendorHash = "sha256-QCr6XY3wol/3GcQTIVOEumpCTbhktBZY/7Wlug//wAo="; + vendorHash = "sha256-uPIP3g8oJb+JnW/WnAdW/ZSLAQwyXI9X006rrA7pnKI="; composerNoPlugins = false; composerNoScripts = false; diff --git a/pkgs/by-name/ki/kind-lang/derivation.nix b/pkgs/by-name/ki/kind-lang/derivation.nix new file mode 100644 index 000000000000..a2c55b89a043 --- /dev/null +++ b/pkgs/by-name/ki/kind-lang/derivation.nix @@ -0,0 +1,46 @@ +# CABAL2NIX AUTOGENERATED THIS FILE. +{ + mkDerivation, + ansi-terminal, + base, + containers, + directory, + fetchgit, + filepath, + hs-highlight, + lib, + mtl, + parsec, +}: +mkDerivation { + pname = "kind-lang"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/higherorderco/kind.git"; + sha256 = "1g4pikxh42p3hikzyfzf11cs7zd1miaxapyf8pijdcxhpdx7wwl0"; + rev = "5cfff210b3aeed01ebd73b2364cf9e5d2df658af"; + fetchSubmodules = false; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal + base + containers + directory + filepath + hs-highlight + mtl + parsec + ]; + executableHaskellDepends = [ + ansi-terminal + base + directory + filepath + hs-highlight + mtl + ]; + license = lib.licenses.mit; + mainProgram = "kind"; +} diff --git a/pkgs/by-name/ki/kind-lang/package.nix b/pkgs/by-name/ki/kind-lang/package.nix new file mode 100644 index 000000000000..613d310a5dfe --- /dev/null +++ b/pkgs/by-name/ki/kind-lang/package.nix @@ -0,0 +1,34 @@ +{ + haskell, + lib, +}: + +let + inherit (haskell.lib.compose) overrideCabal justStaticExecutables; + + # See kind-lang.cabal. GHC2024 >= ghc910. + ghcVersion = "ghc910"; + haskellPackages = haskell.packages.${ghcVersion}; + + overrides = rec { + version = "${raw-pkg.version}-unstable-2024-12-09"; + + postPatch = '' + sed -i -E \ + 's/([ ,]+[^ =]+)[ =^><]+[0-9.]+/\1/' \ + kind-lang.cabal + ''; + + # Test suite does nothing. + doCheck = false; + + maintainers = with lib.maintainers; [ joaomoreira ]; + }; + + # cabal2nix auto-generated derivation.nix. + raw-pkg = haskellPackages.callPackage ./derivation.nix { }; +in +lib.pipe raw-pkg [ + (overrideCabal overrides) + justStaticExecutables +] diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 95a3144df619..fd8674f00f4c 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -56,21 +56,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.40.0"; + version = "0.40.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-c+u+lMuokDR8kWM0an3jFPC/qoK2RZTKqHZtfEnqtnM="; + hash = "sha256-ta9MTbSkIkowkd5zBUbtauFNGVRDgxof1SSQXuEgFTQ="; }; goModules = (buildGo123Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-gBEzW2k1HDDmg1P1t6u90Lf1lLe1IKGpF2T9iCA31qs="; + vendorHash = "sha256-wr5R2X+lV8vVVWsDYLLSaz7HRNOB7Zzk/a7knsdDlXs="; }).goModules; buildInputs = @@ -159,18 +159,6 @@ buildPythonApplication rec { # Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes: # OSError: master_fd is in error condition ./disable-test_ssh_bootstrap_with_different_launchers.patch - - # Remove after 0.40.1 - (fetchpatch { - url = "https://github.com/kovidgoyal/kitty/commit/6171ca6.patch"; - hash = "sha256-OBB0YcgEYgw3Jcg+Dgus6rwQ4gGL6GMr6pd7m9CGq9k="; - }) - - (fetchpatch { - url = "https://github.com/kovidgoyal/kitty/commit/8cbdd003e2.patch"; - hash = "sha256-pKIJIqIdPfB4kQ6FtpYDumpgjJkMxoLT8fKzfgWYJnw="; - }) - ]; hardeningDisable = [ diff --git a/pkgs/by-name/kn/knightos-kcc/package.nix b/pkgs/by-name/kn/knightos-kcc/package.nix index 5505936497c7..e43d2cd29a33 100644 --- a/pkgs/by-name/kn/knightos-kcc/package.nix +++ b/pkgs/by-name/kn/knightos-kcc/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ]; meta = with lib; { - homepage = "https://knightos.org/"; + homepage = "https://github.com/KnightOS/kcc"; description = "KnightOS C compiler"; mainProgram = "kcc"; license = licenses.gpl2Plus; diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index 14c73156648f..a0cee0a2722d 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "sha256-59nW3pfyG/M+kHvZhqQDgCXzlIea8KX9GXhyA6w7ITE="; + sha256 = "sha256-NZr3Cvr6fMqhhDmnwes1Jw/57s6B0HVq5MpxaxQzy0s="; }; outputs = [ diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix index 6560faa0e64c..e682cbe13da8 100644 --- a/pkgs/by-name/ko/kokkos/package.nix +++ b/pkgs/by-name/ko/kokkos/package.nix @@ -38,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ Performance Portability Programming EcoSystem"; homepage = "https://github.com/kokkos/kokkos"; changelog = "https://github.com/kokkos/kokkos/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with licenses; [ asl20-llvm ]; + license = with licenses; [ + asl20 + llvm-exception + ]; maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 5de39d7f4316..dfc73dc09875 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -17,17 +17,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "komac"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "russellbanks"; repo = "Komac"; tag = "v${finalAttrs.version}"; - hash = "sha256-iohqtbzebX/1hkAwEe6UT6cw0BOQF5Ec5MS5ycrHoNU="; + hash = "sha256-X0lvr8GafJIP8kwnLTk3taq3WZAx50/jUt3zJIELJnc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LvYweWuMytBcke1lKNmIPeFFfjEqzR07vO2MQQ37ASY="; + cargoHash = "sha256-utsLfvFGTBuD1Tywu9TfnPGDhvSWZSokvwW22USWWls="; nativeBuildInputs = [ diff --git a/pkgs/by-name/kr/krew/package.nix b/pkgs/by-name/kr/krew/package.nix index 7ad84ac536f2..2fc475b41e9b 100644 --- a/pkgs/by-name/kr/krew/package.nix +++ b/pkgs/by-name/kr/krew/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "krew"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "krew"; rev = "v${version}"; - sha256 = "sha256-SN6F7EmkgjtU4UHYPXWBiuXSSagjQYD6SBYBXRrSVGA="; + sha256 = "sha256-3GoC2HEp9XJe853/JYvX9kAAcFf7XxglVEeU9oQ/5Ms="; }; - vendorHash = "sha256-3tEesDezIyB6005PZmOcrnEeAIvc5za3FxTmBBbKf7s="; + vendorHash = "sha256-r4Dywm0+YxWWD59oaKodkldE2uq8hlt9MwOMYDaj6Gc="; subPackages = [ "cmd/krew" ]; diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index 6babceb3e271..75b65016690c 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-cNLnmJEVYkj4TJNr/oJ5kXeI11f0VtJb/nPojOG4ye8="; + hash = "sha256-zAFDbSbNvFtQeJhyeG1tgFwwFgluiX1Y5BmSUsE4z3c="; }; - vendorHash = "sha256-EFVHWJUk5wiuM6Nn7wsVgXLDHWYvwb53BqXpqV41Jpg="; + vendorHash = "sha256-I65SpIigNQHvQEd84O/b9hHYs2ECYj5vMKi6ikKCAQY="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ku/kubernetes-kcp/package.nix b/pkgs/by-name/ku/kubernetes-kcp/package.nix index 4d294ff8e8d5..68dfe83ae108 100644 --- a/pkgs/by-name/ku/kubernetes-kcp/package.nix +++ b/pkgs/by-name/ku/kubernetes-kcp/package.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "kubernetes-kcp"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "kcp-dev"; repo = "kcp"; tag = "v${version}"; - hash = "sha256-vFwZerOW1H3qR428cSl5mnz8KthO20BWk8gUjOq1OfU="; + hash = "sha256-yAS53KYR6jHZxuvq8jRKH36IPdEqsQeG/Do+SIZnQpw="; }; - vendorHash = "sha256-p0dfkI1YPfQpIeFzRnI+ayge7kbjXT49XuCYP6FPXTQ="; + vendorHash = "sha256-CE3Wloi4evMEftKeRkPJq186kPFqMpI3yWWIEKn/bOQ="; subPackages = [ "cmd/kcp" ]; diff --git a/pkgs/by-name/ku/kubernetes-validate/package.nix b/pkgs/by-name/ku/kubernetes-validate/package.nix new file mode 100644 index 000000000000..39a609259a14 --- /dev/null +++ b/pkgs/by-name/ku/kubernetes-validate/package.nix @@ -0,0 +1,4 @@ +{ + python3Packages, +}: +python3Packages.toPythonApplication python3Packages.kubernetes-validate diff --git a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix new file mode 100644 index 000000000000..6f3cd6d0fa44 --- /dev/null +++ b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + importlib-resources, + jsonschema, + packaging, + pyyaml, + referencing, + typing-extensions, + pytestCheckHook, + versionCheckHook, +}: +buildPythonPackage rec { + pname = "kubernetes-validate"; + version = "1.31.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "willthames"; + repo = "kubernetes-validate"; + tag = "v${version}"; + hash = "sha256-vxsftuipw0rHQIngxKlPHwBIW+rYAjfnEEaJDKmPyfQ="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + importlib-resources + jsonschema + packaging + pyyaml + referencing + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + + pythonImportsCheck = [ "kubernetes_validate" ]; + + meta = { + description = "Module to validate Kubernetes resource definitions against the declared Kubernetes schemas"; + homepage = "https://github.com/willthames/kubernetes-validate"; + changelog = "https://github.com/willthames/kubernetes-validate/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lykos153 ]; + mainProgram = "kubernetes-validate"; + }; +} diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index 8d6325c45723..84ebe5b2e068 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.3.13"; + version = "2.4.1"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-/b4JOWU4WZgkUUiOSox/ly3t8Ehp1dAY6kVyDabjMFE="; + hash = "sha256-IZna+DOavIkhGuNfVq31Hvuq5J0rylCAmNActjbA/io="; }; vendorHash = null; diff --git a/pkgs/by-name/la/labwc-menu-generator/package.nix b/pkgs/by-name/la/labwc-menu-generator/package.nix index 7d6b30f66adc..a9599d1eeb24 100644 --- a/pkgs/by-name/la/labwc-menu-generator/package.nix +++ b/pkgs/by-name/la/labwc-menu-generator/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-menu-generator"; - version = "0.1.0-unstable-2025-02-12"; + version = "0.1.0-unstable-2025-03-08"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-menu-generator"; - rev = "a6e96b496aff6b54bcdaacfcd24720d46d6a683a"; - hash = "sha256-Ju/lH7mZuIsulkQ5lpgfBl9BUs0mAOobS9aBuVlMIqI="; + rev = "f1aa43d776b702f29b7d1e32440f233927a1dfa9"; + hash = "sha256-tjfFE2RJVOhJFw29+CZkLApVS4BTjGpT3cI2WStYAOo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lammps/package.nix b/pkgs/by-name/la/lammps/package.nix index b6e7b89b9134..860f812c5272 100644 --- a/pkgs/by-name/la/lammps/package.nix +++ b/pkgs/by-name/la/lammps/package.nix @@ -49,14 +49,14 @@ stdenv.mkDerivation (finalAttrs: { # LAMMPS has weird versioning convention. Updates should go smoothly with: # nix-update --commit lammps --version-regex 'stable_(.*)' - version = "29Aug2024_update1"; + version = "29Aug2024_update2"; pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; rev = "stable_${finalAttrs.version}"; - hash = "sha256-B2oMs9bVYO+G3yL1DGJVK/INIfANMDREV7AtC4kH3H8="; + hash = "sha256-xhFLsK3CQFIfajdwkpz593KTUGwcIWX1bLIPClDe/V8="; }; preConfigure = '' cd cmake diff --git a/pkgs/by-name/la/latexminted/package.nix b/pkgs/by-name/la/latexminted/package.nix index ff6521d1c4f9..850921ca5461 100644 --- a/pkgs/by-name/la/latexminted/package.nix +++ b/pkgs/by-name/la/latexminted/package.nix @@ -8,12 +8,12 @@ python3Packages.buildPythonApplication rec { pname = "latexminted"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-JI44VGAuSDDUBm7hH6huYdzXeMU2q1ZCixwJNTxBHHo="; + hash = "sha256-sQiIVAmqZBSyryBIvafsVTUVuXbfJJfpNwxD8slGJQA="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 2fb54d3b2620..9b1b5c2647b9 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "lazysql"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-jFQvtC6D7B0p+zh3Mv3QjMTHIolc1VbKqEpXe0WxQAM="; + hash = "sha256-tQZ8thL3rmTtxDG0Z/DgxH1PjDL4Kxx9LXDLqVTZ7Lc="; }; vendorHash = "sha256-LLOUTml/mz7edCUy82k+S5PfpFovgUTQr0BoQQXiVGs="; diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix index 201d76afd5bc..174c2557a506 100644 --- a/pkgs/by-name/lc/lcevcdec/package.nix +++ b/pkgs/by-name/lc/lcevcdec/package.nix @@ -2,7 +2,6 @@ cmake, copyPkgconfigItems, fetchFromGitHub, - fetchpatch, fmt, git, gitUpdater, @@ -19,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lcevcdec"; - version = "3.2.1"; + version = "3.3.5"; outputs = [ "out" @@ -31,27 +30,29 @@ stdenv.mkDerivation (finalAttrs: { owner = "v-novaltd"; repo = "LCEVCdec"; tag = finalAttrs.version; - hash = "sha256-Nf0YntB1A3AH0MTXlfUHhxYbzZqeB0EH9Fe9Xrqdsts="; + hash = "sha256-PcV31lLABv7SGzrD/+rR9j1Z9/uZrp1hFPdW0EZwOqc="; }; - patches = [ - # fix for build with GCC 14 - (fetchpatch { - url = "https://github.com/v-novaltd/LCEVCdec/commit/43ef5a17ec1ced77f834136945b3cbfe2e46b9b4.patch"; - hash = "sha256-8OgPh6v+nmRIUB6flR93qOjvaL8fUJdqIe48ZA+8Pr0="; - }) - ]; + postPatch = + '' + substituteInPlace cmake/tools/version_files.py \ + --replace-fail "args.git_version" '"${finalAttrs.version}"' \ + --replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \ + --replace-fail "args.git_date" '"1970-01-01"' - postPatch = '' - substituteInPlace cmake/tools/version_files.py \ - --replace-fail "args.git_version" '"${finalAttrs.version}"' \ - --replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \ - --replace-fail "args.git_date" '"1970-01-01"' - ''; + '' + + lib.optionalString (!stdenv.hostPlatform.avxSupport) '' + substituteInPlace cmake/modules/Compiler/GNU.cmake \ + --replace-fail "-mavx" "" + + substituteInPlace src/core/decoder/src/common/simd.c \ + --replace-fail "((_xgetbv(kControlRegister) & kOSXSaveMask) == kOSXSaveMask)" "false" + ''; env = { includedir = "${placeholder "dev"}/include"; libdir = "${placeholder "out"}/lib"; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-variable"; }; pkgconfigItems = [ @@ -95,6 +96,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "VN_SDK_FFMPEG_LIBS_PACKAGE" "") (lib.cmakeBool "VN_SDK_UNIT_TESTS" false) (lib.cmakeBool "VN_SDK_SAMPLE_SOURCE" false) + (lib.cmakeBool "VN_CORE_AVX2" stdenv.hostPlatform.avx2Support) + # Requires avx for checking on runtime + (lib.cmakeBool "VN_CORE_SSE" stdenv.hostPlatform.avxSupport) ]; passthru = { diff --git a/pkgs/by-name/lc/lci/package.nix b/pkgs/by-name/lc/lci/package.nix index 11db8b1bf0c8..984c1de5d8b1 100644 --- a/pkgs/by-name/lc/lci/package.nix +++ b/pkgs/by-name/lc/lci/package.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; meta = { description = "Lambda calculus interpreter"; + homepage = "https://www.chatzi.org/lci/"; mainProgram = "lci"; maintainers = with lib.maintainers; [ raskin ]; platforms = with lib.platforms; linux; diff --git a/pkgs/by-name/ld/ldm/package.nix b/pkgs/by-name/ld/ldm/package.nix index 3edf44094f43..d0a850ee2f6d 100644 --- a/pkgs/by-name/ld/ldm/package.nix +++ b/pkgs/by-name/ld/ldm/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight device mounter, with libudev as only dependency"; + homepage = "https://github.com/LemonBoy/ldm"; mainProgram = "ldm"; license = lib.licenses.mit; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index 3e969747f698..1c5a6835018b 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.102.0"; + version = "2.104.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-mi4YOY8TYorLiUbRCmknY3NBzTXId7/vfdvzUJSrdrI="; + hash = "sha256-RZweB6zE4POJRyvUXMC2nPyyIsZrTc2KkrxuZtmdZYY="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index dc5f54495fdd..2bfd59135d5b 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -2,48 +2,70 @@ lib, stdenv, fetchFromGitHub, - pnpm_9, + pnpm, nodejs, - electron_34, + electron, makeWrapper, copyDesktopItems, makeDesktopItem, + autoPatchelfHook, + pipewire, + libpulseaudio, nix-update-script, }: -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "legcord"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Legcord"; repo = "Legcord"; - rev = "v${version}"; - hash = "sha256-IfRjblC3L6A7HgeEDeDrRxtIMvWQB3P7mpq5bhaHWqk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-0RbLvRCvy58HlOhHLcAoErRFgYxjWrKFQ6DPJD50c5Q="; }; nativeBuildInputs = [ - pnpm_9.configHook + pnpm.configHook nodejs + # we use a script wrapper here for environment variable expansion at runtime + # https://github.com/NixOS/nixpkgs/issues/172583 makeWrapper copyDesktopItems + # legcord uses venmic, which is a shipped as a prebuilt node module + # and needs to be patched + autoPatchelfHook ]; - pnpmDeps = pnpm_9.fetchDeps { - inherit pname version src; - hash = "sha256-LbHYY97HsNF9cBQzAfFw+A/tLf27y3he9Bbw9H3RKK4="; - }; + buildInputs = [ + libpulseaudio + pipewire + (lib.getLib stdenv.cc.cc) + ]; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-zAf3EGIt/BWSZ9BMHWWVPWo3m+whnl/p+SahmpdLoZ4="; + }; buildPhase = '' runHook preBuild pnpm build - npm exec electron-builder -- \ + # Replicating the build step to copy venmic from the vendored node module manually, + # since the install script does not do this for whatever reason + cp ./node_modules/@vencord/venmic/prebuilds/venmic-addon-linux-x64/node-napi-v7.node ./dist/venmic-x64.node + cp ./node_modules/@vencord/venmic/prebuilds/venmic-addon-linux-arm64/node-napi-v7.node ./dist/venmic-arm64.node + + # Patch venmic before putting it into the ASAR archive + autoPatchelf ./dist + + pnpm exec electron-builder \ --dir \ - -c.electronDist="${electron_34.dist}" \ - -c.electronVersion="${electron_34.version}" + -c.asarUnpack="**/*.node" \ + -c.electronDist="${electron.dist}" \ + -c.electronVersion="${electron.version}" runHook postBuild ''; @@ -56,39 +78,60 @@ stdenv.mkDerivation rec { install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/legcord.png" - makeShellWrapper "${lib.getExe electron_34}" "$out/bin/legcord" \ + # use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion + # see https://github.com/NixOS/nixpkgs/issues/172583 + makeShellWrapper "${lib.getExe electron}" "$out/bin/legcord" \ --add-flags "$out/share/lib/legcord/resources/app.asar" \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 runHook postInstall ''; + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + desktopItems = [ (makeDesktopItem { name = "legcord"; + genericName = "Internet Messenger"; desktopName = "Legcord"; exec = "legcord %U"; icon = "legcord"; - comment = meta.description; - categories = [ "Network" ]; + comment = finalAttrs.meta.description; + keywords = [ + "discord" + "vencord" + "electron" + "chat" + ]; + categories = [ + "Network" + "InstantMessaging" + "Chat" + ]; startupWMClass = "Legcord"; terminal = false; }) ]; - passthru.updateScript = nix-update-script { }; + passthru = { + inherit (finalAttrs) pnpmDeps; + updateScript = nix-update-script { }; + }; - meta = with lib; { + meta = { description = "Lightweight, alternative desktop client for Discord"; homepage = "https://legcord.app"; downloadPage = "https://github.com/Legcord/Legcord"; - license = licenses.osl3; - maintainers = with maintainers; [ + license = lib.licenses.osl3; + maintainers = with lib.maintainers; [ wrmilling water-sucks + nyabinary ]; platforms = [ "x86_64-linux" @@ -96,4 +139,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "legcord"; }; -} +}) diff --git a/pkgs/by-name/le/lerc/package.nix b/pkgs/by-name/le/lerc/package.nix index 08a7cb63afbf..1443ce855449 100644 --- a/pkgs/by-name/le/lerc/package.nix +++ b/pkgs/by-name/le/lerc/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + buildPackages, fetchFromGitHub, fetchpatch, cmake, @@ -23,14 +24,28 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IHY9QtNYsxPz/ksxRMZGHleT+/bawfTYNVRSTAuYQ7Y="; }; - patches = [ - # https://github.com/Esri/lerc/pull/227 - (fetchpatch { - name = "use-cmake-install-full-dir.patch"; - url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch"; - hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk="; - }) - ]; + # Required to get the freebsd-ports patch to apply. + # There seem to be inconsistent line endings in this project - just converting the patch doesn't work + prePatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + ${buildPackages.dos2unix}/bin/dos2unix src/LercLib/fpl_EsriHuffman.cpp src/LercLib/fpl_Lerc2Ext.cpp + ''; + + patches = + [ + # https://github.com/Esri/lerc/pull/227 + (fetchpatch { + name = "use-cmake-install-full-dir.patch"; + url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch"; + hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk="; + }) + ] + ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ee9e39ceb1af729ac33854b5f3de652cb5ce0eca/graphics/lerc/files/patch-_assert"; + hash = "sha256-agvGqgIsKS8v43UZdTVxDRDGbZdj2+AzKoQONvQumB4="; + extraPrefix = ""; + }) + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix index 2dfee512b8a8..4136ae04bcd7 100644 --- a/pkgs/by-name/lg/lgogdownloader/package.nix +++ b/pkgs/by-name/lg/lgogdownloader/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lgogdownloader"; - version = "3.16"; + version = "3.17"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; tag = "v${finalAttrs.version}"; - hash = "sha256-coPUPercfpB8LilBn5Uww9rEM+X9QAgzDECtQ1Ui/hg="; + hash = "sha256-rERcwPVuioZT4lqw4SUaM0TQIks6ggA5x8fuI+1GAsk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libabigail/package.nix b/pkgs/by-name/li/libabigail/package.nix index f8f257808950..89bd65ccae6f 100644 --- a/pkgs/by-name/li/libabigail/package.nix +++ b/pkgs/by-name/li/libabigail/package.nix @@ -58,7 +58,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ABI Generic Analysis and Instrumentation Library"; homepage = "https://sourceware.org/libabigail/"; - license = licenses.asl20-llvm; + license = with licenses; [ + asl20 + llvm-exception + ]; maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index aa0b4d28341c..38a06b0c2c67 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -3,6 +3,8 @@ stdenv, cmake, fetchFromGitHub, + tbb_2022_0, + useTBB ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -18,11 +20,12 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = finalAttrs.src.name + "/c"; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optionals useTBB [ tbb_2022_0 ]; cmakeFlags = [ + (lib.cmakeBool "BLAKE3_USE_TBB" useTBB) (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) ]; @@ -36,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ fgaz fpletz + silvanshade ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index f648e896d262..498081caac2a 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -21,11 +21,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.73"; + version = "2.74"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - hash = "sha256-ZAX2CJz0zdjCcVQM2ZBlTXjdCxmJstm9og+TOnWnlaU="; + hash = "sha256-64UnHyiTGIZEtkUc7Izpn0VBSY8W/5+Eh3wvyHJxdxQ="; }; outputs = [ "out" "dev" "lib" "man" "doc" ] diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index f17fe31721fb..1a7dcd948788 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.157.1"; + version = "1.157.3"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-2jAlSHKN4QfLdaHZfhbtaJDOLAUmCHX2XRmfcCSstPI="; + hash = "sha256-J9Tm35xuyIbHH2HGcctENYbArIlRWe7xzKyF3hGbwNA="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-0zdhpMfeoEi2zGbFdfpc9CDivfdIDhFH3cFP2+arpG0="; + hash = "sha256-BX0TpyG2OJkD5BUIPCij5/g3aRf6FuF9E8y9GM12o7U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix index 722c0d19d0a4..68a47e60bfcc 100644 --- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix +++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gtksourceview"; - version = "299.4.0"; + version = "299.5.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "gedit"; repo = "libgedit-gtksourceview"; rev = finalAttrs.version; - hash = "sha256-befm5UIXh2aCpKN2NH0aJhCYLf9j/ug0kVDAD5xNt4k="; + hash = "sha256-3HnlYLa1Zy1GRpX5fjEoXUzfB9X6nydpVjZTzJyhvIs="; }; patches = [ diff --git a/pkgs/by-name/li/libharu/package.nix b/pkgs/by-name/li/libharu/package.nix index ab354e13b448..78402032198a 100644 --- a/pkgs/by-name/li/libharu/package.nix +++ b/pkgs/by-name/li/libharu/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libharu"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "libharu"; repo = "libharu"; rev = "v${version}"; - hash = "sha256-tw/E79Cg/8kIei6NUu1W+mP0sUDCm8KTB7ZjzxsqpeM="; + hash = "sha256-v2vudB95OdYPiLxS9Al5lsAInsvmharhPWdnUmCl+Bs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch deleted file mode 100644 index b1f9d0978cec..000000000000 --- a/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch +++ /dev/null @@ -1,13 +0,0 @@ -Common subdirectories: libid3tag-0.15.1b/msvc++ and libid3tag-0.15.1b-patched/msvc++ -diff -uwp libid3tag-0.15.1b/utf16.c libid3tag-0.15.1b-patched/utf16.c ---- libid3tag-0.15.1b/utf16.c 2004-01-23 10:41:32.000000000 +0100 -+++ libid3tag-0.15.1b-patched/utf16.c 2018-11-01 13:12:00.866050641 +0100 -@@ -250,6 +250,8 @@ id3_ucs4_t *id3_utf16_deserialize(id3_by - id3_ucs4_t *ucs4; - - end = *ptr + (length & ~1); -+ if (end == *ptr) -+ return 0; - - utf16 = malloc((length / 2 + 1) * sizeof(*utf16)); - if (utf16 == 0) diff --git a/pkgs/by-name/li/libid3tag/debian-patches.patch b/pkgs/by-name/li/libid3tag/debian-patches.patch deleted file mode 100644 index 0a828b334cf8..000000000000 --- a/pkgs/by-name/li/libid3tag/debian-patches.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/compat.gperf b/compat.gperf -index 4e24613..5635980 100644 ---- a/compat.gperf -+++ b/compat.gperf -@@ -236,6 +236,10 @@ int id3_compat_fixup(struct id3_tag *tag) - - encoding = id3_parse_uint(&data, 1); - string = id3_parse_string(&data, end - data, encoding, 0); -+ if (!string) -+ { -+ continue; -+ } - - if (id3_ucs4_length(string) < 4) { - free(string); -diff --git a/genre.dat b/genre.dat -index 17acab5..1f02779 100644 ---- a/genre.dat -+++ b/genre.dat -@@ -277,8 +277,8 @@ static id3_ucs4_t const genre_PUNK_ROCK[] = - { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 }; - static id3_ucs4_t const genre_DRUM_SOLO[] = - { 'D', 'r', 'u', 'm', ' ', 'S', 'o', 'l', 'o', 0 }; --static id3_ucs4_t const genre_A_CAPPELLA[] = -- { 'A', ' ', 'C', 'a', 'p', 'p', 'e', 'l', 'l', 'a', 0 }; -+static id3_ucs4_t const genre_A_CAPELLA[] = -+ { 'A', ' ', 'C', 'a', 'p', 'e', 'l', 'l', 'a', 0 }; - static id3_ucs4_t const genre_EURO_HOUSE[] = - { 'E', 'u', 'r', 'o', '-', 'H', 'o', 'u', 's', 'e', 0 }; - static id3_ucs4_t const genre_DANCE_HALL[] = -@@ -452,7 +452,7 @@ static id3_ucs4_t const *const genre_table[] = { - genre_DUET, - genre_PUNK_ROCK, - genre_DRUM_SOLO, -- genre_A_CAPPELLA, -+ genre_A_CAPELLA, - genre_EURO_HOUSE, - genre_DANCE_HALL, - genre_GOA, -diff --git a/genre.dat.in b/genre.dat.in -index 872de40..e71e34b 100644 ---- a/genre.dat.in -+++ b/genre.dat.in -@@ -153,7 +153,7 @@ Freestyle - Duet - Punk Rock - Drum Solo --A Cappella -+A Capella - Euro-House - Dance Hall - Goa -diff --git a/parse.c b/parse.c -index 86a3f21..947c249 100644 ---- a/parse.c -+++ b/parse.c -@@ -165,6 +165,9 @@ id3_ucs4_t *id3_parse_string(id3_byte_t const **ptr, id3_length_t length, - case ID3_FIELD_TEXTENCODING_UTF_8: - ucs4 = id3_utf8_deserialize(ptr, length); - break; -+ default: -+ /* FIXME: Unknown encoding! Print warning? */ -+ return NULL; - } - - if (ucs4 && !full) { -diff --git a/utf16.c b/utf16.c -index 70ee9d5..6e60a75 100644 ---- a/utf16.c -+++ b/utf16.c -@@ -282,5 +282,18 @@ id3_ucs4_t *id3_utf16_deserialize(id3_byte_t const **ptr, id3_length_t length, - - free(utf16); - -+ if (end == *ptr && length % 2 != 0) -+ { -+ /* We were called with a bogus length. It should always -+ * be an even number. We can deal with this in a few ways: -+ * - Always give an error. -+ * - Try and parse as much as we can and -+ * - return an error if we're called again when we -+ * already tried to parse everything we can. -+ * - tell that we parsed it, which is what we do here. -+ */ -+ (*ptr)++; -+ } -+ - return ucs4; - } \ No newline at end of file diff --git a/pkgs/by-name/li/libid3tag/id3tag.pc b/pkgs/by-name/li/libid3tag/id3tag.pc deleted file mode 100644 index e3df7b3f9df0..000000000000 --- a/pkgs/by-name/li/libid3tag/id3tag.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@out@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=@dev@/include - -Name: libid3tag -Description: ID3 tag manipulation library -Version: @version@ - -Libs: -L${libdir} -lid3tag -Cflags: -I${includedir} diff --git a/pkgs/by-name/li/libid3tag/package.nix b/pkgs/by-name/li/libid3tag/package.nix index c8c9d8bf5103..e287ee6cdcd2 100644 --- a/pkgs/by-name/li/libid3tag/package.nix +++ b/pkgs/by-name/li/libid3tag/package.nix @@ -1,48 +1,50 @@ -{ lib, stdenv, fetchurl, zlib, gperf_3_0 }: +{ + lib, + stdenv, + fetchFromGitea, + cmake, + gperf, + zlib, +}: stdenv.mkDerivation rec { pname = "libid3tag"; - version = "0.15.1b"; + version = "0.16.3"; - src = fetchurl { - url = "mirror://sourceforge/mad/libid3tag-${version}.tar.gz"; - sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "tenacityteam"; + repo = "libid3tag"; + rev = version; + hash = "sha256-6/49rk7pmIpJRj32WmxC171NtdIOaMNhX8RD7o6Jbzs="; }; - outputs = [ "out" "dev" ]; - setOutputFlags = false; + postPatch = '' + substituteInPlace packaging/id3tag.pc.in \ + --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" + ''; strictDeps = true; - nativeBuildInputs = [ gperf_3_0 ]; - - buildInputs = [ zlib ]; - - patches = [ - ./debian-patches.patch - ./CVE-2017-11550-and-CVE-2017-11551.patch + nativeBuildInputs = [ + cmake + gperf ]; - preConfigure = '' - configureFlagsArray+=( - --includedir=$dev/include - ) - ''; + buildInputs = [ + zlib + ]; - postInstall = '' - mkdir -p $dev/lib/pkgconfig - cp ${./id3tag.pc} $dev/lib/pkgconfig/id3tag.pc - substituteInPlace $dev/lib/pkgconfig/id3tag.pc \ - --subst-var-by out $out \ - --subst-var-by dev $dev \ - --subst-var-by version "${version}" - ''; - - meta = with lib; { + meta = { description = "ID3 tag manipulation library"; - homepage = "https://mad.sourceforge.net/"; - license = licenses.gpl2; + homepage = "https://codeberg.org/tenacityteam/libid3tag"; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/li/liblc3/package.nix b/pkgs/by-name/li/liblc3/package.nix index 8ab037e596bb..4428d1e5220b 100644 --- a/pkgs/by-name/li/liblc3/package.nix +++ b/pkgs/by-name/li/liblc3/package.nix @@ -8,7 +8,7 @@ let name = "liblc3"; - version = "1.1.2"; + version = "1.1.3"; in stdenv.mkDerivation { pname = name; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-OWuj68+YztIh/dPvwqjW7ch7Ph3aiEIDvO9rMkVIrQ8="; + sha256 = "sha256-4KsvCQ1JZaj0yCT7En7ZcNk0rA8LyDwwcSga2IoVd6A="; }; outputs = [ diff --git a/pkgs/by-name/li/libnotify/package.nix b/pkgs/by-name/li/libnotify/package.nix index 655211524f7e..edd43c88da27 100644 --- a/pkgs/by-name/li/libnotify/package.nix +++ b/pkgs/by-name/li/libnotify/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, meson, ninja, pkg-config, @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.8.3"; + version = "0.8.4"; outputs = [ "out" @@ -29,9 +30,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-7o8++UYVatNAb99F/u29zZMtvSEatPFvdeuk82+y9sA="; + hash = "sha256-j6BNTr3BVbCiOd+IvZ8J6PJznVcHoTkLQnq0mF+D0lo="; }; + patches = [ + # Revert to avoid manpages breakage: + # https://gitlab.gnome.org/GNOME/libnotify/-/merge_requests/37#note_2366448 + (fetchpatch { + revert = true; + name = "unbreak-man.path"; + url = "https://gitlab.gnome.org/GNOME/libnotify/-/commit/2f99025b7ad54f29dc5236aa7dfcfa97d1c8efde.patch"; + hash = "sha256-/qbBs+bJjzCR2I7swy0RTsTaXap+gkYzvfchobeOzPQ="; + }) + ]; + mesonFlags = [ # disable tests as we don't need to depend on GTK (2/3) "-Dtests=false" diff --git a/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch b/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch new file mode 100644 index 000000000000..f9ffbb589bf7 --- /dev/null +++ b/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch @@ -0,0 +1,12 @@ +diff --git a/docs/reference/libqmi-glib/meson.build b/docs/reference/libqmi-glib/meson.build +index 2f5cfc3..14e1aea 100644 +--- a/docs/reference/libqmi-glib/meson.build ++++ b/docs/reference/libqmi-glib/meson.build +@@ -57,6 +57,7 @@ sections_txt = custom_target( + capture: true, + command: [find_program('cat'), '@INPUT@'] + gen_sections, + depends: gen_sections_deps, ++ build_by_default: true, + ) + + version_xml = configure_file( diff --git a/pkgs/by-name/li/libqmi/package.nix b/pkgs/by-name/li/libqmi/package.nix index 1bd3a50715ef..daa61c7d3a1e 100644 --- a/pkgs/by-name/li/libqmi/package.nix +++ b/pkgs/by-name/li/libqmi/package.nix @@ -88,6 +88,10 @@ stdenv.mkDerivation rec { ]; doCheck = true; + patches = [ + # https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124 + ./build_doc_deps_by_default.patch + ]; postPatch = '' patchShebangs \ diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix index 700092119a7e..b16a69fea358 100644 --- a/pkgs/by-name/li/libraw/package.nix +++ b/pkgs/by-name/li/libraw/package.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + substituteInPlace libraw*.pc.in --replace-fail -lstdc++ "" + ''; + passthru.tests = { inherit imagemagick hdrmerge freeimage; inherit (python3.pkgs) rawkit; diff --git a/pkgs/by-name/li/libredirect/package.nix b/pkgs/by-name/li/libredirect/package.nix index e770a4209bd5..d700a9afca70 100644 --- a/pkgs/by-name/li/libredirect/package.nix +++ b/pkgs/by-name/li/libredirect/package.nix @@ -104,6 +104,7 @@ else # Provide a setup hook that injects our library into every process. mkdir -p "$hook/nix-support" cat < "$hook/nix-support/setup-hook" + echo "Setting up libredirect" ${ if stdenv.hostPlatform.isDarwin then '' diff --git a/pkgs/by-name/li/libsepol/package.nix b/pkgs/by-name/li/libsepol/package.nix index 09feeb1e2fdf..ea4a5e45838a 100644 --- a/pkgs/by-name/li/libsepol/package.nix +++ b/pkgs/by-name/li/libsepol/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "libsepol"; - version = "3.8"; + version = "3.8.1"; se_url = "https://github.com/SELinuxProject/selinux/releases/download"; outputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${se_url}/${version}/libsepol-${version}.tar.gz"; - sha256 = "sha256-hE+9vwIzS5zgODOtimcQU/Z7QHbXLbTwPg7iZl7C61U="; + sha256 = "sha256-DnhwUwX5VavUwGVNN6VHfuJjSat0254rA6eGiJeuHd8="; }; postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' diff --git a/pkgs/by-name/li/libvisual/package.nix b/pkgs/by-name/li/libvisual/package.nix deleted file mode 100644 index cb7f32925de0..000000000000 --- a/pkgs/by-name/li/libvisual/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - SDL, - autoreconfHook, - autoconf-archive, - glib, - pkg-config, -}: - -stdenv.mkDerivation rec { - pname = "libvisual"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "Libvisual"; - repo = "libvisual"; - rev = "libvisual-${version}"; - hash = "sha256-bDnpQODXB2Z6hezVoh7c6cklp6qpyDzVBAnwZD8Gros="; - }; - - sourceRoot = "${src.name}/libvisual"; - - outputs = [ - "out" - "dev" - ]; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - autoconf-archive - pkg-config - ]; - buildInputs = [ - SDL - glib - ]; - - configureFlags = - lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # Remove when 0.5.x is published. - "--disable-lv-tool" - ] - ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - meta = { - description = "Abstraction library for audio visualisations"; - homepage = "https://sourceforge.net/projects/libvisual/"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux ++ lib.platforms.freebsd; - }; -} diff --git a/pkgs/by-name/li/libvmaf/package.nix b/pkgs/by-name/li/libvmaf/package.nix index 00ee04515b5c..eea42c1c5730 100644 --- a/pkgs/by-name/li/libvmaf/package.nix +++ b/pkgs/by-name/li/libvmaf/package.nix @@ -31,6 +31,14 @@ stdenv.mkDerivation (finalAttrs: { xxd ]; + postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + substituteInPlace meson.build --replace-fail '_XOPEN_SOURCE=600' '_XOPEN_SOURCE=700' + ''; + + env = lib.optionalAttrs stdenv.hostPlatform.isFreeBSD { + NIX_CFLAGS_COMPILE = "-D__BSD_VISIBLE=1"; + }; + mesonFlags = [ "-Denable_avx512=true" ]; outputs = [ diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix index ffd0ab1c8e35..79505191bcac 100644 --- a/pkgs/by-name/li/libwacom/package.nix +++ b/pkgs/by-name/li/libwacom/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libwacom"; - version = "2.14.0"; + version = "2.15.0"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${finalAttrs.version}"; - hash = "sha256-tJwLcHXXg4tFk7qKQyt+6dcDo8Qykqjn13MfXMoGvKc="; + hash = "sha256-fc7ymkyIJ5BvrPxJg7Vw1h1mBy+icr+5kVDecODxRLQ="; }; postPatch = '' diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index 8f929f27f57a..a5a4ac228048 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -11,17 +11,17 @@ }: rustPlatform.buildRustPackage rec { pname = "licensure"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "chasinglogic"; repo = "licensure"; rev = version; - hash = "sha256-ZizTcXmxAQsDXthNaXxrlsZr/tdAa8U3i70mwpvBmHw="; + hash = "sha256-3kZzYDKMLRdYzxa9+wVeTFJk186MJZfGfzRXgY9tI4Y="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tQZ9/Ki7uaWM/zCKfiM9nL4X65K2JRmQmEWY/bnQPPA="; + cargoHash = "sha256-b3Vb8beULbLQuBORcE5nWuHkqDmalexJick9Ct5+iUM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix index 798a330dda69..5abe45061795 100644 --- a/pkgs/by-name/li/lighttpd/package.nix +++ b/pkgs/by-name/li/lighttpd/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.77"; + version = "1.4.78"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-rK+r2/oiZ9i2RS0D2F/dKmZSXz8Fo2p5tmRcAX8VYs4="; + sha256 = "sha256-PAc56Lx1yen8HPqJ4cME3UsOSruHrcZGodILxqLbKj4="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix index 852324d43a29..778c4bb874b9 100644 --- a/pkgs/by-name/li/lintspec/package.nix +++ b/pkgs/by-name/li/lintspec/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "lintspec"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "beeb"; repo = "lintspec"; tag = "v${version}"; - hash = "sha256-QLD2eGuMiNh4qlzGPJOS2VbwpNCQ8+l3qKj2hDNe1oA="; + hash = "sha256-3+E0y3WxyjvIeIaAVhjXoBnS4+THv6L4Dj4LvpRYkog="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EECQpihj+N8TmbSLtheyRo/ZtuTvyLT32D0mVPRR2FI="; + cargoHash = "sha256-TIGNToVqzRUV3/5RpbYpuMrefntft9qasCjOxmpE3lc="; meta = { description = "Blazingly fast linter for NatSpec comments in Solidity code"; diff --git a/pkgs/by-name/li/litemdview/package.nix b/pkgs/by-name/li/litemdview/package.nix index a425d597c3e5..63f08fb7fd8f 100644 --- a/pkgs/by-name/li/litemdview/package.nix +++ b/pkgs/by-name/li/litemdview/package.nix @@ -5,18 +5,18 @@ gtkmm3, autoreconfHook, pkg-config, + versionCheckHook, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "litemdview"; - # litemdview -v version = "0.0.32"; src = fetchFromGitea { - domain = "notabug.org"; + domain = "codeberg.org"; owner = "g0tsu"; repo = "litemdview"; - rev = "litemdview-0.0.32"; + rev = "litemdview-${finalAttrs.version}"; hash = "sha256-XGjP+7i3mYCEzPYwVY+75DARdXJFY4vUWHFpPeoNqAE="; }; @@ -29,8 +29,18 @@ stdenv.mkDerivation { pkg-config ]; - meta = with lib; { - homepage = "https://notabug.org/g0tsu/litemdview"; + # Required for build with gcc-14 + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; + + enableParallelBuilding = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + meta = { + homepage = "https://codeberg.org/g0tsu/litemdview"; description = "Suckless markdown viewer"; longDescription = '' LiteMDview is a lightweight, extremely fast markdown viewer with lots of useful features. One of them is ability to use your prefered text editor to edit markdown files, every time you save the file, litemdview reloads those changes (I call it live-reload). It has a convinient navigation through local directories, has support for a basic "git-like" folders hierarchy as well as vimwiki projects. @@ -53,9 +63,9 @@ stdenv.mkDerivation { - Basic html support (very simple offline documents in html) - Syntax highlighting ''; - license = licenses.gpl2Only; - maintainers = with maintainers; [ WhiteBlackGoose ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ WhiteBlackGoose ]; + platforms = lib.platforms.linux; mainProgram = "litemdview"; }; -} +}) diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix index 3bbaefc31cb9..93f03ec7a786 100644 --- a/pkgs/by-name/li/littlefs-fuse/package.nix +++ b/pkgs/by-name/li/littlefs-fuse/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "littlefs-fuse"; - version = "2.7.10"; + version = "2.7.11"; src = fetchFromGitHub { owner = "littlefs-project"; repo = "littlefs-fuse"; rev = "v${version}"; - hash = "sha256-O9fzwN2qItsmDwqtNCsnU76PR/cYx00eeHjuD1HU5X4="; + hash = "sha256-RZpGLFVNo3WEXVU7V2tFjRs8iYN1Ge6AN4Bcq3d6mtc="; }; buildInputs = [ fuse ]; installPhase = '' diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix index 2013f1a31d98..17d81b99859b 100644 --- a/pkgs/by-name/lk/lk-jwt-service/package.nix +++ b/pkgs/by-name/lk/lk-jwt-service/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lk-jwt-service"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "lk-jwt-service"; tag = "v${version}"; - hash = "sha256-dnlcJaGJqhFLrVvyU9hVwrE/r+wxknbnINSIfUDKC7I="; + hash = "sha256-R4YqmHp0i+RpJJkENJPZJDNCVg+O+70JMoCR8ZlesyM="; }; - vendorHash = "sha256-AGkwjzdTjfDA8K6ko24QSSxbTQeFGpu9sv5m8ZCmNJI="; + vendorHash = "sha256-evzltyQZCBQ4/k641sQrmUvw6yIBWFEic/WUa/WX5xE="; meta = with lib; { description = "Minimal service to issue LiveKit JWTs for MatrixRTC"; diff --git a/pkgs/by-name/lo/lon/package.nix b/pkgs/by-name/lo/lon/package.nix new file mode 100644 index 000000000000..9fa33e864e1f --- /dev/null +++ b/pkgs/by-name/lo/lon/package.nix @@ -0,0 +1,30 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "lon"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "nikstur"; + repo = "lon"; + tag = version; + hash = "sha256-VGvK0ahBl440NMs03WqmP7T4a1DP13yfX47YI84rlGU="; + }; + + sourceRoot = "source/rust/lon"; + + useFetchCargoVendor = true; + cargoHash = "sha256-YzQ6A1dH2D56/3inAmsE6G5rCnpWhDawxk6+FMWfhkc="; + + meta = { + description = "Lock & update Nix dependencies"; + homepage = "https://github.com/nikstur/lon"; + maintainers = with lib.maintainers; [ ma27 ]; + license = lib.licenses.mit; + mainProgram = "lon"; + }; +} diff --git a/pkgs/by-name/lo/lout/package.nix b/pkgs/by-name/lo/lout/package.nix index 4be1a8625ec0..44b01867093c 100644 --- a/pkgs/by-name/lo/lout/package.nix +++ b/pkgs/by-name/lo/lout/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "lout"; - version = "3.43"; + version = "3.43.1"; src = fetchFromGitHub { owner = "william8000"; repo = "lout"; rev = version; - hash = "sha256-YUFrlM7BnDlG1rUV90yBvWG6lOKW5qKxs/xdq6I/kI0="; + hash = "sha256-bXLhkJqhv8pftDZYv6vn9ycy5u3vde+m3gCPvWJz2M8="; }; buildInputs = [ ghostscript ]; diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 3fa3286b7182..561fb1af2ed6 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "louvre"; - version = "2.14.1-1"; + version = "2.16.0-1"; src = fetchFromGitHub { owner = "CuarzoSoftware"; repo = "Louvre"; rev = "v${finalAttrs.version}"; - hash = "sha256-fZ9lH7kfp++YONI3Kr4fJX1SsemhoJGdgz6eEeHKA6Q="; + hash = "sha256-zw/n/Q1wwTiwhk6Q3xrMl2pEFBAk/BqSa/p0LTDbGBA="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/lt/ltex-ls-plus/package.nix b/pkgs/by-name/lt/ltex-ls-plus/package.nix index 08b74fc4b9da..6bb2bccebb20 100644 --- a/pkgs/by-name/lt/ltex-ls-plus/package.nix +++ b/pkgs/by-name/lt/ltex-ls-plus/package.nix @@ -4,6 +4,7 @@ fetchurl, makeBinaryWrapper, jre_headless, + jvmOptions ? [ ], }: stdenvNoCC.mkDerivation rec { @@ -17,18 +18,22 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ makeBinaryWrapper ]; - installPhase = '' - runHook preInstall + installPhase = + let + java_opts = lib.optionalString (jvmOptions != [ ]) ''--set JAVA_OPTS "${toString jvmOptions}"''; + in + '' + runHook preInstall - mkdir -p $out - cp -rfv bin/ lib/ $out - rm -fv $out/bin/.lsp-cli.json $out/bin/*.bat - for file in $out/bin/{ltex-ls-plus,ltex-cli-plus}; do - wrapProgram $file --set JAVA_HOME "${jre_headless}" - done + mkdir -p $out + cp -rfv bin/ lib/ $out + rm -fv $out/bin/.lsp-cli.json $out/bin/*.bat + for file in $out/bin/{ltex-ls-plus,ltex-cli-plus}; do + wrapProgram $file --set JAVA_HOME "${jre_headless}" ${java_opts} + done - runHook postInstall - ''; + runHook postInstall + ''; meta = let diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index 38509eed727d..923b0a1fc417 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.13.6"; + version = "3.13.9"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; tag = finalAttrs.version; - hash = "sha256-LaetDI9kNPRY4+m3gSsh6vbysRjUKHl+zunuyedjZGY="; + hash = "sha256-zttTtMAeBsHBqgDm3CAvp54Tp2bfQUhk5/lKgKWUeJY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix index ab724cd1ef42..5e0e8dc152b4 100644 --- a/pkgs/by-name/lu/lug-helper/package.nix +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -62,7 +62,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { unzip libnotify ] - } + } \ + --prefix XDG_DATA_DIRS : "$out" ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix index f722257c9819..ffc610076e9e 100644 --- a/pkgs/by-name/lu/lunacy/package.nix +++ b/pkgs/by-name/lu/lunacy/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lunacy"; - version = "11.0"; + version = "11.1"; src = fetchurl { url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb"; - hash = "sha256-++UJiJBsb+ywLOVmmUt/YZe3yadF/8ZLIAmm6sygcQ0="; + hash = "sha256-bxJ5gvI0N55+RzFELfkr9HbB//GRiHSlLHTK7Ki0Z+c="; }; buildInputs = [ diff --git a/pkgs/by-name/ly/lyrebird/package.nix b/pkgs/by-name/ly/lyrebird/package.nix index fa70d065c157..7774c9289e5e 100644 --- a/pkgs/by-name/ly/lyrebird/package.nix +++ b/pkgs/by-name/ly/lyrebird/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; src = fetchFromGitHub { - owner = "chxrlt"; + owner = "lyrebird-voice-changer"; repo = "lyrebird"; tag = "v${version}"; sha256 = "sha256-VIYcOxvSpzRvJMzEv2i5b7t0WMF7aQxB4Y1jfvuZN/Y="; @@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Simple and powerful voice changer for Linux, written in GTK 3"; mainProgram = "lyrebird"; - homepage = "https://github.com/chxrlt/lyrebird"; + homepage = "https://github.com/lyrebird-voice-changer/lyrebird"; license = licenses.mit; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.linux; diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 691fa58d9964..d4003bc7914f 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "mago"; - version = "0.10.0"; + version = "0.20.2"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = version; - hash = "sha256-NYAlLJsKI+twrlryVumjsOnY3xvEeLTO/rAFTZtE+KU="; + hash = "sha256-XRPP57ylTLodOCzRTLO1IXLq9Yuk/vkDovSlMcushy0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0AnJIrA15WC3LPiokwuX9w9riaaL5s2vqwhj4XRa6LM="; + cargoHash = "sha256-Mlxs0ApYOOHNYEt2AWuOixLqBJrJ/++Gy+EFGsb9wKM="; env = { # Get openssl-sys to use pkg-config @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { tests.version = testers.testVersion { package = mago; command = "mago --version"; - version = "mago-cli ${version}"; + version = "mago ${version}"; }; }; diff --git a/pkgs/by-name/ma/mandown/package.nix b/pkgs/by-name/ma/mandown/package.nix index f310b34adbb3..8d0d50a64691 100644 --- a/pkgs/by-name/ma/mandown/package.nix +++ b/pkgs/by-name/ma/mandown/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "mandown"; - version = "1.0.0"; + version = "1.1.0"; src = fetchCrate { inherit pname version; - hash = "sha256-30AM/t1Qq4xydG12Nh+J1MBKNvxxD/LVTkmTchsZHLw="; + hash = "sha256-a+1tm9YlBuroTtgCL0nTjASaPiJHif89pRH0CWw7RjM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-T3cUHyKQIYTL9jMoLsq6jEiIeFZcSZuyCna7TNEjGyU="; + cargoHash = "sha256-ZyjoAvsqUyHgfEsG3+CvJatmBt0AJ2ga6HRJ8Y7her0="; meta = with lib; { description = "Markdown to groff (man page) converter"; diff --git a/pkgs/by-name/ma/mani/package.nix b/pkgs/by-name/ma/mani/package.nix index 395328e94834..b3f663dff5c7 100644 --- a/pkgs/by-name/ma/mani/package.nix +++ b/pkgs/by-name/ma/mani/package.nix @@ -1,20 +1,20 @@ { + lib, + gitMinimal, buildGoModule, fetchFromGitHub, - lib, installShellFiles, - git, makeWrapper, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mani"; version = "0.30.0"; src = fetchFromGitHub { owner = "alajmo"; repo = "mani"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-LxW9LPK4cXIXhBWPhOYWLeV5PIf+o710SWX8JVpZhPI="; }; @@ -27,8 +27,7 @@ buildGoModule rec { ldflags = [ "-s" - "-w" - "-X github.com/alajmo/mani/cmd.version=${version}" + "-X github.com/alajmo/mani/cmd.version=${finalAttrs.version}" ]; postInstall = '' @@ -38,7 +37,7 @@ buildGoModule rec { --zsh <($out/bin/mani completion zsh) wrapProgram $out/bin/mani \ - --prefix PATH : ${lib.makeBinPath [ git ]} + --prefix PATH : ${lib.makeBinPath [ gitMinimal ]} ''; # Skip tests @@ -46,17 +45,12 @@ buildGoModule rec { # know how to wrap the dependencies for these integration tests so skip for now. doCheck = false; - meta = with lib; { + meta = { + changelog = "https://github.com/alajmo/mani/releases/tag/v${finalAttrs.version}"; description = "CLI tool to help you manage multiple repositories"; + homepage = "https://manicli.com"; + license = lib.licenses.mit; mainProgram = "mani"; - longDescription = '' - mani is a CLI tool that helps you manage multiple repositories. It's useful - when you are working with microservices, multi-project systems, many - libraries or just a bunch of repositories and want a central place for - pulling all repositories and running commands over them. - ''; - homepage = "https://manicli.com/"; - changelog = "https://github.com/alajmo/mani/releases/tag/v${version}"; - license = licenses.mit; + maintainers = with lib.maintainers; [ phanirithvij ]; }; -} +}) diff --git a/pkgs/by-name/ma/marble-shell-theme/package.nix b/pkgs/by-name/ma/marble-shell-theme/package.nix index b23c2201c639..bc3e8687257d 100644 --- a/pkgs/by-name/ma/marble-shell-theme/package.nix +++ b/pkgs/by-name/ma/marble-shell-theme/package.nix @@ -3,37 +3,47 @@ stdenvNoCC, fetchFromGitHub, python3, + gnome-shell, + dconf, + writableTmpDirAsHomeHook, colors ? [ "all" ], # Default to install all available colors additionalInstallationTweaks ? [ ], # Additional installation tweaks }: + assert lib.assertMsg (colors != [ ]) "The `colors` list can not be empty"; + stdenvNoCC.mkDerivation (finalAttrs: { pname = "marble-shell-theme"; - version = "46.2.3"; + version = "47.0"; src = fetchFromGitHub { owner = "imarkoff"; repo = "Marble-shell-theme"; - rev = "5971b15d8115c60c3a16b1d219ecffd2cfcdb323"; - hash = "sha256-TX6BSS29EAi2PjL1fMvEKD12RjB9xrfqPSQsJJrUcJg="; + tag = finalAttrs.version; + hash = "sha256-+uPjwOUwrdFfBvpWtuZhe789v2xvZG3XeFyYw8HP8QM="; }; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ + python3 + gnome-shell + dconf + writableTmpDirAsHomeHook + ]; - patchPhase = '' - runHook prePatch + postPatch = '' substituteInPlace scripts/config.py \ --replace-fail "~/.themes" ".themes" - runHook postPatch ''; installPhase = '' runHook preInstall - mkdir -p $out/share/themes + python install.py ${ lib.escapeShellArgs (map (color: "--${color}") colors) } ${lib.escapeShellArgs additionalInstallationTweaks} - cp -r .themes/* $out/share/themes/ + mkdir -p $out/share + cp -r .themes $out/share/themes + runHook postInstall ''; diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix index 719eeb88bda6..878352ee473c 100644 --- a/pkgs/by-name/ma/masterpdfeditor/package.nix +++ b/pkgs/by-name/ma/masterpdfeditor/package.nix @@ -65,6 +65,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + preFixup = '' + patchelf $out/opt/masterpdfeditor/masterpdfeditor5 --add-needed libsmime3.so + ''; + meta = { description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index b6f0e14b0986..c3763b6fa674 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -7,16 +7,16 @@ buildGo124Module rec { pname = "matrix-alertmanager-receiver"; - version = "2025.3.5"; + version = "2025.3.19"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = version; - hash = "sha256-psA+tgykqnwB6Y1oQqqEQGNP4wLnEcelHF3dKFqKHtg="; + hash = "sha256-uNQU0E2QItXK5VCwFDC4tZZIIECXhas5SMSOTYj9zlo="; }; - vendorHash = "sha256-KsrDnnsLJV5bLVKeC3ytKdBCsEBWEbs9AciUjItwDwo="; + vendorHash = "sha256-u1oTutEEYZ79Ne27Tu4S5eDuUIlVamsFR2WR6O+giM8="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix index 13088cec236f..bf9d518783c3 100644 --- a/pkgs/by-name/ma/matrix-brandy/package.nix +++ b/pkgs/by-name/ma/matrix-brandy/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + libX11, SDL, }: @@ -17,6 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ + libX11 SDL ]; diff --git a/pkgs/by-name/ma/mautrix-gmessages/package.nix b/pkgs/by-name/ma/mautrix-gmessages/package.nix index c6b6982c555c..d96347f9ec1f 100644 --- a/pkgs/by-name/ma/mautrix-gmessages/package.nix +++ b/pkgs/by-name/ma/mautrix-gmessages/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mautrix-gmessages"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "gmessages"; tag = "v${version}"; - hash = "sha256-FNjFGO/4j3kLo79oU5fsYA2/yhc9cAsAGIAQ5OJ2VPE="; + hash = "sha256-qpqFWQ4ZhgzG7SG6phW6LnS52Ve1S+Ky6YtjzfBkBmE="; }; - vendorHash = "sha256-QZ16R5i0I7uvQCDpa9/0Fh3jP6TEiheenRnRUXHvYIQ="; + vendorHash = "sha256-Ps9I8WtTtrc3gSMxt4XZ/IUipZL2+kbgNfbY2PYFoa8="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix index 4dc71fdd9cd0..c81c36bf00c0 100644 --- a/pkgs/by-name/ma/mautrix-slack/package.nix +++ b/pkgs/by-name/ma/mautrix-slack/package.nix @@ -13,7 +13,7 @@ withGoolm ? false, }: let - version = "0.1.4"; + version = "0.2.0"; in buildGoModule { pname = "mautrix-slack"; @@ -23,10 +23,10 @@ buildGoModule { owner = "mautrix"; repo = "slack"; tag = "v${version}"; - hash = "sha256-MDbWvbEY8+CrUL1SnjdJ4SqyOH/5gPsEQkLnTHyJdOo="; + hash = "sha256-y6DsojQQAQkAB4puhk3DLheVvjn0puoYvzoX1H7gBEM="; }; - vendorHash = "sha256-8U6ifMLRF7PJyG3hWKgBtj/noO/eCXXD60aeB4p2W54="; + vendorHash = "sha256-1aYg6wDG2hzUshtHs9KiJDAFb4OM1oupUJAh3LR4KxY="; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index e05b96965526..4febe1647aab 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -5,6 +5,7 @@ jdk_headless, makeWrapper, stdenvNoCC, + testers, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "maven"; @@ -57,6 +58,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { maven = finalAttrs.finalPackage; } ); + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = '' + env MAVEN_OPTS="-Dmaven.repo.local=$TMPDIR/m2" \ + mvn --version + ''; + }; + }; }; meta = { diff --git a/pkgs/by-name/md/mdbook-pdf-outline/package.nix b/pkgs/by-name/md/mdbook-pdf-outline/package.nix index 1a5478582b38..137dfe791adf 100644 --- a/pkgs/by-name/md/mdbook-pdf-outline/package.nix +++ b/pkgs/by-name/md/mdbook-pdf-outline/package.nix @@ -6,12 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "mdbook-pdf-outline"; - version = "0.1.4"; + version = "0.1.6"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-STi+54iT+5+Xi0IzGXv2dxVS91+T6fjg3xmbJjekpPE="; + inherit version; + pname = "mdbook_pdf_outline"; + hash = "sha256-GPTDlgYpfPtcq+rJCjxgexfViYiqHoVZ8iQkyWXNogw="; }; nativeBuildInputs = [ @@ -26,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/HollowMan6/mdbook-pdf"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ nix-julia ]; + maintainers = with maintainers; [ hollowman6 ]; }; } diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 1a54785575a3..cd6c6ebe79b9 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -9,7 +9,7 @@ installShellFiles, }: let - version = "0.4.45"; + version = "0.4.47"; in rustPlatform.buildRustPackage rec { inherit version; @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = "mdBook"; tag = "v${version}"; - hash = "sha256-LgjJUz1apE1MejVjl4/5O6ISpnGkBXY33g6xfoukZxA="; + hash = "sha256-XTvC2pGRVat0kOybNb9TziG32wDVexnFx2ahmpUFmaA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; allowGitDependencies = false; - hash = "sha256-+7fC6cq6NQIUPtmNc5S5y4lRIS47v0tg1ru/AAYA6TM="; + hash = "sha256-ASPRBAB+elJuyXpPQBm3WI97wD3mjoO1hw0fNHc+KAw="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix index 309b4abe50c5..af2ed13dce4b 100644 --- a/pkgs/by-name/me/mediagoblin/package.nix +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -15,6 +15,12 @@ let celery = prev.celery.overridePythonAttrs { doCheck = false; }; + + kombu = prev.kombu.overridePythonAttrs { + # avoid conflicts with test only dependencies + doCheck = false; + }; + sqlalchemy = prev.sqlalchemy_1_4; }; }; diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 94db2dd0f64a..8c8159dec617 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "1.0rc-unstable-2025-02-21"; + version = "1.0rc-unstable-2025-03-09"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "63b468927e1c744e21057ccb4c5677f52502b442"; - hash = "sha256-LylUfcgYC3CZTycfq/qqEAZ4ajrj90bUSXAkA9SbMqE="; + rev = "0fcf1f6e3a443cb249f85d948ff6e58dc58501d6"; + hash = "sha256-llRmW596UHs/q/DjqG8qQ1RqjvmGMsOO1IUkpjPW4h4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/meme-suite/package.nix b/pkgs/by-name/me/meme-suite/package.nix index 82ca6c340057..90047ee65d5a 100644 --- a/pkgs/by-name/me/meme-suite/package.nix +++ b/pkgs/by-name/me/meme-suite/package.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Motif-based sequence analysis tools"; + homepage = "https://meme-suite.org/meme/meme-software/"; license = licenses.unfree; maintainers = with maintainers; [ gschwartz ]; platforms = platforms.linux; diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index 505f65621dfe..13e23aa57f11 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "meowlnir"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "maunium"; repo = "meowlnir"; tag = "v${version}"; - hash = "sha256-Fzi9KI6bPrmKMku176rAnLpfVcAjYlKUQ8MiSQB9hpU="; + hash = "sha256-ig803e4onU3E4Nj5aJo2+QfwZt12iKIJ7fS/BjXsojc="; }; buildInputs = [ olm ]; - vendorHash = "sha256-G1+KDssamPRFlGs/moBk0qJDT/IctiKgnM+mVfCDMwg="; + vendorHash = "sha256-+P7tlpGTo9N+uSn22uAlzyB36hu3re+KfOe3a/uzLZE="; doCheck = true; doInstallCheck = true; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index b8acdb939ab7..bdefa68e0390 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -144,6 +144,7 @@ python3.pkgs.buildPythonApplication rec { ''; setupHook = ./setup-hook.sh; + env.hostPlatform = stdenv.targetPlatform.system; meta = { homepage = "https://mesonbuild.com"; diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index 1885265eabbf..5aa5b7ed3c02 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -26,6 +26,11 @@ mesonConfigurePhase() { "--buildtype=${mesonBuildType:-plain}" ) + # --no-undefined is universally a bad idea on freebsd because environ is in the csu + if [[ "@hostPlatform@" == *-freebsd ]]; then + flagsArray+=("-Db_lundef=false") + fi + concatTo flagsArray mesonFlags mesonFlagsArray echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}" diff --git a/pkgs/by-name/me/meteor-git/package.nix b/pkgs/by-name/me/meteor-git/package.nix index 94371fa8b855..7123b8860b73 100644 --- a/pkgs/by-name/me/meteor-git/package.nix +++ b/pkgs/by-name/me/meteor-git/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "meteor-git"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "stefanlogue"; repo = "meteor"; rev = "v${version}"; - hash = "sha256-2VeCbxHQNV2gNsRs7JVdSRmKI1pYZzW+amybrSRcjGY="; + hash = "sha256-DWnwofNJhILdVITRDh8MNlGl6PSENCS2PkaFm1o+MW8="; }; vendorHash = "sha256-jKd/eJwp5SZvTrP3RN7xT7ibAB0PQondGR3RT+HQXIo="; diff --git a/pkgs/by-name/me/meterbridge/package.nix b/pkgs/by-name/me/meterbridge/package.nix index 3d285d4d8bc4..7b6e59fc55a8 100644 --- a/pkgs/by-name/me/meterbridge/package.nix +++ b/pkgs/by-name/me/meterbridge/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, pkg-config, + libGL, SDL, SDL_image, libjack2, @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ + libGL SDL SDL_image libjack2 diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 719b3ad7f5b4..d8194599d9d5 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -174,11 +174,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "134.0.3124.51"; + version = "134.0.3124.68"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-i7C6Q4uCBZnIyd2LA+Kws5/WxHZaoz/UxgN9AtZCtuo="; + hash = "sha256-zjN8ssVeR3yyw+e6tVzcrrYkLToo8Rmm4GjcG9iQMpk="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index 329687f31a4b..eff21c563892 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-F7YawlcIH/V+qudXjfFKIrVNjds+fhw6BdlCe2VDdUc="; + hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; diff --git a/pkgs/by-name/mi/miktex/find-exectables-in-path.patch b/pkgs/by-name/mi/miktex/find-exectables-in-path.patch new file mode 100644 index 000000000000..e7af14278a6a --- /dev/null +++ b/pkgs/by-name/mi/miktex/find-exectables-in-path.patch @@ -0,0 +1,20 @@ +diff --git a/Libraries/MiKTeX/Core/Session/filetypes.cpp b/Libraries/MiKTeX/Core/Session/filetypes.cpp +index 82e55382f..84ac206e9 100644 +--- a/Libraries/MiKTeX/Core/Session/filetypes.cpp ++++ b/Libraries/MiKTeX/Core/Session/filetypes.cpp +@@ -198,6 +198,15 @@ void SessionImpl::RegisterFileType(FileType fileType) + searchPath.push_back(myPrefixBinCanon.ToString()); + } + #endif ++ if (Utils::GetEnvironmentString("PATH", str)) ++ { ++ PathName binDir(str); ++ binDir.Canonicalize(); ++ if (std::find(searchPath.begin(), searchPath.end(), binDir.ToString()) == searchPath.end()) ++ { ++ searchPath.push_back(binDir.ToString()); ++ } ++ } + break; + } + case FileType::OTF: diff --git a/pkgs/by-name/mi/miktex/package.nix b/pkgs/by-name/mi/miktex/package.nix new file mode 100644 index 000000000000..2085ee7676e6 --- /dev/null +++ b/pkgs/by-name/mi/miktex/package.nix @@ -0,0 +1,247 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + runCommand, + writeText, + biber, + + # nativeBuildInputs + bison, + cmake, + curl, + flex, + fop, + libxslt, + pkg-config, + writableTmpDirAsHomeHook, + + # buildInputs + apr, + aprutil, + boost, + bzip2, + cairo, + expat, + fontconfig, + freetype, + fribidi, + gd, + gmp, + graphite2, + harfbuzzFull, + hunspell, + libjpeg, + log4cxx, + xz, + mpfr, + mpfi, + libmspack, + libressl, + pixman, + libpng, + popt, + uriparser, + zziplib, + qt6Packages, +}: +let + # This is needed for some bootstrap packages. + webArchivePrefix = "https://web.archive.org/web/20250323131915if_"; + miktexRemoteRepository = "https://ctan.org/tex-archive/systems/win32/miktex/tm/packages"; + miktexLocalRepository = + runCommand "miktex-local-repository" + { + src1 = fetchurl { + url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-zzdb1-2.9.tar.lzma"; + hash = "sha256-XYhbKlxhVSOlCcm0IOs2ddFgAt/CWXJoY6IuLSw74y4="; + }; + src2 = fetchurl { + url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-zzdb3-2.9.tar.lzma"; + hash = "sha256-5vLuGwjddqtJ5F/DtVKuRVRqgGNbkGFxRF41cXwseIs="; + }; + src3 = fetchurl { + url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-config-2.9.tar.lzma"; + hash = "sha256-fkh5KL+BU+gl8Sih8xBLi1DOx2vMuSflXlSTchjlGWQ="; + }; + src4 = fetchurl { + url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-dvips.tar.lzma"; + hash = "sha256-eJQdLhYetNlXAyyiGD/JRDA3fv0BbALwXtNfRxkLM7o="; + }; + src5 = fetchurl { + url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-fontconfig.tar.lzma"; + hash = "sha256-dxH/0iIL3SnjCSXLGAcNTb5cGJb5AQmV/JbH5CcPHdk="; + }; + src6 = fetchurl { + url = "${webArchivePrefix}/${miktexRemoteRepository}/miktex-misc.tar.lzma"; + hash = "sha256-ysNREvnKWseqqN59cwNzlV21UmccbjSGFyno8lv2H+M="; + }; + src7 = fetchurl { + url = "${webArchivePrefix}/${miktexRemoteRepository}/tetex.tar.lzma"; + hash = "sha256-DE1o66r2SFxxxuYeCRuFn6L1uBn26IFnje9b/qeVl6Q="; + }; + } + '' + mkdir $out + cp $src1 $out/miktex-zzdb1-2.9.tar.lzma + cp $src2 $out/miktex-zzdb3-2.9.tar.lzma + cp $src3 $out/miktex-config-2.9.tar.lzma + cp $src4 $out/miktex-dvips.tar.lzma + cp $src5 $out/miktex-fontconfig.tar.lzma + cp $src6 $out/miktex-misc.tar.lzma + cp $src7 $out/tetex.tar.lzma + ''; +in +stdenv.mkDerivation (finalAttrs: { + pname = "miktex"; + version = "25.2"; + + src = fetchFromGitHub { + owner = "miktex"; + repo = "miktex"; + tag = finalAttrs.version; + hash = "sha256-egN9+BRO/EAcbrn/jZac4Lb79H5N/LEjReMPGHVM/yM="; + }; + + patches = [ + ./startup-config-support-nix-store.patch + # Miktex will search exectables in "GetMyPrefix(true)/bin". + # The path evalutate to "/usr/bin" in FHS style linux distrubution, + # compared to "/nix/store/.../bin" in NixOS. + # As a result, miktex will fail to find e.g. 'pkexec','ksudo','gksu' + # under /run/wrappers/bin in NixOS. + # We fix this by adding the PATH environment variable to exectables' search path. + ./find-exectables-in-path.patch + ]; + + postPatch = + '' + # dont symlink fontconfig to /etc/fonts/conf.d + substituteInPlace Programs/MiKTeX/miktex/topics/fontmaps/commands/FontMapManager.cpp \ + --replace-fail 'this->ctx->session->IsAdminMode()' 'false' + + substituteInPlace \ + Libraries/MiKTeX/App/app.cpp \ + Programs/Editors/TeXworks/miktex/miktex-texworks.cpp \ + Programs/MiKTeX/Console/Qt/main.cpp \ + Programs/MiKTeX/PackageManager/mpm/mpm.cpp \ + Programs/MiKTeX/Yap/MFC/StdAfx.h \ + Programs/MiKTeX/initexmf/initexmf.cpp \ + Programs/MiKTeX/miktex/miktex.cpp \ + --replace-fail "log4cxx/rollingfileappender.h" "log4cxx/rolling/rollingfileappender.h" + + substitute cmake/modules/FindPOPPLER_QT5.cmake \ + cmake/modules/FindPOPPLER_QT6.cmake \ + --replace-fail "QT5" "QT6" \ + --replace-fail "qt5" "qt6" + + substituteInPlace Programs/TeXAndFriends/omega/otps/source/outocp.c \ + --replace-fail 'fprintf(stderr, s);' 'fprintf(stderr, "%s", s);' + '' + # This patch fixes mismatch char types (signed int and unsigned int) on aarch64-linux platform. + # Should not be applied to other platforms otherwise the build will fail. + + lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) '' + sed -i 's/--using-namespace=MiKTeX::TeXAndFriends/& --chars-are-unsigned/g' \ + Programs/TeXAndFriends/Knuth/web/CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + bison + cmake + curl + flex + fop + libxslt + pkg-config + writableTmpDirAsHomeHook + qt6Packages.wrapQtAppsHook + qt6Packages.qttools + qt6Packages.qt5compat + ]; + + buildInputs = [ + apr + aprutil + boost + bzip2 + cairo + expat + fontconfig + freetype + fribidi + gd + gmp + graphite2 + harfbuzzFull + hunspell + libjpeg + log4cxx + xz + mpfr + mpfi + libmspack + libressl + pixman + libpng + popt + uriparser + zziplib + qt6Packages.poppler + ]; + + cmakeFlags = [ + (lib.cmakeBool "WITH_BOOTSTRAPPING" true) + (lib.cmakeBool "USE_SYSTEM_POPPLER" true) + (lib.cmakeBool "USE_SYSTEM_POPPLER_QT" true) + (lib.cmakeBool "MIKTEX_SELF_CONTAINED" false) + # Miktex infers install prefix by stripping CMAKE_INSTALL_BINDIR from the called program. + # It should not be set to absolute path in default cmakeFlags, otherwise an infinite loop will happen. + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_LIBEXECDIR" "libexec") + (lib.cmakeFeature "MIKTEX_SYSTEM_LINK_TARGET_DIR" "${placeholder "out"}/bin") + (lib.cmakeFeature "MIKTEX_USER_LINK_TARGET_DIR" "${placeholder "out"}/bin") + ]; + + env = { + LANG = "C.UTF-8"; + MIKTEX_REPOSITORY = "file://${miktexLocalRepository}/"; + }; + + enableParallelBuilding = false; + + enableParallelChecking = false; + + doCheck = true; + + # Todo: figure out the exact binary to be Qt wrapped. + dontWrapQtApps = true; + + postFixup = + '' + wrapQtApp $out/bin/miktex-console + wrapQtApp $out/bin/miktex-texworks + $out/bin/miktexsetup finish --verbose + '' + # Biber binary is missing on ctan.org for aarch64-linux platform. + + lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) '' + ln -sf ${biber}/bin/biber $out/bin/biber + ''; + + meta = { + description = "A modern TeX distribution"; + homepage = "https://miktex.org"; + platforms = lib.platforms.linux; + license = with lib.licenses; [ + lppl13c + gpl2Plus + gpl3Plus + publicDomain + ]; + maintainers = with lib.maintainers; [ + qbisi + ]; + }; +}) diff --git a/pkgs/by-name/mi/miktex/startup-config-support-nix-store.patch b/pkgs/by-name/mi/miktex/startup-config-support-nix-store.patch new file mode 100644 index 000000000000..1b414366583c --- /dev/null +++ b/pkgs/by-name/mi/miktex/startup-config-support-nix-store.patch @@ -0,0 +1,40 @@ +diff --git a/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp b/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp +index 1728e7af9..727c36d8c 100644 +--- a/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp ++++ b/Libraries/MiKTeX/Core/Session/unx/unxStartupConfig.cpp +@@ -90,6 +90,10 @@ InternalStartupConfig SessionImpl::DefaultConfig(MiKTeXConfiguration config, Ver + { + pos = n - 2; + } ++ else if (n > 3 && splittedPrefix[1] == "nix" && splittedPrefix[2] == "store") ++ { ++ pos = 1; ++ } + if (pos < n) + { + PathName destdir; +@@ -98,10 +102,10 @@ InternalStartupConfig SessionImpl::DefaultConfig(MiKTeXConfiguration config, Ver + destdir /= splittedPrefix[i]; + } + MIKTEX_ASSERT(MIKTEX_SYSTEM_VAR_LIB_DIR[0] == '/'); +- ret.commonConfigRoot = destdir / (MIKTEX_SYSTEM_VAR_LIB_DIR + 1) / MIKTEX_PREFIX "texmf"; ++ ret.commonConfigRoot = destdir / (MIKTEX_SYSTEM_VAR_LIB_DIR + 1) / MIKTEX_PREFIX "texmf" / "config"; + MIKTEX_ASSERT(MIKTEX_SYSTEM_VAR_CACHE_DIR[0] == '/'); + ret.commonDataRoot = destdir / (MIKTEX_SYSTEM_VAR_CACHE_DIR + 1) / MIKTEX_PREFIX "texmf"; +- ret.commonInstallRoot = destdir / "usr" / "local" / MIKTEX_INSTALL_DIR; ++ ret.commonInstallRoot = destdir / (MIKTEX_SYSTEM_VAR_LIB_DIR + 1) / MIKTEX_PREFIX "texmf" / "install"; + } + #endif + if (ret.commonConfigRoot.Empty()) +@@ -124,9 +128,9 @@ InternalStartupConfig SessionImpl::DefaultConfig(MiKTeXConfiguration config, Ver + + PathName myLoc = GetMyLocation(true); + #if defined(MIKTEX_MACOS_BUNDLE) +- ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/Applications"), myLoc) ? TriState::True : TriState::False; ++ ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/nix/store"), myLoc) || Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/Applications"), myLoc) ? TriState::True : TriState::False; + #else +- ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/opt"), myLoc) ? TriState::True : TriState::False; ++ ret.isSharedSetup = Utils::IsParentDirectoryOf(PathName("/nix/store"), myLoc) || Utils::IsParentDirectoryOf(PathName("/usr"), myLoc) || Utils::IsParentDirectoryOf(PathName("/opt"), myLoc) ? TriState::True : TriState::False; + #endif + + return ret; diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix index 3b19b4f8ccd2..10dfb82e2190 100644 --- a/pkgs/by-name/mi/mill/package.nix +++ b/pkgs/by-name/mi/mill/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mill"; - version = "0.12.8"; + version = "0.12.9"; src = fetchurl { url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/${finalAttrs.version}/mill-dist-${finalAttrs.version}-assembly.jar"; - hash = "sha256-l+DaOvk7Tajla9IirLfEIij6thZcKI4Zk7wYLnnsiU8="; + hash = "sha256-Ntqzivy8dfsRlBclPNsWOZ4h1Xk7D3UJV7GLVGIEcAU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mi/millet/package.nix b/pkgs/by-name/mi/millet/package.nix index 228a2f7385eb..7bfce8ce574b 100644 --- a/pkgs/by-name/mi/millet/package.nix +++ b/pkgs/by-name/mi/millet/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.14.3"; + version = "0.14.8"; src = fetchFromGitHub { owner = "azdavis"; repo = "millet"; rev = "v${version}"; - hash = "sha256-V1FToLhBzeZd3ve+eKAHniHN6oveEg0FBHnkSZPxBqo="; + hash = "sha256-bsbdyrSRWTVSoNUg3Uns12xRGmA/EdSf+9I1tiQruSU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-49dJ1USxdGK8WmPmO3z8Tkexjn4xi+qJRxawqFeIQBg="; + cargoHash = "sha256-hT7YjJGn2UvWxShdLD7VeKU6OGu8kYAIRHmORY/pAEM="; postPatch = '' rm .cargo/config.toml diff --git a/pkgs/by-name/mi/milu/package.nix b/pkgs/by-name/mi/milu/package.nix index bed794be48bc..c77fd35ad05b 100644 --- a/pkgs/by-name/mi/milu/package.nix +++ b/pkgs/by-name/mi/milu/package.nix @@ -5,6 +5,7 @@ unzip, pkg-config, glib, + llvm, llvmPackages, }: @@ -13,32 +14,44 @@ stdenv.mkDerivation { version = "2016-05-09"; src = fetchFromGitHub { - sha256 = "14cglw04cliwlpvw7qrs6rfm5sv6qa558d7iby5ng3wdjcwx43nk"; - rev = "b5f2521859c0319d321ad3c1ad793b826ab5f6e1"; - repo = "Milu"; owner = "yuejia"; + repo = "Milu"; + rev = "b5f2521859c0319d321ad3c1ad793b826ab5f6e1"; + hash = "sha256-0w7SOZONj2eLX/E0VIrCZutSXTY648P3pTxSRgCnj5E="; }; hardeningDisable = [ "format" ]; preConfigure = '' - sed -i 's#/usr/bin/##g' Makefile - ''; - - installPhase = '' - mkdir -p $out/bin - cp bin/milu $out/bin + substituteInPlace Makefile \ + --replace-fail /usr/bin/ "" \ + --replace-fail bin/milu $out/bin/milu ''; nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ glib + llvm.dev llvmPackages.libclang ]; + preBuild = '' + mkdir -p $out/bin + ''; + + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-incompatible-pointer-types" + "-Wno-implicit-function-declaration" + "-Wno-error=int-conversion" + ]; + + # `make all` already installs the binaries + dontInstall = true; + meta = { description = "Higher Order Mutation Testing Tool for C and C++ programs"; homepage = "https://github.com/yuejia/Milu"; diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix index 7bc0723a3044..2eeb9e166389 100644 --- a/pkgs/by-name/mi/mim-solvers/package.nix +++ b/pkgs/by-name/mi/mim-solvers/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mim-solvers"; - version = "0.0.5"; + version = "0.1.0"; src = fetchFromGitHub { owner = "machines-in-motion"; repo = "mim_solvers"; rev = "v${finalAttrs.version}"; - hash = "sha256-XV8EJqCOTYqljZe2PQvnhIaPUOJ+bBjRIoshdeqZycA="; + hash = "sha256-jUL/kyXKODpcCURG7e7/qNarvwm4+EnzZRL2Wix5Jbs="; }; # eigenpy is not used without python support diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix index dce607c82b21..e64a77a7c1f2 100644 --- a/pkgs/by-name/mi/minify/package.nix +++ b/pkgs/by-name/mi/minify/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "minify"; - version = "2.21.3"; + version = "2.22.2"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-WnkC6wydFDZDt6tPpsDipK/6Hwj3lfzx+20nDTUfn7g="; + hash = "sha256-pwAILZTSYk+AUi/XwC3bvK3KxZJkmCSprG9sbIhtdCc="; }; - vendorHash = "sha256-jZJpaUsHLjPrVTzzxfb9oqm8d6LM28OKdm1v4m7zxC8="; + vendorHash = "sha256-PxmtYVMkZcJvaM9CYSy5OSUkpyhL1VLwkXoY7uIe7Q8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index aec8d8c07e77..f68e39526313 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -23,17 +23,17 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2025.2.7"; + version = "2025.3.6"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-PvZCKi6fvEc0J5SzDazMkf2SS3+r0DTXM6NWCPi95J0="; + hash = "sha256-wp/C7RrMcpk/BFath9zZbEMzhQWFYagnT2zimnPRpPI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qVs1PogSDfMCVgfvgqLltqiGl7yvO+d4Ly0oeQpSftw="; + cargoHash = "sha256-49C4MzvGUiO16kNEKoHtlvkOxG16jsD2iW5upaVuYGI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mo/mod/package.nix b/pkgs/by-name/mo/mod/package.nix index 2a866dbd54d5..3e631c81e2b9 100644 --- a/pkgs/by-name/mo/mod/package.nix +++ b/pkgs/by-name/mo/mod/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mod"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "sha256-QkLARUN/NiN0D6VEhosdFJSce6DP+sWRWFwAEocZaOQ="; + sha256 = "sha256-P0FE0Sl4IXH6DAETnlBwQ2CR0X0AP9Z0noW99By7mxU="; }; - vendorHash = "sha256-5A4W99wcuXMWH0s+uykBWuKCxo8wr3GbTpUKj+Ql0os="; + vendorHash = "sha256-GiE2RNAxbKpIekn54bfYlNvIcQo8D3ysmPSvxQhujYI="; doCheck = false; diff --git a/pkgs/by-name/mo/moq/package.nix b/pkgs/by-name/mo/moq/package.nix index dad45fddff90..6d2b85be6675 100644 --- a/pkgs/by-name/mo/moq/package.nix +++ b/pkgs/by-name/mo/moq/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moq"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "matryer"; repo = "moq"; rev = "v${version}"; - sha256 = "sha256-Y81EPb0h66lx3ISJsfb6iUqek/Ztni8ZITHtn5h34jU="; + sha256 = "sha256-Yk0lGu6wHF5OBFx/yZPJr3h3DVMvyBV8pi5eSxl7hpw="; }; vendorHash = "sha256-Mwx2Z2oVFepNr911zERuoM79NlpXu13pVpXPJox86BA="; diff --git a/pkgs/by-name/mp/mp3fs/package.nix b/pkgs/by-name/mp/mp3fs/package.nix index 6a98b78348b8..0e9ee3fd0bac 100644 --- a/pkgs/by-name/mp/mp3fs/package.nix +++ b/pkgs/by-name/mp/mp3fs/package.nix @@ -10,6 +10,7 @@ autoreconfHook, pkg-config, pandoc, + zlib, }: stdenv.mkDerivation rec { @@ -25,21 +26,23 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/mp3fs.cc \ - --replace "#include " "" \ - --replace "osxfuse_version()" "fuse_version()" + --replace-fail "#include " "" \ + --replace-fail "osxfuse_version()" "fuse_version()" ''; + nativeBuildInputs = [ + autoreconfHook + pkg-config + pandoc + ]; + buildInputs = [ flac fuse lame libid3tag libvorbis - ]; - nativeBuildInputs = [ - autoreconfHook - pkg-config - pandoc + zlib ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index 838d8aedf374..a7fdd5940e1f 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -8,7 +8,7 @@ let pname = "mqttx"; - version = "1.10.1"; + version = "1.11.1"; suffixedUrl = suffix: @@ -16,11 +16,11 @@ let sources = { "aarch64-linux" = fetchurl { url = suffixedUrl "-arm64"; - hash = "sha256-QumOqOOFXOXf0oqXWVaz0+69kHDk3HQKvNcQl8X7Fp8="; + hash = "sha256-gRR0gFHqIPXOrSytqERAi7msfrrYXm2xP84Jy+UhrKg="; }; "x86_64-linux" = fetchurl { url = suffixedUrl ""; - hash = "sha256-+TyZnx3/qraoA3rcpIDKedGyTzFvdaAE/v4pzXrB0zU="; + hash = "sha256-rqzh4whp8NaeQb98mKTu+hL3RXQBEOKgvJKwLhzu+hg="; }; }; @@ -35,6 +35,8 @@ in appimageTools.wrapType2 { inherit pname version src; + extraPkgs = pkgs: [ pkgs.xorg.libxshmfence ]; + extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png @@ -43,7 +45,7 @@ appimageTools.wrapType2 { install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; meta = with lib; { diff --git a/pkgs/by-name/mu/mud/package.nix b/pkgs/by-name/mu/mud/package.nix index a8109b0208df..b67867c11517 100644 --- a/pkgs/by-name/mu/mud/package.nix +++ b/pkgs/by-name/mu/mud/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "mud"; - version = "1.0.11"; + version = "1.0.12"; pyproject = true; src = fetchFromGitHub { owner = "jasursadikov"; repo = "mud"; tag = "v${version}"; - hash = "sha256-HnYBHfburJuA/yRV4Nb8HApi7kfkONh5N9t221GOxMw="; + hash = "sha256-fFSnkodYhV1dokCJq43PwXxjIeAkObYZA3VxhjGZlhM="; }; build-system = with python3Packages; [ @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { description = "multi-directory git runner which allows you to run git commands in a multiple repositories"; homepage = "https://github.com/jasursadikov/mud"; license = lib.licenses.mit; - changelog = "https://github.com/jasursadikov/mud/releases/tag/v${version}"; + changelog = "https://github.com/jasursadikov/mud/releases/tag/${src.tag}"; maintainers = with lib.maintainers; [ genga898 ]; mainProgram = "mud"; }; diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix index 45a434c5521d..9a9d1019e5cb 100644 --- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix +++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix @@ -22,6 +22,7 @@ nss, pango, xorg, + writeScript, }: let id = "232635194"; @@ -93,6 +94,30 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = writeScript "update-multiviewer-for-f1" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + set -eu -o pipefail + + # Get latest API for packages, store so we only make one request + latest=$(curl -s "https://api.multiviewer.app/api/v1/releases/latest/") + + # From the downloaded JSON extract the url, version and id + link=$(echo $latest | jq -r '.downloads[] | select(.platform=="linux_deb").url') + id=$(echo $latest | jq -r '.downloads[] | select(.platform=="linux_deb").id') + version=$(echo $latest | jq -r '.version') + + if [ "$version" != "${version}" ] + then + # Pre-calculate package hash + hash=$(nix-prefetch-url --type sha256 $link) + + # Update ID and version in source + update-source-version ${pname} "$id" --version-key=id + update-source-version ${pname} "$version" "$hash" --system=x86_64-linux + fi + ''; + meta = with lib; { description = "Unofficial desktop client for F1 TV®"; homepage = "https://multiviewer.app"; diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 1b649272aa04..b3f498918b3d 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -9,17 +9,17 @@ buildGoModule rec { pname = "museum"; - version = "0.9.98"; + version = "0.9.99"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; rev = "photos-v${version}"; - hash = "sha256-yC0bt7TUO4agvkWtd7Q0DuPlgFngQynSKaCZ4eaBWdE="; + hash = "sha256-+EL81zSOjoBfew8LRl0awWXgc2r8KDBBCYBBtDU1s5g="; }; - vendorHash = "sha256-loq/YPf+oMWJ6FgtZsgJqkUQhCG8wL7F3kDblKbrc/c="; + vendorHash = "sha256-px4pMqeH73Fe06va4+n6hklIUDMbPmAQNKKRIhwv6ec="; sourceRoot = "${src.name}/server"; diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index f1806ca87403..2f791317ed7e 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -89,8 +89,10 @@ bidict snapcast ]; - sonos = ps: [ - ]; # missing aiosonos + sonos = + ps: with ps; [ + aiosonos + ]; sonos_s1 = ps: with ps; [ defusedxml diff --git a/pkgs/by-name/na/naev/package.nix b/pkgs/by-name/na/naev/package.nix index 9f52a1b623cb..e94414ba8bc2 100644 --- a/pkgs/by-name/na/naev/package.nix +++ b/pkgs/by-name/na/naev/package.nix @@ -77,6 +77,12 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py + + # Add a missing include to fix the build against luajit-2.1.1741730670. + # Otherwise the build fails as: + # src/lutf8lib.c:421:22: error: 'INT_MAX' undeclared (first use in this function) + # TODO: drop after 0.12.3 release + sed -i '1i#include ' src/lutf8lib.c ''; meta = { diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix index 7008db74155f..0531e6a0a795 100644 --- a/pkgs/by-name/na/nats-server/package.nix +++ b/pkgs/by-name/na/nats-server/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.26"; + version = "2.11.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-jOfS1uHI8sTL7xTyIiK/M7bFFNLTZZ6+Xy5QErBe9VY="; + hash = "sha256-9t5DOLZU2VcEBggirf+aLzwzsDBB+uGGXlBkIKP3HkE="; }; - vendorHash = "sha256-9BkcN4XLQPc9Df6m/CssKYxUk1nKJHB5SRPMrsXd+lQ="; + vendorHash = "sha256-CvxAP35/hinewnNhrW9urI0J3DI5QfZybbyRbz9Ol4s="; doCheck = false; diff --git a/pkgs/by-name/nb/nbdkit/package.nix b/pkgs/by-name/nb/nbdkit/package.nix index f31e9bc56888..5a2adb276b48 100644 --- a/pkgs/by-name/nb/nbdkit/package.nix +++ b/pkgs/by-name/nb/nbdkit/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "nbdkit"; - version = "1.42.0"; + version = "1.42.1"; src = fetchurl { url = "https://download.libguestfs.org/nbdkit/${lib.versions.majorMinor finalAttrs.version}-stable/nbdkit-${finalAttrs.version}.tar.gz"; - hash = "sha256-m5IzOExW2otMTVEBp989W4mN9Fx529p3MoGKw0GPSJo="; + hash = "sha256-Azi8dD59OLKrl0xakd92QdPHVdNYUyJ3FbclJqCZ4KE="; }; prePatch = '' diff --git a/pkgs/by-name/nc/nc4nix/package.nix b/pkgs/by-name/nc/nc4nix/package.nix index 7cf9d4f35e53..904d6582b94a 100644 --- a/pkgs/by-name/nc/nc4nix/package.nix +++ b/pkgs/by-name/nc/nc4nix/package.nix @@ -26,6 +26,6 @@ buildGoModule { homepage = "https://github.com/helsinki-systems/nc4nix"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ onny ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/nd/ndpi/package.nix b/pkgs/by-name/nd/ndpi/package.nix index 134487ef4e96..ffade02b5b4a 100644 --- a/pkgs/by-name/nd/ndpi/package.nix +++ b/pkgs/by-name/nd/ndpi/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ndpi"; - version = "4.12"; + version = "4.10"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; tag = finalAttrs.version; - hash = "sha256-jdyKvM/Tb9pRWQPxpB/UQOOKamWrTS24Ofc3M5M1Zso="; + hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/nestopia-ue/package.nix b/pkgs/by-name/ne/nestopia-ue/package.nix index 75798e3d18c4..ede0fc010cc6 100644 --- a/pkgs/by-name/ne/nestopia-ue/package.nix +++ b/pkgs/by-name/ne/nestopia-ue/package.nix @@ -13,6 +13,7 @@ libepoxy, makeWrapper, pkg-config, + libsamplerate, stdenv, unzip, wrapGAppsHook3, @@ -21,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nestopia"; - version = "1.52.1"; + version = "1.53.0"; src = fetchFromGitHub { owner = "0ldsk00l"; repo = "nestopia"; rev = finalAttrs.version; - hash = "sha256-r8Z0Ejf5vWcdvxkUkUKJtipQIRoiwoRj0Bx06Gnxd08="; + hash = "sha256-C2uiC8zlleXQlThrRETJa9vu++mJy1ySJKAkgu5zuxc="; }; buildInputs = [ @@ -41,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { libarchive libao xdg-utils + libsamplerate ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix index 52bba0b2c1fe..cefb43112bba 100644 --- a/pkgs/by-name/ne/netavark/package.nix +++ b/pkgs/by-name/ne/netavark/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "containers"; repo = "netavark"; rev = "v${version}"; - hash = "sha256-/95tYUqjIPoyO2+YGza9RJ88YAbsIOzEB//d2FXfNZY="; + hash = "sha256-kAJOfZ4Q1EQ+JV1izXoLe/Z/qgxbzz3WbczM4fVhxfU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6XSKuohY7gpnGmRK/Y+c3+0es/KRbkXjt5XQU/HksQ0="; + cargoHash = "sha256-MdKTGLNf+7SzdkQNLOWgfmSE9TNLYzPFU0oXh6MnW5w="; nativeBuildInputs = [ installShellFiles mandown protobuf go-md2man ]; diff --git a/pkgs/by-name/ne/netbird-ui/package.nix b/pkgs/by-name/ne/netbird-ui/package.nix new file mode 100644 index 000000000000..8a5ad19846b0 --- /dev/null +++ b/pkgs/by-name/ne/netbird-ui/package.nix @@ -0,0 +1,5 @@ +{ netbird }: + +netbird.override { + ui = true; +} diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/by-name/ne/netbird/package.nix similarity index 66% rename from pkgs/tools/networking/netbird/default.nix rename to pkgs/by-name/ne/netbird/package.nix index 4325ad1a5210..121728929232 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -12,13 +12,9 @@ libX11, libXcursor, libXxf86vm, - Cocoa, - IOKit, - Kernel, - UserNotifications, - WebKit, ui ? false, netbird-ui, + versionCheckHook, }: let modules = @@ -33,43 +29,35 @@ let signal = "netbird-signal"; }; in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "netbird"; - version = "0.37.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; - tag = "v${version}"; - hash = "sha256-5+R0Y/xPgnVH53p1vtY65tOqePWQVOMR4oY1yOOFHK4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-8uxRR8XkomUB9dMN9h1M4/K09wxy5E+XhXVbNc0g6xQ="; }; - vendorHash = "sha256-DGvDkkdM8WaaR5FQwZgKn2n1JEDeqUegZxeAIxniJ5A="; + vendorHash = "sha256-m5ou5p2/ubDDMLr0M2F+9qgkqKjhXRJ6HpizwxJhmtU="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; - buildInputs = - lib.optionals (stdenv.hostPlatform.isLinux && ui) [ - gtk3 - libayatana-appindicator - libX11 - libXcursor - libXxf86vm - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && ui) [ - Cocoa - IOKit - Kernel - UserNotifications - WebKit - ]; + buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && ui) [ + gtk3 + libayatana-appindicator + libX11 + libXcursor + libXxf86vm + ]; subPackages = lib.attrNames modules; ldflags = [ "-s" "-w" - "-X github.com/netbirdio/netbird/version.version=${version}" + "-X github.com/netbirdio/netbird/version.version=${finalAttrs.version}" "-X main.builtBy=nix" ]; @@ -100,31 +88,38 @@ buildGoModule rec { ) modules ) + lib.optionalString (stdenv.hostPlatform.isLinux && ui) '' - mkdir -p $out/share/pixmaps - cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png - - mkdir -p $out/share/applications - cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop + install -Dm644 "$src/client/ui/assets/netbird-systemtray-connected.png" "$out/share/pixmaps/netbird.png" + install -Dm644 "$src/client/ui/build/netbird.desktop" "$out/share/applications/netbird.desktop" substituteInPlace $out/share/applications/netbird.desktop \ --replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + versionCheckProgramArg = "version"; + # Disabled for the `netbird-ui` version because it does a network request. + doInstallCheck = !ui; + passthru = { - tests.netbird = nixosTests.netbird; - tests.netbird-ui = netbird-ui; + tests = { + nixos = nixosTests.netbird; + withUI = netbird-ui; + }; updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { homepage = "https://netbird.io"; - changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}"; + changelog = "https://github.com/netbirdio/netbird/releases/tag/v${finalAttrs.version}"; description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vrifox saturn745 ]; mainProgram = if ui then "netbird-ui" else "netbird"; }; -} +}) diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index b9de20df76ac..c0be15755c61 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -8,6 +8,7 @@ , inotify-tools , kdePackages , libcloudproviders +, libp11 , librsvg , libsecret , openssl @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.15.3"; + version = "3.16.2"; outputs = [ "out" "dev" ]; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { owner = "nextcloud-releases"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-48iqLd1S84ZElibdgwEXl3LZeYruo9r34LPn7BzYpdk="; + hash = "sha256-CBGvASIPN5xB2kgSDXg2vWpnsFBD3c3wudUAL6u64U8="; }; patches = [ @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { inotify-tools kdePackages.kio libcloudproviders + libp11 libsecret openssl pcre diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json index 5f585a605d1a..174d710981e4 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json +++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json @@ -8,69 +8,69 @@ "name": "admin-frontend", "version": "0.0.0", "dependencies": { - "@hookform/resolvers": "^3.9.1", - "@radix-ui/react-alert-dialog": "^1.1.2", - "@radix-ui/react-avatar": "^1.1.1", - "@radix-ui/react-checkbox": "^1.1.2", - "@radix-ui/react-dialog": "^1.1.2", - "@radix-ui/react-dropdown-menu": "^2.1.2", - "@radix-ui/react-label": "^2.1.0", - "@radix-ui/react-navigation-menu": "^1.2.1", - "@radix-ui/react-popover": "^1.1.2", - "@radix-ui/react-scroll-area": "^1.2.1", - "@radix-ui/react-select": "^2.1.2", - "@radix-ui/react-separator": "^1.1.0", + "@hookform/resolvers": "^3.10.0", + "@radix-ui/react-alert-dialog": "^1.1.5", + "@radix-ui/react-avatar": "^1.1.2", + "@radix-ui/react-checkbox": "^1.1.3", + "@radix-ui/react-dialog": "^1.1.5", + "@radix-ui/react-dropdown-menu": "^2.1.5", + "@radix-ui/react-label": "^2.1.1", + "@radix-ui/react-navigation-menu": "^1.2.4", + "@radix-ui/react-popover": "^1.1.5", + "@radix-ui/react-scroll-area": "^1.2.2", + "@radix-ui/react-select": "^2.1.5", + "@radix-ui/react-separator": "^1.1.1", "@radix-ui/react-slot": "^1.1.1", - "@radix-ui/react-tabs": "^1.1.1", - "@tanstack/react-table": "^8.20.5", - "@trivago/prettier-plugin-sort-imports": "^5.2.0", + "@radix-ui/react-tabs": "^1.1.2", + "@tanstack/react-table": "^8.20.6", + "@trivago/prettier-plugin-sort-imports": "^5.2.2", "@types/luxon": "^3.4.2", "@xterm/addon-attach": "^0.11.0", "@xterm/addon-fit": "^0.10.0", "@xterm/xterm": "^5.5.0", - "class-variance-authority": "^0.7.0", + "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", - "cmdk": "^1.0.0", + "cmdk": "^1.0.4", "copy-to-clipboard": "^3.3.3", - "framer-motion": "^11.14.1", - "i18next": "^24.0.2", - "i18next-browser-languagedetector": "^8.0.0", + "framer-motion": "^11.18.2", + "i18next": "^24.2.2", + "i18next-browser-languagedetector": "^8.0.2", "jotai-zustand": "^0.6.0", "lucide-react": "^0.454.0", "luxon": "^3.5.0", - "next-themes": "^0.3.0", - "prettier-plugin-tailwindcss": "^0.6.9", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "react-hook-form": "^7.53.1", - "react-i18next": "^15.1.2", - "react-router-dom": "^6.27.0", - "react-virtuoso": "^4.12.0", - "sonner": "^1.6.1", - "swr": "^2.2.5", - "tailwind-merge": "^2.5.4", + "next-themes": "^0.4.6", + "prettier-plugin-tailwindcss": "^0.6.11", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "react-hook-form": "^7.54.2", + "react-i18next": "^15.4.0", + "react-router-dom": "^7.1.5", + "react-virtuoso": "^4.12.3", + "sonner": "^1.7.4", + "swr": "^2.3.0", + "tailwind-merge": "^2.6.0", "tailwindcss-animate": "^1.0.7", - "vaul": "^1.1.1", - "zod": "^3.23.8", - "zustand": "^5.0.1" + "vaul": "^1.1.2", + "zod": "^3.24.1", + "zustand": "^5.0.3" }, "devDependencies": { - "@eslint/js": "^9.13.0", - "@types/node": "^22.8.6", - "@types/react": "^18.3.12", - "@types/react-dom": "^18.3.1", - "@vitejs/plugin-react": "^4.3.3", + "@eslint/js": "^9.19.0", + "@types/node": "^22.13.0", + "@types/react": "^18.3.18", + "@types/react-dom": "^18.3.5", + "@vitejs/plugin-react": "^4.3.4", "autoprefixer": "^10.4.20", - "eslint": "^9.13.0", - "eslint-plugin-react-hooks": "^5.0.0", - "eslint-plugin-react-refresh": "^0.4.14", - "globals": "^15.11.0", - "postcss": "^8.4.47", - "swagger-typescript-api": "^13.0.22", - "tailwindcss": "^3.4.14", - "typescript": "~5.6.2", - "typescript-eslint": "^8.11.0", - "vite": "^5.4.10" + "eslint": "^9.19.0", + "eslint-plugin-react-hooks": "^5.1.0", + "eslint-plugin-react-refresh": "^0.4.18", + "globals": "^15.14.0", + "postcss": "^8.5.1", + "swagger-typescript-api": "^13.0.23", + "tailwindcss": "^3.4.17", + "typescript": "~5.6.3", + "typescript-eslint": "^8.22.0", + "vite": "^6.0.11" } }, "node_modules/@alloc/quick-lru": { @@ -114,9 +114,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz", - "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", + "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", "dev": true, "license": "MIT", "engines": { @@ -124,22 +124,22 @@ } }, "node_modules/@babel/core": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz", - "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", + "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.5", + "@babel/generator": "^7.26.10", "@babel/helper-compilation-targets": "^7.26.5", "@babel/helper-module-transforms": "^7.26.0", - "@babel/helpers": "^7.26.7", - "@babel/parser": "^7.26.7", - "@babel/template": "^7.25.9", - "@babel/traverse": "^7.26.7", - "@babel/types": "^7.26.7", + "@babel/helpers": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.10", + "@babel/types": "^7.26.10", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -155,13 +155,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz", - "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.10.tgz", + "integrity": "sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.26.5", - "@babel/types": "^7.26.5", + "@babel/parser": "^7.26.10", + "@babel/types": "^7.26.10", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -258,26 +258,26 @@ } }, "node_modules/@babel/helpers": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz", - "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz", + "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.25.9", - "@babel/types": "^7.26.7" + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz", - "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz", + "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==", "license": "MIT", "dependencies": { - "@babel/types": "^7.26.7" + "@babel/types": "^7.26.10" }, "bin": { "parser": "bin/babel-parser.js" @@ -319,9 +319,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz", - "integrity": "sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz", + "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==", "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" @@ -331,30 +331,30 @@ } }, "node_modules/@babel/template": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", - "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", + "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/types": "^7.25.9" + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz", - "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.10.tgz", + "integrity": "sha512-k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A==", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.5", - "@babel/parser": "^7.26.7", - "@babel/template": "^7.25.9", - "@babel/types": "^7.26.7", + "@babel/generator": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -372,9 +372,9 @@ } }, "node_modules/@babel/types": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz", - "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz", + "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.25.9", @@ -385,9 +385,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", - "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz", + "integrity": "sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==", "cpu": [ "ppc64" ], @@ -398,13 +398,13 @@ "aix" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", - "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.1.tgz", + "integrity": "sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==", "cpu": [ "arm" ], @@ -415,13 +415,13 @@ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", - "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz", + "integrity": "sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==", "cpu": [ "arm64" ], @@ -432,13 +432,13 @@ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", - "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.1.tgz", + "integrity": "sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==", "cpu": [ "x64" ], @@ -449,13 +449,13 @@ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", - "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz", + "integrity": "sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==", "cpu": [ "arm64" ], @@ -466,13 +466,13 @@ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", - "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz", + "integrity": "sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==", "cpu": [ "x64" ], @@ -483,13 +483,13 @@ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", - "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz", + "integrity": "sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==", "cpu": [ "arm64" ], @@ -500,13 +500,13 @@ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", - "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz", + "integrity": "sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==", "cpu": [ "x64" ], @@ -517,13 +517,13 @@ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", - "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz", + "integrity": "sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==", "cpu": [ "arm" ], @@ -534,13 +534,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", - "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz", + "integrity": "sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==", "cpu": [ "arm64" ], @@ -551,13 +551,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", - "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz", + "integrity": "sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==", "cpu": [ "ia32" ], @@ -568,13 +568,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", - "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz", + "integrity": "sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==", "cpu": [ "loong64" ], @@ -585,13 +585,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", - "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz", + "integrity": "sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==", "cpu": [ "mips64el" ], @@ -602,13 +602,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", - "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz", + "integrity": "sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==", "cpu": [ "ppc64" ], @@ -619,13 +619,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", - "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz", + "integrity": "sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==", "cpu": [ "riscv64" ], @@ -636,13 +636,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", - "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz", + "integrity": "sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==", "cpu": [ "s390x" ], @@ -653,13 +653,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", - "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz", + "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==", "cpu": [ "x64" ], @@ -670,13 +670,30 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz", + "integrity": "sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", - "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz", + "integrity": "sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==", "cpu": [ "x64" ], @@ -687,13 +704,30 @@ "netbsd" ], "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz", + "integrity": "sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", - "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz", + "integrity": "sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==", "cpu": [ "x64" ], @@ -704,13 +738,13 @@ "openbsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", - "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz", + "integrity": "sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==", "cpu": [ "x64" ], @@ -721,13 +755,13 @@ "sunos" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", - "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz", + "integrity": "sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==", "cpu": [ "arm64" ], @@ -738,13 +772,13 @@ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", - "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz", + "integrity": "sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==", "cpu": [ "ia32" ], @@ -755,13 +789,13 @@ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", - "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz", + "integrity": "sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==", "cpu": [ "x64" ], @@ -772,13 +806,13 @@ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", - "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", + "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", "dev": true, "license": "MIT", "dependencies": { @@ -818,13 +852,13 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz", - "integrity": "sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz", + "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.5", + "@eslint/object-schema": "^2.1.6", "debug": "^4.3.1", "minimatch": "^3.1.2" }, @@ -832,10 +866,20 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/config-helpers": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.0.tgz", + "integrity": "sha512-yJLLmLexii32mGrhW29qvU3QBVTu0GUmEf/J4XsBtVhp4JkIUFN/BjWqTF63yRvGApIDpZm5fa97LtYtINmfeQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/core": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz", - "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz", + "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -846,9 +890,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", - "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, "license": "MIT", "dependencies": { @@ -883,9 +927,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.19.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.19.0.tgz", - "integrity": "sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==", + "version": "9.23.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz", + "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==", "dev": true, "license": "MIT", "engines": { @@ -893,9 +937,9 @@ } }, "node_modules/@eslint/object-schema": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz", - "integrity": "sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -903,13 +947,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz", - "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz", + "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.10.0", + "@eslint/core": "^0.12.0", "levn": "^0.4.1" }, "engines": { @@ -1023,9 +1067,9 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", - "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz", + "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -1159,17 +1203,17 @@ "license": "MIT" }, "node_modules/@radix-ui/react-alert-dialog": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.5.tgz", - "integrity": "sha512-1Y2sI17QzSZP58RjGtrklfSGIf3AF7U/HkD3aAcAnhOUJrm7+7GG1wRDFaUlSe0nW5B/t4mYd/+7RNbP2Wexug==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.6.tgz", + "integrity": "sha512-p4XnPqgej8sZAAReCAKgz1REYZEBLR8hU9Pg27wFnCWIMc8g1ccCs0FjBcy05V15VTu8pAePw/VDYeOm/uZ6yQ==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dialog": "1.1.5", - "@radix-ui/react-primitive": "2.0.1", - "@radix-ui/react-slot": "1.1.1" + "@radix-ui/react-dialog": "1.1.6", + "@radix-ui/react-primitive": "2.0.2", + "@radix-ui/react-slot": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1187,12 +1231,12 @@ } }, "node_modules/@radix-ui/react-arrow": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.1.tgz", - "integrity": "sha512-NaVpZfmv8SKeZbn4ijN2V3jlHA9ngBG16VnIIm22nUR0Yk8KUALyBxT3KYEUnNuch9sTE8UTsS3whzBgKOL30w==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.2.tgz", + "integrity": "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.1" + "@radix-ui/react-primitive": "2.0.2" }, "peerDependencies": { "@types/react": "*", @@ -1210,13 +1254,13 @@ } }, "node_modules/@radix-ui/react-avatar": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.2.tgz", - "integrity": "sha512-GaC7bXQZ5VgZvVvsJ5mu/AEbjYLnhhkoidOboC50Z6FFlLA03wG2ianUoH+zgDQ31/9gCF59bE4+2bBgTyMiig==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.3.tgz", + "integrity": "sha512-Paen00T4P8L8gd9bNsRMw7Cbaz85oxiv+hzomsRZgFm2byltPFDtfcoqlWJ8GyZlIBWgLssJlzLCnKU0G0302g==", "license": "MIT", "dependencies": { "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0" }, @@ -1236,16 +1280,16 @@ } }, "node_modules/@radix-ui/react-checkbox": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.3.tgz", - "integrity": "sha512-HD7/ocp8f1B3e6OHygH0n7ZKjONkhciy1Nh0yuBgObqThc3oyx+vuMfFHKAknXRHHWVE9XvXStxJFyjUmB8PIw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.4.tgz", + "integrity": "sha512-wP0CPAHq+P5I4INKe3hJrIa1WoNqqrejzW+zoU0rOvo1b9gDEJJFl2rYfO1PYJUQCc2H1WZxIJmyv9BS8i5fLw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", "@radix-ui/react-use-size": "1.1.0" @@ -1266,15 +1310,15 @@ } }, "node_modules/@radix-ui/react-collection": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.1.tgz", - "integrity": "sha512-LwT3pSho9Dljg+wY2KN2mrrh6y3qELfftINERIzBUO9e0N+t0oMTyn3k9iv+ZqgrwGkRnLpNJrsMv9BZlt2yuA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.2.tgz", + "integrity": "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==", "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.1", - "@radix-ui/react-slot": "1.1.1" + "@radix-ui/react-primitive": "2.0.2", + "@radix-ui/react-slot": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1322,25 +1366,25 @@ } }, "node_modules/@radix-ui/react-dialog": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.5.tgz", - "integrity": "sha512-LaO3e5h/NOEL4OfXjxD43k9Dx+vn+8n+PCFt6uhX/BADFflllyv3WJG6rgvvSVBxpTch938Qq/LGc2MMxipXPw==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz", + "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.4", + "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.1", + "@radix-ui/react-focus-scope": "1.1.2", "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-portal": "1.1.3", + "@radix-ui/react-portal": "1.1.4", "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.1", - "@radix-ui/react-slot": "1.1.1", + "@radix-ui/react-primitive": "2.0.2", + "@radix-ui/react-slot": "1.1.2", "@radix-ui/react-use-controllable-state": "1.1.0", "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.2" + "react-remove-scroll": "^2.6.3" }, "peerDependencies": { "@types/react": "*", @@ -1373,14 +1417,14 @@ } }, "node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.4.tgz", - "integrity": "sha512-XDUI0IVYVSwjMXxM6P4Dfti7AH+Y4oS/TB+sglZ/EXc7cqLwGAmp1NlMrcUjj7ks6R5WTZuWKv44FBbLpwU3sA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz", + "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-escape-keydown": "1.1.0" }, @@ -1400,17 +1444,17 @@ } }, "node_modules/@radix-ui/react-dropdown-menu": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.5.tgz", - "integrity": "sha512-50ZmEFL1kOuLalPKHrLWvPFMons2fGx9TqQCWlPwDVpbAnaUJ1g4XNcKqFNMQymYU0kKWR4MDDi+9vUQBGFgcQ==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.6.tgz", + "integrity": "sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-menu": "2.1.5", - "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-menu": "2.1.6", + "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { @@ -1444,13 +1488,13 @@ } }, "node_modules/@radix-ui/react-focus-scope": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.1.tgz", - "integrity": "sha512-01omzJAYRxXdG2/he/+xy+c8a8gCydoQ1yOxnWNcRhrrBW5W+RQJ22EK1SaO8tb3WoUsuEw7mJjBozPzihDFjA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz", + "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==", "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0" }, "peerDependencies": { @@ -1487,12 +1531,12 @@ } }, "node_modules/@radix-ui/react-label": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.1.tgz", - "integrity": "sha512-UUw5E4e/2+4kFMH7+YxORXGWggtY6sM8WIwh5RZchhLuUg2H1hc98Py+pr8HMz6rdaYrK2t296ZEjYLOCO5uUw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.2.tgz", + "integrity": "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.1" + "@radix-ui/react-primitive": "2.0.2" }, "peerDependencies": { "@types/react": "*", @@ -1510,29 +1554,29 @@ } }, "node_modules/@radix-ui/react-menu": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.5.tgz", - "integrity": "sha512-uH+3w5heoMJtqVCgYOtYVMECk1TOrkUn0OG0p5MqXC0W2ppcuVeESbou8PTHoqAjbdTEK19AGXBWcEtR5WpEQg==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.6.tgz", + "integrity": "sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.1", + "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.4", + "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.1", + "@radix-ui/react-focus-scope": "1.1.2", "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.1", - "@radix-ui/react-portal": "1.1.3", + "@radix-ui/react-popper": "1.2.2", + "@radix-ui/react-portal": "1.1.4", "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.1", - "@radix-ui/react-roving-focus": "1.1.1", - "@radix-ui/react-slot": "1.1.1", + "@radix-ui/react-primitive": "2.0.2", + "@radix-ui/react-roving-focus": "1.1.2", + "@radix-ui/react-slot": "1.1.2", "@radix-ui/react-use-callback-ref": "1.1.0", "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.2" + "react-remove-scroll": "^2.6.3" }, "peerDependencies": { "@types/react": "*", @@ -1550,25 +1594,25 @@ } }, "node_modules/@radix-ui/react-navigation-menu": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.4.tgz", - "integrity": "sha512-wUi01RrTDTOoGtjEPHsxlzPtVzVc3R/AZ5wfh0dyqMAqolhHAHvG5iQjBCTi2AjQqa77FWWbA3kE3RkD+bDMgQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.5.tgz", + "integrity": "sha512-myMHHQUZ3ZLTi8W381/Vu43Ia0NqakkQZ2vzynMmTUtQQ9kNkjzhOwkZC9TAM5R07OZUVIQyHC06f/9JZJpvvA==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.1", + "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.4", + "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-visually-hidden": "1.1.1" + "@radix-ui/react-visually-hidden": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1586,26 +1630,26 @@ } }, "node_modules/@radix-ui/react-popover": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.5.tgz", - "integrity": "sha512-YXkTAftOIW2Bt3qKH8vYr6n9gCkVrvyvfiTObVjoHVTHnNj26rmvO87IKa3VgtgCjb8FAQ6qOjNViwl+9iIzlg==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz", + "integrity": "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.4", + "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.1", + "@radix-ui/react-focus-scope": "1.1.2", "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.1", - "@radix-ui/react-portal": "1.1.3", + "@radix-ui/react-popper": "1.2.2", + "@radix-ui/react-portal": "1.1.4", "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.1", - "@radix-ui/react-slot": "1.1.1", + "@radix-ui/react-primitive": "2.0.2", + "@radix-ui/react-slot": "1.1.2", "@radix-ui/react-use-controllable-state": "1.1.0", "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.2" + "react-remove-scroll": "^2.6.3" }, "peerDependencies": { "@types/react": "*", @@ -1623,16 +1667,16 @@ } }, "node_modules/@radix-ui/react-popper": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.1.tgz", - "integrity": "sha512-3kn5Me69L+jv82EKRuQCXdYyf1DqHwD2U/sxoNgBGCB7K9TRc3bQamQ+5EPM9EvyPdli0W41sROd+ZU1dTCztw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.2.tgz", + "integrity": "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==", "license": "MIT", "dependencies": { "@floating-ui/react-dom": "^2.0.0", - "@radix-ui/react-arrow": "1.1.1", + "@radix-ui/react-arrow": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0", "@radix-ui/react-use-rect": "1.1.0", @@ -1655,12 +1699,12 @@ } }, "node_modules/@radix-ui/react-portal": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.3.tgz", - "integrity": "sha512-NciRqhXnGojhT93RPyDaMPfLH3ZSl4jjIFbZQ1b/vxvZEdHsBZ49wP9w8L3HzUQwep01LcWtkUvm0OVB5JAHTw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz", + "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-layout-effect": "1.1.0" }, "peerDependencies": { @@ -1703,12 +1747,12 @@ } }, "node_modules/@radix-ui/react-primitive": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.1.tgz", - "integrity": "sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz", + "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==", "license": "MIT", "dependencies": { - "@radix-ui/react-slot": "1.1.1" + "@radix-ui/react-slot": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1726,18 +1770,18 @@ } }, "node_modules/@radix-ui/react-roving-focus": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.1.tgz", - "integrity": "sha512-QE1RoxPGJ/Nm8Qmk0PxP8ojmoaS67i0s7hVssS7KuI2FQoc/uzVlZsqKfQvxPE6D8hICCPHJ4D88zNhT3OOmkw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.2.tgz", + "integrity": "sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.1", + "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-controllable-state": "1.1.0" }, @@ -1757,9 +1801,9 @@ } }, "node_modules/@radix-ui/react-scroll-area": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.2.tgz", - "integrity": "sha512-EFI1N/S3YxZEW/lJ/H1jY3njlvTd8tBmgKEn4GHi51+aMm94i6NmAJstsm5cu3yJwYqYc93gpCPm21FeAbFk6g==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.3.tgz", + "integrity": "sha512-l7+NNBfBYYJa9tNqVcP2AGvxdE3lmE6kFTBXdvHgUaZuy+4wGCL1Cl2AfaR7RKyimj7lZURGLwFO59k4eBnDJQ==", "license": "MIT", "dependencies": { "@radix-ui/number": "1.1.0", @@ -1768,7 +1812,7 @@ "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0" }, @@ -1788,32 +1832,32 @@ } }, "node_modules/@radix-ui/react-select": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.5.tgz", - "integrity": "sha512-eVV7N8jBXAXnyrc+PsOF89O9AfVgGnbLxUtBb0clJ8y8ENMWLARGMI/1/SBRLz7u4HqxLgN71BJ17eono3wcjA==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.6.tgz", + "integrity": "sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg==", "license": "MIT", "dependencies": { "@radix-ui/number": "1.1.0", "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.1", + "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.4", + "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.1", + "@radix-ui/react-focus-scope": "1.1.2", "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.1", - "@radix-ui/react-portal": "1.1.3", - "@radix-ui/react-primitive": "2.0.1", - "@radix-ui/react-slot": "1.1.1", + "@radix-ui/react-popper": "1.2.2", + "@radix-ui/react-portal": "1.1.4", + "@radix-ui/react-primitive": "2.0.2", + "@radix-ui/react-slot": "1.1.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-visually-hidden": "1.1.1", + "@radix-ui/react-visually-hidden": "1.1.2", "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.2" + "react-remove-scroll": "^2.6.3" }, "peerDependencies": { "@types/react": "*", @@ -1831,12 +1875,12 @@ } }, "node_modules/@radix-ui/react-separator": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.1.tgz", - "integrity": "sha512-RRiNRSrD8iUiXriq/Y5n4/3iE8HzqgLHsusUSg5jVpU2+3tqcUFPJXHDymwEypunc2sWxDUS3UC+rkZRlHedsw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.2.tgz", + "integrity": "sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.1" + "@radix-ui/react-primitive": "2.0.2" }, "peerDependencies": { "@types/react": "*", @@ -1854,9 +1898,9 @@ } }, "node_modules/@radix-ui/react-slot": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.1.tgz", - "integrity": "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz", + "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==", "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "1.1.1" @@ -1872,9 +1916,9 @@ } }, "node_modules/@radix-ui/react-tabs": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.2.tgz", - "integrity": "sha512-9u/tQJMcC2aGq7KXpGivMm1mgq7oRJKXphDwdypPd/j21j/2znamPU8WkXgnhUaTrSFNIt8XhOyCAupg8/GbwQ==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.3.tgz", + "integrity": "sha512-9mFyI30cuRDImbmFF6O2KUJdgEOsGh9Vmx9x/Dh9tOhL7BngmQPQfwW4aejKm5OHpfWIdmeV6ySyuxoOGjtNng==", "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", @@ -1882,8 +1926,8 @@ "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.1", - "@radix-ui/react-roving-focus": "1.1.1", + "@radix-ui/react-primitive": "2.0.2", + "@radix-ui/react-roving-focus": "1.1.2", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { @@ -2019,12 +2063,12 @@ } }, "node_modules/@radix-ui/react-visually-hidden": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.1.tgz", - "integrity": "sha512-vVfA2IZ9q/J+gEamvj761Oq1FpWgCDaNOOIfbPVp2MVPLEomUr5+Vf7kJGwQ24YxZSlQVar7Bes8kyTo5Dshpg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz", + "integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.1" + "@radix-ui/react-primitive": "2.0.2" }, "peerDependencies": { "@types/react": "*", @@ -2047,19 +2091,10 @@ "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==", "license": "MIT" }, - "node_modules/@remix-run/router": { - "version": "1.21.1", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.1.tgz", - "integrity": "sha512-KeBYSwohb8g4/wCcnksvKTYlg69O62sQeLynn2YE+5z7JWEj95if27kclW9QqbrlsQ2DINI8fjbV3zyuKfwjKg==", - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.32.1.tgz", - "integrity": "sha512-/pqA4DmqyCm8u5YIDzIdlLcEmuvxb0v8fZdFhVMszSpDTgbQKdw3/mB3eMUHIbubtJ6F9j+LtmyCnHTEqIHyzA==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.36.0.tgz", + "integrity": "sha512-jgrXjjcEwN6XpZXL0HUeOVGfjXhPyxAbbhD0BlXUB+abTOpbPiN5Wb3kOT7yb+uEtATNYF5x5gIfwutmuBA26w==", "cpu": [ "arm" ], @@ -2071,9 +2106,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.32.1.tgz", - "integrity": "sha512-If3PDskT77q7zgqVqYuj7WG3WC08G1kwXGVFi9Jr8nY6eHucREHkfpX79c0ACAjLj3QIWKPJR7w4i+f5EdLH5Q==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.36.0.tgz", + "integrity": "sha512-NyfuLvdPdNUfUNeYKUwPwKsE5SXa2J6bCt2LdB/N+AxShnkpiczi3tcLJrm5mA+eqpy0HmaIY9F6XCa32N5yzg==", "cpu": [ "arm64" ], @@ -2085,9 +2120,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.32.1.tgz", - "integrity": "sha512-zCpKHioQ9KgZToFp5Wvz6zaWbMzYQ2LJHQ+QixDKq52KKrF65ueu6Af4hLlLWHjX1Wf/0G5kSJM9PySW9IrvHA==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.36.0.tgz", + "integrity": "sha512-JQ1Jk5G4bGrD4pWJQzWsD8I1n1mgPXq33+/vP4sk8j/z/C2siRuxZtaUA7yMTf71TCZTZl/4e1bfzwUmFb3+rw==", "cpu": [ "arm64" ], @@ -2099,9 +2134,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.32.1.tgz", - "integrity": "sha512-sFvF+t2+TyUo/ZQqUcifrJIgznx58oFZbdHS9TvHq3xhPVL9nOp+yZ6LKrO9GWTP+6DbFtoyLDbjTpR62Mbr3Q==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.36.0.tgz", + "integrity": "sha512-6c6wMZa1lrtiRsbDziCmjE53YbTkxMYhhnWnSW8R/yqsM7a6mSJ3uAVT0t8Y/DGt7gxUWYuFM4bwWk9XCJrFKA==", "cpu": [ "x64" ], @@ -2113,9 +2148,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.32.1.tgz", - "integrity": "sha512-NbOa+7InvMWRcY9RG+B6kKIMD/FsnQPH0MWUvDlQB1iXnF/UcKSudCXZtv4lW+C276g3w5AxPbfry5rSYvyeYA==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.36.0.tgz", + "integrity": "sha512-KXVsijKeJXOl8QzXTsA+sHVDsFOmMCdBRgFmBb+mfEb/7geR7+C8ypAml4fquUt14ZyVXaw2o1FWhqAfOvA4sg==", "cpu": [ "arm64" ], @@ -2127,9 +2162,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.32.1.tgz", - "integrity": "sha512-JRBRmwvHPXR881j2xjry8HZ86wIPK2CcDw0EXchE1UgU0ubWp9nvlT7cZYKc6bkypBt745b4bglf3+xJ7hXWWw==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.36.0.tgz", + "integrity": "sha512-dVeWq1ebbvByI+ndz4IJcD4a09RJgRYmLccwlQ8bPd4olz3Y213uf1iwvc7ZaxNn2ab7bjc08PrtBgMu6nb4pQ==", "cpu": [ "x64" ], @@ -2141,9 +2176,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.32.1.tgz", - "integrity": "sha512-PKvszb+9o/vVdUzCCjL0sKHukEQV39tD3fepXxYrHE3sTKrRdCydI7uldRLbjLmDA3TFDmh418XH19NOsDRH8g==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.36.0.tgz", + "integrity": "sha512-bvXVU42mOVcF4le6XSjscdXjqx8okv4n5vmwgzcmtvFdifQ5U4dXFYaCB87namDRKlUL9ybVtLQ9ztnawaSzvg==", "cpu": [ "arm" ], @@ -2155,9 +2190,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.32.1.tgz", - "integrity": "sha512-9WHEMV6Y89eL606ReYowXuGF1Yb2vwfKWKdD1A5h+OYnPZSJvxbEjxTRKPgi7tkP2DSnW0YLab1ooy+i/FQp/Q==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.36.0.tgz", + "integrity": "sha512-JFIQrDJYrxOnyDQGYkqnNBtjDwTgbasdbUiQvcU8JmGDfValfH1lNpng+4FWlhaVIR4KPkeddYjsVVbmJYvDcg==", "cpu": [ "arm" ], @@ -2169,9 +2204,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.32.1.tgz", - "integrity": "sha512-tZWc9iEt5fGJ1CL2LRPw8OttkCBDs+D8D3oEM8mH8S1ICZCtFJhD7DZ3XMGM8kpqHvhGUTvNUYVDnmkj4BDXnw==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.36.0.tgz", + "integrity": "sha512-KqjYVh3oM1bj//5X7k79PSCZ6CvaVzb7Qs7VMWS+SlWB5M8p3FqufLP9VNp4CazJ0CsPDLwVD9r3vX7Ci4J56A==", "cpu": [ "arm64" ], @@ -2183,9 +2218,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.32.1.tgz", - "integrity": "sha512-FTYc2YoTWUsBz5GTTgGkRYYJ5NGJIi/rCY4oK/I8aKowx1ToXeoVVbIE4LGAjsauvlhjfl0MYacxClLld1VrOw==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.36.0.tgz", + "integrity": "sha512-QiGnhScND+mAAtfHqeT+cB1S9yFnNQ/EwCg5yE3MzoaZZnIV0RV9O5alJAoJKX/sBONVKeZdMfO8QSaWEygMhw==", "cpu": [ "arm64" ], @@ -2197,9 +2232,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.32.1.tgz", - "integrity": "sha512-F51qLdOtpS6P1zJVRzYM0v6MrBNypyPEN1GfMiz0gPu9jN8ScGaEFIZQwteSsGKg799oR5EaP7+B2jHgL+d+Kw==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.36.0.tgz", + "integrity": "sha512-1ZPyEDWF8phd4FQtTzMh8FQwqzvIjLsl6/84gzUxnMNFBtExBtpL51H67mV9xipuxl1AEAerRBgBwFNpkw8+Lg==", "cpu": [ "loong64" ], @@ -2211,9 +2246,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.32.1.tgz", - "integrity": "sha512-wO0WkfSppfX4YFm5KhdCCpnpGbtgQNj/tgvYzrVYFKDpven8w2N6Gg5nB6w+wAMO3AIfSTWeTjfVe+uZ23zAlg==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.36.0.tgz", + "integrity": "sha512-VMPMEIUpPFKpPI9GZMhJrtu8rxnp6mJR3ZzQPykq4xc2GmdHj3Q4cA+7avMyegXy4n1v+Qynr9fR88BmyO74tg==", "cpu": [ "ppc64" ], @@ -2225,9 +2260,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.32.1.tgz", - "integrity": "sha512-iWswS9cIXfJO1MFYtI/4jjlrGb/V58oMu4dYJIKnR5UIwbkzR0PJ09O0PDZT0oJ3LYWXBSWahNf/Mjo6i1E5/g==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.36.0.tgz", + "integrity": "sha512-ttE6ayb/kHwNRJGYLpuAvB7SMtOeQnVXEIpMtAvx3kepFQeowVED0n1K9nAdraHUPJ5hydEMxBpIR7o4nrm8uA==", "cpu": [ "riscv64" ], @@ -2239,9 +2274,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.32.1.tgz", - "integrity": "sha512-RKt8NI9tebzmEthMnfVgG3i/XeECkMPS+ibVZjZ6mNekpbbUmkNWuIN2yHsb/mBPyZke4nlI4YqIdFPgKuoyQQ==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.36.0.tgz", + "integrity": "sha512-4a5gf2jpS0AIe7uBjxDeUMNcFmaRTbNv7NxI5xOCs4lhzsVyGR/0qBXduPnoWf6dGC365saTiwag8hP1imTgag==", "cpu": [ "s390x" ], @@ -2253,9 +2288,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.32.1.tgz", - "integrity": "sha512-WQFLZ9c42ECqEjwg/GHHsouij3pzLXkFdz0UxHa/0OM12LzvX7DzedlY0SIEly2v18YZLRhCRoHZDxbBSWoGYg==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.36.0.tgz", + "integrity": "sha512-5KtoW8UWmwFKQ96aQL3LlRXX16IMwyzMq/jSSVIIyAANiE1doaQsx/KRyhAvpHlPjPiSU/AYX/8m+lQ9VToxFQ==", "cpu": [ "x64" ], @@ -2267,9 +2302,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.32.1.tgz", - "integrity": "sha512-BLoiyHDOWoS3uccNSADMza6V6vCNiphi94tQlVIL5de+r6r/CCQuNnerf+1g2mnk2b6edp5dk0nhdZ7aEjOBsA==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.36.0.tgz", + "integrity": "sha512-sycrYZPrv2ag4OCvaN5js+f01eoZ2U+RmT5as8vhxiFz+kxwlHrsxOwKPSA8WyS+Wc6Epid9QeI/IkQ9NkgYyQ==", "cpu": [ "x64" ], @@ -2281,9 +2316,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.32.1.tgz", - "integrity": "sha512-w2l3UnlgYTNNU+Z6wOR8YdaioqfEnwPjIsJ66KxKAf0p+AuL2FHeTX6qvM+p/Ue3XPBVNyVSfCrfZiQh7vZHLQ==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.36.0.tgz", + "integrity": "sha512-qbqt4N7tokFwwSVlWDsjfoHgviS3n/vZ8LK0h1uLG9TYIRuUTJC88E1xb3LM2iqZ/WTqNQjYrtmtGmrmmawB6A==", "cpu": [ "arm64" ], @@ -2295,9 +2330,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.32.1.tgz", - "integrity": "sha512-Am9H+TGLomPGkBnaPWie4F3x+yQ2rr4Bk2jpwy+iV+Gel9jLAu/KqT8k3X4jxFPW6Zf8OMnehyutsd+eHoq1WQ==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.36.0.tgz", + "integrity": "sha512-t+RY0JuRamIocMuQcfwYSOkmdX9dtkr1PbhKW42AMvaDQa+jOdpUYysroTF/nuPpAaQMWp7ye+ndlmmthieJrQ==", "cpu": [ "ia32" ], @@ -2309,9 +2344,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.32.1.tgz", - "integrity": "sha512-ar80GhdZb4DgmW3myIS9nRFYcpJRSME8iqWgzH2i44u+IdrzmiXVxeFnExQ5v4JYUSpg94bWjevMG8JHf1Da5Q==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.36.0.tgz", + "integrity": "sha512-aRXd7tRZkWLqGbChgcMMDEHjOKudo1kChb1Jt1IfR8cY/KIpgNviLeJy5FUb9IpSuQj8dU2fAYNMPW/hLKOSTw==", "cpu": [ "x64" ], @@ -2323,12 +2358,12 @@ ] }, "node_modules/@tanstack/react-table": { - "version": "8.20.6", - "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.20.6.tgz", - "integrity": "sha512-w0jluT718MrOKthRcr2xsjqzx+oEM7B7s/XXyfs19ll++hlId3fjTm+B2zrR3ijpANpkzBAr15j1XGVOMxpggQ==", + "version": "8.21.2", + "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.2.tgz", + "integrity": "sha512-11tNlEDTdIhMJba2RBH+ecJ9l1zgS2kjmexDPAraulc8jeNA4xocSNeyzextT0XJyASil4XsCYlJmf5jEWAtYg==", "license": "MIT", "dependencies": { - "@tanstack/table-core": "8.20.5" + "@tanstack/table-core": "8.21.2" }, "engines": { "node": ">=12" @@ -2343,9 +2378,9 @@ } }, "node_modules/@tanstack/table-core": { - "version": "8.20.5", - "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.20.5.tgz", - "integrity": "sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg==", + "version": "8.21.2", + "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.2.tgz", + "integrity": "sha512-uvXk/U4cBiFMxt+p9/G7yUWI/UbHYbyghLCjlpWZ3mLeIZiUBSKcUnw9UnKkdRz7Z/N4UBuFLWQdJCjUe7HjvA==", "license": "MIT", "engines": { "node": ">=12" @@ -2434,6 +2469,12 @@ "@babel/types": "^7.20.7" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", + "license": "MIT" + }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -2455,9 +2496,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.12.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.12.0.tgz", - "integrity": "sha512-Fll2FZ1riMjNmlmJOdAyY5pUbkftXslB5DgEzlIuNaiWhXd00FhWxVC/r4yV/4wBb9JfImTu+jiSvXTkJ7F/gA==", + "version": "22.13.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.11.tgz", + "integrity": "sha512-iEUCUJoU0i3VnrCmgoWCXttklWcvoCIx4jzcP22fioIVSdTmjgoEvmAO/QPw6TcS9k5FrNgn4w7q5lGOd1CT5g==", "dev": true, "license": "MIT", "dependencies": { @@ -2472,9 +2513,9 @@ "license": "MIT" }, "node_modules/@types/react": { - "version": "18.3.18", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz", - "integrity": "sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==", + "version": "18.3.19", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.19.tgz", + "integrity": "sha512-fcdJqaHOMDbiAwJnXv6XCzX0jDW77yI3tJqYh1Byn8EL5/S628WRx9b/y3DnNe55zTukUQKrfYxiZls2dHcUMw==", "devOptional": true, "license": "MIT", "dependencies": { @@ -2500,21 +2541,21 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.22.0.tgz", - "integrity": "sha512-4Uta6REnz/xEJMvwf72wdUnC3rr4jAQf5jnTkeRQ9b6soxLxhDEbS/pfMPoJLDfFPNVRdryqWUIV/2GZzDJFZw==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.27.0.tgz", + "integrity": "sha512-4henw4zkePi5p252c8ncBLzLce52SEUz2Ebj8faDnuUXz2UuHEONYcJ+G0oaCF+bYCWVZtrGzq3FD7YXetmnSA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.22.0", - "@typescript-eslint/type-utils": "8.22.0", - "@typescript-eslint/utils": "8.22.0", - "@typescript-eslint/visitor-keys": "8.22.0", + "@typescript-eslint/scope-manager": "8.27.0", + "@typescript-eslint/type-utils": "8.27.0", + "@typescript-eslint/utils": "8.27.0", + "@typescript-eslint/visitor-keys": "8.27.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", - "ts-api-utils": "^2.0.0" + "ts-api-utils": "^2.0.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2526,20 +2567,20 @@ "peerDependencies": { "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.22.0.tgz", - "integrity": "sha512-MqtmbdNEdoNxTPzpWiWnqNac54h8JDAmkWtJExBVVnSrSmi9z+sZUt0LfKqk9rjqmKOIeRhO4fHHJ1nQIjduIQ==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.27.0.tgz", + "integrity": "sha512-XGwIabPallYipmcOk45DpsBSgLC64A0yvdAkrwEzwZ2viqGqRUJ8eEYoPz0CWnutgAFbNMPdsGGvzjSmcWVlEA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.22.0", - "@typescript-eslint/types": "8.22.0", - "@typescript-eslint/typescript-estree": "8.22.0", - "@typescript-eslint/visitor-keys": "8.22.0", + "@typescript-eslint/scope-manager": "8.27.0", + "@typescript-eslint/types": "8.27.0", + "@typescript-eslint/typescript-estree": "8.27.0", + "@typescript-eslint/visitor-keys": "8.27.0", "debug": "^4.3.4" }, "engines": { @@ -2551,18 +2592,18 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.22.0.tgz", - "integrity": "sha512-/lwVV0UYgkj7wPSw0o8URy6YI64QmcOdwHuGuxWIYznO6d45ER0wXUbksr9pYdViAofpUCNJx/tAzNukgvaaiQ==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.27.0.tgz", + "integrity": "sha512-8oI9GwPMQmBryaaxG1tOZdxXVeMDte6NyJA4i7/TWa4fBwgnAXYlIQP+uYOeqAaLJ2JRxlG9CAyL+C+YE9Xknw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.22.0", - "@typescript-eslint/visitor-keys": "8.22.0" + "@typescript-eslint/types": "8.27.0", + "@typescript-eslint/visitor-keys": "8.27.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2573,16 +2614,16 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.22.0.tgz", - "integrity": "sha512-NzE3aB62fDEaGjaAYZE4LH7I1MUwHooQ98Byq0G0y3kkibPJQIXVUspzlFOmOfHhiDLwKzMlWxaNv+/qcZurJA==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.27.0.tgz", + "integrity": "sha512-wVArTVcz1oJOIEJxui/nRhV0TXzD/zMSOYi/ggCfNq78EIszddXcJb7r4RCp/oBrjt8n9A0BSxRMKxHftpDxDA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.22.0", - "@typescript-eslint/utils": "8.22.0", + "@typescript-eslint/typescript-estree": "8.27.0", + "@typescript-eslint/utils": "8.27.0", "debug": "^4.3.4", - "ts-api-utils": "^2.0.0" + "ts-api-utils": "^2.0.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2593,13 +2634,13 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.22.0.tgz", - "integrity": "sha512-0S4M4baNzp612zwpD4YOieP3VowOARgK2EkN/GBn95hpyF8E2fbMT55sRHWBq+Huaqk3b3XK+rxxlM8sPgGM6A==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.27.0.tgz", + "integrity": "sha512-/6cp9yL72yUHAYq9g6DsAU+vVfvQmd1a8KyA81uvfDE21O2DwQ/qxlM4AR8TSdAu+kJLBDrEHKC5/W2/nxsY0A==", "dev": true, "license": "MIT", "engines": { @@ -2611,20 +2652,20 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.22.0.tgz", - "integrity": "sha512-SJX99NAS2ugGOzpyhMza/tX+zDwjvwAtQFLsBo3GQxiGcvaKlqGBkmZ+Y1IdiSi9h4Q0Lr5ey+Cp9CGWNY/F/w==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.27.0.tgz", + "integrity": "sha512-BnKq8cqPVoMw71O38a1tEb6iebEgGA80icSxW7g+kndx0o6ot6696HjG7NdgfuAVmVEtwXUr3L8R9ZuVjoQL6A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.22.0", - "@typescript-eslint/visitor-keys": "8.22.0", + "@typescript-eslint/types": "8.27.0", + "@typescript-eslint/visitor-keys": "8.27.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", - "ts-api-utils": "^2.0.0" + "ts-api-utils": "^2.0.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2634,7 +2675,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { @@ -2664,9 +2705,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz", - "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", "dev": true, "license": "ISC", "bin": { @@ -2677,16 +2718,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.22.0.tgz", - "integrity": "sha512-T8oc1MbF8L+Bk2msAvCUzjxVB2Z2f+vXYfcucE2wOmYs7ZUwco5Ep0fYZw8quNwOiw9K8GYVL+Kgc2pETNTLOg==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.27.0.tgz", + "integrity": "sha512-njkodcwH1yvmo31YWgRHNb/x1Xhhq4/m81PhtvmRngD8iHPehxffz1SNCO+kwaePhATC+kOa/ggmvPoPza5i0Q==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.22.0", - "@typescript-eslint/types": "8.22.0", - "@typescript-eslint/typescript-estree": "8.22.0" + "@typescript-eslint/scope-manager": "8.27.0", + "@typescript-eslint/types": "8.27.0", + "@typescript-eslint/typescript-estree": "8.27.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2697,17 +2738,17 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.22.0.tgz", - "integrity": "sha512-AWpYAXnUgvLNabGTy3uBylkgZoosva/miNd1I8Bz3SjotmQPbVqhO4Cczo8AsZ44XVErEBPr/CRSgaj8sG7g0w==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.27.0.tgz", + "integrity": "sha512-WsXQwMkILJvffP6z4U3FYJPlbf/j07HIxmDjZpbNvBJkMfvwXj5ACRkkHwBDvLBbDbtX5TdU64/rcvKJ/vuInQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.22.0", + "@typescript-eslint/types": "8.27.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -2763,9 +2804,9 @@ "license": "MIT" }, "node_modules/acorn": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", - "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", "dev": true, "license": "MIT", "bin": { @@ -2874,9 +2915,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.4.20", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz", - "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==", + "version": "10.4.21", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz", + "integrity": "sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==", "dev": true, "funding": [ { @@ -2894,11 +2935,11 @@ ], "license": "MIT", "dependencies": { - "browserslist": "^4.23.3", - "caniuse-lite": "^1.0.30001646", + "browserslist": "^4.24.4", + "caniuse-lite": "^1.0.30001702", "fraction.js": "^4.3.7", "normalize-range": "^0.1.2", - "picocolors": "^1.0.1", + "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" }, "bin": { @@ -3012,9 +3053,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001696", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz", - "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==", + "version": "1.0.30001706", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001706.tgz", + "integrity": "sha512-3ZczoTApMAZwPKYWmwVbQMFpXBDds3/0VciVoUwPUbldlYyVLmRVuRs/PcUZtHpbLRpzzDvrvnFuREsGt6lUug==", "dev": true, "funding": [ { @@ -3085,6 +3126,16 @@ "node": ">= 6" } }, + "node_modules/citty": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz", + "integrity": "sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "consola": "^3.2.3" + } + }, "node_modules/class-variance-authority": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz", @@ -3185,15 +3236,15 @@ } }, "node_modules/cmdk": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.0.4.tgz", - "integrity": "sha512-AnsjfHyHpQ/EFeAnG216WY7A5LiYCoZzCSygiLvfXC3H3LFGCprErteUcszaVluGOhuOTbJS3jWHrSDYPBBygg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.1.1.tgz", + "integrity": "sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==", "license": "MIT", "dependencies": { - "@radix-ui/react-dialog": "^1.1.2", + "@radix-ui/react-compose-refs": "^1.1.1", + "@radix-ui/react-dialog": "^1.1.6", "@radix-ui/react-id": "^1.1.0", - "@radix-ui/react-primitive": "^2.0.0", - "use-sync-external-store": "^1.2.2" + "@radix-ui/react-primitive": "^2.0.2" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", @@ -3235,9 +3286,9 @@ "license": "MIT" }, "node_modules/consola": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.0.tgz", - "integrity": "sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz", + "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==", "dev": true, "license": "MIT", "engines": { @@ -3251,6 +3302,15 @@ "dev": true, "license": "MIT" }, + "node_modules/cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/copy-to-clipboard": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz", @@ -3378,9 +3438,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.90", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.90.tgz", - "integrity": "sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug==", + "version": "1.5.123", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.123.tgz", + "integrity": "sha512-refir3NlutEZqlKaBLK0tzlVLe5P2wDKS7UQt/3SpibizgsRAPOsqQC3ffw1nlv3ze5gjRQZYHoPymgVZkplFA==", "dev": true, "license": "ISC" }, @@ -3418,9 +3478,9 @@ "license": "MIT" }, "node_modules/esbuild": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", - "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.1.tgz", + "integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -3428,32 +3488,34 @@ "esbuild": "bin/esbuild" }, "engines": { - "node": ">=12" + "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.21.5", - "@esbuild/android-arm": "0.21.5", - "@esbuild/android-arm64": "0.21.5", - "@esbuild/android-x64": "0.21.5", - "@esbuild/darwin-arm64": "0.21.5", - "@esbuild/darwin-x64": "0.21.5", - "@esbuild/freebsd-arm64": "0.21.5", - "@esbuild/freebsd-x64": "0.21.5", - "@esbuild/linux-arm": "0.21.5", - "@esbuild/linux-arm64": "0.21.5", - "@esbuild/linux-ia32": "0.21.5", - "@esbuild/linux-loong64": "0.21.5", - "@esbuild/linux-mips64el": "0.21.5", - "@esbuild/linux-ppc64": "0.21.5", - "@esbuild/linux-riscv64": "0.21.5", - "@esbuild/linux-s390x": "0.21.5", - "@esbuild/linux-x64": "0.21.5", - "@esbuild/netbsd-x64": "0.21.5", - "@esbuild/openbsd-x64": "0.21.5", - "@esbuild/sunos-x64": "0.21.5", - "@esbuild/win32-arm64": "0.21.5", - "@esbuild/win32-ia32": "0.21.5", - "@esbuild/win32-x64": "0.21.5" + "@esbuild/aix-ppc64": "0.25.1", + "@esbuild/android-arm": "0.25.1", + "@esbuild/android-arm64": "0.25.1", + "@esbuild/android-x64": "0.25.1", + "@esbuild/darwin-arm64": "0.25.1", + "@esbuild/darwin-x64": "0.25.1", + "@esbuild/freebsd-arm64": "0.25.1", + "@esbuild/freebsd-x64": "0.25.1", + "@esbuild/linux-arm": "0.25.1", + "@esbuild/linux-arm64": "0.25.1", + "@esbuild/linux-ia32": "0.25.1", + "@esbuild/linux-loong64": "0.25.1", + "@esbuild/linux-mips64el": "0.25.1", + "@esbuild/linux-ppc64": "0.25.1", + "@esbuild/linux-riscv64": "0.25.1", + "@esbuild/linux-s390x": "0.25.1", + "@esbuild/linux-x64": "0.25.1", + "@esbuild/netbsd-arm64": "0.25.1", + "@esbuild/netbsd-x64": "0.25.1", + "@esbuild/openbsd-arm64": "0.25.1", + "@esbuild/openbsd-x64": "0.25.1", + "@esbuild/sunos-x64": "0.25.1", + "@esbuild/win32-arm64": "0.25.1", + "@esbuild/win32-ia32": "0.25.1", + "@esbuild/win32-x64": "0.25.1" } }, "node_modules/escalade": { @@ -3480,22 +3542,23 @@ } }, "node_modules/eslint": { - "version": "9.19.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.19.0.tgz", - "integrity": "sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA==", + "version": "9.23.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz", + "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.0", - "@eslint/core": "^0.10.0", - "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.19.0", - "@eslint/plugin-kit": "^0.2.5", + "@eslint/config-array": "^0.19.2", + "@eslint/config-helpers": "^0.2.0", + "@eslint/core": "^0.12.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.23.0", + "@eslint/plugin-kit": "^0.2.7", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.1", + "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", @@ -3503,7 +3566,7 @@ "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.2.0", + "eslint-scope": "^8.3.0", "eslint-visitor-keys": "^4.2.0", "espree": "^10.3.0", "esquery": "^1.5.0", @@ -3540,9 +3603,9 @@ } }, "node_modules/eslint-plugin-react-hooks": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.1.0.tgz", - "integrity": "sha512-mpJRtPgHN2tNAvZ35AMfqeB3Xqeo273QxrHJsbBEPWODRM4r0yB6jfoROqKEYrOn27UtRPpcpHc2UqyBSuUNTw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.2.0.tgz", + "integrity": "sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg==", "dev": true, "license": "MIT", "engines": { @@ -3553,9 +3616,9 @@ } }, "node_modules/eslint-plugin-react-refresh": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.18.tgz", - "integrity": "sha512-IRGEoFn3OKalm3hjfolEWGqoF/jPqeEYFp+C8B0WMzwGwBMvlRDQd06kghDhF0C61uJ6WfSDhEZE/sAQjduKgw==", + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.19.tgz", + "integrity": "sha512-eyy8pcr/YxSYjBoqIFSrlbn9i/xvxUFa8CjzAYo9cFjgGXqq1hyjihcpZvxRLalpaWmueWR81xn7vuKmAFijDQ==", "dev": true, "license": "MIT", "peerDependencies": { @@ -3563,9 +3626,9 @@ } }, "node_modules/eslint-scope": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", - "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", + "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -3726,9 +3789,9 @@ "license": "MIT" }, "node_modules/fastq": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz", - "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", "license": "ISC", "dependencies": { "reusify": "^1.0.4" @@ -3791,19 +3854,19 @@ } }, "node_modules/flatted": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", - "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", "dev": true, "license": "ISC" }, "node_modules/foreground-child": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", - "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", "license": "ISC", "dependencies": { - "cross-spawn": "^7.0.0", + "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" }, "engines": { @@ -3963,9 +4026,9 @@ } }, "node_modules/globals": { - "version": "15.14.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", - "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", + "version": "15.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", + "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", "dev": true, "license": "MIT", "engines": { @@ -4021,9 +4084,9 @@ "license": "MIT" }, "node_modules/i18next": { - "version": "24.2.2", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.2.tgz", - "integrity": "sha512-NE6i86lBCKRYZa5TaUDkU5S4HFgLIEJRLr3Whf2psgaxBleQ2LC1YW1Vc+SCgkAW7VEzndT6al6+CzegSUHcTQ==", + "version": "24.2.3", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.3.tgz", + "integrity": "sha512-lfbf80OzkocvX7nmZtu7nSTNbrTYR52sLWxPtlXX1zAhVw8WEnFk4puUkCR4B1dNQwbSpEHHHemcZu//7EcB7A==", "funding": [ { "type": "individual", @@ -4040,7 +4103,7 @@ ], "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.2" + "@babel/runtime": "^7.26.10" }, "peerDependencies": { "typescript": "^5" @@ -4052,9 +4115,9 @@ } }, "node_modules/i18next-browser-languagedetector": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.2.tgz", - "integrity": "sha512-shBvPmnIyZeD2VU5jVGIOWP7u9qNG3Lj7mpaiPFpbJ3LVfHZJvVzKR4v1Cb91wAOFpNw442N+LGPzHOHsten2g==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.4.tgz", + "integrity": "sha512-f3frU3pIxD50/Tz20zx9TD9HobKYg47fmAETb117GKGPrhwcSSPJDoCposXlVycVebQ9GQohC3Efbpq7/nnJ5w==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.2" @@ -4071,9 +4134,9 @@ } }, "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4207,9 +4270,9 @@ } }, "node_modules/jotai": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.11.1.tgz", - "integrity": "sha512-41Su098mpHIX29hF/XOpDb0SqF6EES7+HXfrhuBqVSzRkxX48hD5i8nGsEewWZNAsBWJCTTmuz8M946Ih2PfcQ==", + "version": "2.12.2", + "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.12.2.tgz", + "integrity": "sha512-oN8715y7MkjXlSrpyjlR887TOuc/NLZMs9gvgtfWH/JP47ChwO0lR2ijSwBvPMYyXRAPT+liIAhuBavluKGgtA==", "license": "MIT", "peer": true, "engines": { @@ -4380,18 +4443,6 @@ "dev": true, "license": "MIT" }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "license": "MIT", - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -4497,9 +4548,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", - "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", "funding": [ { "type": "github", @@ -4522,13 +4573,13 @@ "license": "MIT" }, "node_modules/next-themes": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.3.0.tgz", - "integrity": "sha512-/QHIrsYpd6Kfk7xakK4svpDI5mmXP0gfvCoJdGpZQ2TOrQZmsW0QxjaiLn8wbIKjtm4BTSqLoix4lxYYOnLJ/w==", + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.4.6.tgz", + "integrity": "sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA==", "license": "MIT", "peerDependencies": { - "react": "^16.8 || ^17 || ^18", - "react-dom": "^16.8 || ^17 || ^18" + "react": "^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc" } }, "node_modules/node-fetch": { @@ -4626,6 +4677,16 @@ "url": "https://github.com/Mermade/oas-kit?sponsor=1" } }, + "node_modules/oas-linter/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, "node_modules/oas-resolver": { "version": "2.5.6", "resolved": "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.6.tgz", @@ -4646,6 +4707,16 @@ "url": "https://github.com/Mermade/oas-kit?sponsor=1" } }, + "node_modules/oas-resolver/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, "node_modules/oas-schema-walker": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz", @@ -4676,6 +4747,16 @@ "url": "https://github.com/Mermade/oas-kit?sponsor=1" } }, + "node_modules/oas-validator/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -4866,9 +4947,9 @@ } }, "node_modules/postcss": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz", - "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==", + "version": "8.5.3", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", + "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", "funding": [ { "type": "opencollective", @@ -4964,18 +5045,6 @@ } } }, - "node_modules/postcss-load-config/node_modules/yaml": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", - "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", - "license": "ISC", - "bin": { - "yaml": "bin.mjs" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/postcss-nested": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz", @@ -5031,11 +5100,10 @@ } }, "node_modules/prettier": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", - "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", + "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", "license": "MIT", - "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -5155,28 +5223,24 @@ "license": "MIT" }, "node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz", + "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==", "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0" - }, "engines": { "node": ">=0.10.0" } }, "node_modules/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz", + "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==", "license": "MIT", "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.2" + "scheduler": "^0.25.0" }, "peerDependencies": { - "react": "^18.3.1" + "react": "^19.0.0" } }, "node_modules/react-hook-form": { @@ -5196,9 +5260,9 @@ } }, "node_modules/react-i18next": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.0.tgz", - "integrity": "sha512-Py6UkX3zV08RTvL6ZANRoBh9sL/ne6rQq79XlkHEdd82cZr2H9usbWpUNVadJntIZP2pu3M2rL1CN+5rQYfYFw==", + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.1.tgz", + "integrity": "sha512-ahGab+IaSgZmNPYXdV1n+OYky95TGpFwnKRflX/16dY04DsYYKHtVLjeny7sBSCREEcoMbAgSkFiGLF5g5Oofw==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.25.0", @@ -5275,35 +5339,43 @@ } }, "node_modules/react-router": { - "version": "6.28.2", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.2.tgz", - "integrity": "sha512-BgFY7+wEGVjHCiqaj2XiUBQ1kkzfg6UoKYwEe0wv+FF+HNPCxtS/MVPvLAPH++EsuCMReZl9RYVGqcHLk5ms3A==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.4.0.tgz", + "integrity": "sha512-Y2g5ObjkvX3VFeVt+0CIPuYd9PpgqCslG7ASSIdN73LwA1nNWzcMLaoMRJfP3prZFI92svxFwbn7XkLJ+UPQ6A==", "license": "MIT", "dependencies": { - "@remix-run/router": "1.21.1" + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8" + "react": ">=18", + "react-dom": ">=18" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } } }, "node_modules/react-router-dom": { - "version": "6.28.2", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.2.tgz", - "integrity": "sha512-O81EWqNJWqvlN/a7eTudAdQm0TbI7hw+WIi7OwwMcTn5JMyZ0ibTFNGz+t+Lju0df4LcqowCegcrK22lB1q9Kw==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.4.0.tgz", + "integrity": "sha512-VlksBPf3n2bijPvnA7nkTsXxMAKOj+bWp4R9c3i+bnwlSOFAGOkJkKhzy/OsRkWaBMICqcAl1JDzh9ZSOze9CA==", "license": "MIT", "dependencies": { - "@remix-run/router": "1.21.1", - "react-router": "6.28.2" + "react-router": "7.4.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" + "react": ">=18", + "react-dom": ">=18" } }, "node_modules/react-style-singleton": { @@ -5329,16 +5401,13 @@ } }, "node_modules/react-virtuoso": { - "version": "4.12.3", - "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.12.3.tgz", - "integrity": "sha512-6X1p/sU7hecmjDZMAwN+r3go9EVjofKhwkUbVlL8lXhBZecPv9XVCkZ/kBPYOr0Mv0Vl5+Ziwgexg9Kh7+NNXQ==", + "version": "4.12.5", + "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.12.5.tgz", + "integrity": "sha512-YeCbRRsC9CLf0buD0Rct7WsDbzf+yBU1wGbo05/XjbcN2nJuhgh040m3y3+6HVogTZxEqVm45ac9Fpae4/MxRQ==", "license": "MIT", - "engines": { - "node": ">=10" - }, "peerDependencies": { - "react": ">=16 || >=17 || >= 18", - "react-dom": ">=16 || >=17 || >= 18" + "react": ">=16 || >=17 || >= 18 || >= 19", + "react-dom": ">=16 || >=17 || >= 18 || >=19" } }, "node_modules/read-cache": { @@ -5419,9 +5488,9 @@ } }, "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", "license": "MIT", "engines": { "iojs": ">=1.0.0", @@ -5429,9 +5498,9 @@ } }, "node_modules/rollup": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.32.1.tgz", - "integrity": "sha512-z+aeEsOeEa3mEbS1Tjl6sAZ8NE3+AalQz1RJGj81M+fizusbdDMoEJwdJNHfaB40Scr4qNu+welOfes7maKonA==", + "version": "4.36.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.36.0.tgz", + "integrity": "sha512-zwATAXNQxUcd40zgtQG0ZafcRK4g004WtEl7kbuhTWPvf07PsfohXl39jVUvPF7jvNAIkKPQ2XrsDlWuxBd++Q==", "dev": true, "license": "MIT", "dependencies": { @@ -5445,25 +5514,25 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.32.1", - "@rollup/rollup-android-arm64": "4.32.1", - "@rollup/rollup-darwin-arm64": "4.32.1", - "@rollup/rollup-darwin-x64": "4.32.1", - "@rollup/rollup-freebsd-arm64": "4.32.1", - "@rollup/rollup-freebsd-x64": "4.32.1", - "@rollup/rollup-linux-arm-gnueabihf": "4.32.1", - "@rollup/rollup-linux-arm-musleabihf": "4.32.1", - "@rollup/rollup-linux-arm64-gnu": "4.32.1", - "@rollup/rollup-linux-arm64-musl": "4.32.1", - "@rollup/rollup-linux-loongarch64-gnu": "4.32.1", - "@rollup/rollup-linux-powerpc64le-gnu": "4.32.1", - "@rollup/rollup-linux-riscv64-gnu": "4.32.1", - "@rollup/rollup-linux-s390x-gnu": "4.32.1", - "@rollup/rollup-linux-x64-gnu": "4.32.1", - "@rollup/rollup-linux-x64-musl": "4.32.1", - "@rollup/rollup-win32-arm64-msvc": "4.32.1", - "@rollup/rollup-win32-ia32-msvc": "4.32.1", - "@rollup/rollup-win32-x64-msvc": "4.32.1", + "@rollup/rollup-android-arm-eabi": "4.36.0", + "@rollup/rollup-android-arm64": "4.36.0", + "@rollup/rollup-darwin-arm64": "4.36.0", + "@rollup/rollup-darwin-x64": "4.36.0", + "@rollup/rollup-freebsd-arm64": "4.36.0", + "@rollup/rollup-freebsd-x64": "4.36.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.36.0", + "@rollup/rollup-linux-arm-musleabihf": "4.36.0", + "@rollup/rollup-linux-arm64-gnu": "4.36.0", + "@rollup/rollup-linux-arm64-musl": "4.36.0", + "@rollup/rollup-linux-loongarch64-gnu": "4.36.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.36.0", + "@rollup/rollup-linux-riscv64-gnu": "4.36.0", + "@rollup/rollup-linux-s390x-gnu": "4.36.0", + "@rollup/rollup-linux-x64-gnu": "4.36.0", + "@rollup/rollup-linux-x64-musl": "4.36.0", + "@rollup/rollup-win32-arm64-msvc": "4.36.0", + "@rollup/rollup-win32-ia32-msvc": "4.36.0", + "@rollup/rollup-win32-x64-msvc": "4.36.0", "fsevents": "~2.3.2" } }, @@ -5491,13 +5560,10 @@ } }, "node_modules/scheduler": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", - "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0" - } + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz", + "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==", + "license": "MIT" }, "node_modules/semver": { "version": "6.3.1", @@ -5509,6 +5575,12 @@ "semver": "bin/semver.js" } }, + "node_modules/set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==", + "license": "MIT" + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -5603,9 +5675,9 @@ } }, "node_modules/sonner": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.3.tgz", - "integrity": "sha512-KXLWQfyR6AHpYZuQk8eO8fCbZSJY3JOpgsu/tbGc++jgPjj8JsR1ZpO8vFhqR/OxvWMQCSAmnSShY0gr4FPqHg==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.4.tgz", + "integrity": "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==", "license": "MIT", "peerDependencies": { "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc", @@ -5785,24 +5857,24 @@ "license": "ISC" }, "node_modules/swagger-typescript-api": { - "version": "13.0.23", - "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.0.23.tgz", - "integrity": "sha512-HhoIepxlFEU7Ol42Gh8/tvwhSxdkHcweX2tRkNhbZYBiEA+rK3C6N85MnwoeQR5XbidE3Kz8mLOqIerVGgR9uw==", + "version": "13.0.24", + "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.0.24.tgz", + "integrity": "sha512-gr0bz8RNgRswiY8hEJghPVC5Sv1D2dbePiYsfZavlg5vCUS/xXCdNNW6iKLx8yRYV7qo+tyRT31DEEzZPB3eEA==", "dev": true, "license": "MIT", "dependencies": { "@types/swagger-schema-official": "^2.0.25", - "consola": "^3.2.3", + "citty": "^0.1.6", + "consola": "^3.4.2", "cosmiconfig": "^9.0.0", - "didyoumean": "^1.2.2", "eta": "^2.2.0", "js-yaml": "^4.1.0", "lodash": "^4.17.21", - "nanoid": "^3.3.7", - "prettier": "~3.3.3", + "nanoid": "^5.1.5", + "prettier": "~3.5.3", "swagger-schema-official": "2.0.0-bab6bed", "swagger2openapi": "^7.0.8", - "typescript": "~5.5.4" + "typescript": "~5.8.2" }, "bin": { "sta": "dist/cli.js", @@ -5812,26 +5884,29 @@ "node": ">=18.0.0" } }, - "node_modules/swagger-typescript-api/node_modules/prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "node_modules/swagger-typescript-api/node_modules/nanoid": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz", + "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "license": "MIT", "bin": { - "prettier": "bin/prettier.cjs" + "nanoid": "bin/nanoid.js" }, "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" + "node": "^18 || >=20" } }, "node_modules/swagger-typescript-api/node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", + "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -5870,10 +5945,20 @@ "url": "https://github.com/Mermade/oas-kit?sponsor=1" } }, + "node_modules/swagger2openapi/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, "node_modules/swr": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.0.tgz", - "integrity": "sha512-NyZ76wA4yElZWBHzSgEJc28a0u6QZvhb6w0azeL2k7+Q1gAzVK+IqQYXhVOC/mzi+HZIozrZvBVeSeOZNR2bqA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.3.tgz", + "integrity": "sha512-dshNvs3ExOqtZ6kJBaAsabhPdHyeY4P2cKwRCniDVifBMoG/SVI7tfLWqPXriVspf2Rg4tPzXJTnwaihIeFw2A==", "license": "MIT", "dependencies": { "dequal": "^2.0.3", @@ -5986,9 +6071,9 @@ "license": "MIT" }, "node_modules/ts-api-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz", - "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", "dev": true, "license": "MIT", "engines": { @@ -6010,6 +6095,12 @@ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "license": "0BSD" }, + "node_modules/turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==", + "license": "ISC" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -6038,15 +6129,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.22.0.tgz", - "integrity": "sha512-Y2rj210FW1Wb6TWXzQc5+P+EWI9/zdS57hLEc0gnyuvdzWo8+Y8brKlbj0muejonhMI/xAZCnZZwjbIfv1CkOw==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.27.0.tgz", + "integrity": "sha512-ZZ/8+Y0rRUMuW1gJaPtLWe4ryHbsPLzzibk5Sq+IFa2aOH1Vo0gPr1fbA6pOnzBke7zC2Da4w8AyCgxKXo3lqA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.22.0", - "@typescript-eslint/parser": "8.22.0", - "@typescript-eslint/utils": "8.22.0" + "@typescript-eslint/eslint-plugin": "8.27.0", + "@typescript-eslint/parser": "8.27.0", + "@typescript-eslint/utils": "8.27.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6057,7 +6148,7 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/undici-types": { @@ -6068,9 +6159,9 @@ "license": "MIT" }, "node_modules/update-browserslist-db": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", - "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", "dev": true, "funding": [ { @@ -6180,21 +6271,21 @@ } }, "node_modules/vite": { - "version": "5.4.14", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", - "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.2.tgz", + "integrity": "sha512-yW7PeMM+LkDzc7CgJuRLMW2Jz0FxMOsVJ8Lv3gpgW9WLcb9cTW+121UEr1hvmfR7w3SegR5ItvYyzVz1vxNJgQ==", "dev": true, "license": "MIT", "dependencies": { - "esbuild": "^0.21.3", - "postcss": "^8.4.43", - "rollup": "^4.20.0" + "esbuild": "^0.25.0", + "postcss": "^8.5.3", + "rollup": "^4.30.1" }, "bin": { "vite": "bin/vite.js" }, "engines": { - "node": "^18.0.0 || >=20.0.0" + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" }, "funding": { "url": "https://github.com/vitejs/vite?sponsor=1" @@ -6203,19 +6294,25 @@ "fsevents": "~2.3.3" }, "peerDependencies": { - "@types/node": "^18.0.0 || >=20.0.0", + "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", + "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", - "terser": "^5.4.0" + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" }, "peerDependenciesMeta": { "@types/node": { "optional": true }, + "jiti": { + "optional": true + }, "less": { "optional": true }, @@ -6236,6 +6333,12 @@ }, "terser": { "optional": true + }, + "tsx": { + "optional": true + }, + "yaml": { + "optional": true } } }, @@ -6397,13 +6500,15 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true, + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", + "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", "license": "ISC", + "bin": { + "yaml": "bin.mjs" + }, "engines": { - "node": ">= 6" + "node": ">= 14" } }, "node_modules/yargs": { @@ -6494,9 +6599,9 @@ } }, "node_modules/zod": { - "version": "3.24.1", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz", - "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==", + "version": "3.24.2", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz", + "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix index 90084f122a17..a305dfc8980b 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package.nix +++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "nezha-theme-admin"; - version = "1.6.4"; + version = "1.10.0"; src = fetchFromGitHub { owner = "nezhahq"; repo = "admin-frontend"; tag = "v${version}"; - hash = "sha256-6dWf2vC7zCVx77OdCUd9iYAACZcvkhfQdVSKQp3DGnE="; + hash = "sha256-WA7NkXIJEtXRp+Nky5PjCl6afmnpj8p7TNrOuTNyQ/E="; }; # TODO: Switch to the bun build function once available in nixpkgs @@ -21,7 +21,7 @@ buildNpmPackage rec { cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-8SvD6dycFWk4+PYNNnsbUb3e3H+CTRMwMeWLfx7xppc="; + npmDepsHash = "sha256-6lt2Z4RvVHaQ9MZs0D4BT7Rmwf9G79pdnp6l0ItFXeY="; npmPackFlags = [ "--ignore-scripts" ]; diff --git a/pkgs/by-name/ng/ngn-k/package.nix b/pkgs/by-name/ng/ngn-k/package.nix index 4268f816f087..7ba248eb34ed 100644 --- a/pkgs/by-name/ng/ngn-k/package.nix +++ b/pkgs/by-name/ng/ngn-k/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, stdenvNoLibs , fetchFromGitea , runtimeShell }: diff --git a/pkgs/by-name/ni/nibtools/package.nix b/pkgs/by-name/ni/nibtools/package.nix index 84b80b412a79..9671ba282b7a 100644 --- a/pkgs/by-name/ni/nibtools/package.nix +++ b/pkgs/by-name/ni/nibtools/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "nibtools"; - version = "0-unstable-2024-02-22"; + version = "0-unstable-2024-11-30"; src = fetchFromGitHub { owner = "OpenCBM"; repo = "nibtools"; - rev = "1d69f64eec55031c346a2ce115227479f9579a8a"; - hash = "sha256-+hnkj0uevURkRboTH8WbSt82pZTdWL4ii2PKr6NO0Cg="; + rev = "91344e0ee357780a90ad7fe3a0a0721a2e11f265"; + hash = "sha256-0skAavJe01b+4Z7LEfS2qIhqkwj8XhOwmflhYPEynw4="; }; NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; @@ -41,11 +41,11 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "disk transfer utility for imaging and converting commodore 64 disk images"; homepage = "https://github.com/OpenCBM/nibtools/"; - license = licenses.gpl2; - maintainers = with maintainers; [ matthewcroughan ]; - platforms = platforms.all; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ matthewcroughan ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ni/nim_builder/nim_builder.nim b/pkgs/by-name/ni/nim_builder/nim_builder.nim index ec1d3ccb45b9..6339645bb4ad 100644 --- a/pkgs/by-name/ni/nim_builder/nim_builder.nim +++ b/pkgs/by-name/ni/nim_builder/nim_builder.nim @@ -89,7 +89,7 @@ proc configurePhase*() = else: fmWrite var cfg = newFileStream(configFilePath, mode) proc switch(key, val: string) = - cfg.writeLine("switch(", key.escape, ",", val.escape, ")") + cfg.writeLine("\nswitch(", key.escape, ",", val.escape, ")") switch("backend", nf.getNimbleValue("backend", "c")) switch("nimcache", getEnv("NIX_BUILD_TOP", ".") / "nimcache") if getEnvBool("nimRelease", true): diff --git a/pkgs/by-name/ni/nimlangserver/lock.json b/pkgs/by-name/ni/nimlangserver/lock.json index 4d1189a42a08..f2235cbc94bf 100644 --- a/pkgs/by-name/ni/nimlangserver/lock.json +++ b/pkgs/by-name/ni/nimlangserver/lock.json @@ -1,185 +1,5 @@ { "depends": [ - { - "method": "fetchzip", - "path": "/nix/store/y6w1gzbf6i691z35rbn6kzrmf1n5bmdc-source", - "rev": "cb8b7bfdcdc2272aadf92153c668acd3c901bd6b", - "sha256": "1ggp5rvs217dv2n0p5ddm5h17pv2mc7724n8cd0b393kmsjiykhz", - "srcDir": "src", - "url": "https://github.com/nitely/nim-regex/archive/cb8b7bfdcdc2272aadf92153c668acd3c901bd6b.tar.gz", - "subDir": "", - "packages": [ - "regex" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/wb2x78l0bcjax6mzh6kc0ir7081hwsqp-source", - "rev": "15c5e25e2a49a924bc97647481ff50125bba2c76", - "sha256": "13s6mmsy5ah4sjpcl53x0qd8szc040s4nd47kszqyj1qxy340j6j", - "srcDir": "src", - "url": "https://github.com/nitely/nim-unicodedb/archive/15c5e25e2a49a924bc97647481ff50125bba2c76.tar.gz", - "subDir": "", - "packages": [ - "unicodedb" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/vmy6gkjzq9h7myz0x6d9nhvkbbsyswxm-source", - "rev": "c04576d829b8a0a1b12baaa8bc92037501b3a4a0", - "sha256": "0plwammxi4iis59p2416g7420f5fx38jziwhmi082c5lm2x658x9", - "srcDir": "", - "url": "https://github.com/status-im/nim-chronos/archive/c04576d829b8a0a1b12baaa8bc92037501b3a4a0.tar.gz", - "subDir": "", - "packages": [ - "chronos" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/nl53j85lzfw7292g7ly0nydp60icp1ba-source", - "rev": "8bb1acbaa4b86eb866145b0d468eff64a57d1897", - "sha256": "0p8gs6q91j0s8k7f83j07v0ka75jgbd3x6n5fcjp76yyfxq6nll4", - "srcDir": "", - "url": "https://github.com/status-im/nim-http-utils/archive/8bb1acbaa4b86eb866145b0d468eff64a57d1897.tar.gz", - "subDir": "", - "packages": [ - "httputils" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/ldwb9l3j8xz8z591v9954asg1f6sx990-source", - "rev": "3236fa68394f1e3a06e2bc34218aacdd2d675923", - "sha256": "0k8q80s8ibhb5dssbg87z4rlhpqkmwhccpl8djg2l671bjbpc1hp", - "srcDir": "", - "url": "https://github.com/status-im/nim-stint/archive/3236fa68394f1e3a06e2bc34218aacdd2d675923.tar.gz", - "subDir": "", - "packages": [ - "stint" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/2ksmfd7p93a1a7ibcv3qzsk8h3c3shz7-source", - "rev": "845b6af28b9f68f02d320e03ad18eccccea7ddb9", - "sha256": "1c55kl05pbavm9v5dv42n43sql9qcrblhh3hnp99p5xmlv20c9vf", - "srcDir": "", - "url": "https://github.com/status-im/nim-unittest2/archive/845b6af28b9f68f02d320e03ad18eccccea7ddb9.tar.gz", - "subDir": "", - "packages": [ - "unittest2" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/jk20z5n9y08il34a6w0wzkiak1vyww57-source", - "rev": "179f81dedaddb5ba8d02534ccc8b7a8335981f49", - "sha256": "04l35gx67pyaja1zf14ix1ykvf985affxrwdz9j01pdq89mi4wzi", - "srcDir": "", - "url": "https://github.com/status-im/nim-websock/archive/179f81dedaddb5ba8d02534ccc8b7a8335981f49.tar.gz", - "subDir": "", - "packages": [ - "websock" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/d6c7dvmzzvc1ja7kf65jbclbjv74zll7-source", - "rev": "2086c99608b4bf472e1ef5fe063710f280243396", - "sha256": "1m7c9bvxarw167kd5mpfnddzydji03azhz347hvad592qfw4vwrc", - "srcDir": "", - "url": "https://github.com/status-im/nim-serialization/archive/2086c99608b4bf472e1ef5fe063710f280243396.tar.gz", - "subDir": "", - "packages": [ - "serialization" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/cgk4hrq58z2lkyvw50z48fx2amknznwk-source", - "rev": "a6e198132097fb544d04959aeb3b839e1408f942", - "sha256": "0g9k6f6myjbzqnvpw031jbndld24vhgzbw04mhrg8drshkcc8hl5", - "srcDir": "", - "url": "https://github.com/status-im/nim-stew/archive/a6e198132097fb544d04959aeb3b839e1408f942.tar.gz", - "subDir": "", - "packages": [ - "stew" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/8ijlgkqw88mgn94xagrjclixsi0czcmz-source", - "rev": "c246d00eaa7d6f52019464b37da510a8be23e939", - "sha256": "0b23xim2vprz2kfycj63kz4hmga92rvxx37a4r4dp562p5rncjgv", - "srcDir": "", - "url": "https://github.com/status-im/nim-faststreams/archive/c246d00eaa7d6f52019464b37da510a8be23e939.tar.gz", - "subDir": "", - "packages": [ - "faststreams" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/0fqfwjcwsln69s6kjg21nan1zpjkhm5a-source", - "rev": "bd36a44410dd8365649e425ccade817178628e12", - "sha256": "159h07k8axskgpq64b79qsixf83nq7b9r09367ghj7f1bgbgfa6w", - "srcDir": "", - "url": "https://github.com/zevv/with/archive/bd36a44410dd8365649e425ccade817178628e12.tar.gz", - "subDir": "", - "packages": [ - "with" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/68bbq8adcyng1n6wlh1mxs9zrvmlqfhj-source", - "rev": "e4fb95cbe36ad1e231661c922da04b81e0ffeed9", - "sha256": "0gqhag91f8dkdv0v2mg6pz5q6afl70bbnk628i52p4wsi4bl49jj", - "srcDir": "", - "url": "https://github.com/status-im/nim-testutils/archive/e4fb95cbe36ad1e231661c922da04b81e0ffeed9.tar.gz", - "subDir": "", - "packages": [ - "testutils" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/d2k2zimyby03ppam7a3jagjp64s7kv66-source", - "rev": "57b2392ad69849e3e2d02b74a8a0feee2c3d9570", - "sha256": "1wma3dhrrdfxn05ds6yiv9mj071czv90x06bm7f5rslzk0s7m1af", - "srcDir": "", - "url": "https://github.com/arnetheduck/nim-results/archive/57b2392ad69849e3e2d02b74a8a0feee2c3d9570.tar.gz", - "subDir": "", - "packages": [ - "results" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/ifn939s0mkrk8apgzw9zx8r7qlqq7hff-source", - "rev": "31af0f2bda1486ffb7326c5df1dc47dc63d73fff", - "sha256": "1vsbrs2fyais2x58sz5a214zbvjbczzj4ph8hjmaxc7gwmh901xn", - "srcDir": "", - "url": "https://github.com/status-im/nim-json-rpc/archive/31af0f2bda1486ffb7326c5df1dc47dc63d73fff.tar.gz", - "subDir": "", - "packages": [ - "json_rpc" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/1y5divckxhpdlhjf25jakr3fnlbqqv0k-source", - "rev": "dc07e3058c6904eef965394493b6ea99aa2adefc", - "sha256": "1nj45bn99lyylzd3add01irxn2irhpj2ll9sphjf1zlczmga7d49", - "srcDir": "", - "url": "https://github.com/cheatfate/nimcrypto/archive/dc07e3058c6904eef965394493b6ea99aa2adefc.tar.gz", - "subDir": "", - "packages": [ - "nimcrypto" - ] - }, { "method": "git", "path": "/nix/store/mki47dpj9mi8wa7gwhp3n0q6z9lhn1mv-nim-bearssl-667b404", @@ -194,18 +14,6 @@ "bearssl" ] }, - { - "method": "fetchzip", - "path": "/nix/store/jfiwlq3w0jq79aj3izx5zdrv218phjqy-source", - "rev": "ab1a061756bb6fc2e0f98cb57852f2bb0c6f9772", - "sha256": "0926ixcw451qdfvcfx0b7g7bm3345gvnchfy349v3pf8vh3nn7jz", - "srcDir": "", - "url": "https://github.com/status-im/nim-json-serialization/archive/ab1a061756bb6fc2e0f98cb57852f2bb0c6f9772.tar.gz", - "subDir": "", - "packages": [ - "json_serialization" - ] - }, { "method": "fetchzip", "path": "/nix/store/s0xpqswh05sy658ah0jxwvarczi2p8b1-source", @@ -218,11 +26,203 @@ "chronicles" ] }, + { + "method": "fetchzip", + "path": "/nix/store/7sgxspvgamvlsds48j7lb3p48qcwz1iw-source", + "rev": "0646c444fce7c7ed08ef6f2c9a7abfd172ffe655", + "sha256": "1r499jl0lhnjq7hgddwgjl0gh3y1mprnqkhk0h6yh3cwgsmr5ym9", + "srcDir": "", + "url": "https://github.com/status-im/nim-chronos/archive/0646c444fce7c7ed08ef6f2c9a7abfd172ffe655.tar.gz", + "subDir": "", + "packages": [ + "chronos" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/cxdwn7p4cis5hd5w4jsn8lql5vzx5civ-source", + "rev": "2b08c774afaafd600cf4c6f994cf78b8aa090c0c", + "sha256": "10zl9a5phdsjj811v8by0yzadfc8d3azaj878an2hr8qsfi9y1ps", + "srcDir": "", + "url": "https://github.com/status-im/nim-faststreams/archive/2b08c774afaafd600cf4c6f994cf78b8aa090c0c.tar.gz", + "subDir": "", + "packages": [ + "faststreams" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/m2c5l6z5mgknzkidhjsaz7n8pr1lb5ia-source", + "rev": "79cbab1460f4c0cdde2084589d017c43a3d7b4f1", + "sha256": "14nfr78anj3vsj5rwy7ikjnggzdzb7m2x2pjjgi8z20a6pv9p1ha", + "srcDir": "", + "url": "https://github.com/status-im/nim-http-utils/archive/79cbab1460f4c0cdde2084589d017c43a3d7b4f1.tar.gz", + "subDir": "", + "packages": [ + "httputils" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/s6inc18jrmmnzpvdnms6lh85bv25523w-source", + "rev": "274372132de497e6b7b793c9d5d5474b71bf80a2", + "sha256": "04p030b0lk6j54bwyh47mc4qhvbym0px5l4y69p51n953s7affy7", + "srcDir": "", + "url": "https://github.com/status-im/nim-json-rpc/archive/274372132de497e6b7b793c9d5d5474b71bf80a2.tar.gz", + "subDir": "", + "packages": [ + "json_rpc" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/p6c3fm650blwa95zvf52vh08lmjk3vfj-source", + "rev": "6eadb6e939ffa7882ff5437033c11a9464d3385c", + "sha256": "00w5kv5w4hz9yq5xzkxk95591n1m56z76j1al8kqhsabbgvnab8a", + "srcDir": "", + "url": "https://github.com/status-im/nim-json-serialization/archive/6eadb6e939ffa7882ff5437033c11a9464d3385c.tar.gz", + "subDir": "", + "packages": [ + "json_serialization" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/1y5divckxhpdlhjf25jakr3fnlbqqv0k-source", + "rev": "dc07e3058c6904eef965394493b6ea99aa2adefc", + "sha256": "1nj45bn99lyylzd3add01irxn2irhpj2ll9sphjf1zlczmga7d49", + "srcDir": "", + "url": "https://github.com/cheatfate/nimcrypto/archive/dc07e3058c6904eef965394493b6ea99aa2adefc.tar.gz", + "subDir": "", + "packages": [ + "nimcrypto" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/zk3nnz2rphdjll15cfws3k1m16gs7zpf-source", + "rev": "0673df07cb266e15942c3b5f5b8a4732f049cd73", + "sha256": "1aip87rhvl6jhxkpj0gw9z18g5k03qjkhwi15rgqh7dmy4f7qggv", + "srcDir": "src", + "url": "https://github.com/nitely/nim-regex/archive/0673df07cb266e15942c3b5f5b8a4732f049cd73.tar.gz", + "subDir": "", + "packages": [ + "regex" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/17gj9sw2hw818cbxvd6i94n734inm1vf-source", + "rev": "df8113dda4c2d74d460a8fa98252b0b771bf1f27", + "sha256": "1h7amas16sbhlr7zb7n3jb5434k98ji375vzw72k1fsc86vnmcr9", + "srcDir": "", + "url": "https://github.com/arnetheduck/nim-results/archive/df8113dda4c2d74d460a8fa98252b0b771bf1f27.tar.gz", + "subDir": "", + "packages": [ + "results" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/d6c7dvmzzvc1ja7kf65jbclbjv74zll7-source", + "rev": "2086c99608b4bf472e1ef5fe063710f280243396", + "sha256": "1m7c9bvxarw167kd5mpfnddzydji03azhz347hvad592qfw4vwrc", + "srcDir": "", + "url": "https://github.com/status-im/nim-serialization/archive/2086c99608b4bf472e1ef5fe063710f280243396.tar.gz", + "subDir": "", + "packages": [ + "serialization" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/a5kmnnbk27rxk9vsx1vchiiq9znkpijf-source", + "rev": "79e4fa5a9d3374db17ed63622714d3e1094c7f34", + "sha256": "0x92sgnxczwx5ak067d6169j9qm0cdpbrcpp1ijrzgyfgknpyq0r", + "srcDir": "", + "url": "https://github.com/status-im/nim-stew/archive/79e4fa5a9d3374db17ed63622714d3e1094c7f34.tar.gz", + "subDir": "", + "packages": [ + "stew" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/ch40287lsmlpcrimi6p32irsyp8750dz-source", + "rev": "1a2c661e3f50ff696b0b6692fab0d7bb2abf10cc", + "sha256": "1791gj3nxn8cffw0q5id5fahyqz6chl4b94hbvvcj45nv7drj8ms", + "srcDir": "", + "url": "https://github.com/status-im/nim-stint/archive/1a2c661e3f50ff696b0b6692fab0d7bb2abf10cc.tar.gz", + "subDir": "", + "packages": [ + "stint" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/5zsg89yl1c4xbwxz204f89fhqw0pfyh2-source", + "rev": "4d37244f9f5e1acd8592a4ceb5c3fc47bc160181", + "sha256": "1knxmh42y10lgk2np3msacb0p01m071zq522sz19rc7c192qylin", + "srcDir": "", + "url": "https://github.com/status-im/nim-testutils/archive/4d37244f9f5e1acd8592a4ceb5c3fc47bc160181.tar.gz", + "subDir": "", + "packages": [ + "testutils" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/kfq6qp0l8vcr7dlnb4ahjldyp2wmg9d2-source", + "rev": "66f2458710dc641dd4640368f9483c8a0ec70561", + "sha256": "092z3glgdb7rmwajm7dmqzvralkm7ixighixk8ycf8sf17zm72ck", + "srcDir": "src", + "url": "https://github.com/nitely/nim-unicodedb/archive/66f2458710dc641dd4640368f9483c8a0ec70561.tar.gz", + "subDir": "", + "packages": [ + "unicodedb" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/2ksmfd7p93a1a7ibcv3qzsk8h3c3shz7-source", + "rev": "845b6af28b9f68f02d320e03ad18eccccea7ddb9", + "sha256": "1c55kl05pbavm9v5dv42n43sql9qcrblhh3hnp99p5xmlv20c9vf", + "srcDir": "", + "url": "https://github.com/status-im/nim-unittest2/archive/845b6af28b9f68f02d320e03ad18eccccea7ddb9.tar.gz", + "subDir": "", + "packages": [ + "unittest2" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/y0bn3k5amqv7dymdg4743f6ib3xjv9c2-source", + "rev": "ebe308a79a7b440a11dfbe74f352be86a3883508", + "sha256": "0xzkhx0hbzidxfasy0sna9jnr83qfnddklmm4ngvp11fgz29licd", + "srcDir": "", + "url": "https://github.com/status-im/nim-websock/archive/ebe308a79a7b440a11dfbe74f352be86a3883508.tar.gz", + "subDir": "", + "packages": [ + "websock" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/0fqfwjcwsln69s6kjg21nan1zpjkhm5a-source", + "rev": "bd36a44410dd8365649e425ccade817178628e12", + "sha256": "159h07k8axskgpq64b79qsixf83nq7b9r09367ghj7f1bgbgfa6w", + "srcDir": "", + "url": "https://github.com/zevv/with/archive/bd36a44410dd8365649e425ccade817178628e12.tar.gz", + "subDir": "", + "packages": [ + "with" + ] + }, { "method": "git", - "path": "/nix/store/yz5sl71l2s8fa0af2afrip4adv5yz681-nim-zlib-02311a3", - "rev": "02311a35623964a3ef37da8cd896ed95be06e6da", - "sha256": "105yzm4phva8ga2nw9yy9kk37lwanpgiq9g77ag54fc005cr0sm6", + "path": "/nix/store/5wiybf9wc0fajjh5d4f9gi4k4d92yakz-nim-zlib-3f79980", + "rev": "3f7998095264d262a8d99e2be89045e6d9301537", + "sha256": "054raay2cx5yyq7bda7pvfa5d5m7shv70kp21l9g767idybc7jr8", "srcDir": "", "url": "https://github.com/status-im/nim-zlib", "subDir": "", diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix index 870ad9692f92..89de05040bbd 100644 --- a/pkgs/by-name/ni/nimlangserver/package.nix +++ b/pkgs/by-name/ni/nimlangserver/package.nix @@ -6,17 +6,17 @@ buildNimPackage ( final: prev: rec { pname = "nimlangserver"; - version = "1.8.1"; + version = "1.10.0"; # nix build ".#nimlangserver.src" - # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --prefetch-git:bearssl,zlib + # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --git,=,bearssl,zlib lockFile = ./lock.json; src = fetchFromGitHub { owner = "nim-lang"; repo = "langserver"; rev = "v${version}"; - hash = "sha256-j5YnTGPtt0WhRvNfpgO9tjAqZJA5Kt1FE1Mjqn0/DNY="; + hash = "sha256-KApIzGknWDb7UJkzii9rGOING4G8D31zUoWvMH4iw4A="; }; doCheck = false; diff --git a/pkgs/by-name/ni/ninjavis/package.nix b/pkgs/by-name/ni/ninjavis/package.nix new file mode 100644 index 000000000000..9d24ea24eaca --- /dev/null +++ b/pkgs/by-name/ni/ninjavis/package.nix @@ -0,0 +1,44 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "ninjavis"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chagui"; + repo = "ninjavis"; + tag = "v${version}"; + hash = "sha256-4MXU43noG0mKwiXWrLu1tW9YGkU1YjP/UoUKZzVer14="; + }; + + build-system = [ + python3Packages.poetry-core + ]; + + pythonImportsCheck = [ + "ninjavis" + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + env --ignore-environment $out/bin/ninjavis --help + + runHook postInstallCheck + ''; + + meta = { + description = "Generate visualization from Ninja build logs"; + homepage = "https://github.com/chagui/ninjavis"; + changelog = "https://github.com/chagui/ninjavis/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; + mainProgram = "ninjavis"; + }; +} diff --git a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix index f4b20b56ea71..8bad7ed5fbc2 100644 --- a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix +++ b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - sourceRoot = "source/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' patchShebangs configure diff --git a/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix b/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix index 51d448ee808c..e998049715d9 100644 --- a/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix +++ b/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation { inherit pname version src; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' substituteInPlace Makefile \ diff --git a/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix b/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix index dea4e7e1dbf9..73ab0d7ebfa4 100644 --- a/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix +++ b/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkgsCross.avr.stdenv.cc ]; - sourceRoot = "source/src"; + sourceRoot = "${finalAttrs.src.name}/src"; makeFlags = [ "all" ]; diff --git a/pkgs/by-name/ni/nix-playground/package.nix b/pkgs/by-name/ni/nix-playground/package.nix index 28116d8ef445..371cd1598931 100644 --- a/pkgs/by-name/ni/nix-playground/package.nix +++ b/pkgs/by-name/ni/nix-playground/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-playground"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "nix-playground"; tag = version; - hash = "sha256-+X21Fub8G7vx+HjuExUojYy7duY5enbakBCxXbOb3GM="; + hash = "sha256-WiQlqQHW4RNvk79cs3B6+Tg1STYXj2tq2+Pvu82saxk="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/asciidoc.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/asciidoc.py index 0c2531209876..dadcaa96b467 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/asciidoc.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/asciidoc.py @@ -182,6 +182,7 @@ class AsciiDocRenderer(Renderer): self._leave_block() return "\n" def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: + # NixOS-specific roles are documented at /doc/README.md (with reverse reference) self._parstack[-1].continuing = True content = asciidoc_escape(token.content) if token.meta['name'] == 'manpage' and (url := self._manpage_urls.get(token.content)): diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py index 6287b60f0a51..7f31d0be44ae 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py @@ -159,6 +159,7 @@ class CommonMarkRenderer(Renderer): self._leave_block() return "" def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: + # NixOS-specific roles are documented at /doc/README.md (with reverse reference) self._parstack[-1].continuing = True content = md_make_code(token.content) if token.meta['name'] == 'manpage' and (url := self._manpage_urls.get(token.content)): diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py index 1de511c7ce31..3e4ff1aedb7a 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py @@ -136,6 +136,7 @@ class HTMLRenderer(Renderer): def dd_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: + # NixOS-specific roles are documented at /doc/README.md (with reverse reference) if token.meta['name'] == 'command': return f'{escape(token.content)}' if token.meta['name'] == 'file': diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manpage.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manpage.py index 024ec8d134dd..a3d6e791cabd 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manpage.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manpage.py @@ -253,6 +253,7 @@ class ManpageRenderer(Renderer): self._leave_block() return ".RE" def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: + # NixOS-specific roles are documented at /doc/README.md (with reverse reference) if token.meta['name'] in [ 'command', 'env', 'option' ]: return f'\\fB{man_escape(token.content)}\\fP' elif token.meta['name'] in [ 'file', 'var' ]: diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/md.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/md.py index 894daf9ca9c7..93f07818b454 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/md.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/md.py @@ -228,6 +228,7 @@ class Renderer: def dd_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported", token) def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: + # NixOS-specific roles are documented at /doc/README.md (with reverse reference) raise RuntimeError("md token not supported", token) def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported", token) diff --git a/pkgs/by-name/nn/nnn/package.nix b/pkgs/by-name/nn/nnn/package.nix index 9e8a0467b3d8..568eba6e28c8 100644 --- a/pkgs/by-name/nn/nnn/package.nix +++ b/pkgs/by-name/nn/nnn/package.nix @@ -28,13 +28,13 @@ assert withEmojis -> (!withIcons && !withNerdIcons); stdenv.mkDerivation (finalAttrs: { pname = "nnn"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; - rev = "v${finalAttrs.version}"; - hash = "sha256-HShHSjqD0zeE1/St1Y2dUeHfac6HQnPFfjmFvSuEXUA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+2lFFBtaqRPBkEspCFtKl9fllbSR5MBB+4ks3Xh7vp4="; }; patches = [ @@ -93,13 +93,13 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/nnn --prefix PATH : "$binPath" ''; - meta = with lib; { + meta = { description = "Small ncurses-based file browser forked from noice"; homepage = "https://github.com/jarun/nnn"; changelog = "https://github.com/jarun/nnn/blob/v${finalAttrs.version}/CHANGELOG"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ Br1ght0ne ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ Br1ght0ne ]; mainProgram = "nnn"; }; }) diff --git a/pkgs/by-name/no/nomnatong/package.nix b/pkgs/by-name/no/nomnatong/package.nix index da334efbe55d..894ecc0c999d 100644 --- a/pkgs/by-name/no/nomnatong/package.nix +++ b/pkgs/by-name/no/nomnatong/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nomnatong"; - version = "5.13"; + version = "5.14"; src = fetchFromGitHub { owner = "nomfoundation"; repo = "font"; rev = "v${finalAttrs.version}"; - hash = "sha256-OGJJpvjrHqP6P5eoazrezRVhQ9Hj3xDYi/pYTUG2edw="; + hash = "sha256-H9Cdl27qg94SgyDS1KvoyHTQC4s2geLBPKKupEXGJQE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/np/npins/package.nix b/pkgs/by-name/np/npins/package.nix index f54fbe449bcb..4b9269f11d14 100644 --- a/pkgs/by-name/np/npins/package.nix +++ b/pkgs/by-name/np/npins/package.nix @@ -1,10 +1,10 @@ { lib, rustPlatform, + fetchFromGitHub, makeWrapper, stdenv, darwin, - callPackage, # runtime dependencies nix, # for nix-prefetch-url @@ -18,15 +18,20 @@ let nix-prefetch-git git ]; - sources = (lib.importJSON ./sources.json).pins; in rustPlatform.buildRustPackage rec { pname = "npins"; - version = src.version; - src = passthru.mkSource sources.npins; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "andir"; + repo = "npins"; + tag = version; + sha256 = "sha256-nTm6IqCHNFQLU7WR7dJRP7ktBctpE/O2LHbUV25roJA="; + }; useFetchCargoVendor = true; - cargoHash = "sha256-RUtWpZYaydXzF7gcROiIr04K7+Usq9iHAQwnv3ELqLI="; + cargoHash = "sha256-HnX7dkWLxa3DARXG8y9OVBRwvwgxwRIs4mWK3VNblG0="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; @@ -51,6 +56,4 @@ rustPlatform.buildRustPackage rec { license = licenses.eupl12; maintainers = with maintainers; [ piegames ]; }; - - passthru.mkSource = callPackage ./source.nix { }; } diff --git a/pkgs/by-name/np/npins/source.nix b/pkgs/by-name/np/npins/source.nix deleted file mode 100644 index d7f08ede9c8f..000000000000 --- a/pkgs/by-name/np/npins/source.nix +++ /dev/null @@ -1,76 +0,0 @@ -# Not part of the public API – for use within nixpkgs only -# -# Usage: -# ```nix -# let -# sources = lib.importJSON ./sources.json; -# in mkMyDerivation rec { -# version = src.version; # This obviously only works for releases -# src = pkgs.npins.mkSource sources.mySource; -# } -# ``` - -{ - fetchgit, - fetchzip, - fetchurl, -}: -let - mkSource = - spec: - assert spec ? type; - let - path = - if spec.type == "Git" then - mkGitSource spec - else if spec.type == "GitRelease" then - mkGitSource spec - else if spec.type == "PyPi" then - mkPyPiSource spec - else if spec.type == "Channel" then - mkChannelSource spec - else - throw "Unknown source type ${spec.type}"; - in - spec // { outPath = path; }; - - mkGitSource = - { - repository, - revision, - url ? null, - hash, - ... - }: - assert repository ? type; - # At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository - # In the latter case, there we will always be an url to the tarball - if url != null then - (fetchzip { - inherit url; - sha256 = hash; - extension = "tar"; - }) - else - assert repository.type == "Git"; - fetchgit { - url = repository.url; - rev = revision; - }; - - mkPyPiSource = - { url, hash, ... }: - fetchurl { - inherit url; - sha256 = hash; - }; - - mkChannelSource = - { url, hash, ... }: - fetchzip { - inherit url; - sha256 = hash; - extension = "tar"; - }; -in -mkSource diff --git a/pkgs/by-name/np/npins/sources.json b/pkgs/by-name/np/npins/sources.json deleted file mode 100644 index f7faf4210d72..000000000000 --- a/pkgs/by-name/np/npins/sources.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pins": { - "npins": { - "type": "GitRelease", - "repository": { - "type": "GitHub", - "owner": "andir", - "repo": "npins" - }, - "pre_releases": false, - "version_upper_bound": null, - "version": "0.2.4", - "revision": "181da464f7edb5e675dd96cc25d611760796a739", - "url": "https://api.github.com/repos/andir/npins/tarball/0.2.4", - "hash": "04155dr6i1gy2zgy49v8zm75sn1akm83l4x8h6cxvxyk1l2abn4q" - } - }, - "version": 3 -} diff --git a/pkgs/by-name/nv/nvidia-modprobe/package.nix b/pkgs/by-name/nv/nvidia-modprobe/package.nix index 2af81867fa80..594e92923936 100644 --- a/pkgs/by-name/nv/nvidia-modprobe/package.nix +++ b/pkgs/by-name/nv/nvidia-modprobe/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "nvidia-modprobe"; - version = "570.124.04"; + version = "570.133.07"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; rev = version; - hash = "sha256-slYK8O3/Nz07MCP8fB4sg9Io0YSMVzFhXEyM+ZAaKiA="; + hash = "sha256-6/1g66Mr0Ru4V3JMTRXet1aiNa0wrTIGw84QPrCO85c="; }; nativeBuildInputs = [ gnum4 ]; diff --git a/pkgs/by-name/nv/nvmet-cli/package.nix b/pkgs/by-name/nv/nvmet-cli/package.nix index beaeea887c39..00bfcef2829e 100644 --- a/pkgs/by-name/nv/nvmet-cli/package.nix +++ b/pkgs/by-name/nv/nvmet-cli/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { buildInputs = with python3Packages; [ nose2 ]; - propagatedBuildInputs = with python3Packages; [ configshell ]; + propagatedBuildInputs = with python3Packages; [ configshell-fb ]; # This package requires the `nvmet` kernel module to be loaded for tests. doCheck = false; diff --git a/pkgs/by-name/nw/nwg-look/package.nix b/pkgs/by-name/nw/nwg-look/package.nix index a74a4b9ed79e..5cd108ef1a3a 100644 --- a/pkgs/by-name/nw/nwg-look/package.nix +++ b/pkgs/by-name/nw/nwg-look/package.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "nwg-look"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-look"; rev = "v${version}"; - hash = "sha256-02BzYhWWPPaNR0bt1cNn0H40hkLaSlcJHZx1eilluwI="; + hash = "sha256-oP+qcOu03ZKQRdvPKCRVL187QP3gAg2dyvRO94N7+GE="; }; - vendorHash = "sha256-J9Wc5MCgztzzYnjm3lAREmYLGPyuCX9Xr+qhAwf9Fzg="; + vendorHash = "sha256-KzAozP9pfqoFOgK+/xmwsI0m2QWAVW/b+hoWHlQoVX0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index e01223d1bf44..ec73eaff2289 100644 --- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix +++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix @@ -7,7 +7,7 @@ let bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32"; - version = "0.96.0"; + version = "0.97.0"; in stdenv.mkDerivation { pname = "nwjs-ffmpeg-prebuilt"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { src = let hashes = { - "x64" = "sha256-5eqFzl8bHZnHBTuR10D7MCcjdk07diT7RhaF8TtGd2w="; - "ia32" = "sha256-5eqFzl8bHZnHBTuR10D7MCcjdk07diT7RhaF8TtGd2w="; + "x64" = "sha256-Z4AS8qjDgbXhpzLVspc4Y/78kdmwuqB2wtsjQ3MjMzE="; + "ia32" = "sha256-Z4AS8qjDgbXhpzLVspc4Y/78kdmwuqB2wtsjQ3MjMzE="; }; in fetchurl { diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix index 7ac3f5de49e0..d7831ac55337 100644 --- a/pkgs/by-name/nz/nzbget/package.nix +++ b/pkgs/by-name/nz/nzbget/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nzbget"; - version = "24.7"; + version = "24.8"; src = fetchFromGitHub { owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-t/zVSCiSL+/8qnmLwKqmL7IL84CAtZRfZneoC0mvnJM="; + hash = "sha256-jsCjiZQ5Li+PKAfeMliAe341f8kn7QgUjUKciP5CdKE="; }; patches = [ diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index 105bb4170a77..bd2eca88c35c 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -25,14 +25,14 @@ in py.pkgs.buildPythonApplication rec { pname = "oci-cli"; - version = "3.52.0"; + version = "3.53.0"; format = "setuptools"; src = fetchFromGitHub { owner = "oracle"; repo = pname; tag = "v${version}"; - hash = "sha256-5b+KFKj1IjAJwu166Q4YRmvNGmjKMVFhDwzPzWeKT2w="; + hash = "sha256-7PCKnYHUeuQ8/mtDFUoP8ay0dR1Gq3HxRG9Ws+uM39Q="; }; nativeBuildInputs = [ installShellFiles ]; @@ -103,7 +103,6 @@ py.pkgs.buildPythonApplication rec { upl ]; maintainers = with maintainers; [ - adamcstephens ilian FKouhai ]; diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix index d309a70f5feb..3a75f033f772 100644 --- a/pkgs/by-name/oc/octoprint/package.nix +++ b/pkgs/by-name/oc/octoprint/package.nix @@ -238,8 +238,6 @@ let setup.py ''; - dontUseSetuptoolsCheck = true; - preCheck = '' export HOME=$(mktemp -d) rm pytest.ini diff --git a/pkgs/by-name/od/odp-dpdk/package.nix b/pkgs/by-name/od/odp-dpdk/package.nix index 163d1959c47c..0c8ef1005e6f 100644 --- a/pkgs/by-name/od/odp-dpdk/package.nix +++ b/pkgs/by-name/od/odp-dpdk/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "odp-dpdk"; - version = "1.44.0.0_DPDK_22.11"; + version = "1.46.0.0_DPDK_22.11"; src = fetchFromGitHub { owner = "OpenDataPlane"; repo = "odp-dpdk"; rev = "v${version}"; - hash = "sha256-hYtQ7kKB08BImkTYXqtnv1Ny1SUPCs6GX7WOYks8iKA="; + hash = "sha256-9stWGupRSQwUXOdPEQ9Rhkim22p5BBA5Z+2JCYS7Za0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 2bb7c780f314..8e45f3811933 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -1,6 +1,6 @@ { lib, - buildGo124Module, + buildGoModule, fetchFromGitHub, buildEnv, linkFarm, @@ -43,15 +43,13 @@ assert builtins.elem acceleration [ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.6.0"; - - buildGoModule = buildGo124Module; + version = "0.6.2"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${version}"; - hash = "sha256-xcnzLBrTbH5IRDZoUR0OoXslcTvml9d/jnQEM52Rmyg="; + hash = "sha256-ZQiBbVQbMYxC73DAPyWi6Yn/cPySpsPcTiCOHK3F35w="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 333d7f0c7875..de52df25d619 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.46.3"; + version = "0.47.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-pVi27A8U3+nDMMmVAV/7HXXXydWFxB8M/PiEJCnqdwo="; + hash = "sha256-/hv6YNaBfECFlf1xJCiSeWg+/PqmIa+Rtip6kFuHPCM="; }; - vendorHash = "sha256-5+15d7QcjajZ6yOSQgN4D0Lzy2Bljk0ih/KKG1SGtX8="; + vendorHash = "sha256-BQn+3TEaHnJrzDZt3j/sB9Gbh4mQXhqfX0ssu+G+mg0="; ldflags = [ "-s" diff --git a/pkgs/by-name/op/open-web-calendar/package.nix b/pkgs/by-name/op/open-web-calendar/package.nix index 5e77b50f470b..0d8c0cc7cac9 100644 --- a/pkgs/by-name/op/open-web-calendar/package.nix +++ b/pkgs/by-name/op/open-web-calendar/package.nix @@ -12,7 +12,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "open-web-calendar"; - version = "1.42"; + version = "1.48"; pyproject = true; disabled = python.pythonOlder "3.9"; @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "open_web_calendar"; - hash = "sha256-w4XaT1+qIM80K6B+LIAeYdZzYIw4FYSd/nvWphOx460="; + hash = "sha256-SSe5vkrfTpUFdSLglBxo5//VZfuXYnWs5sUKJL2zWOw="; }; # The Pypi tarball doesn't contain open_web_calendars/features @@ -35,6 +35,7 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ hatchling hatch-vcs + hatch-requirements-txt ]; dependencies = @@ -44,6 +45,10 @@ python.pkgs.buildPythonApplication rec { flask-allowed-hosts flask icalendar + icalendar-compatibility + cryptography + bcrypt + caldav requests pyyaml recurring-ical-events @@ -52,6 +57,7 @@ python.pkgs.buildPythonApplication rec { beautifulsoup4 lxml-html-clean pytz + mergecal ] ++ requests.optional-dependencies.socks; diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index ca22d434ae0a..155f3342bed4 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -5,7 +5,7 @@ dbus, fetchFromGitHub, gamescope, - godot_4_3, + godot_4_4, hwdata, lib, libGL, @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "opengamepadui"; - version = "0.35.8"; + version = "0.37.0"; buildType = if withDebug then "debug" else "release"; @@ -32,21 +32,21 @@ stdenv.mkDerivation (finalAttrs: { owner = "ShadowBlip"; repo = "OpenGamepadUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-vMb08Wqjt5j6IgMnXuZr6MGNk1CprVn2GTNDdOxnFG0="; + hash = "sha256-kzGFyzOu4Pkj+a7kExFwxFu35qfoLoWz3uqd8COUTNA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "source/${finalAttrs.cargoRoot}"; - hash = "sha256-sTzMewIfKHbmVhSPZgUIzFFz1ahK+PMoQ5oB4GEt8nY="; + hash = "sha256-T79G2bShJuFRfaCqG3IDHqW0s68yAdGyv58kdDYg6kg="; }; cargoRoot = "extensions"; nativeBuildInputs = [ autoPatchelfHook cargo - godot_4_3 - godot_4_3.export-templates-bin + godot_4_4 + godot_4_4.export-templates-bin pkg-config rustPlatform.cargoSetupHook ]; @@ -75,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: { env = let - versionAndRelease = lib.splitString "-" godot_4_3.version; + versionAndRelease = lib.splitString "-" godot_4_4.version; in { - GODOT = lib.getExe godot_4_3; + GODOT = lib.getExe godot_4_4; GODOT_VERSION = lib.elemAt versionAndRelease 0; GODOT_RELEASE = lib.elemAt versionAndRelease 1; - EXPORT_TEMPLATE = "${godot_4_3.export-templates-bin}"; + EXPORT_TEMPLATE = "${godot_4_4.export-templates-bin}"; BUILD_TYPE = "${finalAttrs.buildType}"; }; @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { # Godot looks for export templates in HOME export HOME=$(mktemp -d) mkdir -p $HOME/.local/share/godot/export_templates - ln -s "${godot_4_3.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE" + ln -s "${godot_4_4.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE" ''; postInstall = '' diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index c4518d3124ae..f62ea69a3e21 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, gtest, meson, nasm, @@ -26,6 +27,15 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + patches = [ + # https://github.com/cisco/openh264/pull/3867 + (fetchpatch { + name = "freebsd-configure.patch"; + url = "https://github.com/cisco/openh264/commit/ea8a1ad5791ee5c4e2ecf459aec235128d69b35b.patch"; + hash = "sha256-pJvh9eRxFZQ+ob4WPu/x+jr1CCpgnug1uBViLfAtBDg="; + }) + ]; + nativeBuildInputs = [ meson nasm @@ -58,6 +68,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.platforms.aarch64 ++ lib.platforms.loongarch64 ++ lib.platforms.riscv64 - ) (lib.platforms.linux ++ lib.platforms.darwin); + ) lib.platforms.unix; }; }) diff --git a/pkgs/by-name/op/openlibm/package.nix b/pkgs/by-name/op/openlibm/package.nix index d2f81c4c9c4f..be0cb6996efc 100644 --- a/pkgs/by-name/op/openlibm/package.nix +++ b/pkgs/by-name/op/openlibm/package.nix @@ -2,19 +2,24 @@ lib, stdenv, fetchFromGitHub, + fixDarwinDylibNames, }: stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openlibm"; rev = "v${version}"; - sha256 = "sha256-z2PMovHk9M4Wb5K4EWOrp0b+3RLRHDVUKDzIxHsKrXg="; + sha256 = "sha256-HFSRrTdIhbbSyeU/FSo5e2ZI5tff2ZDEFgYcI412ATU="; }; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; + makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/by-name/op/opensearch/package.nix b/pkgs/by-name/op/opensearch/package.nix index 3fadc5b5672a..040421bec198 100644 --- a/pkgs/by-name/op/opensearch/package.nix +++ b/pkgs/by-name/op/opensearch/package.nix @@ -12,11 +12,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.19.0"; + version = "2.19.1"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-RVuQAYLvKnGT1EPZaq6lX1NOwPkbG61tLqzbrqYB8W4="; + hash = "sha256-skOqp9jc67h4gfcPcWE5A8Nt2gd/2Q7hHqN3QS1tVp8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openvmm/package.nix b/pkgs/by-name/op/openvmm/package.nix index 2f63584b0f1c..3cc2e402a036 100644 --- a/pkgs/by-name/op/openvmm/package.nix +++ b/pkgs/by-name/op/openvmm/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage { pname = "openvmm"; - version = "0-unstable-2024-10-19"; + version = "0-unstable-2025-03-13"; src = fetchFromGitHub { owner = "microsoft"; repo = "openvmm"; - rev = "2e5acb8ab89b75d6ff59d537e9f21445d830386d"; - hash = "sha256-Fi5hDFV2SfpqJjXSc7YwlNDnoL5TTgiqmFMt+ls2Uu4="; + rev = "047fde8a2b3eec17a46203fbc54ce7f3aa9b4dfd"; + hash = "sha256-w6MxJVm5/ABU04MZUCSjzHVZLXQIsOVCIJZkHOfxQC0="; }; separateDebugInfo = true; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-6ciIbLc/L54Rhhf/IOnv63vUlqoXPi087taw6MY80HA="; + cargoHash = "sha256-u0E09yFssd71wUS1BD766ztDImauu90T/jIWOb2v0mE="; useFetchCargoVendor = true; meta = with lib; { diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix index 713d10af36c4..aa409ccb1ea5 100644 --- a/pkgs/by-name/op/operator-sdk/package.nix +++ b/pkgs/by-name/op/operator-sdk/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.39.1"; + version = "1.39.2"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; tag = "v${version}"; - hash = "sha256-+lgpwpLkqpAZ0aScM62gk4l/h44auB7ixhW3ZoT7m64="; + hash = "sha256-2Kv6mDC1MndUgttRYODnI8DZ84RVz8jn3+RpXmOemq0="; }; - vendorHash = "sha256-3CtVl3HWUcbXp/U/pTqoCol4kmJqtLsTlcAijGHENtI="; + vendorHash = "sha256-W+q9K2003dJfcjyoN4YMoY98cwBy+nfZCi3tHNLbm1w="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 337f314302b1..223064576721 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -57,13 +57,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "orca-slicer"; - version = "v2.3.0-rc"; + version = "v2.3.0"; src = fetchFromGitHub { owner = "SoftFever"; repo = "OrcaSlicer"; tag = finalAttrs.version; - hash = "sha256-obQUn5vG+6g8PYK9Xatt3QiBPNWskoTs2Byi+1xabBk="; + hash = "sha256-MEa57jFBJkqwoAkqI7wXOn1X1zxgLQt3SNeanfD88kU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 15e16e971f97..b6ff0c60258d 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.28.3"; + version = "0.29.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-blXxINsM793iH7X38J+Mrqf/WKnSRoS48yP4r3Dllow="; + hash = "sha256-Dw1cD+ScWS8GmBx04ZC8cxsgvq/6J9JC6SaOUeM6nZg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-OimkH34coQLhJlJd3BGBFE9L/TQtU4tJbTl0zwmQh3w="; + vendorHash = "sha256-X2TiE1ANze5EQemTnSlMVwi6ttNWEINXlgq1czLWWeQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/or/orthanc-framework/package.nix b/pkgs/by-name/or/orthanc-framework/package.nix new file mode 100644 index 000000000000..037044b68a6f --- /dev/null +++ b/pkgs/by-name/or/orthanc-framework/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + orthanc, + gtest, + icu, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "orthanc-framework"; + inherit (orthanc) + src + version + nativeBuildInputs + strictDeps + cmakeFlags + ; + + sourceRoot = "${finalAttrs.src.name}/OrthancFramework/SharedLibrary"; + outputs = [ + "out" + "dev" + ]; + + buildInputs = orthanc.buildInputs ++ [ + icu + ]; + + NIX_LDFLAGS = lib.strings.concatStringsSep " " [ + "-L${lib.getLib zlib}" + "-lz" + "-L${lib.getLib gtest}" + "-lgtest" + ]; + + meta = { + description = "SDK for building Orthanc plugins and related applications"; + homepage = "https://www.orthanc-server.com/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch b/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch new file mode 100644 index 000000000000..87c92ed94d1b --- /dev/null +++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch @@ -0,0 +1,16 @@ +diff -r ad41d16f36b1 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake +--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Fri Jan 17 12:24:54 2025 +0100 ++++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Thu Mar 20 17:45:59 2025 +0100 +@@ -552,9 +552,10 @@ + set(ORTHANC_FRAMEWORK_INCLUDE_DIR ${ORTHANC_FRAMEWORK_ROOT}) + else() + find_path(ORTHANC_FRAMEWORK_INCLUDE_DIR OrthancFramework.h +- /usr/include/orthanc-framework +- /usr/local/include/orthanc-framework ++ /usr/ ++ /usr/local/ + ${ORTHANC_FRAMEWORK_ROOT} ++ PATH_SUFFIXES include include/orthanc-framework + ) + endif() + diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix new file mode 100644 index 000000000000..160d7bb47949 --- /dev/null +++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix @@ -0,0 +1,106 @@ +{ + lib, + stdenv, + fetchhg, + fetchurl, + orthanc, + cmake, + python3, + unzip, + gtest, + jsoncpp, + boost, + pugixml, + libuuid, + zlib, + pkg-config, +}: + +let + bootstrap = fetchurl { + url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/bootstrap-5.3.3.zip"; + hash = "sha256-VdfxznlQQK+4MR3wnSnQ00ZIQAweqrstCi7SIWs9sF0="; + }; + vuejs = fetchurl { + url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/vuejs-2.6.10.tar.gz"; + hash = "sha256-49kAzZJmtb7Zu21XX8mrZ4fnnnrSHAHuEne/9UUxIfI="; + }; + axios = fetchurl { + url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/axios-0.19.0.tar.gz"; + hash = "sha256-KVd8YIWwkLTkqZOS/N1YL7a7y0myqvLMe3+jh0Ups4A="; + }; + font-awesome = fetchurl { + url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/Font-Awesome-4.7.0.tar.gz"; + hash = "sha256-3lEroOHerTgrv843LN50s/GJcdh2//tjXukzPw2wXUM="; + }; + babel-polyfill = fetchurl { + url = "https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/babel-polyfill-6.26.0.min.js.gz"; + hash = "sha256-CH09LWISr7QY9QSRhY9/BVy1Te+2NR1sXQCPZioqlcI="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "orthanc-plugin-dicomweb"; + version = "1.18"; + + src = fetchhg { + url = "https://orthanc.uclouvain.be/hg/orthanc-dicomweb/"; + rev = "OrthancDicomWeb-${finalAttrs.version}"; + hash = "sha256-ee271Fcu8yi1gZpTWrCuqhsBdFcPR/JK/fsnJg8PwIc="; + }; + + patches = [ + # Fix Orthanc Framework headers files detection + ./fix-orthanc-framework-headers-detection.patch + ]; + + postPatch = '' + mkdir -p ThirdPartyDownloads + ln -s ${bootstrap} ThirdPartyDownloads/bootstrap-5.3.3.zip + ln -s ${vuejs} ThirdPartyDownloads/vuejs-2.6.10.tar.gz + ln -s ${axios} ThirdPartyDownloads/axios-0.19.0.tar.gz + ln -s ${font-awesome} ThirdPartyDownloads/Font-Awesome-4.7.0.tar.gz + ln -s ${babel-polyfill} ThirdPartyDownloads/babel-polyfill-6.26.0.min.js.gz + ''; + + SourceRoot = "${finalAttrs.src.name}/Build"; + + nativeBuildInputs = [ + cmake + python3 + unzip + ]; + + buildInputs = [ + orthanc + orthanc.framework + jsoncpp + boost + gtest + libuuid + pugixml + zlib + ]; + + strictDeps = true; + + NIX_LDFLAGS = lib.strings.concatStringsSep " " [ + "-L${lib.getLib gtest}" + "-lgtest" + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DSTATIC_BUILD=OFF" + "-DORTHANC_FRAMEWORK_SOURCE=system" + ]; + + meta = { + description = "Plugin that extends Orthanc with support for the DICOMweb protocols"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + drupol + dvcorreia + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix index 292338d09451..31ec189162b5 100644 --- a/pkgs/by-name/or/orthanc/package.nix +++ b/pkgs/by-name/or/orthanc/package.nix @@ -23,6 +23,7 @@ unzip, versionCheckHook, nixosTests, + orthanc-framework, }: stdenv.mkDerivation (finalAttrs: { @@ -41,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: { ./add-missing-include.patch ]; + outputs = [ + "out" + "dev" + "doc" + ]; + sourceRoot = "${finalAttrs.src.name}/OrthancServer"; nativeBuildInputs = [ @@ -98,6 +105,15 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_ZLIB" true) ]; + # Remove warnings during the build + env.NIX_CFLAGS_COMPILE = "-Wno-builtin-macro-redefined"; + + postInstall = '' + mkdir -p $doc/share/doc/orthanc + cp -r $src/OrthancServer/Resources/Samples $doc/share/doc/orthanc/Samples + cp -r $src/OrthancServer/Plugins/Samples $doc/share/doc/orthanc/OrthancPluginSamples + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; @@ -105,8 +121,11 @@ stdenv.mkDerivation (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; - passthru.tests = { - inherit (nixosTests) orthanc; + passthru = { + framework = orthanc-framework; + tests = { + inherit (nixosTests) orthanc; + }; }; meta = { diff --git a/pkgs/by-name/os/osmium-tool/package.nix b/pkgs/by-name/os/osmium-tool/package.nix index c7f2f06ad373..7d8bee0466c5 100644 --- a/pkgs/by-name/os/osmium-tool/package.nix +++ b/pkgs/by-name/os/osmium-tool/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osmium-tool"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-l6C2DGGKcbMUkKDruM8QzpriqFMvDnsi4OE99a2EzhA="; + hash = "sha256-6CT5vhzZtGZDr3mCgtpI8AGXn+Iiasf9SxUV6qN9+I8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index 59d4d229b1ab..a33bd35bcee2 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2025.316.0"; + version = "2025.321.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-u5d8MjBRWd4Y/6avRyBIzgR9J+GJANjGYhkXhu7imbI="; + hash = "sha256-oc5IbLhOGn7nug47YHpEqTkQoGWQXrVS77xQMW9khqw="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-isgYm4+GXAC6A9P1UjNLcohNr1Zi4C/94V2jtLixGVI="; + hash = "sha256-c1EHrkLbxYUwwgMdgGTHHkop6STFLVH8vRQ41MzGeeI="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-348B6gtYLRTGlyCNsWiOrqg98bF/cPIsPBroisApzfc="; + hash = "sha256-mNxoEx/wgJ1OUm7y9JLd5vHSwfcB49QjKDVQWZaMDJQ="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json index 0802a357e2b8..2cc851c8fbb5 100644 --- a/pkgs/by-name/os/osu-lazer/deps.json +++ b/pkgs/by-name/os/osu-lazer/deps.json @@ -651,8 +651,8 @@ }, { "pname": "ppy.osu.Framework", - "version": "2025.313.0", - "hash": "sha256-daN3BmGYAyh+I0l5l7fFMaMoksYR3mhb9sPMg70GZxo=" + "version": "2025.321.0", + "hash": "sha256-+TD1TcZfAzFMlVsT19hCfhoMfU4MQcL8K18N/wHZhns=" }, { "pname": "ppy.osu.Framework.NativeLibs", @@ -666,8 +666,8 @@ }, { "pname": "ppy.osu.Game.Resources", - "version": "2025.313.0", - "hash": "sha256-DbPR7XwlhC9wDkgUCRUt2QrYRoscqJaRGvtUZ9LGyvM=" + "version": "2025.321.0", + "hash": "sha256-vjNwUVBSOrWEc8z8QXD+CPSZMj9BCKuKIQZXxqaXldc=" }, { "pname": "ppy.osuTK.NS20", diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index 9a5e224743c9..69841a20bdd6 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -21,13 +21,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2025.316.0"; + version = "2025.321.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = version; - hash = "sha256-EbuJ3LrfW+JtNqFx9HSR5xWDZdXP72NXvKC05ek7zhc="; + hash = "sha256-37foEm4MO8kuir72qARQ7LKiICRiRq1vorABh3OaL3g="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix new file mode 100644 index 000000000000..4f13a14dd229 --- /dev/null +++ b/pkgs/by-name/ot/otf2/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchurl, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "otf2"; + version = "3.0.3"; + + src = fetchurl { + url = "http://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/otf2-${finalAttrs.version}.tar.gz"; + hash = "sha256-GKOQX3kXNAOH4+3I5XZvMasa9B9OzFZl2mx2nKIcTug="; + }; + + configureFlags = [ + "--enable-backend-test-runs" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doCheck = true; + doInstallCheck = true; + + versionCheckProgram = [ "${placeholder "out"}/bin/otf2-config" ]; + + meta = { + homepage = "https://www.vi-hps.org/projects/score-p"; + changelog = "https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/ChangeLog.txt"; + description = "Open Trace Format 2 library"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lesuisse ]; + }; +}) diff --git a/pkgs/by-name/ow/owntone/package.nix b/pkgs/by-name/ow/owntone/package.nix new file mode 100644 index 000000000000..4fcfb8cd2616 --- /dev/null +++ b/pkgs/by-name/ow/owntone/package.nix @@ -0,0 +1,101 @@ +{ + config, + lib, + stdenv, + autoPatchelfHook, + autoreconfHook, + fetchFromGitHub, + nix-update-script, + + chromecastSupport ? config.chromecast or stdenv.hostPlatform.isLinux, + pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + + avahi, + curl, + bison, + ffmpeg, + flex, + gettext, + gnutls, + gperf, + json_c, + libconfuse, + libevent, + libgcrypt, + libgpg-error, + libplist, + libpulseaudio, + libsodium, + libtool, + libunistring, + libwebsockets, + libxml2, + pkg-config, + protobufc, + sqlite, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + version = "28.12"; + pname = "owntone"; + + src = fetchFromGitHub { + owner = "owntone"; + repo = "owntone-server"; + tag = "${finalAttrs.version}"; + hash = "sha256-Mj3G1+Hwa/zl0AM4SO6TcB4W3WJkpIDzrSPEFx0vaEk="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + autoreconfHook + bison + flex + libtool + gperf + pkg-config + ]; + + buildInputs = + [ + avahi + curl + ffmpeg + gettext + json_c + libconfuse + libevent + libgcrypt + libgpg-error + libplist + libsodium + libunistring + libwebsockets + libxml2 + protobufc + sqlite + zlib + ] + ++ lib.optionals chromecastSupport [ gnutls ] + ++ lib.optionals pulseSupport [ libpulseaudio ]; + + configureFlags = + lib.optionals chromecastSupport [ "--enable-chromecast" ] + ++ lib.optionals pulseSupport [ "--with-pulseaudio" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Media server to stream audio to AirPlay and Chromecast receivers"; + homepage = "https://github.com/owntone/owntone-server"; + downloadPage = "https://github.com/owntone/owntone-server/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/owntone/owntone-server/releases/tag/${finalAttrs.version}"; + mainProgram = "owntone"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + hensoko + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ow/owntracks-recorder/package.nix b/pkgs/by-name/ow/owntracks-recorder/package.nix index 7f11113a5a2c..ae5133cb46df 100644 --- a/pkgs/by-name/ow/owntracks-recorder/package.nix +++ b/pkgs/by-name/ow/owntracks-recorder/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "owntracks-recorder"; - version = "0.9.9"; + version = "1.0.0"; src = fetchFromGitHub { owner = "owntracks"; repo = "recorder"; rev = finalAttrs.version; - hash = "sha256-6oCWzTiQgpp75xojd2ZFsrg+Kd5/gex1BPQVOWHfMuk="; + hash = "sha256-E4hdsUAg8NHjmUrlr8cskezib4qMv+wF32cThe2/kBc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix index b3250497eff8..6ddb6210e48a 100644 --- a/pkgs/by-name/ox/ox/package.nix +++ b/pkgs/by-name/ox/ox/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "ox"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "curlpipe"; repo = "ox"; tag = version; - hash = "sha256-kTCdq3C0OUQS3tQRwEJ0+MTHZ8j2nnUARjdbmfH6ed4="; + hash = "sha256-h4oC+TRLPKgXid4YIn2TdTxgEBvbBDy66jfbyA5ia4o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1d5gGqEn6kBCXqAnwHAe7rnvaGG2wVODrxeQt+k6iJs="; + cargoHash = "sha256-Vf5Y/rXykaYkrnTjVMShnGYikDIu2b1l2oDOiB0O95I="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 91678699fad7..5a83c2bff3e3 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.15.10"; + version = "0.15.14"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-8K+ylqDKHtxCHteXKvSPEDQyRb3bSndXTEAXbeSLMco="; + hash = "sha256-PCaS60UjD502YI9lZsvbSa3utwrYl8YazZj/CF91euQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4WsJGSDVw618kUfTHekzOOdqDzbOoLYF9vinOI+jmJk="; + cargoHash = "sha256-/OLcyHTTevqpkrHY3Ueo38xtIjhjE4quqPTEZfPEcaY="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix index 95aa97478311..824def6c114e 100644 --- a/pkgs/by-name/pa/paretosecurity/package.nix +++ b/pkgs/by-name/pa/paretosecurity/package.nix @@ -9,19 +9,16 @@ buildGoModule rec { pname = "paretosecurity"; - version = "0.0.86"; + version = "0.0.91"; src = fetchFromGitHub { owner = "ParetoSecurity"; repo = "agent"; rev = version; - hash = "sha256-ASWECYUfG+lmkvAwQf05mCUwwFlUrx3vI0pYbGHdbuI="; + hash = "sha256-/kGwV96Jp7U08jh/wPQMcoV48zQe9ixY7gpNdtFyOkk="; }; - # tests do network access, fix pending - doCheck = false; - - vendorHash = "sha256-eqwrCbDKmXOCo0+X8w6Me2aaCQ3WQljgOtzqI01FzbU="; + vendorHash = "sha256-kGrYoN0dGcSuQW47Y4LUFdHQYAoY74NOM1LLPdhmLhc="; proxyVendor = true; subPackages = [ @@ -56,7 +53,11 @@ buildGoModule rec { root helper, so that you can run the checker in userspace. Some checks require root permissions, and the checker asks the helper to run those. - Additionally, you can run `paretosecurity link` to configure the agent + Additionally, if you enable `services.paretosecurity.trayIcon`, you get a + little Vilfredo Pareto living in your systray showing your the current + status of checks. + + Finally, you can run `paretosecurity link` to configure the agent to send the status of checks to https://dash.paretosecurity.com to make compliance people happy. No sending happens until your device is linked. ''; diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 12e0059452c1..714c3140070a 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-WYNvHwikY6ULEar2ZBvsALEgHuZarrwBjk3ZaGhvlk8="; + hash = "sha256-RQg7Fo8Z0P+z6Fv6YTv/IpEErP6ncxylvBaeargTrIQ="; }; - vendorHash = "sha256-Y7WpJ6h76+5BJonmDldXYzUxLH6YYl9zlitoqX3H/mk="; + vendorHash = "sha256-VzskPOd1nlrkiwGsS5OoXP0v8LQbqS+NumV2WoahFvY="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index 351a2e6af053..9add368f7738 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -39,13 +39,13 @@ let pname = "pcloud"; - version = "1.14.10"; - code = "XZLHKH5Z2KieO7jdb34LVHFY8okPD8bpqXM7"; + version = "1.14.11"; + code = "XZQRe85ZLPTV99jSGRkmdR9ET2xzqHYeABBX"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-yIsUScXGmIoZc1Mawq/SVrpJWMYFn1G/ovukLWMYVa8="; + hash = "sha256-fqC6cQYfmtwBfnXsKNXbHQ1jB6xPXleCcfi2DV5AtLw="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/pd/pdf4qt/find_lcms2_path.patch b/pkgs/by-name/pd/pdf4qt/find_lcms2_path.patch index eb38b07feb45..b9b1372e56bd 100644 --- a/pkgs/by-name/pd/pdf4qt/find_lcms2_path.patch +++ b/pkgs/by-name/pd/pdf4qt/find_lcms2_path.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 98752ec..aa029b3 100644 +index 298cdca..8894db3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,15 @@ endif() qt_standard_project_setup() find_package(OpenSSL REQUIRED) --find_package(lcms REQUIRED) +-find_package(lcms2 REQUIRED) +SET(LCMS2_NAMES ${LCMS2_NAMES} lcms2 liblcms2 liblcms2_static) +FIND_LIBRARY(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} ) +FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h) @@ -14,7 +14,7 @@ index 98752ec..aa029b3 100644 +set_target_properties(lcms2::lcms2 PROPERTIES + IMPORTED_LOCATION ${LCMS2_LIBRARY} + INTERFACE_INCLUDE_DIRECTORIES ${LCMS2_INCLUDE_DIR} -+ INTERFACE_COMPILE_DEFINITIONS "HAVE_LCMS2=1;CMS_NO_REGISTER_KEYWORD=1") ++ INTERFACE_COMPILE_DEFINITIONS "HAVE_LCMS2=1;CMS_NO_REGISTER_KEYWORD=1") +set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP lcms2::lcms2) find_package(ZLIB REQUIRED) find_package(Freetype REQUIRED) diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index 47613a53fa84..e12839032fbc 100644 --- a/pkgs/by-name/pd/pdf4qt/package.nix +++ b/pkgs/by-name/pd/pdf4qt/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdf4qt"; - version = "1.4.0.0"; + version = "1.5.0.0"; src = fetchFromGitHub { owner = "JakubMelka"; repo = "PDF4QT"; rev = "v${finalAttrs.version}"; - hash = "sha256-NlIy/C4uHRG5wwXPuqCShe113qhhsQ5jp50zrOLLA2c="; + hash = "sha256-ELdmnOEKFGCtuf240R/0M6r8aPwRQiXurAxrqcCZvOI="; }; patches = [ diff --git a/pkgs/by-name/pd/pdisk/cmdline.patch b/pkgs/by-name/pd/pdisk/cmdline.patch new file mode 100644 index 000000000000..42642dbcf676 --- /dev/null +++ b/pkgs/by-name/pd/pdisk/cmdline.patch @@ -0,0 +1,13 @@ +--- a/cmdline.c 2021-10-05 22:29:41.000000000 -0700 ++++ a/cmdline.c 2024-05-30 12:05:29.146787602 -0700 +@@ -22,10 +22,8 @@ + * @APPLE_LICENSE_HEADER_END@ + */ + #include +-#ifndef __linux__ + #include + #include +-#endif + #include + #include + #include diff --git a/pkgs/tools/system/pdisk/default.nix b/pkgs/by-name/pd/pdisk/package.nix similarity index 75% rename from pkgs/tools/system/pdisk/default.nix rename to pkgs/by-name/pd/pdisk/package.nix index 43e2ef61d70d..3be86851b2c4 100644 --- a/pkgs/tools/system/pdisk/default.nix +++ b/pkgs/by-name/pd/pdisk/package.nix @@ -5,18 +5,16 @@ fetchpatch, installShellFiles, libbsd, - CoreFoundation, - IOKit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdisk"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "apple-oss-distributions"; - repo = pname; - rev = "${pname}-${lib.versions.minor version}"; + repo = "pdisk"; + tag = "pdisk-${lib.versions.minor finalAttrs.version}"; hash = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs="; }; @@ -41,30 +39,30 @@ stdenv.mkDerivation rec { url = "https://aur.archlinux.org/cgit/aur.git/plain/linux_strerror.patch?h=pdisk&id=d0c930ea8bcac008bbd0ade1811133a625caea54"; sha256 = "sha256-HGJIS+vTn6456KtaETutIgTPPBm2C9OHf1anG8yaJPo="; }) + + # Fix missing includes on Linux + ./cmdline.patch ]; postPatch = '' substituteInPlace makefile \ - --replace 'cc' '${stdenv.cc.targetPrefix}cc' + --replace-fail 'cc' '${stdenv.cc.targetPrefix}cc' '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace makefile \ - --replace '-lbsd' '-framework CoreFoundation -framework IOKit' + --replace-fail '-lbsd' '-framework CoreFoundation -framework IOKit' ''; + strictDeps = true; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ - libbsd - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - CoreFoundation - IOKit - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libbsd + ]; env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; @@ -73,8 +71,9 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm755 cvt_pt $out/bin/cvt_pt - install -Dm755 pdisk $out/bin/pdisk + for exe in pdisk cvt_pt; do + install -Dm755 -t $out/bin $exe + done installManPage pdisk.8 install -Dm644 pdisk.html $out/share/doc/pdisk/pdisk.html @@ -82,14 +81,15 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Low-level Apple partition table editor for Linux, OSS Apple version"; homepage = "https://github.com/apple-oss-distributions/pdisk"; - license = with licenses; [ + license = with lib.licenses; [ hpnd # original license statements seems to match this (in files that are shared with mac-fdisk) apple-psl10 # new files ]; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.unix; + mainProgram = "pdisk"; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index b89368fc0068..fdcaae9e1c2d 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -101,7 +101,7 @@ python.pkgs.buildPythonApplication rec { preCheck = '' export HOME=$TMPDIR substituteInPlace tests/cli/test_run.py \ - --replace-warn "/bin/bash" "${runtimeShell}" + --replace-fail "/bin/bash" "${runtimeShell}" ''; disabledTests = [ diff --git a/pkgs/by-name/pe/penpot-desktop/electron-package-lock.diff b/pkgs/by-name/pe/penpot-desktop/electron-package-lock.diff deleted file mode 100644 index 9e2fee2657fb..000000000000 --- a/pkgs/by-name/pe/penpot-desktop/electron-package-lock.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff --git i/package-lock.json w/package-lock.json -index 039e3c0..135e0a0 100644 ---- i/package-lock.json -+++ w/package-lock.json -@@ -18,7 +18,7 @@ - "@commitlint/cli": "^19.6.1", - "@commitlint/config-conventional": "^19.6.0", - "@eslint/js": "^9.19.0", -- "electron": "^34.0.1", -+ "electron": "^33.3.1", - "electron-builder": "^25.1.8", - "eslint": "^9.19.0", - "globals": "^15.14.0", -@@ -3495,9 +3495,9 @@ - } - }, - "node_modules/electron": { -- "version": "34.0.1", -- "resolved": "https://registry.npmjs.org/electron/-/electron-34.0.1.tgz", -- "integrity": "sha512-aArw5tAM80i3CKwEREnyZSM1SkARf5Jd1yBMTIdOL4pB1M+p/oDeyWSFI9Dl+vujyfJKiK4SS5+j19wna1onMw==", -+ "version": "33.3.1", -+ "resolved": "https://registry.npmjs.org/electron/-/electron-33.3.1.tgz", -+ "integrity": "sha512-Z7l2bVgpdKxHQMI4i0CirBX2n+iCYKOx5mbzNM3BpOyFELwlobEXKmzCmEnwP+3EcNeIhUQyIEBFQxN06QgdIw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", -diff --git i/package.json w/package.json -index 9525e62..deb065e 100644 ---- i/package.json -+++ w/package.json -@@ -43,7 +43,7 @@ - "@commitlint/cli": "^19.6.1", - "@commitlint/config-conventional": "^19.6.0", - "@eslint/js": "^9.19.0", -- "electron": "^34.0.1", -+ "electron": "^33.1.1", - "electron-builder": "^25.1.8", - "eslint": "^9.19.0", - "globals": "^15.14.0", diff --git a/pkgs/by-name/pe/penpot-desktop/package.nix b/pkgs/by-name/pe/penpot-desktop/package.nix index 302e63e0a1da..91efa18e6afb 100644 --- a/pkgs/by-name/pe/penpot-desktop/package.nix +++ b/pkgs/by-name/pe/penpot-desktop/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, copyDesktopItems, - electron_33, + electron, fetchFromGitHub, jq, makeDesktopItem, @@ -15,29 +15,24 @@ let description = "Unofficial desktop application for the open-source design tool, Penpot"; icon = "penpot"; nodejs = nodejs_22; - electron = electron_33; in buildNpmPackage rec { pname = "penpot-desktop"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "author-more"; repo = "penpot-desktop"; tag = "v${version}"; - hash = "sha256-KlTE61k5rl13GPpOznpugSn1hmn55Cd/Z9vhwDjWhPo="; + hash = "sha256-33LAhR0L7pAnS27dz5DuqgfUllyAFA9JVZRmrHoajE4="; }; - patches = [ - ./electron-package-lock.diff # this downgrades electron version from 34 to 33 to match the latest available version in nixpkgs - ]; - makeCacheWritable = true; npmFlags = [ "--engine-strict" "--legacy-peer-deps" ]; - npmDepsHash = "sha256-DWZ1ih4i0vyYlShBWkJTCq0IKgT4CgEmvURnGoQiSy0="; + npmDepsHash = "sha256-BR51Oi9Ffxy7d0fBkSQ6Iz/PVi+ghIaLqzm3Loq6aDo="; # Do not run the default build script as it leads to errors caused by the electron-builder configuration dontNpmBuild = true; @@ -81,11 +76,9 @@ buildNpmPackage rec { --inherit-argv0 pushd build - for icon in icon.*; do - dir=$out/share/icons/hicolor/"''${icon%.*}"/apps - mkdir -p "$dir" - cp "$icon" "$dir"/${icon}.png - done + dir=$out/share/icons/hicolor/512x512/apps + mkdir -p "$dir" + cp icon.png "$dir"/${icon}.png popd runHook postInstall @@ -105,10 +98,11 @@ buildNpmPackage rec { meta = { changelog = "https://github.com/author-more/penpot-desktop/releases/tag/v${version}"; inherit description; - homepage = "https://github.com/author-more/penpot.desktop"; + homepage = "https://github.com/author-more/penpot-desktop"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ ntbbloodbath ]; platforms = electron.meta.platforms; + badPlatforms = lib.platforms.darwin; mainProgram = "penpot-desktop"; }; } diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix index f76b8848e311..dce1e844d5f0 100644 --- a/pkgs/by-name/pe/persepolis/package.nix +++ b/pkgs/by-name/pe/persepolis/package.nix @@ -38,15 +38,6 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" ]; - # The presence of these dependencies is checked during setuptoolsCheckPhase, - # but apart from that, they're not required during build, only runtime - nativeCheckInputs = [ - libnotify - pulseaudio - sound-theme-freedesktop - ffmpeg - ]; - propagatedBuildInputs = [ pulseaudio sound-theme-freedesktop diff --git a/pkgs/by-name/pi/piday25/package.nix b/pkgs/by-name/pi/piday25/package.nix new file mode 100644 index 000000000000..5fdc920df1ad --- /dev/null +++ b/pkgs/by-name/pi/piday25/package.nix @@ -0,0 +1,42 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage { + pname = "piday25"; + version = "0-unstable-2025-03-13"; + + src = fetchFromGitHub { + owner = "elkasztano"; + repo = "piday25"; + rev = "68b417a3016c58a2948cb3b39c9bde985d82bdb8"; + hash = "sha256-58ZBRmB990Tp+/nkuRZA+8cjCRFUBzdzu93Sk5uvKOE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-3uztB5/VevFyEz3S+VlAUPgDrNDJcwaTnHuXXYAX+MY="; + + # upstream does not have any tests + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/piday25 > result + diff -U3 --color=auto <(head -c12 result) <(echo -n 3.1415926535) + + runHook postInstallCheck + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; + + meta = { + description = "Multithreaded implementation of the Chudnovsky algorithm to calculate Pi"; + homepage = "https://github.com/elkasztano/piday25"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "piday25"; + }; +} diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index b3d2b6c0824a..7a478fee9259 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "pik"; - version = "0.16.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = version; - hash = "sha256-L5r8ds5Avh6WqiYYg/0hVDjdp/TBGgCZgKnJoDzs7Rw="; + hash = "sha256-8+Q5j9PWiITVgZkJnX+oWbC6QnNDhFxX4jLiMDWnw/g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-d2I4RDo/U+69WwXjxHRsRNUxY2ymxzHqObR6X68xXRo="; + cargoHash = "sha256-6U0QkLgGEONGRDfrDVkxeHSJy9QnfQqn2YiZEswunTk="; passthru.tests.version = testers.testVersion { package = pik; }; diff --git a/pkgs/by-name/pi/pilipalax/package.nix b/pkgs/by-name/pi/pilipalax/package.nix index 8d9dca783f05..5c2f29f68c59 100644 --- a/pkgs/by-name/pi/pilipalax/package.nix +++ b/pkgs/by-name/pi/pilipalax/package.nix @@ -11,13 +11,13 @@ flutter324.buildFlutterApplication rec { pname = "pilipalax"; - version = "1.1.0-beta.5"; + version = "1.1.2-beta"; src = fetchFromGitHub { owner = "orz12"; repo = "PiliPalaX"; - tag = "${version}+180"; - hash = "sha256-bKs0EZjJCJvtVOZYl3GqXPE2MxX7DRjMwtmFUcNgrOQ="; + tag = "${version}+187"; + hash = "sha256-8GQtPYgeYM7yTw3i5H9REWfM5j3G0aQz3oHxz8i9p2Y="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/pi/pilipalax/pubspec.lock.json b/pkgs/by-name/pi/pilipalax/pubspec.lock.json index 45aff6ad9528..935bd0e5dc4f 100644 --- a/pkgs/by-name/pi/pilipalax/pubspec.lock.json +++ b/pkgs/by-name/pi/pilipalax/pubspec.lock.json @@ -1718,61 +1718,61 @@ "dependency": "direct overridden", "description": { "name": "screen_brightness", - "sha256": "a9a98666045ad4ea0d82bca09fe5f007b8440e315075dc948c1507a9b72ee41f", + "sha256": "99b898dae860ebe55fc872d8e300c6eafff3ee4ccb09301b90adb3f241f29874", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "2.1.1" }, "screen_brightness_android": { "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "74455f9901ab8a1a45c9097b83855dbbb7498110cc2bc249cb5a86570dd1cf7c", + "sha256": "ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "screen_brightness_ios": { "dependency": "transitive", "description": { "name": "screen_brightness_ios", - "sha256": "caee02b34e0089b138a7aee35c461bd2d7c78446dd417f07613def192598ca08", + "sha256": "bfd9bfd0ac852e7aa170e7e356cc27195b2a75037b72c8c6336cf6fb2115cffb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.1" }, "screen_brightness_macos": { "dependency": "transitive", "description": { "name": "screen_brightness_macos", - "sha256": "84fc8ffcbcf19c03d76b7673b0f2c2a2663c09aa2bc37c76ea83ab049294a97a", + "sha256": "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.1" }, "screen_brightness_platform_interface": { "dependency": "transitive", "description": { "name": "screen_brightness_platform_interface", - "sha256": "321e9455b0057e3647fd37700931e063739d94a8aa1b094f98133c01cb56c27b", + "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "screen_brightness_windows": { "dependency": "transitive", "description": { "name": "screen_brightness_windows", - "sha256": "5edbfb1dcaedf960f6858efac8ca45d6c18faae17df86e2c03137d3a563ea155", + "sha256": "d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "2.1.0" }, "scrollable_positioned_list": { "dependency": "direct main", diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix index 368ab13ec10b..0e3db37d2b31 100644 --- a/pkgs/by-name/pi/pimsync/package.nix +++ b/pkgs/by-name/pi/pimsync/package.nix @@ -10,21 +10,21 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "pimsync"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = "pimsync"; - rev = "v${version}"; - hash = "sha256-IY+5n4sWlOzD29ERQ7CEsES0BizV68qnZt5NwCjLlfY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-EHDGiyDGNr6cPj2N2cTV0f7I9vmM/WIZTsPR1f+HFIE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QRbjv8k7JEktHjfwJGwVReu9lynB817edsyClOoAwoA="; + cargoHash = "sha256-/6YjyKB/xOCTNZlKewddEaZ1ZN2PC5dQoP0A5If67MA="; - PIMSYNC_VERSION = version; + PIMSYNC_VERSION = finalAttrs.version; nativeBuildInputs = [ pkg-config @@ -55,4 +55,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.qxrein ]; mainProgram = "pimsync"; }; -} +}) diff --git a/pkgs/by-name/pi/pixelflasher/package.nix b/pkgs/by-name/pi/pixelflasher/package.nix index c946c22dbd0b..44793c11c3c3 100644 --- a/pkgs/by-name/pi/pixelflasher/package.nix +++ b/pkgs/by-name/pi/pixelflasher/package.nix @@ -10,14 +10,14 @@ }: python3Packages.buildPythonApplication rec { pname = "pixelflasher"; - version = "7.11.1.0"; + version = "7.11.2.0"; format = "other"; src = fetchFromGitHub { owner = "badabing2005"; repo = "PixelFlasher"; tag = "v${version}"; - hash = "sha256-1h0rHiYi3buLZjWFjJoTDWckeEBtZwFVRNscS3wsD3o="; + hash = "sha256-SwenOw1st8Pk2515wylNsfego5dH6WUC5ocnb6a4+e4="; }; desktopItems = [ diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 98278cbe8e60..8e5de5a58e6d 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "2.3.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q7qSky/wY5l72EVhTGnwQ8lI3Uu3TnZpgqXaClCxWZQ="; + hash = "sha256-YDYVjAbizmo1+E1DVeyISKM4Jb/HkKY/On9RanJBuvI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/platypus/package.nix b/pkgs/by-name/pl/platypus/package.nix deleted file mode 100644 index 893377db79a1..000000000000 --- a/pkgs/by-name/pl/platypus/package.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - python27, - htslib, - zlib, - makeWrapper, -}: - -let - python = python27.withPackages (ps: with ps; [ cython ]); - -in -stdenv.mkDerivation { - pname = "platypus-unstable"; - version = "2018-07-22"; - - src = fetchFromGitHub { - owner = "andyrimmer"; - repo = "Platypus"; - rev = "3e72641c69800da0cd4906b090298e654d316ee1"; - sha256 = "0nah6r54b8xm778gqyb8b7rsd76z8ji4g73sm6rvpw5s96iib1vw"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - htslib - python - zlib - ]; - - buildPhase = '' - patchShebangs . - make - ''; - - installPhase = '' - mkdir -p $out/libexec/platypus - cp -r ./* $out/libexec/platypus - - mkdir -p $out/bin - makeWrapper ${python}/bin/python $out/bin/platypus --add-flags "$out/libexec/platypus/bin/Platypus.py" - ''; - - meta = with lib; { - description = "Platypus variant caller"; - license = licenses.gpl3; - homepage = "https://github.com/andyrimmer/Platypus"; - maintainers = with maintainers; [ jbedo ]; - platforms = platforms.x86_64; - }; -} diff --git a/pkgs/by-name/pm/pmix/package.nix b/pkgs/by-name/pm/pmix/package.nix index 606c11ee1c64..d4eed1fef336 100644 --- a/pkgs/by-name/pm/pmix/package.nix +++ b/pkgs/by-name/pm/pmix/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pmix"; - version = "5.0.6"; + version = "5.0.7"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${finalAttrs.version}"; - hash = "sha256-uzsUqf4ZmXmz3vTtD01RkILPxrtCiQ5RMyZ57KAKG1U="; + hash = "sha256-qj/exBi1siCHY1QqNY+ad6n3XI4JZuwnM93Vp+rj1AQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 4c17080a1d0b..3dd33ffb972b 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "pmtiles"; - version = "1.25.3"; + version = "1.26.0"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; tag = "v${version}"; - hash = "sha256-usntKGxErwywMy0tVzl0neycrgFQhgLTTdv2u5QwHUQ="; + hash = "sha256-J2gR1KJh8mMp9VA3GwXyvg1yM5doMw+X/5zOik0tDm8="; }; - vendorHash = "sha256-NQ74rLYhzacOrw6Tl6WoERfqbx2aF9X18rh0oOjCotE="; + vendorHash = "sha256-4E7qtP0w/c1LLJ/pNBJFosl1K3ycq4HLfjO0CmHaT3k="; ldflags = [ "-s" diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 21a7e9032ccb..0ef2a0f2ee9e 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -142,6 +142,12 @@ buildPythonPackage rec { "test_env_system_packages_are_relative_to_lib" "test_install_warning_corrupt_root" "test_project_plugins_are_installed_in_project_folder" + "test_application_command_not_found_messages" + # PermissionError: [Errno 13] Permission denied: '/build/pytest-of-nixbld/pytest-0/popen-gw3/test_find_poetry_managed_pytho1/.local/share/pypoetry/python/pypy@3.10.8/bin/python' + "test_list_poetry_managed" + "test_list_poetry_managed" + "test_find_all_with_poetry_managed" + "test_find_poetry_managed_pythons" ]; pytestFlagsArray = [ diff --git a/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch b/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch index 4e38660217fe..bef49a26ad44 100644 --- a/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch +++ b/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch @@ -1,4 +1,4 @@ -From 7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3 Mon Sep 17 00:00:00 2001 +From 5db2dee82bf652cca5fd782c19c8cc8e7ad5ed3e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Nov 2021 14:17:17 +0100 Subject: [PATCH] build: Use datarootdir in Meson-generated pkg-config files @@ -29,18 +29,17 @@ in the generated pkg-config files, mirroring Autotools. 2. https://www.gnu.org/prep/standards/html_node/Directory-Variables.html 3. https://blogs.gnome.org/hughsie/2014/06/16/datarootdir-v-s-datadir/ --- - src/polkit/meson.build | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + src/polkit/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/polkit/meson.build b/src/polkit/meson.build -index 63dc1e85..c92cb70f 100644 +index a7ce02b..9192a36 100644 --- a/src/polkit/meson.build +++ b/src/polkit/meson.build -@@ -113,9 +113,8 @@ pkg.generate( +@@ -114,8 +114,8 @@ pkg.generate( requires: common_deps, variables: [ 'exec_prefix=${prefix}', -- 'datadir=' + ('${prefix}' / pk_datadir), - 'policydir=' + ('${datadir}' / pk_actiondir), - 'actiondir=' + ('${datadir}' / pk_actiondir), + 'policydir=' + ('${prefix}' / 'share' / pk_actiondir), @@ -49,5 +48,5 @@ index 63dc1e85..c92cb70f 100644 ], ) -- -GitLab +2.48.1 diff --git a/pkgs/by-name/po/polkit/elogind.patch b/pkgs/by-name/po/polkit/elogind.patch deleted file mode 100644 index e7d97a7b131c..000000000000 --- a/pkgs/by-name/po/polkit/elogind.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 78e625dbafa8543b17ffaf9c42cf90c9cf9a612e Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Wed, 8 May 2024 11:20:42 +0200 -Subject: [PATCH] Fix configuration with elogind - -Previously, it would try to get sysusers_dir from systemd even though -systemd_dep was undefined. Determining systemd_systemdsystemunitdir -from systemd was already checking for systemd logind specifically, and -systemd_sysusers_dir is only used in the systemd logind case, so move -both of those into the systemd-logind-specific branch above. - -(cherry picked from commit b58b58af10c390ab9a11a4cfe6a4ff3d50cc0fa5) ---- - meson.build | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/meson.build b/meson.build -index 2f81c90..0888322 100644 ---- a/meson.build -+++ b/meson.build -@@ -202,6 +202,16 @@ if enable_logind - if not logind_dep.found() - logind_dep = dependency('libsystemd-login', not_found_message: 'libsystemd support requested but libsystemd or libsystemd-login library not found') - endif -+ -+ # systemd unit / service files -+ systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') -+ if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' -+ systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') -+ # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used -+ systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') -+ endif -+ -+ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') - else - logind_dep = dependency('libelogind', not_found_message: 'libelogind support requested but libelogind library not found') - endif -@@ -210,16 +220,6 @@ if enable_logind - config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) - func = 'sd_pidfd_get_session' - config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) -- -- # systemd unit / service files -- systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') -- if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' -- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') -- # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used -- systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') -- endif -- -- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') - endif - config_h.set('HAVE_LIBSYSTEMD', enable_logind) - -@@ -404,7 +404,7 @@ output += ' introspection: ' + enable_introspection.to_string( - output += ' Distribution/OS: ' + os_type + '\n' - output += ' Authentication framework: ' + auth_fw + '\n' - output += ' Session tracking: ' + session_tracking + '\n' --if enable_logind -+if session_tracking == 'logind' - output += ' systemdsystemunitdir: ' + systemd_systemdsystemunitdir + '\n' - endif - output += ' polkitd user: ' + polkitd_user + ' \n' --- -2.44.0 - diff --git a/pkgs/by-name/po/polkit/package.nix b/pkgs/by-name/po/polkit/package.nix index a02a4dbbc1c1..1ecf173e5608 100644 --- a/pkgs/by-name/po/polkit/package.nix +++ b/pkgs/by-name/po/polkit/package.nix @@ -17,10 +17,10 @@ libxslt, docbook-xsl-nons, dbus, + util-linux, docbook_xml_dtd_412, gtk-doc, coreutils, - fetchpatch, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, systemdMinimal, elogind, @@ -41,7 +41,7 @@ let in stdenv.mkDerivation rec { pname = "polkit"; - version = "124"; + version = "126"; outputs = [ "bin" @@ -54,22 +54,13 @@ stdenv.mkDerivation rec { owner = "polkit-org"; repo = "polkit"; rev = version; - hash = "sha256-Vc9G2xK6U1cX+xW2BnKp3oS/ACbSXS/lztbFP5oJOlM="; + hash = "sha256-ZSqgW//q5DFIsmY17U93mJcK/CHSCHphKTHsTxp40q8="; }; patches = [ # Allow changing base for paths in pkg-config file as before. # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100 ./0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch - - ./elogind.patch - - # FIXME: remove in the next release - # https://github.com/NixOS/nixpkgs/issues/18012 - (fetchpatch { - url = "https://github.com/polkit-org/polkit/commit/f93c7466039ea3403e0576928aeb620b806d0cce.patch"; - sha256 = "sha256-cF0nNovYmyr+XixpBgQFF0A+oJeSPGZgTkgDQkQuof8="; - }) ]; depsBuildBuild = [ @@ -116,6 +107,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ dbus + util-linux # for mount (python3.pythonOnBuildForHost.withPackages ( pp: with pp; [ dbus-python @@ -127,67 +119,50 @@ stdenv.mkDerivation rec { )) ]; - env = - { - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSUSERS_DIR = "${placeholder "out"}/lib/sysusers.d"; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSUSERS_DIR = "${placeholder "out"}/lib/sysusers.d"; + PKG_CONFIG_SYSTEMD_TMPFILES_DIR = "${placeholder "out"}/lib/tmpfiles.d"; - # HACK: We want to install policy files files to $out/share but polkit - # should read them from /run/current-system/sw/share on a NixOS system. - # Similarly for config files in /etc. - # With autotools, it was possible to override Make variables - # at install time but Meson does not support this - # so we need to convince it to install all files to a temporary - # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "dest"; - } - // lib.optionalAttrs (stdenv.cc.isGNU || stdenv.cc.isClang) { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; + # HACK: We want to install policy files files to $out/share but polkit + # should read them from /run/current-system/sw/share on a NixOS system. + # Similarly for config files in /etc. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "dest"; + }; mesonFlags = [ "--datadir=${system}/share" "--sysconfdir=/etc" "-Dpolkitd_user=polkituser" # TODO? config.ids.uids.polkituser - "-Dos_type=redhat" # only affects PAM includes + "-Dos_type=redhat" # affects PAM includes and privileged group name (wheel) "-Dintrospection=${lib.boolToString withIntrospection}" "-Dtests=${lib.boolToString doCheck}" "-Dgtk_doc=${lib.boolToString withIntrospection}" "-Dman=true" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" + "-Dsession_tracking=${if useSystemd then "logind" else "elogind"}" ]; inherit doCheck; postPatch = '' - patchShebangs test/polkitbackend/polkitbackendjsauthoritytest-wrapper.py + patchShebangs \ + test/wrapper.py # ‘libpolkit-agent-1.so’ should call the setuid wrapper on # NixOS. Hard-coding the path is kinda ugly. Maybe we can just # call through $PATH, but that might have security implications. substituteInPlace src/polkitagent/polkitagentsession.c \ - --replace 'PACKAGE_PREFIX "/lib/polkit-1/' '"${setuid}/' + --replace-fail 'PACKAGE_PREFIX "/lib/polkit-1/' '"${setuid}/' substituteInPlace test/data/etc/polkit-1/rules.d/10-testing.rules \ - --replace /bin/true ${coreutils}/bin/true \ - --replace /bin/false ${coreutils}/bin/false - ''; - - postConfigure = lib.optionalString doCheck '' - # Unpacked by meson - chmod +x subprojects/mocklibc-1.0/bin/mocklibc - patchShebangs subprojects/mocklibc-1.0/bin/mocklibc - ''; - - checkPhase = '' - runHook preCheck - - # tests need access to the system bus - dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS meson test --print-errorlogs' - - runHook postCheck + --replace-fail /bin/true ${coreutils}/bin/true \ + --replace-fail /bin/false ${coreutils}/bin/false ''; postInstall = '' @@ -212,6 +187,6 @@ stdenv.mkDerivation rec { # mandatory libpolkit-gobject shared library lib.systems.inspect.platformPatterns.isStatic ]; - maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); + maintainers = teams.freedesktop.members; }; } diff --git a/pkgs/by-name/po/polkit/system_bus.conf b/pkgs/by-name/po/polkit/system_bus.conf deleted file mode 100644 index 435b4740a2f7..000000000000 --- a/pkgs/by-name/po/polkit/system_bus.conf +++ /dev/null @@ -1,58 +0,0 @@ - - - - system - - - - - - - - - EXTERNAL - - - unix:path=/tmp/system_bus_socket - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index 0932e7adee6f..bdac9ee5e202 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation rec { patches = [ ./postfix-script-shell.patch ./post-install-script.patch + ./postfix-3.0-no-warnings.patch ./relative-symlinks.patch # glibc 2.34 compat diff --git a/pkgs/by-name/po/postfix/postfix-3.0-no-warnings.patch b/pkgs/by-name/po/postfix/postfix-3.0-no-warnings.patch new file mode 100644 index 000000000000..acfc6b9e14a9 --- /dev/null +++ b/pkgs/by-name/po/postfix/postfix-3.0-no-warnings.patch @@ -0,0 +1,86 @@ +diff -ru3 postfix-3.0.3/conf/postfix-script postfix-3.0.3-new/conf/postfix-script +--- postfix-3.0.3/conf/postfix-script 2014-06-27 18:05:15.000000000 +0400 ++++ postfix-3.0.3-new/conf/postfix-script 2016-01-09 17:51:38.545733631 +0300 +@@ -84,24 +84,6 @@ + exit 1 + } + +-# If this is a secondary instance, don't touch shared files. +- +-instances=`test ! -f $def_config_directory/main.cf || +- $command_directory/postconf -qc $def_config_directory \ +- -h multi_instance_directories | sed 'y/,/ /'` || { +- $FATAL cannot execute $command_directory/postconf! +- exit 1 +-} +- +-check_shared_files=1 +-for name in $instances +-do +- case "$name" in +- "$def_config_directory") ;; +- "$config_directory") check_shared_files=; break;; +- esac +-done +- + # + # Parse JCL + # +@@ -262,22 +244,6 @@ + -prune \( -perm -020 -o -perm -002 \) \ + -exec $WARN group or other writable: {} \; + +- # Check Postfix root-owned directory tree owner/permissions. +- +- todo="$config_directory/." +- test -n "$check_shared_files" && { +- todo="$daemon_directory/. $meta_directory/. $todo" +- test "$shlib_directory" = "no" || +- todo="$shlib_directory/. $todo" +- } +- todo=`echo "$todo" | tr ' ' '\12' | sort -u` +- +- find $todo ! -user root \ +- -exec $WARN not owned by root: {} \; +- +- find $todo \( -perm -020 -o -perm -002 \) \ +- -exec $WARN group or other writable: {} \; +- + # Check Postfix mail_owner-owned directory tree owner/permissions. + + find $data_directory/. ! -user $mail_owner \ +@@ -302,18 +268,11 @@ + # Check Postfix setgid_group-owned directory and file group/permissions. + + todo="$queue_directory/public $queue_directory/maildrop" +- test -n "$check_shared_files" && +- todo="$command_directory/postqueue $command_directory/postdrop $todo" + + find $todo \ + -prune ! -group $setgid_group \ + -exec $WARN not owned by group $setgid_group: {} \; + +- test -n "$check_shared_files" && +- find $command_directory/postqueue $command_directory/postdrop \ +- -prune ! -perm -02111 \ +- -exec $WARN not set-gid or not owner+group+world executable: {} \; +- + # Check non-Postfix root-owned directory tree owner/content. + + for dir in bin etc lib sbin usr +@@ -334,15 +293,6 @@ + + find corrupt -type f -exec $WARN damaged message: {} \; + +- # Check for non-Postfix MTA remnants. +- +- test -n "$check_shared_files" -a -f /usr/sbin/sendmail -a \ +- -f /usr/lib/sendmail && { +- cmp -s /usr/sbin/sendmail /usr/lib/sendmail || { +- $WARN /usr/lib/sendmail and /usr/sbin/sendmail differ +- $WARN Replace one by a symbolic link to the other +- } +- } + exit 0 + ;; + diff --git a/pkgs/by-name/po/powershell-editor-services/package.nix b/pkgs/by-name/po/powershell-editor-services/package.nix index b303d617e2b6..3fbf787d671d 100644 --- a/pkgs/by-name/po/powershell-editor-services/package.nix +++ b/pkgs/by-name/po/powershell-editor-services/package.nix @@ -7,11 +7,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "powershell-editor-services"; - version = "4.2.0"; + version = "4.3.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShellEditorServices/releases/download/v${version}/PowerShellEditorServices.zip"; - hash = "sha256-HSLpgnCx871BuKcerX8NZIN+NbpEz+KQtm1HfUXr7kY="; + hash = "sha256-YiXxztfsYujJK6+56Lwi4QdRIZb7NH+dAUJTOYk8pGI="; stripRoot = false; }; diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index a3429658b317..a77e50810126 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.5.1"; + version = "3.5.2"; pluginManagerVersion = "1.2.9"; src = fetchFromGitHub { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-o19akSgsWLRTyHT+dvmTeTS4HtNfzEyNXBhVot92OD4="; + hash = "sha256-RT+/h5vUILlik/YqcpwgkdOJRmhGBtEHRVynjlHWunw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index 9a8d5bd3a662..8c3b9aca06e6 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -7,7 +7,6 @@ coursier, dotnet-sdk, gitMinimal, - glibcLocales, go, nodejs, perl, @@ -52,7 +51,6 @@ buildPythonApplication rec { [ cargo gitMinimal - glibcLocales go libiconv # For rust tests on Darwin perl @@ -101,7 +99,7 @@ buildPythonApplication rec { + '' export GIT_AUTHOR_NAME=test GIT_COMMITTER_NAME=test \ GIT_AUTHOR_EMAIL=test@example.com GIT_COMMITTER_EMAIL=test@example.com \ - VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8 + VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 '' + lib.optionalString (!i686Linux) '' # Resolve `.NET location: Not found` errors for dotnet tests diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix index 52c734533609..793694c962bc 100644 --- a/pkgs/by-name/pr/prefect/package.nix +++ b/pkgs/by-name/pr/prefect/package.nix @@ -2,11 +2,12 @@ lib, python3Packages, fetchPypi, + nixosTests, }: python3Packages.buildPythonApplication rec { pname = "prefect"; - version = "3.2.7"; + version = "3.2.13"; pyproject = true; # Trying to install from source is challenging @@ -15,7 +16,7 @@ python3Packages.buildPythonApplication rec { # Source will be missing sdist, uv.lock, ui artefacts ... src = fetchPypi { inherit pname version; - hash = "sha256-4kwGrKvDihBi6Gcvcf6ophNI6GGd+M4qR0nnu/AUK1Q="; + hash = "sha256-NJL3KTvSIzUX1JMa/Lfpx2UzsAgqjU/mbndnkG2evTA="; }; pythonRelaxDeps = [ @@ -27,61 +28,68 @@ python3Packages.buildPythonApplication rec { versioningit ]; - dependencies = with python3Packages; [ - aiosqlite - alembic - anyio - apprise - asgi-lifespan - asyncpg - cachetools - click - cloudpickle - coolname - cryptography - dateparser - docker - exceptiongroup - fastapi - fsspec - graphviz - griffe - httpcore - httpx - humanize - importlib-metadata - jinja2 - jinja2-humanize-extension - jsonpatch - jsonschema - opentelemetry-api - orjson - packaging - pathspec - pendulum - prometheus-client - pydantic - pydantic-core - pydantic-extra-types - pydantic-settings - python-dateutil - python-slugify - python-socks - pytz - pyyaml - readchar - rfc3339-validator - rich - ruamel-yaml - sniffio - sqlalchemy - toml - typer - typing-extensions - ujson - uvicorn - websockets - ]; + dependencies = + with python3Packages; + [ + aiosqlite + alembic + apprise + asyncpg + click + cryptography + dateparser + docker + graphviz + jinja2 + jinja2-humanize-extension + humanize + pytz + readchar + sqlalchemy + typer + # client dependencies + anyio + asgi-lifespan + cachetools + cloudpickle + coolname + exceptiongroup + fastapi + fsspec + # graphviz already included + griffe + httpcore + httpx + jsonpatch + jsonschema + opentelemetry-api + orjson + packaging + pathspec + pendulum + prometheus-client + pydantic + pydantic-core + pydantic-extra-types + pydantic-settings + python-dateutil + python-slugify + python-socks + pyyaml + rfc3339-validator + rich + ruamel-yaml + sniffio + toml + typing-extensions + ujson + uvicorn + websockets + uv + ] + ++ sqlalchemy.optional-dependencies.asyncio + ++ httpx.optional-dependencies.http2 + ++ python-socks.optional-dependencies.asyncio; optional-dependencies = with python3Packages; { aws = [ @@ -147,6 +155,16 @@ python3Packages.buildPythonApplication rec { ]; }; + makeWrapperArgs = [ + # Add the installed directories to the python path so the worker can find them + "--prefix PYTHONPATH : ${python3Packages.makePythonPath dependencies}" + "--prefix PYTHONPATH : $out/${python3Packages.python.sitePackages}" + ]; + + passthru.tests = { + inherit (nixosTests) prefect; + }; + # Tests are not included in the pypi source doCheck = false; # nativeCheckInputs = ( diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index db4805612854..c5baa51d8dbe 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -103,6 +103,7 @@ python.pkgs.buildPythonApplication rec { "protobuf" "pycryptodome" "pyjwt" + "pypdf" "python-bidi" "qrcode" "redis" diff --git a/pkgs/by-name/pr/proksi/package.nix b/pkgs/by-name/pr/proksi/package.nix new file mode 100644 index 000000000000..f60a31829f2e --- /dev/null +++ b/pkgs/by-name/pr/proksi/package.nix @@ -0,0 +1,83 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + yq, + pkg-config, + cmake, + openssl, + zstd, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "proksi"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "luizfonseca"; + repo = "proksi"; + tag = "proksi-v${finalAttrs.version}"; + hash = "sha256-zwLF6yL/EqyBtZ+hHXLJRe2UaZyhSzotEFYlpoLXKZ4="; + }; + + postPatch = '' + tomlq -ti 'del(.bench)' crates/proksi/Cargo.toml + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-vFZUcHh/gI4fdlM6LcN+6kjweLUnPNYNq6Y+XxWoSl8="; + + nativeBuildInputs = [ + pkg-config + cmake # required for libz-ng-sys + yq # for `tomlq` + ]; + + buildInputs = [ + openssl + zstd + ]; + + cargoBuildFlags = [ "--package=proksi" ]; + cargoTestFlags = finalAttrs.cargoBuildFlags; + + checkFlags = [ + # requires network access + "--skip=services::discovery::test::test_domain_addr" + + # these tests don't fail themselves, however they invoke clap which tries to parse configuration + # from the command line, which would normally be empty, but here it includes the `--skip` flags + # above which clap doesn't recognize and thus rejects + "--skip=config::tests::" + ]; + + env = { + OPENSSL_NO_VENDOR = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "proksi-v(.*)" + ]; + }; + + meta = { + description = "Batteries-included CDN, reverse proxy and Load Balancer using Cloudflare Pingora"; + homepage = "https://github.com/luizfonseca/proksi"; + changelog = "https://github.com/luizfonseca/proksi/blob/proksi-v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "proksi"; + }; +}) diff --git a/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix b/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix index 7fb1401a37aa..db77baa2df36 100644 --- a/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix +++ b/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "protoc-gen-twirp_php"; - version = "0.12.0"; + version = "0.13.0"; # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - hash = "sha256-GDDycFWGrNXWdWNjGhb+W6kImF1nqVVH+dJ8VjYQ2MQ="; + hash = "sha256-Yn1oR69cHu/Q2HDRGzDNZ7RrTkNcwu4eFIrJFbmdhG0="; }; - vendorHash = "sha256-ErTXIbPKAFm8jBYRPuWSaCFbTS+5MPyto9edixbTR7E="; + vendorHash = "sha256-OjOHHXGWFX1K7berkc8vPXegdlr1QFFMPhRd0D5bK00="; subPackages = [ "protoc-gen-twirp_php" ]; diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index d05c31a45e54..35a76591e9eb 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -9,7 +9,7 @@ }: let mainProgram = "proton-mail"; - version = "1.7.1"; + version = "1.8.0"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb"; - sha256 = "sha256-h5OQBZrG8whhsilS7qQU8txFKzjpl+Q27fcUOBYUzbQ="; + sha256 = "sha256-ti00RSMnSwrGNUys7mO0AmK+OSq4SZmCsfPKm7RRm2g="; }; dontConfigure = true; diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix index 08abda07893b..50443df49692 100644 --- a/pkgs/by-name/pr/protonplus/package.nix +++ b/pkgs/by-name/pr/protonplus/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "protonplus"; - version = "0.4.25"; + version = "0.4.27"; src = fetchFromGitHub { owner = "Vysp3r"; repo = "protonplus"; rev = "v${finalAttrs.version}"; - hash = "sha256-IDEJ1/53fVq8FA58e3Fk/SPD8+xtXWLQr5IgNiim1jk="; + hash = "sha256-y6fqn02Ui5RbBy5oMeX5HPRHQDUYD2MphoubZxIwQI8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index d63a1bd2f844..4d31b701e269 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "5.4.0"; + version = "5.4.1"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; tag = version; - hash = "sha256-D+GifYxAqB5/Y7+x5CRdG2tF99MBWQF5meD1TIUI0ZE="; + hash = "sha256-byZjb208AHpzKHRp+wJeT3Brt3p5MLWSYZ+7go7Ciw4="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/pr/proxsuite-nlp/package.nix b/pkgs/by-name/pr/proxsuite-nlp/package.nix index 2abd4d6c8fd8..02b473ce1b90 100644 --- a/pkgs/by-name/pr/proxsuite-nlp/package.nix +++ b/pkgs/by-name/pr/proxsuite-nlp/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxsuite-nlp"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "proxsuite-nlp"; rev = "v${finalAttrs.version}"; - hash = "sha256-+zg3QGPLqrvwT7rjnYXTUwIzHlHrIAISj/+Q9HU4cYs="; + hash = "sha256-ae8o0R+79qetAsc/KmvtBSVfH9695Cg4bcDBAEzKr6A="; }; outputs = [ diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index a4284b88168f..6e6089f50321 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "prrte"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "openpmix"; repo = "prrte"; rev = "v${version}"; - hash = "sha256-4Xc6We0mXpKCwfHlmqi+WbFjdQegWHGzWrEnMVqkqtU="; + hash = "sha256-wLM+txjngY5gh/+yiaSKrenG6oIzF2dPgMumIGyCsXU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ps/ps3netsrv/package.nix b/pkgs/by-name/ps/ps3netsrv/package.nix index 4f01cfae445c..7c12ded94862 100644 --- a/pkgs/by-name/ps/ps3netsrv/package.nix +++ b/pkgs/by-name/ps/ps3netsrv/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hash = "sha256-ynFuCD+tp8E/DDdB/HU9BCmwKcmQy6NBx26MKnP4W0o="; }; - sourceRoot = "./source/${pname}"; + sourceRoot = "${src.name}/${pname}"; buildInputs = [ meson diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index 36d77901822a..ffbd140a6627 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.221.0"; + version = "0.230.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-wWcBQG6GRub14TL6IEgQ9YJkFp3vVPj0TfpJJgyuECY="; + sha256 = "sha256-aWml3iTcci1V8RkiCrvv+E7zmW5JJCDzDNv2RaDhjAg="; }; - vendorHash = "sha256-ZTBW6YCWNVh/PQV43JXHR9dTm7Qq7uL6vRm/A49gYp4="; + vendorHash = "sha256-soDM7IfgTKWZnFNfGSlKH4aScGr1A26OZrgqiJ5UAlA="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix index 47e58145ec52..8f8355569f05 100644 --- a/pkgs/by-name/pu/publii/package.nix +++ b/pkgs/by-name/pu/publii/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.46.3"; + version = "0.46.4"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-fbK9DVdwjzoxYMvR0EXpZ1Uv3CIMIVAdYcgRdD1p0F4="; + hash = "sha256-06bPVsfWHASQFzsXr5QONZq27UaeXbMfqyuuKmTcjNE="; }; dontConfigure = true; diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix index 561ec997b7f6..a7eaaf051273 100644 --- a/pkgs/by-name/pu/pulumi/package.nix +++ b/pkgs/by-name/pu/pulumi/package.nix @@ -15,18 +15,18 @@ }: buildGoModule rec { pname = "pulumi"; - version = "3.152.0"; + version = "3.156.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi"; tag = "v${version}"; - hash = "sha256-/cRWj7y6d5sNQRUXg9l7eDAOkUqNGXTzgpWDQdPP8zw="; + hash = "sha256-1iML+WCEkLMdAJ7e+F5XwBzM+pn3eZQsCaSi3Ui/JdM="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorHash = "sha256-JhIyivD+YpUUr9T8roNpINb3Tx8ZElHa+BrpJkyFx60="; + vendorHash = "sha256-2hpn1IKJvWtXgNKgf56dZABA4VO1aT0cDsHOmCEPrGo="; sourceRoot = "${src.name}/pkg"; diff --git a/pkgs/by-name/pv/pv-migrate/package.nix b/pkgs/by-name/pv/pv-migrate/package.nix index 0488e41ae9e6..4878c27a2b7d 100644 --- a/pkgs/by-name/pv/pv-migrate/package.nix +++ b/pkgs/by-name/pv/pv-migrate/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "pv-migrate"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = pname; tag = "v${version}"; - sha256 = "sha256-yYY3UgqHdFXoGj6n4kY45J/2QujPboWucnmbbXjjhRM="; + sha256 = "sha256-ZCNOg2HZjcEEM+hsAOtRR6hYmoKLyThpIw3warnravc="; }; subPackages = [ "cmd/pv-migrate" ]; - vendorHash = "sha256-wMlwfWMrjvo+9VUt8ZUcYHrsa9NOZhCj6LArdqXVCI4="; + vendorHash = "sha256-V1IR9teiJeCqekKgTShOEZhtlBbtsnp6eZe6A7q6EAQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix index 62975da236f1..47fcecde48b7 100644 --- a/pkgs/by-name/pw/pwvucontrol/package.nix +++ b/pkgs/by-name/pw/pwvucontrol/package.nix @@ -43,18 +43,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pwvucontrol"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "saivert"; repo = "pwvucontrol"; tag = finalAttrs.version; - hash = "sha256-E3UfZO0R6WGeUffgGQ2ceHiG4hwIuFntTdCpojaWL8E="; + hash = "sha256-fmEXVUz3SerVgWijT/CAoelSUzq861AkBVjP5qwS0ao="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-uaRpaiVjxc0j4oDbmmwt8SPS7O7hWzoYO62jLYzHl1c="; + hash = "sha256-oQSH4P9WxvkXZ53KM5ZoRAZyQFt60Zz7guBbgT1iiBk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index fb5b99f841dd..3bfa13310d3f 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.1.394"; + version = "1.1.396"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-zOJtv9ETolo3XmH+ztNJEmX319rV/CABDIw2crSxqqw="; + hash = "sha256-6YvjpLV1Jj5N0CgN9hE7C2X9BMYZBJegB0xpSBW8n5c="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-RE1ZwMKgWu686/ejMB0E1CRix8MLv6lNoEkyAkvOC6U="; + npmDepsHash = "sha256-HwwVshop15nHE5oFuPIFmL5AduJ2z208cv2TbEAEMnY="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-sQeHXfhm6u0at4vhFjGPwMmTdDomU6cJnolOFO6ynXA="; + npmDepsHash = "sha256-ywQimf2w5xXbNqcluv6Bi/wH7/QQG0U/r6Ferx9vbis="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index b2e94eb7bf4c..3b5cbc11e155 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pywal16"; - version = "3.8.2"; + version = "3.8.3"; pyproject = true; src = fetchFromGitHub { owner = "eylles"; repo = "pywal16"; tag = version; - hash = "sha256-3GowgiLZpQmAaR903sg+4MmzBkj5mS+D3556F6lxxfw="; + hash = "sha256-yF90HkRg44pPRO/7Gj5BEgj44Qgs4OIM+GR7inJVKMI="; }; build-system = [ python3.pkgs.setuptools ]; diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index 72f5706e52ae..c73d7a6e7d58 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -30,18 +30,18 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "q2pro"; - version = "0-unstable-2025-03-08"; + version = "0-unstable-2025-03-20"; src = fetchFromGitHub { owner = "skullernet"; repo = "q2pro"; - rev = "700559cd4669c1e2f899a4eae869395c33dd4933"; - hash = "sha256-zJYEeVPyppVISjKC0L8zfjfoG0c8TjmSAML4gPryT0A="; + rev = "ef4001c596344aea179fc673a07de53fc0ab6a9d"; + hash = "sha256-PTNxh7UGKT1GZk8Rbub2l6EBLBy+n46AiS4BAyDALX8="; }; # build date and rev number is displayed in the game's console - revCount = "3697"; # git rev-list --count ${src.rev} - SOURCE_DATE_EPOCH = "1741434552"; # git show -s --format=%ct ${src.rev} + revCount = "3724"; # git rev-list --count ${src.rev} + SOURCE_DATE_EPOCH = "1742479264"; # git show -s --format=%ct ${src.rev} nativeBuildInputs = [ diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/by-name/qa/qastools/package.nix similarity index 50% rename from pkgs/tools/audio/qastools/default.nix rename to pkgs/by-name/qa/qastools/package.nix index 37af3d9e7a61..b94318db64e2 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/by-name/qa/qastools/package.nix @@ -1,40 +1,47 @@ { - mkDerivation, + stdenv, lib, fetchFromGitLab, cmake, alsa-lib, udev, - qtbase, - qtsvg, - qttools, + qt6Packages, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qastools"; - version = "0.23.0"; + version = "1.4.0"; src = fetchFromGitLab { owner = "sebholt"; repo = pname; rev = "v${version}"; - sha256 = "19hn64hnvryfmrkdg6rqyzahdbqf1s5y3dcca389jj6sdx93b3ip"; + hash = "sha256-mJjhM1y50f44kvxMidM7uqlkkXx1sbJC21vIMEDenoU="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ - alsa-lib - udev - qtbase - qtsvg - qttools + nativeBuildInputs = [ + cmake + qt6Packages.wrapQtAppsHook ]; + buildInputs = + [ + alsa-lib + udev + ] + ++ (with qt6Packages; [ + qtbase + qtsvg + qttools + ]); meta = with lib; { description = "Collection of desktop applications for ALSA configuration"; homepage = "https://gitlab.com/sebholt/qastools"; license = licenses.mit; - maintainers = with maintainers; [ orivej ]; + maintainers = with maintainers; [ + avnik + orivej + ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix index 758642bb9130..cdc03f547e39 100644 --- a/pkgs/by-name/qg/qgroundcontrol/package.nix +++ b/pkgs/by-name/qg/qgroundcontrol/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.4.3"; + version = "4.4.4"; propagatedBuildInputs = with libsForQt5; [ qtbase @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { owner = "mavlink"; repo = "qgroundcontrol"; rev = "v${version}"; - hash = "sha256-pHs9pRL5fAeRtDcNPCdqy4oPYyJ0mbJjLDlotFfjOl4="; + hash = "sha256-+BsI79p0XJ1nCjEtaCVgHbD+jseVGLQZOll79xZ5THo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/qi/qir-runner/package.nix b/pkgs/by-name/qi/qir-runner/package.nix index 2d1270274f63..cfa1167666a4 100644 --- a/pkgs/by-name/qi/qir-runner/package.nix +++ b/pkgs/by-name/qi/qir-runner/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "qir-runner"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "qir-alliance"; repo = "qir-runner"; tag = "v${version}"; - hash = "sha256-65ioZ+7Xo4ocpFFVvwtY6Hn1FKuI48hcAfbAjPnSYEs="; + hash = "sha256-dvzvLm8omt4Uh/yTisaUcwuom0ZJnV6SwwFfbDNjHvM="; }; nativeBuildInputs = [ llvmPackages_19.llvm ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-ciQ6TFl+LNBVrIwhCdpzbaQz72W7EC5wj85PW29UV0M="; + cargoHash = "sha256-11+TV+7JLLvoWQIwgc4owUV4jNZcjD6S1uUwD8xWAEI="; meta = { description = "QIR bytecode runner to assist with QIR development and validation"; diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index a69f751c91ca..655a36f50566 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.19.1"; + version = "3.19.3"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-mkY59bSbdkoqC5x1qThA4gJ8kQO8JuJG52+Y42WLMRA="; + hash = "sha256-Vz+L3wB7IjfCw47ZHMyD2LnonoUbSAFS5byQ5DylUCo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/qu/quicktemplate/package.nix b/pkgs/by-name/qu/quicktemplate/package.nix index 37e6b1e92ecf..6f6afe08d811 100644 --- a/pkgs/by-name/qu/quicktemplate/package.nix +++ b/pkgs/by-name/qu/quicktemplate/package.nix @@ -3,16 +3,15 @@ buildGoModule, fetchFromGitHub, }: - buildGoModule rec { pname = "quicktemplate"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "valyala"; repo = "quicktemplate"; rev = "v${version}"; - sha256 = "0xzsvhpllmzmyfg8sj1dpp02826j1plmyrdvqbwryzhf2ci33nqr"; + sha256 = "cra3LZ3Yq0KNQErQ2q0bVSy7rOLKdSkIryIgQsNRBHw="; }; vendorHash = null; diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index 76c14bd473a1..ce5073e41d83 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.1.56"; + version = "3.1.57"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-38PHTI/sAKLf70b/uBPYlJvbkogijiyuUvn7veGGZTY="; + hash = "sha256-1b24tclqXGx85BGFYL9cbthLScVWau2OmRh9YElfCLs="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index cd14943a88cf..ebc208a9d4fa 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -12,17 +12,17 @@ let in rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.22.0"; + version = "3.23.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-WzdLMKL0Bg8z1qlhg4sbzRuGreqgyydqLEkwl8lbngY="; + hash = "sha256-WxL5mETs7PVGhJcg1wVobYo/ETYFg3/1Fs/wJCJgKXg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TVuA8Xo7v+NSGMnttLu1iCwFpi7ue7s/z3i1H4ofaXs="; + cargoHash = "sha256-cMi3raSQgCSu6ZbiTgU2ABCy+NWJjY5IcWPJMMcmqyI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index cf11f8f03bbd..a8260c273a5b 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -9,7 +9,7 @@ rainfrog, }: let - version = "0.2.14"; + version = "0.2.15"; in rustPlatform.buildRustPackage { inherit version; @@ -19,11 +19,11 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; tag = "v${version}"; - hash = "sha256-mN7xZs95bi+/wjmOZnOC6LRF7frF0xGJvTMseK2Uorc="; + hash = "sha256-r+tual/ko8SjToMR9ek/Gf5GJieu2wPsMMkjKXw+cLk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-a5uMHiuxVyfRNdGBf7LW00qfQNqAyRnxMq/rMYz3dBg="; + cargoHash = "sha256-JkH771cXGz8YcRy+zO/mB4hkFrA6l0Yg86cLCgsjbrE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index 30b319e6683e..d546f0cae5ea 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-l8pMUgSU0L1GhB3FiwDVcSEJCpnfE46bCsyNsZSG0mQ="; + hash = "sha256-8U48Jow/6mOBTxRgMUtW6CaTkhwaAu8Hkad3WjRdkEM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TgUPeoOua9oqPPDb+SAlYztd1ZBEFvsSrCYCQGXKhgU="; + cargoHash = "sha256-U9ebUV9Hkfu5clAffncMXBo/ujnVf80Qt6dOkzphWx4="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index bdbe4a4768ea..e4952620dae8 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -12,19 +12,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.93.2"; + version = "1.94.0"; src = { aarch64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; - hash = "sha256-DSK42E11ZEfcTFXLY7dz54hqdRXzX8RUBv2YHKuOMMQ="; + hash = "sha256-jSGlMh+8K27lpz8oLxTGLaER5x1+CeLhGK7pITJ12rQ="; }; x86_64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-TMbgaENxPiM2UETNmpP5BmVHwdNs4+3FGssaOqNBzew="; + hash = "sha256-pmmKPSnr6/mixdNCfgpvBu7n8hWT/U1YyV0DwOhqfhk="; }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix index 43213c52150d..c01cc63a1443 100644 --- a/pkgs/by-name/re/readarr/package.nix +++ b/pkgs/by-name/re/readarr/package.nix @@ -24,15 +24,15 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-vQ0kENScBr9PXw19/xs60dSrr1l8bWRgd+v/WPu5qCc="; - arm64-linux_hash = "sha256-a+SdpL5Ah+pDxJehPhSWaSnsiD4pNJtl+1J94JUXEqc="; - x64-osx_hash = "sha256-390WU9ylgWSLwHoF73OQ5hKUMmzjpLgytp/Koxg9OcE="; + x64-linux_hash = "sha256-lpINlPOZL7dMxrxzmPr6O4yK2kK9irTQ7gL64xBR0G0="; + arm64-linux_hash = "sha256-rn0J93wpwGNz9wbfVRa2P/Sj+YrN0EeKhDGdAlpzZAE="; + x64-osx_hash = "sha256-eWo6E76x+cI34T8FcbGEgmYA+J3CZj3YgtiolP77+JU="; } ."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.4.11.2747"; + version = "0.4.12.2753"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 11a89acba5c9..2e39521699a3 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { pname = "readest"; - version = "0.9.19"; + version = "0.9.23"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${version}"; - hash = "sha256-Z84vH6vEtUMly++I+2AWBGl+3NXEAyjSIVJ57DnUS54="; + hash = "sha256-MveWZ+9SSd6mPw580U8d8aP7c4rl4861VzCKHpOKiXU="; fetchSubmodules = true; }; @@ -38,14 +38,14 @@ rustPlatform.buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-gHYZpUQOznFIwH0w0tyWyQYyOwNwL8aRcDthx902h+4="; + hash = "sha256-faLytJLMlWs80HZpN0TnCCEWPe9SPP9QH0bx3HLDO5o="; }; pnpmRoot = "../.."; useFetchCargoVendor = true; - cargoHash = "sha256-uAVYvyNKK0megsl3QEfN3vbuO1gJfwbOm9K0SohuGfg="; + cargoHash = "sha256-5E+3Hpa6hiOORtZ5ykrXVOPucbppwO5KVVS1mb9mVXY="; cargoRoot = "../.."; diff --git a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix new file mode 100644 index 000000000000..d44bf2c324bb --- /dev/null +++ b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix @@ -0,0 +1,36 @@ +{ + stdenvNoCC, + fetchurl, + pname, + version, + meta, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + inherit + pname + version + meta + ; + src = fetchurl { + url = + let + arch = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then "x86_64" else "arm64"; + in + "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-${arch}.dylib"; + hash = + { + x86_64-darwin = "sha256-slLzjIWpEzOn4GAcRwb6WdJSVExuQK0cVgHgd7qM4oE="; + aarch64-darwin = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4="; + } + .${stdenvNoCC.hostPlatform.system}; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + install -D * -t $out/UserPlugins + runHook postInstall + ''; +}) diff --git a/pkgs/by-name/re/reaper-reapack-extension/linux.nix b/pkgs/by-name/re/reaper-reapack-extension/linux.nix new file mode 100644 index 000000000000..04fd22b25267 --- /dev/null +++ b/pkgs/by-name/re/reaper-reapack-extension/linux.nix @@ -0,0 +1,57 @@ +{ + boost, + catch2_3, + cmake, + curl, + fetchFromGitHub, + git, + libxml2, + openssl, + php, + ruby, + sqlite, + stdenv, + zlib, + + pname, + version, + meta, +}: + +stdenv.mkDerivation (finalAttrs: { + inherit + pname + version + meta + ; + + src = fetchFromGitHub { + owner = "cfillion"; + repo = "reapack"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RhXAjTNAJegeCJaYkvwJedZrXRA92dQ0EeHJr9ngeCg="; + fetchSubmodules = true; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + git + php + ruby + ]; + + buildInputs = [ + boost + catch2_3 + curl + libxml2 + openssl + sqlite + zlib + ]; + + cmakeFlags = [ "-Wno-dev" ]; + +}) diff --git a/pkgs/by-name/re/reaper-reapack-extension/package.nix b/pkgs/by-name/re/reaper-reapack-extension/package.nix new file mode 100644 index 000000000000..1f5bafa0574c --- /dev/null +++ b/pkgs/by-name/re/reaper-reapack-extension/package.nix @@ -0,0 +1,27 @@ +{ + lib, + stdenvNoCC, + callPackage, +}: +let + p = if stdenvNoCC.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix; +in +callPackage p { + pname = "reaper-reapack-extension"; + version = "1.2.5"; + meta = { + description = "Package manager for REAPER"; + homepage = "https://reapack.com/"; + license = with lib.licenses; [ + lgpl3Plus + gpl3Plus + ]; + maintainers = with lib.maintainers; [ pancaek ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +} diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix new file mode 100644 index 000000000000..1ad6b3688032 --- /dev/null +++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix @@ -0,0 +1,52 @@ +{ + stdenvNoCC, + fetchurl, + pname, + version, + meta, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + inherit + pname + version + meta + ; + srcs = + + let + plugin = fetchurl { + url = + let + arch = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then "x86_64" else "arm64"; + in + "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-${arch}.dylib"; + hash = + { + x86_64-darwin = "sha256-B185QWS9FaC/0XDhxUBbgr9zu2Ot8OIsfaPQ3sUHh4s="; + aarch64-darwin = "sha256-8gbyPlnIXdWtSD+Aj70xzacJhO34edTTG2IOryB67os="; + } + .${stdenvNoCC.hostPlatform.system}; + }; + in + [ + plugin + (fetchurl { + url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/sws_python64.py"; + hash = "sha256-Yujj60+jOEfdSZ74cRU1Wxoh7RL2fo/IhJIpa+BDYV0="; + }) + (fetchurl { + url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/sws_python32.py"; + hash = "sha256-QktzdIDpTvNs9IrH7TOI6LTIBkfuQ3cqw06iqLxSSTI="; + }) + ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + install -D *.py -t $out/Scripts + install -D *.dylib -t $out/UserPlugins + runHook postInstall + ''; +}) diff --git a/pkgs/by-name/re/reaper-sws-extension/linux.nix b/pkgs/by-name/re/reaper-sws-extension/linux.nix new file mode 100644 index 000000000000..c45de74689b8 --- /dev/null +++ b/pkgs/by-name/re/reaper-sws-extension/linux.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + php, + perl, + git, + pkg-config, + gtk3, + + pname, + version, + meta, +}: +stdenv.mkDerivation (finalAttrs: { + inherit pname version meta; + + src = fetchFromGitHub { + owner = "reaper-oss"; + repo = "sws"; + tag = "v${finalAttrs.version}"; + hash = "sha256-37pBbNACQuuEk1HJTiUHdb0mDiR2+ZsEQUOhz7mrPPg="; + fetchSubmodules = true; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + git + perl + php + pkg-config + ]; + + buildInputs = [ gtk3 ]; + +}) diff --git a/pkgs/by-name/re/reaper-sws-extension/package.nix b/pkgs/by-name/re/reaper-sws-extension/package.nix new file mode 100644 index 000000000000..4f8a4892cc17 --- /dev/null +++ b/pkgs/by-name/re/reaper-sws-extension/package.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenvNoCC, + callPackage, +}: +let + p = if stdenvNoCC.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix; +in +callPackage p { + + pname = "reaper-sws-extension"; + version = "2.14.0.3"; + meta = { + description = "Reaper Plugin Extension"; + longDescription = '' + The SWS / S&M extension is a collection of features that seamlessly integrate into REAPER, the Digital Audio Workstation (DAW) software by Cockos, Inc. + It is a collaborative and open source project. + ''; + homepage = "https://www.sws-extension.org/"; + maintainers = with lib.maintainers; [ pancaek ]; + license = lib.licenses.mit; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +} diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index 8e6b697aaa39..d14f90d09f81 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isFreeBSD "-lexecinfo"; # darwin currently lacks a pure `pgrep` which is extensively used here doCheck = !stdenv.hostPlatform.isDarwin; @@ -93,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { --timeout 2000 \ --clients $NIX_BUILD_CORES \ --tags -leaks \ + --skipunit integration/aof-multi-part \ --skipunit integration/failover # flaky and slow runHook postCheck diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index ccef1c4376ce..0bcfd5c58d5f 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -9,24 +9,24 @@ }: rustPlatform.buildRustPackage rec { pname = "redlib"; - version = "0.35.1-unstable-2024-11-27"; + version = "0.36.0"; src = fetchFromGitHub { owner = "redlib-org"; repo = "redlib"; - rev = "9f6b08cbb2d0f43644a34f5d0210ac32b9add30c"; - hash = "sha256-lFvlrVFzMk6igH/h/3TZnkl8SooanVyIRYbSyleb2OU="; + tag = "v${version}"; + hash = "sha256-a+FFQqKXYws8b/iGr49eZMVmKBqacQGvW8P51ybtBSc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-cqYPxDhIPA45A29Kl3XlF1gd9/EzlyqyFHH69lAju2A="; + cargoHash = "sha256-1zPLnkNZvuZS5z9AEJvhyIv+8/y+YhqFcj5Mu7RSqnE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postInstall = '' - install -Dm644 contrib/redlib.service $out/lib/systemd/system/redlib.service + install -D contrib/redlib.service $out/lib/systemd/system/redlib.service substituteInPlace $out/lib/systemd/system/redlib.service \ --replace-fail "/usr/bin/redlib" "$out/bin/redlib" ''; diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 7e524c944d03..648818481f40 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -34,7 +34,7 @@ in python3Packages.buildPythonApplication rec { pname = "refine"; - version = "0.5.2"; + version = "0.5.5"; pyproject = false; # uses meson src = fetchFromGitLab { @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { owner = "TheEvilSkeleton"; repo = "Refine"; tag = version; - hash = "sha256-G1G9uuch7kdqWvSfCSOgb9o67da7spNKnnka47k4/rY="; + hash = "sha256-b2dNhd5UJqH/l5BOEgcOUZrhCZa8ErdBzNw5g4VjtM8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/remote-touchpad/package.nix b/pkgs/by-name/re/remote-touchpad/package.nix index 8f7db0223206..72c81bd39393 100644 --- a/pkgs/by-name/re/remote-touchpad/package.nix +++ b/pkgs/by-name/re/remote-touchpad/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.4.8"; + version = "1.5.0"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C/qaLEYvIbl0XINsumAFLnsQgy+EDjoX446BJnuE6eQ="; + sha256 = "sha256-UZjbU9Ti5+IjcxIf+LDWlcqxb4kMIwa8zHmZDdZbnw8="; }; buildInputs = [ @@ -27,7 +27,7 @@ buildGoModule rec { ]; tags = [ "portal,x11" ]; - vendorHash = "sha256-bt5KUgNDgWX7CVHvX5c0uYqoxGRDbGbae52+mpnBEZU="; + vendorHash = "sha256-4TJ9Nok1P3qze69KvrwFo5sMJ4nDYhDNuApsNlZLWCI="; meta = with lib; { description = "Control mouse and keyboard from the web browser of a smartphone"; diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index ee778ec7c21e..448c21e62e27 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2025-03-05"; + version = "0-unstable-2025-03-17"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "3aa8ca84d3cba6043ebf9158b9fa1ce77beb7ea8"; - hash = "sha256-k2gaDI5eymAqhqW9XErR2QlU7VNoquAYi+8L1U6Lcg0="; + rev = "1039408cd06b7630bef0ef2d04d64d14e9a00641"; + hash = "sha256-Ho7H4gb48PfkuF0q4My9E4MHIny1cfqWeLwZpVb0L1E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index b670cf3a4a3d..0b2a13317059 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "39.191.0"; + version = "39.208.1"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-HJvtYqEUmIr+P8g6cCr+NSgmZkzF7TZaVifyhI84oSY="; + hash = "sha256-Y4EJCbIK3XZAilbf/zMEfjEDYHNrUrAGRfsNmY0h/Bw="; }; postPatch = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-w0BaiLwP2AC2KsP2+GTgagMcfFbP/FBaUurbL9y+pXw="; + hash = "sha256-5KGTt6lx44LNpHG/RelCQ1ZlQOMOL6bJi66M2nCiirg="; }; env.COREPACK_ENABLE_STRICT = 0; diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index a5c0aa7ea091..dc72a086f7e0 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -12,7 +12,7 @@ makeWrapper, nix-update-script, pkg-config, - python311, + python3, SDL2, stdenv, versionCheckHook, @@ -21,25 +21,23 @@ }: let - python = python311; + python = python3; in stdenv.mkDerivation (finalAttrs: { pname = "renpy"; - version = "8.3.4.24120703"; + version = "8.3.7.25031702"; src = fetchFromGitHub { owner = "renpy"; repo = "renpy"; tag = finalAttrs.version; - hash = "sha256-9f1ptw+6OQ2rMytwPZPtUd+K/ihnVKHUiELs22iTTqE="; + hash = "sha256-QY6MMiagPVV+pCDM0FRD++r2fY3tD8qWmHj7fJKIxUQ="; }; nativeBuildInputs = [ makeWrapper pkg-config - # Ren'Py currently does not compile on Cython 3.x. - # See https://github.com/renpy/renpy/issues/5359 - python.pkgs.cython_0 + python.pkgs.cython python.pkgs.setuptools ]; @@ -120,7 +118,9 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - env.NIX_CFLAGS_COMPILE = "-I${python.pkgs.pygame-sdl2}/include/${python.libPrefix}"; + env = { + NIX_CFLAGS_COMPILE = "-I${python.pkgs.pygame-sdl2}/include"; + }; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ri/riemann_c_client/package.nix b/pkgs/by-name/ri/riemann_c_client/package.nix index e4b2898d77ed..3933346a85ef 100644 --- a/pkgs/by-name/ri/riemann_c_client/package.nix +++ b/pkgs/by-name/ri/riemann_c_client/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "https://git.madhouse-project.org/algernon/riemann-c-client"; description = "C client library for the Riemann monitoring system"; mainProgram = "riemann-client"; - license = licenses.lgpl3Plus; + license = licenses.eupl12; maintainers = with maintainers; [ pradeepchhetri ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/ri/river/build.zig.zon.nix b/pkgs/by-name/ri/river/build.zig.zon.nix index 38529cfe603b..99979073f69d 100644 --- a/pkgs/by-name/ri/river/build.zig.zon.nix +++ b/pkgs/by-name/ri/river/build.zig.zon.nix @@ -16,15 +16,11 @@ with lib; let unpackZigArtifact = { name, artifact }: - runCommandLocal name - { - nativeBuildInputs = [ zig ]; - } - '' - hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" - mv "$TMPDIR/p/$hash" "$out" - chmod 755 "$out" - ''; + runCommandLocal name { nativeBuildInputs = [ zig ]; } '' + hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" + mv "$TMPDIR/p/$hash" "$out" + chmod 755 "$out" + ''; fetchZig = { @@ -42,13 +38,12 @@ let name, url, hash, + rev ? throw "rev is required, remove and regenerate the zon2json-lock file", }: let parts = splitString "#" url; url_base = elemAt parts 0; url_without_query = elemAt (splitString "?" url_base) 0; - rev_base = elemAt parts 1; - rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}"; in fetchgit { inherit name rev hash; @@ -61,20 +56,25 @@ let name, url, hash, - }: + ... + }@args: let parts = splitString "://" url; proto = elemAt parts 0; path = elemAt parts 1; fetcher = { - "git+http" = fetchGitZig { - inherit name hash; - url = "http://${path}"; - }; - "git+https" = fetchGitZig { - inherit name hash; - url = "https://${path}"; - }; + "git+http" = fetchGitZig ( + args + // { + url = "http://${path}"; + } + ); + "git+https" = fetchGitZig ( + args + // { + url = "https://${path}"; + } + ); http = fetchZig { inherit name hash; url = "http://${path}"; @@ -89,35 +89,35 @@ let in linkFarm name [ { - name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56"; + name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX"; path = fetchZigArtifact { - name = "zig-pixman"; - url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz"; - hash = "sha256-CYgFIOR9H5q8UUpFglaixOocCMT6FGpcKQQBUVWpDKQ="; + name = "pixman"; + url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz"; + hash = "sha256-zX/jQV1NWGhalP3t0wjpmUo38BKCiUDPtgNGHefyxq0="; }; } { - name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; + name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl"; path = fetchZigArtifact { - name = "zig-wayland"; - url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; - hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA="; + name = "wayland"; + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz"; + hash = "sha256-xU8IrETSFOKKQQMgwVyRKLwGaek4USaKXg49S9oHSTQ="; }; } { - name = "122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1"; + name = "wlroots-0.18.2-jmOlchnIAwBq45_cxU1V3OWErxxJjQZlc9PyJfR-l3uk"; path = fetchZigArtifact { - name = "zig-wlroots"; - url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.1.tar.gz"; - hash = "sha256-S77/Own9/GjhLCCE/eI56pdpmhlvMVP41WZ27b+Sook="; + name = "wlroots"; + url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.2.tar.gz"; + hash = "sha256-4/MGFCCgMeN6+oCaj0Z5dsbVo3s88oYk1+q0mMXrj8I="; }; } { - name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f"; + name = "xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr"; path = fetchZigArtifact { - name = "zig-xkbcommon"; - url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz"; - hash = "sha256-f5oEJU5i2qeVN3GBrnQcqzEJCiOT7l4ak7GQ6gw5cH0="; + name = "xkbcommon"; + url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz"; + hash = "sha256-HhhUI+ayPtlylhTmZ1GrdSLbRIffTg3MeisGN1qs2iM="; }; } ] diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix index fb24693c0b45..22272a9cc550 100644 --- a/pkgs/by-name/ri/river/package.nix +++ b/pkgs/by-name/ri/river/package.nix @@ -17,14 +17,14 @@ wayland-scanner, wlroots_0_18, xwayland, - zig_0_13, + zig_0_14, withManpages ? true, xwaylandSupport ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "river"; - version = "0.3.7"; + version = "0.3.9"; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; @@ -34,18 +34,18 @@ stdenv.mkDerivation (finalAttrs: { repo = "river"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-4ac0LGQtLldHyXJ2GIRMHV+VZfUrRFdBYLiAHX5lWcw="; + hash = "sha256-g6qjSkvcA2Ud4W+/NVzYZjiWoWkAuKvuD20KlO/zGhE="; }; deps = callPackage ./build.zig.zon.nix { - zig = zig_0_13; + zig = zig_0_14; }; nativeBuildInputs = [ pkg-config wayland-scanner xwayland - zig_0_13.hook + zig_0_14.hook ] ++ lib.optional withManpages scdoc; buildInputs = [ diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index f5b04fd910b2..62c326b36bfc 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rmg"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "Rosalie241"; repo = "RMG"; tag = "v${finalAttrs.version}"; - hash = "sha256-KnLQvfbCwQbC+ofbIOnxuMK57Nc3HuqPJJtpLidjb8I="; + hash = "sha256-Jwp3DXCh30TLBALXdnu6IubT4Y/8NGjJoSj7WwPp8Q8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix index e74f247c9efb..5fab4df3975e 100644 --- a/pkgs/by-name/ro/roadrunner/package.nix +++ b/pkgs/by-name/ro/roadrunner/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "roadrunner"; - version = "2024.3.3"; + version = "2024.3.5"; src = fetchFromGitHub { repo = "roadrunner"; owner = "roadrunner-server"; tag = "v${version}"; - hash = "sha256-5AB+fGyQa5+/fGqqNSYu0KnFbIZwL/ZjXyYHYk00cV8="; + hash = "sha256-zENTLo3jVOUE1yerIGTb+jFAMnClOVpU/IbUor+bi+g="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ buildGoModule rec { --replace "127.0.0.1:0" "127.0.0.1:55554" ''; - vendorHash = "sha256-BsIZxeSTz7wv4VJKffpOACXo7dm/qwZ/MYbmNogtMvg="; + vendorHash = "sha256-/2MuuvWEyo6zY3op359BUjG/HcjKxRSIv7Qb+6vtNqM="; meta = { changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 624f6219e934..e790854e7a40 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -17,12 +17,6 @@ "hash": "sha256-4BWs04Va9pc/SLeMA/vKoBydhw+Bu6s9MDtoo/Ucft8=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/8.2.0.7535/icsharpcode.decompiler.8.2.0.7535.nupkg" }, - { - "pname": "MessagePack", - "version": "2.5.108", - "hash": "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.108/messagepack.2.5.108.nupkg" - }, { "pname": "MessagePack", "version": "2.5.124", @@ -30,10 +24,10 @@ "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.124/messagepack.2.5.124.nupkg" }, { - "pname": "MessagePack.Annotations", - "version": "2.5.108", - "hash": "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.108/messagepack.annotations.2.5.108.nupkg" + "pname": "MessagePack", + "version": "2.5.187", + "hash": "sha256-3sBINhdkGdKPKTKxE4YuLGFHg6stAEHUIboR1g7eXgA=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.187/messagepack.2.5.187.nupkg" }, { "pname": "MessagePack.Annotations", @@ -41,6 +35,12 @@ "hash": "sha256-4zgAUW6py8CA2hMGUUrHr7Q6vKeRBqOCmcKgAR9fRGg=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.124/messagepack.annotations.2.5.124.nupkg" }, + { + "pname": "MessagePack.Annotations", + "version": "2.5.187", + "hash": "sha256-SQCJa6u8coWMptbR9iQJLjoi/YkT9t0kJNbojh9vUPw=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.187/messagepack.annotations.2.5.187.nupkg" + }, { "pname": "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace", "version": "9.0.0-preview.25064.4", @@ -49,15 +49,21 @@ }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "8.0.0", - "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/8.0.0/microsoft.bcl.asyncinterfaces.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/9.0.0/microsoft.bcl.asyncinterfaces.9.0.0.nupkg" + }, + { + "pname": "Microsoft.Bcl.HashCode", + "version": "1.1.1", + "hash": "sha256-gP6ZhEsjjbmw6a477sm7UuOvGFFTxZYfRE2kKxK8jnc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.hashcode/1.1.1/microsoft.bcl.hashcode.1.1.1.nupkg" }, { "pname": "Microsoft.Build", - "version": "17.12.0-preview-24426-07", - "hash": "sha256-OHQd2npzibOaNSR2sq3NrKKtAALOmnIARmFoBaXiJ0k=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build/17.12.0-preview-24426-07/microsoft.build.17.12.0-preview-24426-07.nupkg" + "version": "17.13.9", + "hash": "sha256-rS0qX48D/t6YLJ+PbI6fmZKkCz8VSLHAZOGDsGpGbu8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.13.9/microsoft.build.17.13.9.nupkg" }, { "pname": "Microsoft.Build", @@ -73,9 +79,9 @@ }, { "pname": "Microsoft.Build.Framework", - "version": "17.12.0-preview-24426-07", - "hash": "sha256-p5JNAp442gjiu14gfM4eF477iT9Ttac8ALHXISbsecs=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.framework/17.12.0-preview-24426-07/microsoft.build.framework.17.12.0-preview-24426-07.nupkg" + "version": "17.13.9", + "hash": "sha256-IrYG5ushm3fFW7DudKBPBj1Xs5BDwfc3vpZnkwsn2Bc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.13.9/microsoft.build.framework.17.13.9.nupkg" }, { "pname": "Microsoft.Build.Framework", @@ -97,9 +103,9 @@ }, { "pname": "Microsoft.Build.Tasks.Core", - "version": "17.12.0-preview-24426-07", - "hash": "sha256-2igOkxetlTeRv2Xq5wVcQXU7hxdP43yMJq3aK6vndoI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.tasks.core/17.12.0-preview-24426-07/microsoft.build.tasks.core.17.12.0-preview-24426-07.nupkg" + "version": "17.13.9", + "hash": "sha256-ZF6MaW4TIGGgqMqr78f7XrY4ZuoxTyaDi8EMLNMiV5I=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.13.9/microsoft.build.tasks.core.17.13.9.nupkg" }, { "pname": "Microsoft.Build.Tasks.Core", @@ -115,9 +121,9 @@ }, { "pname": "Microsoft.Build.Utilities.Core", - "version": "17.12.0-preview-24426-07", - "hash": "sha256-np372GONmrZJ8ppPxjZrvtofA5gTnUf2n/Pn9f02ilo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.utilities.core/17.12.0-preview-24426-07/microsoft.build.utilities.core.17.12.0-preview-24426-07.nupkg" + "version": "17.13.9", + "hash": "sha256-B1+u6sdrkwz3b5JLZ42BHkFRvPKRGyMWWUt44Fyb9Zo=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.13.9/microsoft.build.utilities.core.17.13.9.nupkg" }, { "pname": "Microsoft.Build.Utilities.Core", @@ -205,27 +211,27 @@ }, { "pname": "Microsoft.Extensions.Configuration", - "version": "8.0.0", - "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/8.0.0/microsoft.extensions.configuration.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/9.0.0/microsoft.extensions.configuration.9.0.0.nupkg" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "8.0.0", - "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/8.0.0/microsoft.extensions.configuration.abstractions.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/9.0.0/microsoft.extensions.configuration.abstractions.9.0.0.nupkg" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.0", - "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.binder/8.0.0/microsoft.extensions.configuration.binder.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.binder/9.0.0/microsoft.extensions.configuration.binder.9.0.0.nupkg" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection/8.0.0/microsoft.extensions.dependencyinjection.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection/9.0.0/microsoft.extensions.dependencyinjection.9.0.0.nupkg" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -233,6 +239,12 @@ "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/8.0.0/microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg" }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.0", + "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/9.0.0/microsoft.extensions.dependencyinjection.abstractions.9.0.0.nupkg" + }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", "version": "8.0.0", @@ -241,27 +253,27 @@ }, { "pname": "Microsoft.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging/8.0.0/microsoft.extensions.logging.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging/9.0.0/microsoft.extensions.logging.9.0.0.nupkg" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "8.0.0", - "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.abstractions/8.0.0/microsoft.extensions.logging.abstractions.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.abstractions/9.0.0/microsoft.extensions.logging.abstractions.9.0.0.nupkg" }, { "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "8.0.0", - "hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.configuration/8.0.0/microsoft.extensions.logging.configuration.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-ysPjBq64p6JM4EmeVndryXnhLWHYYszzlVpPxRWkUkw=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.configuration/9.0.0/microsoft.extensions.logging.configuration.9.0.0.nupkg" }, { "pname": "Microsoft.Extensions.Logging.Console", - "version": "8.0.0", - "hash": "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.console/8.0.0/microsoft.extensions.logging.console.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-N2t9EUdlS6ippD4Z04qUUyBuQ4tKSR/8TpmKScb5zRw=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.console/9.0.0/microsoft.extensions.logging.console.9.0.0.nupkg" }, { "pname": "Microsoft.Extensions.ObjectPool", @@ -271,21 +283,21 @@ }, { "pname": "Microsoft.Extensions.Options", - "version": "8.0.0", - "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options/8.0.0/microsoft.extensions.options.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options/9.0.0/microsoft.extensions.options.9.0.0.nupkg" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "8.0.0", - "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/8.0.0/microsoft.extensions.options.configurationextensions.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-r1Z3sEVSIjeH2UKj+KMj86har68g/zybSqoSjESBcoA=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/9.0.0/microsoft.extensions.options.configurationextensions.9.0.0.nupkg" }, { "pname": "Microsoft.Extensions.Primitives", - "version": "8.0.0", - "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/8.0.0/microsoft.extensions.primitives.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/9.0.0/microsoft.extensions.primitives.9.0.0.nupkg" }, { "pname": "Microsoft.IO.Redist", @@ -295,15 +307,9 @@ }, { "pname": "Microsoft.NET.StringTools", - "version": "17.12.0-preview-24426-07", - "hash": "sha256-yoReTrCOhI6ud3v6fLGi5ivS0RuBDhDWw/giD9+bYOk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.stringtools/17.12.0-preview-24426-07/microsoft.net.stringtools.17.12.0-preview-24426-07.nupkg" - }, - { - "pname": "Microsoft.NET.StringTools", - "version": "17.4.0", - "hash": "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.4.0/microsoft.net.stringtools.17.4.0.nupkg" + "version": "17.13.9", + "hash": "sha256-E3bKeMbBLabLM3GWPmD4HDjJzS3Ru1KcPTRWHugRgrQ=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.13.9/microsoft.net.stringtools.17.13.9.nupkg" }, { "pname": "Microsoft.NET.StringTools", @@ -343,9 +349,9 @@ }, { "pname": "Microsoft.ServiceHub.Analyzers", - "version": "4.7.32-beta", - "hash": "sha256-vYKNtk5BauoAwUt2g+0GodmRZ9JWHWfFIBrcOPFHuyQ=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.7.32-beta/microsoft.servicehub.analyzers.4.7.32-beta.nupkg" + "version": "4.8.3", + "hash": "sha256-ZF9f8HvwnY1oZB+/ACRdswBrVOUrHGVJ4cCUoDQqIco=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.8.3/microsoft.servicehub.analyzers.4.8.3.nupkg" }, { "pname": "Microsoft.ServiceHub.Client", @@ -355,9 +361,9 @@ }, { "pname": "Microsoft.ServiceHub.Framework", - "version": "4.7.32-beta", - "hash": "sha256-QGtg9LL8FRRjDiMn5sJYPn1gliSzzxokyMVsa1uvDfs=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.7.32-beta/microsoft.servicehub.framework.4.7.32-beta.nupkg" + "version": "4.8.3", + "hash": "sha256-p9rVrNzs4PAiZpZr7x24N2PgZDKC64XT0ngtj/R5sSs=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.servicehub.framework/4.8.3/microsoft.servicehub.framework.4.8.3.nupkg" }, { "pname": "Microsoft.ServiceHub.Resources", @@ -379,15 +385,15 @@ }, { "pname": "Microsoft.VisualStudio.Composition", - "version": "17.12.17-preview", - "hash": "sha256-RxakGlbjWXC28F50Z5Ayez5gVsmCeyPqOKw3aBCKrDc=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition/17.12.17-preview/microsoft.visualstudio.composition.17.12.17-preview.nupkg" + "version": "17.12.20", + "hash": "sha256-gRFLq/ggHBz/wP7btKIwId9MjnaepQEZpotCTutxWE0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.composition/17.12.20/microsoft.visualstudio.composition.17.12.20.nupkg" }, { "pname": "Microsoft.VisualStudio.Composition.Analyzers", - "version": "17.12.17-preview", - "hash": "sha256-tZ7SmS9wq1f7FJMLo+c5YRdeAoJ7ZHemhgtXiTTzqIU=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/17.12.17-preview/microsoft.visualstudio.composition.analyzers.17.12.17-preview.nupkg" + "version": "17.12.20", + "hash": "sha256-WjjWfmMh+cK0bwGyWEJm1KVn7X7er+DXrgruEYbfoVA=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/17.12.20/microsoft.visualstudio.composition.analyzers.17.12.20.nupkg" }, { "pname": "Microsoft.VisualStudio.RemoteControl", @@ -401,6 +407,12 @@ "hash": "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg" }, + { + "pname": "Microsoft.VisualStudio.SolutionPersistence", + "version": "1.0.28", + "hash": "sha256-7BmeidGDb19wfvpaYA91luCFE1CStb8iLlnyJhVCJ6w=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.solutionpersistence/1.0.28/microsoft.visualstudio.solutionpersistence.1.0.28.nupkg" + }, { "pname": "Microsoft.VisualStudio.Telemetry", "version": "17.14.2", @@ -409,15 +421,15 @@ }, { "pname": "Microsoft.VisualStudio.Threading", - "version": "17.12.13-preview", - "hash": "sha256-StuzZma2nOXFJ5Al9AZZPo0kM4FrTgHYz2ji+zKgtlM=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading/17.12.13-preview/microsoft.visualstudio.threading.17.12.13-preview.nupkg" + "version": "17.13.2", + "hash": "sha256-NSknHS71f/GLA1GcJwGXGOcRYuir6aGz5+u4SEJ99cE=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading/17.13.2/microsoft.visualstudio.threading.17.13.2.nupkg" }, { "pname": "Microsoft.VisualStudio.Threading.Analyzers", - "version": "17.12.13-preview", - "hash": "sha256-wrCnLYNSujq8fcpmjm/yTTY7uVOPAjpJA+1X8ujuVbA=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.12.13-preview/microsoft.visualstudio.threading.analyzers.17.12.13-preview.nupkg" + "version": "17.13.2", + "hash": "sha256-pfhN5HDSWbo6hmlSnCVWvnkYTqSjs8PNtSyHCEEtUjI=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.13.2/microsoft.visualstudio.threading.analyzers.17.13.2.nupkg" }, { "pname": "Microsoft.VisualStudio.Utilities.Internal", @@ -769,9 +781,9 @@ }, { "pname": "StreamJsonRpc", - "version": "2.20.8-beta", - "hash": "sha256-cELu//Ad7sAITbq/i5ISi4g1Mvf9mUIYT6vDTukUjQY=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.20.8-beta/streamjsonrpc.2.20.8-beta.nupkg" + "version": "2.21.10", + "hash": "sha256-Ufx0QWwG9dNm/OrHRzkztVvbQHyKdj6MtTzNTQwTwl0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/streamjsonrpc/2.21.10/streamjsonrpc.2.21.10.nupkg" }, { "pname": "System.Buffers", @@ -797,6 +809,12 @@ "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/8.0.0/system.collections.immutable.8.0.0.nupkg" }, + { + "pname": "System.Collections.Immutable", + "version": "9.0.0", + "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/9.0.0/system.collections.immutable.9.0.0.nupkg" + }, { "pname": "System.CommandLine", "version": "2.0.0-beta4.24528.1", @@ -805,15 +823,15 @@ }, { "pname": "System.ComponentModel.Composition", - "version": "8.0.0", - "hash": "sha256-MnKdjE/qIvAmEeRc3gOn5uJhT0TI3UnUJPjj3TLHFQo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.componentmodel.composition/8.0.0/system.componentmodel.composition.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-CsWwo/NLEAt36kE52cT4wud8uUjJ31vpHlAY6RkUbog=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.componentmodel.composition/9.0.0/system.componentmodel.composition.9.0.0.nupkg" }, { "pname": "System.Composition", - "version": "8.0.0", - "hash": "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition/8.0.0/system.composition.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-FehOkQ2u1p8mQ0/wn3cZ+24HjhTLdck8VZYWA1CcgbM=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition/9.0.0/system.composition.9.0.0.nupkg" }, { "pname": "System.Composition.AttributedModel", @@ -821,35 +839,41 @@ "hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.attributedmodel/8.0.0/system.composition.attributedmodel.8.0.0.nupkg" }, + { + "pname": "System.Composition.AttributedModel", + "version": "9.0.0", + "hash": "sha256-a7y7H6zj+kmYkllNHA402DoVfY9IaqC3Ooys8Vzl24M=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.attributedmodel/9.0.0/system.composition.attributedmodel.9.0.0.nupkg" + }, { "pname": "System.Composition.Convention", - "version": "8.0.0", - "hash": "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.convention/8.0.0/system.composition.convention.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-tw4vE5JRQ60ubTZBbxoMPhtjOQCC3XoDFUH7NHO7o8U=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.convention/9.0.0/system.composition.convention.9.0.0.nupkg" }, { "pname": "System.Composition.Hosting", - "version": "8.0.0", - "hash": "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.hosting/8.0.0/system.composition.hosting.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-oOxU+DPEEfMCuNLgW6wSkZp0JY5gYt44FJNnWt+967s=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.hosting/9.0.0/system.composition.hosting.9.0.0.nupkg" }, { "pname": "System.Composition.Runtime", - "version": "8.0.0", - "hash": "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.runtime/8.0.0/system.composition.runtime.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-AyIe+di1TqwUBbSJ/sJ8Q8tzsnTN+VBdJw4K8xZz43s=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.runtime/9.0.0/system.composition.runtime.9.0.0.nupkg" }, { "pname": "System.Composition.TypedParts", - "version": "8.0.0", - "hash": "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.typedparts/8.0.0/system.composition.typedparts.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-F5fpTUs3Rr7yP/NyIzr+Xn5NdTXXp8rrjBnF9UBBUog=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.typedparts/9.0.0/system.composition.typedparts.9.0.0.nupkg" }, { "pname": "System.Configuration.ConfigurationManager", - "version": "8.0.0", - "hash": "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/8.0.0/system.configuration.configurationmanager.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-+pLnTC0YDP6Kjw5DVBiFrV/Q3x5is/+6N6vAtjvhVWk=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/9.0.0/system.configuration.configurationmanager.9.0.0.nupkg" }, { "pname": "System.Data.DataSetExtensions", @@ -865,15 +889,15 @@ }, { "pname": "System.Diagnostics.DiagnosticSource", - "version": "8.0.1", - "hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/8.0.1/system.diagnostics.diagnosticsource.8.0.1.nupkg" + "version": "9.0.0", + "hash": "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/9.0.0/system.diagnostics.diagnosticsource.9.0.0.nupkg" }, { "pname": "System.Diagnostics.EventLog", - "version": "8.0.0", - "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.eventlog/8.0.0/system.diagnostics.eventlog.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.eventlog/9.0.0/system.diagnostics.eventlog.9.0.0.nupkg" }, { "pname": "System.Diagnostics.PerformanceCounter", @@ -905,6 +929,12 @@ "hash": "sha256-eMF+SD/yeslf/wOIlOTlpfpj3LtP6HUilGeSj++bJKg=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/7.0.0/system.formats.asn1.7.0.0.nupkg" }, + { + "pname": "System.Formats.Nrbf", + "version": "9.0.0", + "hash": "sha256-c4qf6CocQUZB0ySGQd8s15PXY7xfrjQqMGXxkwytKyw=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.nrbf/9.0.0/system.formats.nrbf.9.0.0.nupkg" + }, { "pname": "System.Globalization", "version": "4.3.0", @@ -937,9 +967,9 @@ }, { "pname": "System.IO.Pipelines", - "version": "8.0.0", - "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipelines/8.0.0/system.io.pipelines.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipelines/9.0.0/system.io.pipelines.9.0.0.nupkg" }, { "pname": "System.IO.Pipes", @@ -1019,6 +1049,12 @@ "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/8.0.0/system.reflection.metadata.8.0.0.nupkg" }, + { + "pname": "System.Reflection.Metadata", + "version": "9.0.0", + "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/9.0.0/system.reflection.metadata.9.0.0.nupkg" + }, { "pname": "System.Reflection.MetadataLoadContext", "version": "7.0.0", @@ -1039,9 +1075,9 @@ }, { "pname": "System.Resources.Extensions", - "version": "8.0.0", - "hash": "sha256-5dHZdRwq0tdQanaU5Hw3QISvqSijSGrTa2VdgwifGDI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/8.0.0/system.resources.extensions.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-y2gLEMuAy6QfEyNJxABC/ayMWGnwlpX735jsUQLktho=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/9.0.0/system.resources.extensions.9.0.0.nupkg" }, { "pname": "System.Resources.ResourceManager", @@ -1093,9 +1129,9 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "8.0.0", - "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/8.0.0/system.security.cryptography.protecteddata.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/9.0.0/system.security.cryptography.protecteddata.9.0.0.nupkg" }, { "pname": "System.Security.Cryptography.Xml", @@ -1105,9 +1141,9 @@ }, { "pname": "System.Security.Permissions", - "version": "8.0.0", - "hash": "sha256-+YUPY+3HnTmfPLZzr+5qEk0RqalCbFZBgLXee1yCH1M=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/8.0.0/system.security.permissions.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-BFrA9ottmQtLIAiKiGRbfSUpzNJwuaOCeFRDN4Z0ku0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/9.0.0/system.security.permissions.9.0.0.nupkg" }, { "pname": "System.Security.Principal", @@ -1147,15 +1183,15 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "8.0.0", - "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/8.0.0/system.text.encodings.web.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/9.0.0/system.text.encodings.web.9.0.0.nupkg" }, { "pname": "System.Text.Json", - "version": "8.0.5", - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.5/system.text.json.8.0.5.nupkg" + "version": "9.0.0", + "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/9.0.0/system.text.json.9.0.0.nupkg" }, { "pname": "System.Threading", @@ -1183,9 +1219,9 @@ }, { "pname": "System.Threading.Tasks.Dataflow", - "version": "8.0.0", - "hash": "sha256-Q6fPtMPNW4+SDKCabJzNS+dw4B04Oxd9sHH505bFtQo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/8.0.0/system.threading.tasks.dataflow.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-nRzcFvLBpcOfyIJdCCZq5vDKZN0xHVuB8yCXoMrwZJA=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/9.0.0/system.threading.tasks.dataflow.9.0.0.nupkg" }, { "pname": "System.Threading.Tasks.Extensions", @@ -1213,8 +1249,8 @@ }, { "pname": "System.Windows.Extensions", - "version": "8.0.0", - "hash": "sha256-aHkz7LtmUDDRS7swQM0i6dDVUytRCMYeA2CfaeVA2Y0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/8.0.0/system.windows.extensions.8.0.0.nupkg" + "version": "9.0.0", + "hash": "sha256-RErD+Ju15qtnwdwB7E0SjjJGAnhXwJyC7UPcl24Z3Vs=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/9.0.0/system.windows.extensions.9.0.0.nupkg" } ] diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index ca3ea69a4968..f0ec2eada083 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -32,18 +32,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.68.46"; + vsVersion = "2.69.22"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-cFIqLepeMMHadnSFGN2XFkSo4vJ1RsySA07SoSn1MvY="; + hash = "sha256-z3DDbLFKH5u0w6LswZcghLkkqDYEtCRFNIfoq7N+P2c="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.14.0-2.25120.5"; + version = "4.14.0-3.25156.1"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/ro/rospo/package.nix b/pkgs/by-name/ro/rospo/package.nix index 19300832cef1..5658c5854d74 100644 --- a/pkgs/by-name/ro/rospo/package.nix +++ b/pkgs/by-name/ro/rospo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "rospo"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "ferama"; repo = "rospo"; rev = "v${version}"; - hash = "sha256-+1xrke8dfMkuZZ/imY+1KkeJnZCDtKJpxwAg5ksErnM="; + hash = "sha256-H6hZbOnX+1P1Ob5fCROQtV+64NiFD9mO3kiaQY63OBM="; }; - vendorHash = "sha256-MTPFBrLFMQ2hEwtSDb7t3ls/Wagw7s9/w6bwWjZ62vE="; + vendorHash = "sha256-KyTDyV27YQDqbEyKSYfbJuTKw2EsZAqWsHhmMncUHUs="; ldflags = [ "-s" diff --git a/pkgs/by-name/rp/rp/package.nix b/pkgs/by-name/rp/rp/package.nix new file mode 100644 index 000000000000..7bf1a58aaf73 --- /dev/null +++ b/pkgs/by-name/rp/rp/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, +}: +stdenv.mkDerivation rec { + pname = "rp"; + version = "2.1.4"; + + nativeBuildInputs = [ + cmake + ninja + ]; + buildInputs = lib.optionals (stdenv.isLinux) [ stdenv.cc.libc.static ]; + + src = fetchFromGitHub { + owner = "0vercl0k"; + repo = "rp"; + rev = "a60f8117443e421bb572df890341b5a0f982c267"; + hash = "sha256-lkyuV+yC3NTsdipyJkoxgh1N8/+15N15nQpjItUgyb0="; + }; + sourceRoot = "${src.name}/src"; + + installPhase = '' + mkdir -p $out/bin + cp rp-${if stdenv.isDarwin then "osx" else "lin"} $out/bin/rp + ''; + + meta = with lib; { + description = "Fast C++ ROP gadget finder for PE/ELF/Mach-O x86/x64/ARM/ARM64 binaries"; + homepage = "https://github.com/0vercl0k/rp"; + license = licenses.mit; + maintainers = with maintainers; [ sportshead ]; + platforms = platforms.all; + mainProgram = "rp"; + }; +} diff --git a/pkgs/by-name/rp/rpiboot/package.nix b/pkgs/by-name/rp/rpiboot/package.nix index a3cbf58f7cd4..7f0a68862f7a 100644 --- a/pkgs/by-name/rp/rpiboot/package.nix +++ b/pkgs/by-name/rp/rpiboot/package.nix @@ -22,15 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; nativeBuildInputs = [ pkg-config ]; - patchPhase = '' - sed -i "s@/usr/@$out/@g" main.c - ''; + makeFlags = [ "INSTALL_PREFIX=$(out)" ]; - installPhase = '' + preInstall = '' mkdir -p $out/bin - mkdir -p $out/share/rpiboot - cp rpiboot $out/bin - cp -r msd firmware eeprom-erase mass-storage-gadget* recovery* secure-boot* rpi-eeprom rpi-imager-embedded $out/share/rpiboot ''; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/rr/rrootage/package.nix b/pkgs/by-name/rr/rrootage/package.nix index 819a560d2b87..7d0813df2e37 100644 --- a/pkgs/by-name/rr/rrootage/package.nix +++ b/pkgs/by-name/rr/rrootage/package.nix @@ -3,6 +3,8 @@ stdenv, fetchpatch, fetchurl, + libGL, + libGLU, SDL, SDL_mixer, bulletml, @@ -47,6 +49,8 @@ stdenv.mkDerivation { ''; buildInputs = [ + libGL + libGLU SDL SDL_mixer bulletml diff --git a/pkgs/by-name/ru/rucola/package.nix b/pkgs/by-name/ru/rucola/package.nix index 502eebfdc485..974be5e86620 100644 --- a/pkgs/by-name/ru/rucola/package.nix +++ b/pkgs/by-name/ru/rucola/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "rucola"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Linus-Mussmaecher"; repo = "rucola"; rev = "v${version}"; - hash = "sha256-FeQPf9sCEqypvB8VrGa1nnXmxlqo6K4fpLkJakbysvI="; + hash = "sha256-vBY6tkzLgZuSU5AqH3uzDwjPl/ayWY0S8uRvlgE/Wmw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Cciop3vwRbK3JCUx+SBdIv5Ix/15p6/SmHR8ZVb6LSM="; + cargoHash = "sha256-a1f+WSXMNaZCKc7bScknW9WW+Qi1CZIuNLdJseem11I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 4f6def011fd7..9df3c113abde 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-/CVpNBOBpvQhz7X80nUHC2x7ZxxCJH8O0WAABJKEriA="; + hash = "sha256-/K6+zze5d0RAE7/Nalnmx9qKHI1rPDeh3OkTatgP5Q4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-t2VRNmuKdl1kgZ5g2BS79PFKhJsxDHwxxuMRDcjt//k="; + cargoHash = "sha256-uDuR7GF3918V6ssx4p64pOzCRlLl2vJR0FEBSUnlFQ8="; nativeBuildInputs = [ installShellFiles ]; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rust-jemalloc-sys ]; - postInstall = + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( let emulator = stdenv.hostPlatform.emulator buildPackages; in @@ -44,7 +44,8 @@ rustPlatform.buildRustPackage (finalAttrs: { --bash <(${emulator} $out/bin/ruff generate-shell-completion bash) \ --fish <(${emulator} $out/bin/ruff generate-shell-completion fish) \ --zsh <(${emulator} $out/bin/ruff generate-shell-completion zsh) - ''; + '' + ); # Run cargo tests checkType = "debug"; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index bdafe35baa3b..02f49f8a8a23 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2025-03-10"; + version = "2025-03-17"; useFetchCargoVendor = true; - cargoHash = "sha256-t2cA2JWV+l2cfTUrIpPojNmrElVty2JJAi8+XdxquTs="; + cargoHash = "sha256-XiTq3Qpk996Rmp9KUSeKnzSggkx/1ntLd5Xgx3lVaek="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-MmYdZyVwKa3YHzqoHdHw9/jZXkDE/5M3M+7363t4Pkc="; + hash = "sha256-fqc6tqBGq83Q1SY37EDKf085WKtsSzf0vKgsqla8r3s="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/ru/rust-stakeholder/package.nix b/pkgs/by-name/ru/rust-stakeholder/package.nix new file mode 100644 index 000000000000..1180b6cad19b --- /dev/null +++ b/pkgs/by-name/ru/rust-stakeholder/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage { + pname = "rust-stakeholder"; + version = "0-unstable-2025-03-15"; + + src = fetchFromGitHub { + owner = "giacomo-b"; + repo = "rust-stakeholder"; + rev = "aacdccbed72be34e0231e6d15cecb6d87a9a5ef6"; + hash = "sha256-YnXqvZlItCoAUEYUpRVQLM4fuLaf9Wd+OFY9ItSg25U="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-NxO+7Wh8Ff6RPFtmbEa3EJszfDaZDXGWZDAoXPEAnpI="; + + nativeInstallCheck = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Generate impressive-looking terminal output to look busy when stakeholders walk by"; + homepage = "https://github.com/giacomo-b/rust-stakeholder"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.awwpotato ]; + mainProgram = "rust-stakeholder"; + }; +} diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix index 48a56690b2d1..5c3f1549df0c 100644 --- a/pkgs/by-name/ru/rustlings/package.nix +++ b/pkgs/by-name/ru/rustlings/package.nix @@ -8,6 +8,7 @@ cargo, rustc, clippy, + gcc, makeWrapper, }: let @@ -47,6 +48,7 @@ rustPlatform.buildRustPackage { cargo rustc clippy + gcc ] } ''; diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix index e6d7281ed4a9..9548360b2f22 100644 --- a/pkgs/by-name/ru/rustypaste/package.nix +++ b/pkgs/by-name/ru/rustypaste/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "orhun"; repo = "rustypaste"; rev = "v${version}"; - sha256 = "sha256-Kv6hmqqGY9SssiT/MYmYCZ71N8CHFTT7K4q7eMdQTQU="; + sha256 = "sha256-Jfi2Q6551g58dfOqtHtWxkbxwYV71f7MIuLB8RbaR94="; }; useFetchCargoVendor = true; - cargoHash = "sha256-g7HoDPNP6DeV6NlC/F5KxBVMMgLw6zvVmOUe6yndRMQ="; + cargoHash = "sha256-10tBbn4XtdUNhfzb+KpwFGZAc7YVIEQRaqNLzJC1GGI="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix index 978f6a973137..ebec8ce6973c 100644 --- a/pkgs/by-name/sa/samrewritten/package.nix +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "samrewritten"; - version = "202008-unstable-2025-01-09"; + version = "202008-unstable-2025-03-11"; src = fetchFromGitHub { owner = "PaulCombal"; repo = "SamRewritten"; # The latest release is too old, use latest commit instead - rev = "b18a009c20eb90e2edffb6ee6d5290c86c860e03"; - hash = "sha256-qwasSxNc4hJDadGTUOxzumJ4lZcHQ4Aa8W8jIJAvTt4="; + rev = "cac0291f3e4465135f5cf7d5b99fdb005fb23ade"; + hash = "sha256-+f/j2q1lJ3yp3/BBgnK9kS4P3ULQ5onQPAcUV12LYnI="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix index 83c5640d3c67..2d2b0154802e 100644 --- a/pkgs/by-name/sa/saucectl/package.nix +++ b/pkgs/by-name/sa/saucectl/package.nix @@ -5,7 +5,7 @@ }: let pname = "saucectl"; - version = "0.193.0"; + version = "0.194.0"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "saucelabs"; repo = "saucectl"; tag = "v${version}"; - hash = "sha256-f4OtXjqtqcMIIssXq5UjPX450Ji2objhOcgm82m52V0="; + hash = "sha256-Fetm/Qh6v+4UNBvhexf+mQMBBWUvlpisHOoExuqRunk="; }; ldflags = [ diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix index fcedb1f60e49..74397ae1ad50 100644 --- a/pkgs/by-name/sb/sbom4python/package.nix +++ b/pkgs/by-name/sb/sbom4python/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "sbom4python"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; src = fetchFromGitHub { owner = "anthonyharrison"; repo = "sbom4python"; tag = "v${version}"; - hash = "sha256-F2rEyHvosP0/FJHFN/kPdM1e18bWdbC1V5L4de3aAZc="; + hash = "sha256-H96M/X6WKSrA3zs0uLUHqY2zmsXLNZ8OtekC1MDfF1s="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/sb/sbt-extras/package.nix b/pkgs/by-name/sb/sbt-extras/package.nix index a3e052c16e93..454582b04789 100644 --- a/pkgs/by-name/sb/sbt-extras/package.nix +++ b/pkgs/by-name/sb/sbt-extras/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "e16dab993203b611b9592ddae7b8822a68ae16ec"; - version = "2024-11-06"; + rev = "0282f6f856be680c91184d8a4b2b8698da84fae3"; + version = "2025-03-08"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "Z9bN+gmWiomWnp94pMXf5+Bksl6OejIPbYUGfVrDxJQ="; + sha256 = "nZnrs+oODq+8KZ73JrWDptC0KLLHAGY1SdtRi4zEQ58="; }; dontBuild = true; diff --git a/pkgs/by-name/sc/scc/package.nix b/pkgs/by-name/sc/scc/package.nix index f3494d5bd31f..2dedc510192b 100644 --- a/pkgs/by-name/sc/scc/package.nix +++ b/pkgs/by-name/sc/scc/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "scc"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - hash = "sha256-B6QYG4ZREZEaSfOLo5nwi6yFXkFBWvSsXwnZog1uBj8="; + hash = "sha256-ec3k6NL3zTYvcJo0bR/BqdTu5br4vRZpgrBR6Kj5YxY="; }; vendorHash = null; diff --git a/pkgs/by-name/sc/schemaspy/package.nix b/pkgs/by-name/sc/schemaspy/package.nix index bb5cfddfd261..2a8922758043 100644 --- a/pkgs/by-name/sc/schemaspy/package.nix +++ b/pkgs/by-name/sc/schemaspy/package.nix @@ -10,17 +10,17 @@ maven.buildMavenPackage rec { pname = "schemaspy"; - version = "6.2.4"; + version = "7.0.2"; src = fetchFromGitHub { owner = "schemaspy"; repo = "schemaspy"; tag = "v${version}"; - hash = "sha256-yEqhLpGrJ4hki8o+u+bigVXv+3YvEb8TvHDTYsEl8z4="; + hash = "sha256-X85Yv6yx1Hpl3vNDHtv6u38Err668dkAx1lqpoGnALg="; }; mvnParameters = "-Dmaven.test.skip=true -Dmaven.buildNumber.skip=true"; - mvnHash = "sha256-LCPRiY/DDSUnLGnaFUS9PPKnh3TmSyAOqKfEKRLRjpg="; + mvnHash = "sha256-sCVWNzh8m3KvJyYzE2Mn+gbJTSt1/yX44dE4s7HkygU="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 89f3fb9320b5..acfffd47c5ad 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - version = "7.0.6"; + version = "7.0.7"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "scotch"; repo = "scotch"; rev = "v${finalAttrs.version}"; - hash = "sha256-RW1H0By7jqSM9bT4v6zIuaAZj3iyM1vNsfIcFlRxlkc="; + hash = "sha256-hjxEJCV6/L/oJnonpN5zj0Asnh6d7j0We1T29G1dhmQ="; }; outputs = [ diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index b0000e660243..bdc63084a87e 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -9,6 +9,7 @@ libX11, mesa, pkg-config, + pkg-config-unwrapped, stdenv, # Boolean flags libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms, @@ -39,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: { autoSignDarwinBinariesHook ]; + # re-export PKG_CHECK_MODULES m4 macro used by sdl.m4 + propagatedNativeBuildInputs = [ pkg-config-unwrapped ]; + buildInputs = [ libX11 diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index fcb105e9947e..52b23ccc5513 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -57,7 +57,7 @@ assert lib.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; - version = "3.2.6"; + version = "3.2.8"; outputs = [ "lib" @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL"; tag = "release-${finalAttrs.version}"; - hash = "sha256-SEL/JIenmueYayxZlWlMO3lTUOcqiaZZC6RJbbH4DmE="; + hash = "sha256-BpNo8t0st8v2cTV2iSrjvjCPiDa26NwkWXgMGKFkeAQ="; }; postPatch = diff --git a/pkgs/by-name/se/selenium-manager/disable-telemetry.patch b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch index 0591c5b2d438..28db72d7595b 100644 --- a/pkgs/by-name/se/selenium-manager/disable-telemetry.patch +++ b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch @@ -1,7 +1,7 @@ -diff --git a/rust/src/config.rs b/rust/src/config.rs +diff --git a/src/config.rs b/src/config.rs index f7cd4f32ec..ec454127be 100644 ---- a/rust/src/config.rs -+++ b/rust/src/config.rs +--- a/src/config.rs ++++ b/src/config.rs @@ -120,7 +120,7 @@ impl ManagerConfig { avoid_browser_download: BooleanKey("avoid-browser-download", false).get_value(), language_binding: StringKey(vec!["language-binding"], "").get_value(), diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 9b33ee7b7672..44f92db58aed 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -7,25 +7,23 @@ rustPlatform.buildRustPackage rec { pname = "selenium-manager"; - version = "4.28.0"; + version = "4.29.0"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; tag = "selenium-${version}"; - hash = "sha256-b5xwuZ4lcwLbGhJuEmHYrFXoaTW/M0ABdK3dvbpj8oM="; + hash = "sha256-IyMXgYl/TPTpe/Y0pFyJVKj4Mp0xbkg1LSCNHzFL3bE="; }; + sourceRoot = "${src.name}/rust"; + patches = [ ./disable-telemetry.patch ]; - postPatch = '' - cd rust - ''; - useFetchCargoVendor = true; - cargoHash = "sha256-hXtF3qFzzM2TqpEP9JWdi7uU5TgFHF9lZO5bmZcEuDk="; + cargoHash = "sha256-MgnmEJif4Z4CcmBFkC5BJR67DMGm1ttObtl4LhAFw4g="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index 0eb2017dc08b..3dfbd7f562ec 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -10,22 +10,23 @@ capnproto, installShellFiles, openssl, + cacert, sqlite, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "sequoia-sq"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; - rev = "v${version}"; - hash = "sha256-m6uUqTXswzdtIabNgijdU54VGQSk0SkSqdh+7m1Q7RU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-1jssSlyjbrGgkxGC1gieZooVVI42Qvz0q+pIfcZRIj0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-a+3oKORX88SfMw4/QA6+Ls12koZIw0iadTulCzGlr6U="; + cargoHash = "sha256-tATxGaoF/+cUDywvlnW1N2sKo/FbKhJM7yUb74mxB5s="; nativeBuildInputs = [ pkg-config @@ -48,14 +49,11 @@ rustPlatform.buildRustPackage rec { ] ); - checkFlags = [ - # https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/297 - "--skip=sq_autocrypt_import" - ]; - # Needed for tests to be able to create a ~/.local/share/sequoia directory + # Needed for avoiding "OpenSSL error" since 1.2.0 preCheck = '' export HOME=$(mktemp -d) + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt ''; env.ASSET_OUT_DIR = "/tmp/"; @@ -74,10 +72,10 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; meta = { - description = "Cool new OpenPGP implementation"; + description = "Command line application exposing a useful set of OpenPGP functionality for common tasks"; homepage = "https://sequoia-pgp.org/"; - changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${version}/NEWS"; - license = lib.licenses.gpl2Plus; + changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${finalAttrs.version}/NEWS"; + license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ minijackson doronbehar @@ -85,4 +83,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "sq"; }; -} +}) diff --git a/pkgs/by-name/se/setools/package.nix b/pkgs/by-name/se/setools/package.nix index 47cd6fcbcc19..d00a1b9789f9 100644 --- a/pkgs/by-name/se/setools/package.nix +++ b/pkgs/by-name/se/setools/package.nix @@ -1,16 +1,17 @@ { lib, fetchFromGitHub, - python3, + python3Packages, libsepol, libselinux, checkpolicy, withGraphics ? false, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "setools"; version = "4.5.1"; + pyproject = true; src = fetchFromGitHub { owner = "SELinuxProject"; @@ -19,25 +20,32 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-/6dOzSz2Do4d6TSS50fuak0CysoQ532zJ0bJ532BUCE="; }; - nativeBuildInputs = [ python3.pkgs.cython ]; + build-system = with python3Packages; [ + cython + setuptools + ]; + buildInputs = [ libsepol ]; - propagatedBuildInputs = - with python3.pkgs; + + dependencies = + with python3Packages; [ - enum34 libselinux - networkx setuptools ] ++ lib.optionals withGraphics [ pyqt5 ]; + optional-dependencies = { + analysis = with python3Packages; [ + networkx + pygraphviz + ]; + }; + nativeCheckInputs = [ - python3.pkgs.tox + python3Packages.tox checkpolicy ]; - preCheck = '' - export CHECKPOLICY=${checkpolicy}/bin/checkpolicy - ''; setupPyBuildFlags = [ "-i" ]; @@ -45,10 +53,19 @@ python3.pkgs.buildPythonApplication rec { export SEPOL="${lib.getLib libsepol}/lib/libsepol.a" ''; - meta = with lib; { + preCheck = '' + export CHECKPOLICY=${lib.getExe checkpolicy} + ''; + + meta = { description = "SELinux Policy Analysis Tools"; homepage = "https://github.com/SELinuxProject/setools"; - license = licenses.gpl2Only; - platforms = platforms.linux; + changelog = "https://github.com/SELinuxProject/setools/blob/${version}/ChangeLog"; + license = with lib.licenses; [ + gpl2Only + lgpl21Plus + ]; + maintainers = [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/se/sexpp/package.nix b/pkgs/by-name/se/sexpp/package.nix index 608f044ceb5f..ddad2a21fe8f 100644 --- a/pkgs/by-name/se/sexpp/package.nix +++ b/pkgs/by-name/se/sexpp/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sexpp"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "rnpgp"; repo = "sexpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-mNt6J8nhzT5sF28ktl3jOkQMKn6x9iE04MMrwwVxyZs="; + hash = "sha256-T0DZPWGDg8lz9TrouD/T6i7W+Qj1UJzjnMchfTEQdEM="; }; buildInputs = [ diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index 2036350ae206..9a272e4418e8 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -144,7 +144,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion"; homepage = "https://github.com/shader-slang/slang"; - license = lib.licenses.asl20-llvm; + license = with lib.licenses; [ + asl20 + llvm-exception + ]; maintainers = with lib.maintainers; [ niklaskorz ]; mainProgram = "slangc"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix index 1f17652503f2..ff35f290a91d 100644 --- a/pkgs/by-name/sh/shadps4/package.nix +++ b/pkgs/by-name/sh/shadps4/package.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shadps4"; - version = "0.6.0-unstable-2025-03-10"; + version = "0.6.0-unstable-2025-03-18"; src = fetchFromGitHub { owner = "shadps4-emu"; repo = "shadPS4"; - rev = "ba1eb298dec48f88431068390232e3978ae07bda"; - hash = "sha256-LUo8IOwjlnk3jUeEAbGVmafO8XJuCGzHaZig2HAmNI0="; + rev = "171f755c139764d83e6fc712fcbbcc9d4c5c5956"; + hash = "sha256-vYOI4ffKN8QPg6om3T0PUu2I/K84Y7Hn2iUfVHi7N7o="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sh/shim-unsigned/package.nix b/pkgs/by-name/sh/shim-unsigned/package.nix index a6e7e8b34345..21811d3a422a 100644 --- a/pkgs/by-name/sh/shim-unsigned/package.nix +++ b/pkgs/by-name/sh/shim-unsigned/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "shim"; - version = "15.8"; + version = "16.0"; src = fetchFromGitHub { owner = "rhboot"; repo = "shim"; rev = version; - hash = "sha256-xnr9HBfYP035C7p2YTRZasx5SF4a2ZkOl9IpsVduNm4="; + hash = "sha256-KFpt//A4/T0FRBSPuTKQH/mEIqLVEiE+Lpvuq7ec6eo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix index 64613e6b3ac0..8e800045389c 100644 --- a/pkgs/by-name/sh/showtime/package.nix +++ b/pkgs/by-name/sh/showtime/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { pname = "showtime"; - version = "47.0"; + version = "48.0"; pyproject = false; src = fetchFromGitLab { @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { owner = "Incubator"; repo = "showtime"; rev = "refs/tags/${version}"; - hash = "sha256-Bnz+LFyvwSjkrbePmoVZZqy2pNLqiyJTsZsSuUyDy+E="; + hash = "sha256-w6ERJNBw+YgPHfm24KKYFS6T4EKEguHOeron0ofLxIg="; }; strictDeps = true; diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index c7417a32c988..f289cc25a766 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250313-1"; + version = "20250319"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-N72BNa/6ZqWD5epdVIeuC7tOCkn5Hy8+txPT4ScUgjo="; + hash = "sha256-kKFPaeuA0E5wf6/EiL2cV86KQukBlSKdrVwMbblx9Y4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index 47fa20b475aa..cd6af5de63de 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signaturepdf"; - version = "1.7.2"; + version = "1.7.4"; src = fetchFromGitHub { owner = "24eme"; repo = "signaturepdf"; rev = "v${version}"; - hash = "sha256-Mo8r80XgrHdtr7k67MQpWBgTrsUpnyygufwmvUIe2n4="; + hash = "sha256-8R1eowMpdb4oj3j+gMJ2RsWVzHvNiXPwFaLHR0jqFJo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/si/simplenes/package.nix b/pkgs/by-name/si/simplenes/package.nix index 3ed2efe18c23..1df43bc18110 100644 --- a/pkgs/by-name/si/simplenes/package.nix +++ b/pkgs/by-name/si/simplenes/package.nix @@ -8,29 +8,33 @@ stdenv.mkDerivation { pname = "simplenes"; - version = "unstable-2019-03-13"; + version = "0-unstable-2025-01-05"; src = fetchFromGitHub { owner = "amhndu"; repo = "SimpleNES"; - rev = "4edb7117970c21a33b3bfe11a6606764fffc5173"; - sha256 = "1nmwj431iwqzzcykxd4xinqmg0rm14mx7zsjyhcc5skz7pihz86g"; + rev = "154a2fd4f2f2611a27197aa8d802bbcdfd1a0ea3"; + hash = "sha256-4Nb42tb/pJaVOOhj7hH9cQLDKCz8GUXWz8KAHPOd9nE="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ sfml ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp ./SimpleNES $out/bin + + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/amhndu/SimpleNES"; description = "NES emulator written in C++"; - license = licenses.gpl3; + license = lib.licenses.gpl3; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "SimpleNES"; }; } diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index cddb360c5885..40fa34b87761 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -119,12 +119,6 @@ stdenv.mkDerivation rec { -i '{}' ';' ''; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - preConfigure = '' - substituteInPlace build-aux/ltmain.sh \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector"; doCheck = true; # very basic checks, does not test any libraries diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix index 632c27bd7a9f..64ff70b09b27 100644 --- a/pkgs/by-name/si/sish/package.nix +++ b/pkgs/by-name/si/sish/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sish"; - version = "2.16.1"; + version = "2.17.0"; src = fetchFromGitHub { owner = "antoniomika"; repo = "sish"; tag = "v${version}"; - hash = "sha256-p/7NulUvDUnTCD1H1LRe6OHB7coloIwXiOnOvFbmLhM="; + hash = "sha256-HsN/NQ82tHqdh295fSkJ8SW5oqKF8TJ4ck1VwmNZtk8="; }; - vendorHash = "sha256-AtGxRW2OtWBKxLHBqeL+D4PFLgT8APMwuK6NZCBTpao="; + vendorHash = "sha256-8QNqq/FV8/eZcDnYiRayxsoDTPU+WgDYdURM0Mgzt8s="; ldflags = [ "-s" diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 101f6dbcd688..f653c61f20a0 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.1.24"; + version = "3.1.25"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-BrFyMaxACkdjQy151vIYiJ9WotogEbEKWnFXNhyqKw4="; + hash = "sha256-ZLhLuRj5gdqca9Sbty7BEUBB/+8SgPYhnhoSOR5j4YE="; }; kernel = buildGo123Module { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-2ryd+GciVGmvqLNgdvoHC1tjjnFZgWO2uObj8uNwu0E="; + vendorHash = "sha256-pW52K3nvIdhpeBj2CtJwwsihcV10+FEf2mgAX61s5nM="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-yfcgSCL78hGcq/QDvqx9jMLivW06oRVzI8iqQ7gCrlQ="; + hash = "sha256-01UyupFLr82w0LmainA/7u6195Li/QoTzz/tVxXSVQE="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix index c86459496a6e..b8e77c385d51 100644 --- a/pkgs/by-name/sk/skaffold/package.nix +++ b/pkgs/by-name/sk/skaffold/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.14.1"; + version = "2.14.2"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-cqgtcruyoKdLh4OiRoHLO6VUPjBhQDZ75siU0T9BZxA="; + hash = "sha256-iw9SYoepa2QjKnSaqFkIxuU5dcsLcR7S13kPh5S2Jyw="; }; vendorHash = null; diff --git a/pkgs/by-name/sk/skyscraper/package.nix b/pkgs/by-name/sk/skyscraper/package.nix index 81b0f882facd..a4098eb944c7 100644 --- a/pkgs/by-name/sk/skyscraper/package.nix +++ b/pkgs/by-name/sk/skyscraper/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "skyscraper"; - version = "3.16.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "Gemba"; repo = "skyscraper"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-r+9qhkLKhjtYZUqUM5zvzqo7nxvIKtQN5oC/VACDbBM="; + hash = "sha256-9brCKUIXuBC4T9655HUI/BZ6g0ABdAWf7QrE5Y0kSzw="; }; strictDeps = true; diff --git a/pkgs/by-name/sl/slacky/package.nix b/pkgs/by-name/sl/slacky/package.nix index 873b2154aa2e..65bfa61b1ee0 100644 --- a/pkgs/by-name/sl/slacky/package.nix +++ b/pkgs/by-name/sl/slacky/package.nix @@ -7,14 +7,14 @@ makeDesktopItem, nix-update-script, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "slacky"; version = "0.0.5"; src = fetchFromGitHub { owner = "andirsun"; repo = "Slacky"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nDxmzZqi7xEe4hnY6iXJg+613lSKElWxvF3w8bRDW90="; }; @@ -58,10 +58,10 @@ buildNpmPackage rec { meta = { description = "Unofficial Slack desktop client for arm64 Linux"; homepage = "https://github.com/andirsun/Slacky"; - changelog = "https://github.com/andirsun/Slacky/releases/tag/v${version}"; + changelog = "https://github.com/andirsun/Slacky/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ awwpotato ]; platforms = [ "aarch64-linux" ]; mainProgram = "slacky"; }; -} +}) diff --git a/pkgs/by-name/sm/smpeg/package.nix b/pkgs/by-name/sm/smpeg/package.nix index 51adb5e90c79..32dc1cc52de3 100644 --- a/pkgs/by-name/sm/smpeg/package.nix +++ b/pkgs/by-name/sm/smpeg/package.nix @@ -26,10 +26,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-nq/i7cFGpJXIuTwN/ScLMX7FN8NMdgdsRM9xOD3uycs="; }; - patches = [ + patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ ./libx11.patch ] ++ [ ./format.patch ./gcc6.patch - ./libx11.patch ./gtk.patch # These patches remove use of the `register` storage class specifier, # allowing smpeg to build with clang 16, which defaults to C++17. @@ -93,7 +92,7 @@ stdenv.mkDerivation rec { --prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL}/lib/pkgconfig" ''; - NIX_LDFLAGS = "-lX11"; + NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-lX11"; meta = { homepage = "https://icculus.org/smpeg/"; diff --git a/pkgs/servers/snac2/default.nix b/pkgs/by-name/sn/snac2/package.nix similarity index 53% rename from pkgs/servers/snac2/default.nix rename to pkgs/by-name/sn/snac2/package.nix index 7a12b94f9168..27921a048117 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -5,20 +5,19 @@ curl, openssl, nix-update-script, - testers, - snac2, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snac2"; - version = "2.73"; + version = "2.74"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; - repo = pname; - rev = version; - hash = "sha256-5LKDwp5f5BWhm+9uVBlv3mJpLLQ+ETP9lcRXlfD579Y="; + repo = "snac2"; + tag = finalAttrs.version; + hash = "sha256-jFII9MP+jmtguqE+QMQLbDQ6tSuhie0FhXeSyf42AaQ="; }; buildInputs = [ @@ -35,21 +34,21 @@ stdenv.mkDerivation rec { ] ); + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/snac"; + doInstallCheck = true; + passthru = { - tests.version = testers.testVersion { - package = snac2; - command = "${meta.mainProgram} || true"; - }; updateScript = nix-update-script { }; }; - meta = with lib; { - homepage = "https://codeberg.org/grunfink/snac2"; + meta = { + changelog = "https://codeberg.org/grunfink/snac2/src/tag/${finalAttrs.version}/RELEASE_NOTES.md"; description = "Simple, minimalistic ActivityPub instance (2.x, C)"; - changelog = "https://codeberg.org/grunfink/snac2/src/tag/${version}/RELEASE_NOTES.md"; - license = licenses.mit; - maintainers = with maintainers; [ misuzu ]; - platforms = platforms.unix; + homepage = "https://codeberg.org/grunfink/snac2"; + license = lib.licenses.mit; mainProgram = "snac"; + maintainers = with lib.maintainers; [ misuzu ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sn/snis-unwrapped/package.nix b/pkgs/by-name/sn/snis-unwrapped/package.nix index 8c955e2d84ff..51ac65f3f8d2 100644 --- a/pkgs/by-name/sn/snis-unwrapped/package.nix +++ b/pkgs/by-name/sn/snis-unwrapped/package.nix @@ -27,27 +27,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "snis"; - version = "1.0.2"; + version = "1.0.6"; src = fetchFromGitHub { owner = "smcameron"; repo = "space-nerds-in-space"; tag = "v${finalAttrs.version}"; - hash = "sha256-K7sZUBsR+sd7fUzDnK7C/9Q8+A2XPqUg3llyxdOo/RQ="; + hash = "sha256-QfRH/YWu2BS5Dn47DmaPqoXe0SVFaBxaBIuE6Pq2XwY="; }; enableParallelBuilding = true; postPatch = '' substituteInPlace Makefile \ - --replace "OPUSARCHIVE=libopus.a" "OPUSARCHIVE=" \ - --replace "-I./opus-1.3.1/include" "-I${libopus.dev}/include/opus" + --replace-fail "OPUSARCHIVE=libopus.a" "OPUSARCHIVE=" \ + --replace-fail "-I./opus-1.3.1/include" "-I${libopus.dev}/include/opus" substituteInPlace snis_text_to_speech.sh \ - --replace "pico2wave" "${sox}/bin/pico2wave" \ - --replace "espeak" "${espeak-classic}/bin/espeak" \ - --replace "play" "${sox}/bin/play" \ - --replace "aplay" "${alsa-utils}/bin/aplay" \ - --replace "/bin/rm" "${coreutils}/bin/rm" + --replace-fail "pico2wave" "${sox}/bin/pico2wave" \ + --replace-fail "espeak" "${espeak-classic}/bin/espeak" \ + --replace-fail "aplay" "${alsa-utils}/bin/aplay" \ + --replace-fail "play" "${sox}/bin/play" \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/sn/snowflake/package.nix b/pkgs/by-name/sn/snowflake/package.nix index 9179ba4b499c..c59e0377f6ca 100644 --- a/pkgs/by-name/sn/snowflake/package.nix +++ b/pkgs/by-name/sn/snowflake/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "snowflake"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "anti-censorship/pluggable-transports"; repo = "snowflake"; rev = "v${version}"; - sha256 = "sha256-cpvLBC4mGz4iSP+d3qyKBtCkXNvC8YJ04nIbZuR/15M="; + sha256 = "sha256-VfKiY5XCUnhsWoSfMeYQ5rxxXmAtWzD94o4EvhDCwDM="; }; - vendorHash = "sha256-wCgG6CzxBAvhMICcmDm9a+JdtWs+rf3VU1XAICsc170="; + vendorHash = "sha256-vopRE4B4WhncUdBfmBTzRbZzCU20vsHoNCYcPG4BGc0="; meta = with lib; { description = "System to defeat internet censorship"; diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index ce5b3a7d7597..9fded07e6228 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-eYe+F/1oiAshQeUQhpf8aUtmy1OWUL00F5SH6tV1NO0="; + hash = "sha256-pxwSgnT2AV/PFCxwnOPGKXmzBgX6CDOQA6GGdw8xv1Q="; }; - vendorHash = "sha256-DGlenK4CsxhoxtD87KeJYuKG/cpP3MuCCS+7Zlc4WUM="; + vendorHash = "sha256-9SbgujUUFVf092F/Gp/F3+Mcpd/SxMQBehw/nxHNWIY="; doCheck = false; diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix index 738779b2325b..7a3e57071253 100644 --- a/pkgs/by-name/sp/spdk/package.nix +++ b/pkgs/by-name/sp/spdk/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - python3.pkgs.configshell + python3.pkgs.configshell-fb ]; postPatch = '' diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index f75896e4493d..ff94172eeae9 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "spider"; - version = "2.33.11"; + version = "2.34.2"; src = fetchFromGitHub { owner = "spider-rs"; repo = "spider"; tag = "v${finalAttrs.version}"; - hash = "sha256-wrtkBqq1wJWg+0K4+PILPdMQe1AFOhJ1dJHvwq2irQo="; + hash = "sha256-3KEOzrIFizVBZRI1pD1PeNVj1IiV3ImucW77qHJhDM8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QxfnpiGHYYk8v0rR/eE6KHW1KdZQGuJPz1jGwtl27rs="; + cargoHash = "sha256-Hn9rQ9yv7vekmtGWorETK1b5rdfW0M/88Q6IvH51oE0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix index 47b9544ee475..ab8f2b250df9 100644 --- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix +++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix @@ -49,9 +49,9 @@ let } else if llvmMajor == "14" then { - version = "14.0.0+unstable-2024-07-15"; - rev = "2823e7052b7999c10fff63bc8089e5aa205716f4"; - hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4="; + version = "14.0.0+unstable-2025-01-28"; + rev = "9df26b6af308cb834a4013deb8094f386f29accd"; + hash = "sha256-8VRQwXFbLcYgHtWKs73yuTsy2kkCgYgPqD+W/GPy1BM="; } else if llvmMajor == "11" then { diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix index f1803cde2c6e..09625fbd415f 100644 --- a/pkgs/by-name/sp/spotube/package.nix +++ b/pkgs/by-name/sp/spotube/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "spotube"; - version = "4.0.0"; + version = "4.0.2"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; @@ -84,28 +84,29 @@ stdenv.mkDerivation (finalAttrs: { passthru.sources = let fetchArtifact = - { filename, hash }: + { suffix, hash }: fetchurl { - url = "https://github.com/KRTirtho/spotube/releases/download/v${finalAttrs.version}/${filename}"; + name = "Spotube-${finalAttrs.version}-${suffix}"; + url = "https://github.com/KRTirtho/spotube/releases/download/v${finalAttrs.version}/Spotube-${suffix}"; inherit hash; }; in { "aarch64-linux" = fetchArtifact { - filename = "Spotube-linux-aarch64.deb"; - hash = "sha256-q+0ah6C83zVdrWWMmaBvZebRQP0Ie83Ewp7hjnp2NPw="; + suffix = "linux-aarch64.deb"; + hash = "sha256-zoJ0WPui6KdUyML47RbEBNySTZ8FvStYAOj1mndjh1s="; }; "x86_64-linux" = fetchArtifact { - filename = "Spotube-linux-x86_64.deb"; - hash = "sha256-pk+xi7y0Qilmzk70T4u747zzFn4urZ6Kwuiqq+/q8uM="; + suffix = "linux-x86_64.deb"; + hash = "sha256-SM/lWUhXe20FCgneegn5As5a53YBsoDIMfIYhRBHWjI="; }; "x86_64-darwin" = fetchArtifact { - filename = "Spotube-macos-universal.dmg"; - hash = "sha256-ielRdH+D1QdrKH4OxQFdw6rpzURBs/dRf/synS/Vrdk="; + suffix = "macos-universal.dmg"; + hash = "sha256-0eNeMpC8usPfbuh2aj43n6KLysRQ55yLdOT7Z5faVLU="; }; "aarch64-darwin" = fetchArtifact { - filename = "Spotube-macos-universal.dmg"; - hash = "sha256-ielRdH+D1QdrKH4OxQFdw6rpzURBs/dRf/synS/Vrdk="; + suffix = "macos-universal.dmg"; + hash = "sha256-0eNeMpC8usPfbuh2aj43n6KLysRQ55yLdOT7Z5faVLU="; }; }; diff --git a/pkgs/by-name/sq/sqlcl/package.nix b/pkgs/by-name/sq/sqlcl/package.nix index b8a33f1bac29..637aac13ab83 100644 --- a/pkgs/by-name/sq/sqlcl/package.nix +++ b/pkgs/by-name/sq/sqlcl/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; - version = "24.4.1.042.1221"; + version = "24.4.3.070.2106"; src = fetchurl { url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; - hash = "sha256-IHiIWBz+V1au1KQzM5AslMkbFNCq7jgGLJeIYBkwSVk="; + hash = "sha256-7/8J+XY2Uk/CUWimrTf8/ikjZQT2+4/jNdhs8K1sWjI="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix index 65b79029f8c1..bfcda6373cb3 100644 --- a/pkgs/by-name/sq/sqldef/package.nix +++ b/pkgs/by-name/sq/sqldef/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "sqldef"; - version = "1.0.0"; + version = "1.0.5"; src = fetchFromGitHub { owner = "sqldef"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-eg2iy0vQyg7ZyTejgmJEKD1s6b2ikk7gMFIEudn2PZs="; + hash = "sha256-vwkvKOM8/57lzT6toLqaux3yJD6zYi+J5Ae1qhxnhEw="; }; proxyVendor = true; - vendorHash = "sha256-AKYmE/nysDYyYsqfFleOpWw8DEp/587XI/NA1gv20BU="; + vendorHash = "sha256-+hpqhpkTPVRyr0b80NgSnHGPLO/ueVm4x4/uFrS9ATI="; ldflags = [ "-s" diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix index cc7ab1a65fe9..b2b403461222 100644 --- a/pkgs/by-name/sq/squeezelite/package.nix +++ b/pkgs/by-name/sq/squeezelite/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "2.0.0.1518"; + version = "2.0.0.1524"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "ed3c82052db4846e8e0da01c5bf8db130db00dee"; - hash = "sha256-nxEsraKV5OPaeRuN2NRvxGtUb189ArP3blxSOMPD2II="; + rev = "db51a7b16934f41b72437394bf8114c3a85e0a91"; + hash = "sha256-nPlIvyxhka4ANk74209RFW0Ok5eSZwKFDQw7AJO3qPs="; }; buildInputs = diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index 22d472ce9800..3202fdc692e8 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "srgn"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "alexpovel"; repo = "srgn"; rev = "srgn-v${version}"; - hash = "sha256-KshZ7QnY4TXng9KCcIzdt0E4R83cTEr6fGo9p/riCPU="; + hash = "sha256-S6Wc79LY6WKtjDw/Ob3v4ETRI8Zxjrx9BDNKn79M1j4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-g3ShEKslU01zDLCNHQZ+ZxF1ErCh7jSRELD2wtxWRSs="; + cargoHash = "sha256-4BravWJRtZxC34JjbH26HY7mDdDFPryQZC4e4jOZ1fQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ss/sshuttle/package.nix b/pkgs/by-name/ss/sshuttle/package.nix index ca1d12bacce6..2c878db45299 100644 --- a/pkgs/by-name/ss/sshuttle/package.nix +++ b/pkgs/by-name/ss/sshuttle/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "sshuttle"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "sshuttle"; repo = "sshuttle"; tag = "v${version}"; - hash = "sha256-xJxFtyLTqPozTaPZxAYZySKIo9c23dwEzn6GHpxW1OY="; + hash = "sha256-6RNH2S4GXlAWBQSSmgHFcpYECYJoQtZVScrhLMM0gEk="; }; build-system = [ python3Packages.poetry-core ]; @@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec { Works with Linux and Mac OS and supports DNS tunneling. ''; homepage = "https://github.com/sshuttle/sshuttle"; - changelog = "https://github.com/sshuttle/sshuttle/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/sshuttle/sshuttle/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ domenkozar diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 190338cdce61..69a8b759f915 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.24.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-n1F/DjGvNzU5aF05y3K6/vDuFa/ed2XZLfpafi5+NWg="; + hash = "sha256-7XI5YkfLY/Jo1lVEQ2waN7/g8xN8LUTXIva8OzRdRSo="; }; - vendorHash = "sha256-EaHRYdP7w1PQFYNxAWiTYcCpfipuqvbtbBUYNXNM6nc="; + vendorHash = "sha256-ZVDe28D2vw/p5i6MoBZ1KS9pjncOzul3/bLB4cGoY80="; subPackages = [ "." ]; diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index 4ae1fa96e587..2c62a019283c 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -22,6 +22,9 @@ rustPlatform.buildRustPackage { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; + # Prerelease reports incorrect version + dontVersionCheck = true; + meta = { inherit (stalwart-mail.meta) license homepage changelog; description = "Stalwart Mail Server CLI"; diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index c9ec6087aa74..38cf3474661b 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.32"; + version = "2.11.35"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-3ObXD4DiJGlZhr+ItoBsF6cXuvecoyfKUDHXtAlBGks="; + hash = "sha256-A033eMKoQQ7Zz7P/UmndTqWQ8HjUhkW0ysb2M7px6RM="; }; sourceRoot = "."; diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index 824dd7118f28..2147b331caf7 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "steamguard-cli"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "dyc3"; repo = "steamguard-cli"; rev = "v${version}"; - hash = "sha256-gPw0D5/XpT1bRYgG6GgDSP47Pa6MR3qzKhVwB4MrLKU="; + hash = "sha256-o4hJ8+FsFLKJwifLP3pGbn35SOsTTnQosO4IejitUeI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uu+Ngz5hfH1Pg2KcumpHW3BDggBGJgRh0W06a6fPrfg="; + cargoHash = "sha256-OBftq8bPqmc77oeOStAeXZN5DHfASdOJCrmgDTgHFWc="; nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix index db780b77b561..92763dd75952 100644 --- a/pkgs/by-name/st/step-ca/package.nix +++ b/pkgs/by-name/st/step-ca/package.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.28.2"; + version = "0.28.3"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; tag = "v${version}"; - hash = "sha256-iyv/cMRoJ5fYBVdQZ52zDTLdeESzNMJWXbgsDbU+p5Q="; + hash = "sha256-5W39Nc6WuxhrXbEfPWMaWWAUX6UnjYqlEAPlDCeYgrY="; }; - vendorHash = "sha256-N3MZXs/eJ+vvgsoq6s3vz22j3/CUyUhcwTc/nNU5Axo="; + vendorHash = "sha256-AuMYdZa1QpmMQZxlv+lmoWtszQkVdwXOTXxY8CWaUbI="; ldflags = [ "-w" diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix index 04d666fd2831..0d6be886a07a 100644 --- a/pkgs/by-name/st/step-cli/package.nix +++ b/pkgs/by-name/st/step-cli/package.nix @@ -6,7 +6,7 @@ installShellFiles, }: let - version = "0.28.5"; + version = "0.28.6"; in buildGoModule { pname = "step-cli"; @@ -16,7 +16,7 @@ buildGoModule { owner = "smallstep"; repo = "cli"; tag = "v${version}"; - hash = "sha256-cuD66Llk0789mYL0x17jKjSmAxCcCvwPEz3/BHXJ5NQ="; + hash = "sha256-9tw/d6n6tzhBhBqizDG1dGhj8se9GF2DtrfYwwhvsLs="; # this file change depending on git branch status (via .gitattributes) # https://github.com/NixOS/nixpkgs/issues/84312 postFetch = '' @@ -35,7 +35,7 @@ buildGoModule { rm command/certificate/remote_test.go ''; - vendorHash = "sha256-iOtW5uioDDHR7ZJFX3pBdrQlWV6LnfjjHinQppmX5Fo="; + vendorHash = "sha256-+pHc2uBgQwMkJ7BTgHGHDPgfBpLlN0Yxf+6Enhb7cys="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix index 253ef36abd0a..99a253961d19 100644 --- a/pkgs/by-name/st/step-kms-plugin/package.nix +++ b/pkgs/by-name/st/step-kms-plugin/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-AFHqkHPa4+/VbeSq9TZA0mUXyXLAfXFAFVkKqnEfg7k="; + hash = "sha256-6+5xZGzLsXu+283aOCeRmzxvjsk5PXTpbszVYuSSuGA="; }; - vendorHash = "sha256-u2CXNOaDn4dYWarOW3f11rsqo52hMpRntBhmNf1+axc="; + vendorHash = "sha256-S8T2GMFOVYqG2+8jdDRNJfAN057HagUA3HR0/UBpBR0="; proxyVendor = true; diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index 5ba3bb064e0c..6fd08edbb04a 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -14,13 +14,13 @@ let iconame = "STM32CubeMX"; package = stdenvNoCC.mkDerivation rec { pname = "stm32cubemx"; - version = "6.13.0"; + version = "6.14.0"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${ builtins.replaceStrings [ "." ] [ "" ] version }-lin.zip"; - hash = "sha256-ypZVVPmAsApaccWl7ZtAECwphD2SUUiVNC2DYC5rYb4="; + hash = "sha256-GOvoPyfPdQV/gjveuFpZjueTZD/BYuEWSHgQKBm3o3A="; stripRoot = false; }; diff --git a/pkgs/by-name/st/stown/package.nix b/pkgs/by-name/st/stown/package.nix new file mode 100644 index 000000000000..7a85908e97b0 --- /dev/null +++ b/pkgs/by-name/st/stown/package.nix @@ -0,0 +1,41 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + tree, + versionCheckHook, +}: +let + version = "1.2.0"; +in +python3Packages.buildPythonApplication { + pname = "stown"; + inherit version; + pyproject = true; + + src = fetchFromGitHub { + owner = "rseichter"; + repo = "stown"; + tag = version; + hash = "sha256-iHeqmlo7be28ISJfPZ7GZC2gj2VVgt20ORnfYVToo0A="; + }; + + build-system = [ + python3Packages.setuptools + ]; + + nativeCheckInputs = [ + python3Packages.pytestCheckHook + tree + versionCheckHook + ]; + + meta = { + description = "Manage file system object mapping via symlinks. Lightweight alternative to GNU Stow"; + homepage = "https://www.seichter.de/stown/"; + changelog = "https://github.com/rseichter/stown/blob/${version}/CHANGELOG.md"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ rseichter ]; + mainProgram = "stown"; + }; +} diff --git a/pkgs/by-name/st/streamcontroller/package.nix b/pkgs/by-name/st/streamcontroller/package.nix index e1f95c5ebf61..2054f05560b0 100644 --- a/pkgs/by-name/st/streamcontroller/package.nix +++ b/pkgs/by-name/st/streamcontroller/package.nix @@ -1,6 +1,7 @@ { stdenv, lib, + isKde ? false, python3Packages, fetchFromGitHub, copyDesktopItems, @@ -12,20 +13,23 @@ libportal-gtk4, xdg-desktop-portal, xdg-desktop-portal-gtk, + kdotool, }: -stdenv.mkDerivation rec { +let + # We have to hardcode revision because upstream often create multiple releases for the same version number. + # This is the commit hash that maps to 1.5.0-beta.8 released on 2025-03-12 + rev = "de11d84afac7873044568606a8468c78d57aceda"; +in +stdenv.mkDerivation { pname = "streamcontroller"; - version = "1.5.0-beta.7"; - # We have to hardcode revision because upstream often create multiple releases for the same version number. - # This is the commit hash that maps to 1.5.0-beta.7 released on 2024-11-20 - rev = "45b5bc72f617c5aea306450d6592da66ade53568"; + version = "1.5.0-beta.8"; src = fetchFromGitHub { repo = "StreamController"; owner = "StreamController"; inherit rev; - hash = "sha256-tgbqURtqp1KbzOfXo4b4Dp3N8Sg8xcUSTwdEFXq+f6w="; + hash = "sha256-pE92/oX9iZYCIhwDkPkjPq/cDUQLUGs+Ou5rjFEIBpo="; }; # The installation method documented upstream @@ -34,37 +38,48 @@ stdenv.mkDerivation rec { # Due to how the code is structured upstream, it's infeasible to use `buildPythonApplication`. dontBuild = true; - installPhase = '' - runHook preInstall + installPhase = + # Some plugins needs to load things dynamically and in that case we won't find python3 without this + let + binPath = + [ + python3Packages.python.interpreter + ] + # Allows automatic detection of windows to switch pages on KDE + ++ lib.optional isKde kdotool; + in + '' + runHook preInstall - mkdir -p $out/usr/lib/streamcontroller - cp -r ./* $out/usr/lib/streamcontroller/ + mkdir -p $out/usr/lib/streamcontroller + cp -r ./* $out/usr/lib/streamcontroller/ - mkdir -p $out/bin/ + mkdir -p $out/bin/ - # Note that the implementation of main.py assumes - # working directory to be at the root of the project's source code - makeWrapper \ - ${python3Packages.python.interpreter} \ - $out/bin/streamcontroller \ - --add-flags main.py \ - --chdir $out/usr/lib/streamcontroller \ - --prefix PYTHONPATH : "$PYTHONPATH" + # Note that the implementation of main.py assumes + # working directory to be at the root of the project's source code + makeWrapper \ + ${python3Packages.python.interpreter} \ + $out/bin/streamcontroller \ + --add-flags main.py \ + --chdir $out/usr/lib/streamcontroller \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : "$PATH:${lib.makeBinPath binPath}" - mkdir -p "$out/etc/udev/rules.d" - cp ./udev.rules $out/etc/udev/rules.d/70-streamcontroller.rules + mkdir -p "$out/etc/udev/rules.d" + cp ./udev.rules $out/etc/udev/rules.d/70-streamcontroller.rules - install -D ./flatpak/icon_256.png $out/share/icons/hicolor/256x256/apps/streamcontroller.png + install -D ./flatpak/icon_256.png $out/share/icons/hicolor/256x256/apps/com.core447.StreamController.png - runHook postInstall - ''; + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { name = "StreamController"; desktopName = "StreamController"; exec = "streamcontroller"; - icon = "streamcontroller"; + icon = "com.core447.StreamController"; comment = "Control your Elgato Stream Decks"; categories = [ "Utility" ]; }) diff --git a/pkgs/by-name/st/strelka/package.nix b/pkgs/by-name/st/strelka/package.nix deleted file mode 100644 index a7470394213c..000000000000 --- a/pkgs/by-name/st/strelka/package.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - cmake, - boost, - zlib, - python2, -}: - -stdenv.mkDerivation rec { - pname = "strelka"; - version = "2.9.10"; - - src = fetchFromGitHub { - owner = "Illumina"; - repo = "strelka"; - rev = "v${version}"; - sha256 = "1nykbmim1124xh22nrhrsn8xgjb3s2y7akrdapn9sl1gdych4ppf"; - }; - - patches = [ - # Pull pending fix for gcc-12: - # https://github.com/Illumina/strelka/pull/204 - (fetchpatch { - name = "limits.patch"; - url = "https://github.com/Illumina/strelka/commit/98272cd345c6e4c672e6a5b7721204fcac0502d6.patch"; - hash = "sha256-psBiuN32nvwZ+QX51JQjIdRhEE3k7PfwbkD10ckqvZk="; - }) - ]; - - postPatch = '' - substituteInPlace src/cmake/boost.cmake \ - --replace "1.58.0" "${boost.version}" \ - --replace "Boost_USE_STATIC_LIBS ON" "Boost_USE_STATIC_LIBS OFF" - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - boost - zlib - python2 - ]; - - cmakeFlags = [ - "-DCMAKE_CXX_STANDARD=14" - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=maybe-uninitialized" - "-Wno-error=pessimizing-move" - ]; - - preConfigure = '' - sed -i 's|/usr/bin/env python|${python2}/bin/python|' src/python/lib/makeRunScript.py - patchShebangs . - ''; - - postFixup = '' - pushd $out/lib/python/pyflow - sed -i 's|/bin/bash|${stdenv.shell}|' pyflowTaskWrapper.py - rm pyflowTaskWrapper.pyc - echo "import pyflowTaskWrapper" | python2 - popd - ''; - - meta = with lib; { - description = "Germline and small variant caller"; - license = licenses.gpl3; - homepage = "https://github.com/Illumina/strelka"; - maintainers = with maintainers; [ jbedo ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index fc4bc498428e..b3c2298c9783 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "stripe"; repo = "stripe-cli"; rev = "v${version}"; - hash = "sha256-DSJqP55Va0stqVrYSCVsysANTAeVd0UAlCH24gbihnU="; + hash = "sha256-WlLrWMDOwpSoHUixkJbCoewt/4UgnTbwIMBD5p5SI3c="; }; vendorHash = "sha256-dWLrJ866R+yPEYs4vc8SRADZXC1xCO7sDosHbU1G63o="; diff --git a/pkgs/by-name/su/sunxi-tools/package.nix b/pkgs/by-name/su/sunxi-tools/package.nix index eb92e3f342ce..075b94148822 100644 --- a/pkgs/by-name/su/sunxi-tools/package.nix +++ b/pkgs/by-name/su/sunxi-tools/package.nix @@ -6,17 +6,18 @@ dtc, libusb1, zlib, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "sunxi-tools"; - version = "unstable-2021-08-29"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "linux-sunxi"; repo = "sunxi-tools"; - rev = "74273b671a3fc34048383c40c85c684423009fb9"; - sha256 = "1gwamb64vr45iy2ry7jp1k3zc03q5sydmdflrbwr892f0ijh2wjl"; + rev = "29d48c3c39d74200fb35b5750f99d06a4886bf2e"; + sha256 = "sha256-IUgAM/wVHGbidJ2bfLcTIdXg7wxEjxCg1IA8FtDFpR4="; }; nativeBuildInputs = [ pkg-config ]; @@ -38,11 +39,13 @@ stdenv.mkDerivation { "install-misc" ]; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { description = "Tools for Allwinner SoC devices"; homepage = "http://linux-sunxi.org/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ elitak ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.elitak ]; }; } diff --git a/pkgs/by-name/su/superlu_dist/package.nix b/pkgs/by-name/su/superlu_dist/package.nix index 3b6c0124de16..a2e5677ed2ef 100644 --- a/pkgs/by-name/su/superlu_dist/package.nix +++ b/pkgs/by-name/su/superlu_dist/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitHub, + fetchurl, + llvmPackages, cmake, gfortran, blas, @@ -10,7 +12,9 @@ mpiCheckPhaseHook, metis, parmetis, - + withExamples ? false, + fortranSupport ? stdenv.hostPlatform.isLinux, + enableOpenMP ? true, # Todo: ask for permission of unfree parmetis withParmetis ? false, }: @@ -34,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./mc64ad_dist-stub.patch + (fetchurl { + url = "https://github.com/xiaoyeli/superlu_dist/commit/8ef3f7fda091529d7e7f16087864fee66c4834c9.patch"; + hash = "sha256-kCSqojYKpk75m+FwhS0hXHSybm+GZzOYikePcf2U3Fw="; + }) ]; postPatch = '' @@ -41,13 +49,20 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "LargeDiag_MC64" "NOROWPERM" ''; - nativeBuildInputs = [ - cmake - gfortran - ]; + nativeBuildInputs = + [ + cmake + ] + ++ lib.optionals fortranSupport [ + gfortran + ]; buildInputs = - [ + lib.optionals (enableOpenMP && stdenv.cc.isClang) [ + # cmake can not find mpi if openmp is placed after mpi + llvmPackages.openmp + ] + ++ [ mpi lapack ] @@ -60,9 +75,11 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ + (lib.cmakeBool "enable_examples" withExamples) + (lib.cmakeBool "enable_openmp" enableOpenMP) (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) - (lib.cmakeBool "enable_fortran" true) - (lib.cmakeBool "enable_complex16" true) + (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) + (lib.cmakeBool "XSDK_ENABLE_Fortran" fortranSupport) (lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false) (lib.cmakeBool "TPL_ENABLE_LAPACKLIB" true) (lib.cmakeBool "TPL_ENABLE_PARMETISLIB" withParmetis) @@ -96,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { asl20 ]; description = "Library for the solution of large, sparse, nonsymmetric systems of linear equations"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; }; }) diff --git a/pkgs/by-name/su/suricata/package.nix b/pkgs/by-name/su/suricata/package.nix index 6c7006d32715..630da8c0aeca 100644 --- a/pkgs/by-name/su/suricata/package.nix +++ b/pkgs/by-name/su/suricata/package.nix @@ -27,7 +27,7 @@ python3, zlib, redisSupport ? true, - redis, + valkey, hiredis, rustSupport ? true, rustc, @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional hyperscanSupport hyperscan ++ lib.optionals redisSupport [ - redis + valkey hiredis ]; diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index ecff75270285..1420a6374fe0 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -22,6 +22,7 @@ libexif, libavif, libsixel, + libraw, openexr_3, bash-completion, testers, @@ -30,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; tag = "v${finalAttrs.version}"; - hash = "sha256-nPmVUJy5hlWk6Q+s6rRBEzlJvpDKLStKTRjLwj7iA/c="; + hash = "sha256-QPTODuVVDQCP7Ix63F0J0tOzfg5Q9B4GXaxjuTerkI0="; }; strictDeps = true; @@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { libexif libavif libsixel + libraw openexr_3 ]; diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index b575c35be975..148eedd90b9f 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; tag = "v${version}"; - hash = "sha256-1+AXxw1gH0SKAxUa0JIhSzMbSmsfmBPCBY5IKaYtldg="; + hash = "sha256-VZxUyASWyg+UMTTYeuyRIO+++ZKL0nAqjNS6nJ756yk="; }; strictDeps = true; diff --git a/pkgs/by-name/t3/t3/package.nix b/pkgs/by-name/t3/t3/package.nix index c1b05db9d3ce..2017c0d57287 100644 --- a/pkgs/by-name/t3/t3/package.nix +++ b/pkgs/by-name/t3/t3/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "t3"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "flox"; repo = "t3"; tag = "v${finalAttrs.version}"; - hash = "sha256-SaSBFqMh6zOty0mnYL4RJxAxbB1LJusKLdMn7Atv+As="; + hash = "sha256-42T0qQ3zK1jTRU+gcBzEet5rHZ6QuknCbPdbGPNlETI="; }; makeFlags = [ diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index e4a173f72779..d006f2cfcff6 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "tail-tray"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "SneWs"; repo = "tail-tray"; tag = "v${version}"; - sha256 = "sha256-Mobbh1c7f3aTxn0BEIm2A+DgS2TBSZTYiDlHxyaQEjk="; + sha256 = "sha256-Q+kethk9JpJCdMnt4qDpzuf8RUq3vpwTq1N8dLTpcpI="; }; nativeBuildInputs = with kdePackages; [ diff --git a/pkgs/by-name/ta/targetcli/package.nix b/pkgs/by-name/ta/targetcli-fb/package.nix similarity index 52% rename from pkgs/by-name/ta/targetcli/package.nix rename to pkgs/by-name/ta/targetcli-fb/package.nix index 9498717b22d6..a8db141a5e64 100644 --- a/pkgs/by-name/ta/targetcli/package.nix +++ b/pkgs/by-name/ta/targetcli-fb/package.nix @@ -1,6 +1,6 @@ { lib, - python3, + python3Packages, fetchFromGitHub, nixosTests, wrapGAppsNoGuiHook, @@ -8,26 +8,32 @@ glib, }: -python3.pkgs.buildPythonApplication rec { - pname = "targetcli"; - version = "2.1.58"; +python3Packages.buildPythonApplication rec { + pname = "targetcli-fb"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "open-iscsi"; - repo = "${pname}-fb"; - rev = "v${version}"; - hash = "sha256-9QYo7jGk9iWr26j0qPQCqYsJ+vLXAsO4Xs7+7VT9/yc="; + repo = "targetcli-fb"; + tag = "v${version}"; + hash = "sha256-jRujBgUdeJY8ekVBDscitajDhYohlx/BS4wn+jFkZSg="; }; + build-system = with python3Packages; [ + hatch-vcs + hatchling + ]; + nativeBuildInputs = [ wrapGAppsNoGuiHook gobject-introspection ]; buildInputs = [ glib ]; - propagatedBuildInputs = with python3.pkgs; [ - configshell - rtslib + dependencies = with python3Packages; [ + configshell-fb + rtslib-fb pygobject3 ]; @@ -40,11 +46,13 @@ python3.pkgs.buildPythonApplication rec { inherit (nixosTests) iscsi-root; }; - meta = with lib; { + meta = { description = "Command shell for managing the Linux LIO kernel target"; homepage = "https://github.com/open-iscsi/targetcli-fb"; - license = licenses.asl20; + changelog = "https://github.com/open-iscsi/targetcli-fb/releases/tag/v${version}"; + license = lib.licenses.asl20; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; + mainProgram = "targetcli"; }; } diff --git a/pkgs/by-name/ta/taskjuggler/Gemfile b/pkgs/by-name/ta/taskjuggler/Gemfile index f6dec6ebf490..80e39dfa2962 100644 --- a/pkgs/by-name/ta/taskjuggler/Gemfile +++ b/pkgs/by-name/ta/taskjuggler/Gemfile @@ -1,3 +1,5 @@ source 'https://rubygems.org' gem 'taskjuggler' gem 'webrick' +gem 'base64' +gem 'drb' diff --git a/pkgs/by-name/ta/taskjuggler/Gemfile.lock b/pkgs/by-name/ta/taskjuggler/Gemfile.lock index d0578a49c759..64f624c9f3e8 100644 --- a/pkgs/by-name/ta/taskjuggler/Gemfile.lock +++ b/pkgs/by-name/ta/taskjuggler/Gemfile.lock @@ -1,39 +1,45 @@ GEM remote: https://rubygems.org/ specs: - date (3.3.3) + base64 (0.2.0) + bigdecimal (3.1.9) + date (3.4.1) + drb (2.2.1) mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - mini_mime (1.1.2) - net-imap (0.3.4) + mini_mime (1.1.5) + net-imap (0.5.6) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.5.1) net-protocol sync (0.5.0) - taskjuggler (3.7.2) + taskjuggler (3.8.1) mail (~> 2.7, >= 2.7.1) term-ansicolor (~> 1.7, >= 1.7.1) - term-ansicolor (1.7.1) + term-ansicolor (1.11.2) tins (~> 1.0) - timeout (0.3.2) - tins (1.32.1) + timeout (0.4.3) + tins (1.38.0) + bigdecimal sync - webrick (1.8.1) + webrick (1.9.1) PLATFORMS - x86_64-linux + ruby DEPENDENCIES + base64 + drb taskjuggler webrick BUNDLED WITH - 2.4.12 + 2.5.22 diff --git a/pkgs/by-name/ta/taskjuggler/gemset.nix b/pkgs/by-name/ta/taskjuggler/gemset.nix index aa9de0e564e1..4a37a8e0eb27 100644 --- a/pkgs/by-name/ta/taskjuggler/gemset.nix +++ b/pkgs/by-name/ta/taskjuggler/gemset.nix @@ -1,13 +1,43 @@ { + 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 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; + type = "gem"; + }; + version = "3.1.9"; + }; date = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; type = "gem"; }; - version = "3.3.3"; + version = "3.4.1"; + }; + drb = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; }; mail = { dependencies = [ @@ -30,10 +60,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; net-imap = { dependencies = [ @@ -44,10 +74,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy"; type = "gem"; }; - version = "0.3.4"; + version = "0.5.6"; }; net-pop = { dependencies = [ "net-protocol" ]; @@ -66,10 +96,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.2"; }; net-smtp = { dependencies = [ "net-protocol" ]; @@ -77,10 +107,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd"; type = "gem"; }; - version = "0.3.3"; + version = "0.5.1"; }; sync = { groups = [ "default" ]; @@ -101,10 +131,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07fagka8nl29xwwzfhxx89gp34m5hih5vnq4sha1z814004md53j"; + sha256 = "16d5vgz54all8vl3haqy6j69plny3np4kc3wq7wy3xa3i0h7v60z"; type = "gem"; }; - version = "3.7.2"; + version = "3.8.1"; }; term-ansicolor = { dependencies = [ "tins" ]; @@ -112,40 +142,43 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; + sha256 = "10shkrl9sl1qhrzbmch2cn67w1yy63d0f2948m80b5nl44zwc02b"; type = "gem"; }; - version = "1.7.1"; + version = "1.11.2"; }; timeout = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; + sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.3"; }; tins = { - dependencies = [ "sync" ]; + dependencies = [ + "bigdecimal" + "sync" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0373zn7zkllcn2q4ylbjgjx9mvm8m73ll3jwjav48dx8myplsp5p"; + sha256 = "0vc80cw3qbbdfiydv7bj7zvch189mh3ifbz7v0ninnrxnwwd3b4r"; type = "gem"; }; - version = "1.32.1"; + version = "1.38.0"; }; webrick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; + sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.1"; }; } diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix index acdb7c0095d1..27eb4d3fd6a7 100644 --- a/pkgs/by-name/te/tealdeer/package.nix +++ b/pkgs/by-name/te/tealdeer/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "tealdeer"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "dbrgn"; repo = "tealdeer"; rev = "v${version}"; - hash = "sha256-UYOAj6ft6FHQz06A+K2K+bK3WXQnF5U7TuN95WIXj+M="; + hash = "sha256-GZN7WE12f3MEoBfswag0O04UOCmZeYwt5CbYwddmwHs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-gIJWHqJk0epsPJm1QNOpbvDC1a0d/6AfcNlaT824vWA="; + cargoHash = "sha256-Zk2L4cq7j9CkSc+cnZRWwhtfWP6y5faiMVGFFNkBwwA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index ac33529a0d4a..ac52e80b7891 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -15,16 +15,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-m2zJoJBjbeTU+WlZeH8R84mYKsxpUxN93SKOIVCjoj4="; + hash = "sha256-0u5UyhRSa4gsLVQLctWMZe/oE8l9jrwCzkPtLWv2xlo="; }; - npmDepsHash = "sha256-TNX6QikNs/TI/Wt+eHIMwwORjjFIVAa1J/vHiOkHQXU="; + npmDepsHash = "sha256-BHz1+pd88TDfTXtG0gl5kYiDeG/M94pYdpPtwBrBYzQ="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix index 293ced9968c3..665d46cac14b 100644 --- a/pkgs/by-name/te/telepresence2/package.nix +++ b/pkgs/by-name/te/telepresence2/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.21.3"; + version = "2.22.0"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-s0P8l8EokVGCUXo9Bm+uPtxS9uwIhBULtFeVR/Fl38M="; + hash = "sha256-SSzZ54grTt9VJL3avugb3FiKkaF6I+42DUorpmHkhlE="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-FvNC0E367p473yNfbMntSOxh6TYa7OoR6/YbZ7q4WRs="; + vendorHash = "sha256-THMWbN/wlBPphQeoZgeSlkI06dbA2/FmqxKn3LgtbPg="; ldflags = [ "-s" diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 37a0307f7ad2..d3007bb58fb0 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage rec { pname = "television"; - version = "0.10.9"; + version = "0.11.2"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = version; - hash = "sha256-R46r3S7zaogyVpdLGFIU1l6UDnRQ1lMZvd4RA6iq+qI="; + hash = "sha256-4iS11aBUxtEaWyfdIppdpGs5n8EzgOPEvpZsN+hXhfo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-teUJyLTUiSIbsMVOTj8/wBIimZOMDPQ/h6OryRsTJQ0="; + cargoHash = "sha256-KOvTCMdj6xtKZjqKHxPjts4dE3/TAUbUqv6ew8CYKPY="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index 304e3ecbd4ee..061563b73c6c 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "templ"; - version = "0.3.833"; + version = "0.3.850"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8="; + hash = "sha256-kH7nVXL6pINqOBPK5E5j9scw38lvnhyiQqMOe0MwUy8="; }; - vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM="; + vendorHash = "sha256-JVOsjBn1LV8p6HHelfAO1Qcqi/tPg1S3xBffo+0aplE="; subPackages = [ "cmd/templ" ]; diff --git a/pkgs/by-name/te/tera-cli/package.nix b/pkgs/by-name/te/tera-cli/package.nix index 66429fa08504..f488bf279f8b 100644 --- a/pkgs/by-name/te/tera-cli/package.nix +++ b/pkgs/by-name/te/tera-cli/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + nix-update-script, rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -10,19 +11,21 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "chevdor"; repo = "tera-cli"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-TN3zkxZC0Y9lev2wmvzwyLU+t4rNwut/dQILIA7+qbw="; }; useFetchCargoVendor = true; cargoHash = "sha256-+qf/MlifpVXzDpADJoTqxU40wDntcPu+bW7eq6/iubk="; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Command line utility to render templates from json|toml|yaml and ENV, using the tera templating engine"; homepage = "https://github.com/chevdor/tera-cli"; - license = licenses.mit; - maintainers = with maintainers; [ _365tuwe ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers._365tuwe ]; mainProgram = "tera"; - platforms = platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index ae08e96860aa..0d388b76ea8d 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terramate"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-e1eSKLBTPor7P78LOlZJDj31eB61x++9IF/Ebcpys+E="; + hash = "sha256-9Bv4FlQzUX/mnSlv1qZqVER/JS0gr3HHmPV+axHKgJw="; }; vendorHash = "sha256-EdrELFQYQ5clUQJQdB/tlr9IhZz3+CF0jUKH7F6kCM8="; @@ -22,6 +22,9 @@ buildGoModule rec { ldflags = [ "-extldflags" "-static" ]; + # Needed for the tests to pass on macOS + __darwinAllowLocalNetworking = true; + # Disable failing E2E tests preventing the package from building excludedPackages = [ "./e2etests/cloud" "./e2etests/core" ]; diff --git a/pkgs/by-name/te/terrascan/package.nix b/pkgs/by-name/te/terrascan/package.nix index 28d18447028f..cc7d29033348 100644 --- a/pkgs/by-name/te/terrascan/package.nix +++ b/pkgs/by-name/te/terrascan/package.nix @@ -17,6 +17,11 @@ buildGoModule rec { vendorHash = "sha256-yQien8v7Ru+JWLou9QfyKZAR2ENMHO2aF2vzuWyQcjY="; + ldflags = [ + # Fix protobuf errors https://github.com/tenable/terrascan/pull/1703/files + "-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=ignore" + ]; + # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/by-name/te/terraspace/Gemfile.lock b/pkgs/by-name/te/terraspace/Gemfile.lock index aa9e1600198b..74b43d988b07 100644 --- a/pkgs/by-name/te/terraspace/Gemfile.lock +++ b/pkgs/by-name/te/terraspace/Gemfile.lock @@ -1,43 +1,48 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.4) + activesupport (8.0.2) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + aws-eventstream (1.3.2) + aws-partitions (1.1071.0) + aws-sdk-core (3.220.2) 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.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (1.99.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.156.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-s3 (1.182.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - bigdecimal (3.1.8) + benchmark (0.4.0) + bigdecimal (3.1.9) cli-format (0.6.1) activesupport text-table zeitwerk - concurrent-ruby (1.3.3) - connection_pool (2.4.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) deep_merge (1.2.2) - diff-lcs (1.5.1) - dotenv (3.1.2) + diff-lcs (1.6.0) + dotenv (3.1.7) drb (2.2.1) dsl_evaluator (0.3.2) activesupport @@ -50,47 +55,46 @@ GEM graph (2.11.1) hcl_parser (0.2.2) rhcl - i18n (1.14.5) + i18n (1.14.7) concurrent-ruby (~> 1.0) jmespath (1.6.2) + logger (1.6.6) memoist (0.16.2) - mini_portile2 (2.8.7) - minitest (5.24.1) - mutex_m (0.2.0) - nokogiri (1.16.6) + mini_portile2 (2.8.8) + minitest (5.25.5) + nokogiri (1.18.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) - racc (1.8.0) + racc (1.8.1) rainbow (3.1.1) - render_me_pretty (0.9.0) + render_me_pretty (1.0.0) activesupport rainbow tilt - rexml (3.3.2) - strscan + rexml (3.4.1) rhcl (0.1.0) deep_merge rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) + rspec-core (3.13.3) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.1) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.1) + rspec-support (3.13.2) rspec-terraspace (0.3.3) activesupport memoist rainbow rspec zeitwerk - rubyzip (2.3.2) - strscan (3.1.0) + rubyzip (2.4.1) + securerandom (0.4.1) terraspace (2.2.17) activesupport bundler @@ -122,12 +126,13 @@ GEM thor zeitwerk text-table (1.2.4) - thor (1.3.1) - tilt (2.4.0) + thor (1.3.2) + tilt (2.6.0) tty-tree (0.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.16) + uri (1.0.3) + zeitwerk (2.7.2) zip_folder (0.1.0) rubyzip @@ -138,4 +143,4 @@ DEPENDENCIES terraspace BUNDLED WITH - 2.5.11 + 2.6.2 diff --git a/pkgs/by-name/te/terraspace/gemset.nix b/pkgs/by-name/te/terraspace/gemset.nix index 1a78094d37a5..6a07f9ece302 100644 --- a/pkgs/by-name/te/terraspace/gemset.nix +++ b/pkgs/by-name/te/terraspace/gemset.nix @@ -2,59 +2,63 @@ activesupport = { dependencies = [ "base64" + "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" + "logger" "minitest" - "mutex_m" + "securerandom" "tzinfo" + "uri" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; + sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5"; type = "gem"; }; - version = "7.1.3.4"; + version = "8.0.2"; }; aws-eventstream = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; + sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.2"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03zb6x4x68y91gywsyi4a6hxy4pdyng8mnxwd858bhjfymml8kkf"; + sha256 = "1qlygf2bg086hr5cpyg8hh0jwvx4xvkh8v09maxdj7xqplzplhg7"; type = "gem"; }; - version = "1.956.0"; + version = "1.1071.0"; }; aws-sdk-core = { dependencies = [ "aws-eventstream" "aws-partitions" "aws-sigv4" + "base64" "jmespath" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ihl7iwndl3jjy89sh427wf8mdb7ii76bsjf6fkxq9ha30nz4f3g"; + sha256 = "0qydjik09i110rxpkz4g8kfq5n10x0fwp2cwpb9zw44kprzwvcmn"; type = "gem"; }; - version = "3.201.1"; + version = "3.220.2"; }; aws-sdk-kms = { dependencies = [ @@ -65,10 +69,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02g3l3lcyddqncrwjxgawxl33p2p715k1gbrdlgyiv0yvy88sn0k"; + sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; type = "gem"; }; - version = "1.88.0"; + version = "1.99.0"; }; aws-sdk-s3 = { dependencies = [ @@ -80,10 +84,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ika0xmmrkc7jiwdi5gqia5wywkcbw1nal2dhl436dkh38fxl0lk"; + sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; type = "gem"; }; - version = "1.156.0"; + version = "1.182.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -91,10 +95,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; + sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; type = "gem"; }; - version = "1.8.0"; + version = "1.11.0"; }; base64 = { groups = [ "default" ]; @@ -106,15 +110,25 @@ }; version = "0.2.0"; }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; type = "gem"; }; - version = "3.1.8"; + version = "3.1.9"; }; cli-format = { dependencies = [ @@ -136,20 +150,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.5"; }; connection_pool = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; deep_merge = { groups = [ "default" ]; @@ -166,20 +180,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + sha256 = "0bnss89lcm3b1k3xcjd35grxqz5q040d12imd73qybwnfarggrx1"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; dotenv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0y24jabiz4cf9ni9vi4j8sab8b5phpf2mpw3981r0r94l4m6q0q8"; + sha256 = "1wrw6fm0s38cd6h55w79bkvjhcj2zfkargjpws4kilkmhr3xyw66"; type = "gem"; }; - version = "3.1.2"; + version = "3.1.7"; }; drb = { groups = [ "default" ]; @@ -255,10 +269,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; + sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; type = "gem"; }; - version = "1.14.5"; + version = "1.14.7"; }; jmespath = { groups = [ "default" ]; @@ -270,6 +284,16 @@ }; version = "1.6.2"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + type = "gem"; + }; + version = "1.6.6"; + }; memoist = { groups = [ "default" ]; platforms = [ ]; @@ -285,30 +309,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.7"; + version = "2.8.8"; }; minitest = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i"; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; type = "gem"; }; - version = "5.24.1"; - }; - mutex_m = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; + version = "5.25.5"; }; nokogiri = { dependencies = [ @@ -319,20 +333,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; + sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8"; type = "gem"; }; - version = "1.16.6"; + version = "1.18.5"; }; racc = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; rainbow = { groups = [ "default" ]; @@ -354,21 +368,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qx9pv0irkcqjx9f0mh5s6d9m0fck329bp845ryic34nsvnbsp4k"; + sha256 = "012hbn90kwc2byqyibkadqjbhbwvz3fa8n3iw190p031f5cm75n2"; type = "gem"; }; - version = "0.9.0"; + version = "1.0.0"; }; rexml = { - dependencies = [ "strscan" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; rhcl = { dependencies = [ "deep_merge" ]; @@ -402,10 +415,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm"; + sha256 = "1r6zbis0hhbik1ck8kh58qb37d1qwij1x1d2fy4jxkzryh3na4r5"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.3"; }; rspec-expectations = { dependencies = [ @@ -416,10 +429,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0022nxs9gqfhx35n4klibig770n0j31pnkd8anz00yvrvkdghk41"; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.3"; }; rspec-mocks = { dependencies = [ @@ -430,20 +443,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88"; + sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.2"; }; rspec-support = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; + sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.2"; }; rspec-terraspace = { dependencies = [ @@ -467,20 +480,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; - strscan = { + securerandom = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; type = "gem"; }; - version = "3.1.0"; + version = "0.4.1"; }; terraspace = { dependencies = [ @@ -548,20 +561,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; tilt = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.4.0"; + version = "2.6.0"; }; tty-tree = { groups = [ "default" ]; @@ -584,15 +597,25 @@ }; version = "2.0.6"; }; + uri = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + type = "gem"; + }; + version = "1.0.3"; + }; zeitwerk = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp"; + sha256 = "0ws6rpyj0y9iadjg1890dwnnbjfdbzxsv6r48zbj7f8yn5y0cbl4"; type = "gem"; }; - version = "2.6.16"; + version = "2.7.2"; }; zip_folder = { dependencies = [ "rubyzip" ]; diff --git a/pkgs/by-name/te/tevent/package.nix b/pkgs/by-name/te/tevent/package.nix index 15ff833851a7..93e9c59c7b54 100644 --- a/pkgs/by-name/te/tevent/package.nix +++ b/pkgs/by-name/te/tevent/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "tevent"; - version = "0.16.1"; + version = "0.16.2"; src = fetchurl { url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; - sha256 = "sha256-Nilx4PMtwZBfb+RzYxnEuDSMItyFqmw/aQoo7+VIAp4="; + sha256 = "sha256-8LvSnfq7y7zp9HGPwWVBDN1PfY7h89/FRhjUwDGZzqM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix index 62bf5d675e83..68d7d188cfb5 100644 --- a/pkgs/by-name/tg/tgpt/package.nix +++ b/pkgs/by-name/tg/tgpt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tgpt"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "tgpt"; tag = "v${version}"; - hash = "sha256-6kJwJedFnALP4hpoaQ5DR/zN1KijgwFpYSBb1o+XCHw="; + hash = "sha256-LE6wwGEsqI/wfD21FiLpEo5fc7V0uGkN+hUPeAXCOZE="; }; vendorHash = "sha256-hPbvzhYHOxytQs3NkSVaZhFH0TbOlr4U/QiH+vemTrc="; diff --git a/pkgs/by-name/ti/ticker/package.nix b/pkgs/by-name/ti/ticker/package.nix index df6bfe064f3a..0b81f7e8e443 100644 --- a/pkgs/by-name/ti/ticker/package.nix +++ b/pkgs/by-name/ti/ticker/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ticker"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; tag = "v${version}"; - hash = "sha256-L7vqZVfj7Ns8xCFU0ruhosReM4RMhIbIHXrMbQ8YI6I="; + hash = "sha256-2qg7/gzogvK8eIj9NzFELoeXrtJGC5pS4LvR2msOuHY="; }; vendorHash = "sha256-o3hVRHyrJpmYgephoZ2JlVLGSqZtRQAp48OzoIMY3do="; diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index 7165e3249c93..d9584664bdbb 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.17.0"; + version = "5.18.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-oM0hXimXSrV33tntV+DeYdV0WyyRqioKSm+rL+Oce6Y="; + sha256 = "sha256-R5Xw9uIptVPYEZ73TtdWarQNtn8nhAUN+zA5tnzTaCU="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook3 ]; diff --git a/pkgs/by-name/ti/time-decode/package.nix b/pkgs/by-name/ti/time-decode/package.nix index eeaa7ba5bebb..f7582b35cf51 100644 --- a/pkgs/by-name/ti/time-decode/package.nix +++ b/pkgs/by-name/ti/time-decode/package.nix @@ -6,38 +6,37 @@ python3.pkgs.buildPythonApplication rec { pname = "time-decode"; - version = "7.0.2"; + version = "9.0.0"; pyproject = true; src = fetchFromGitHub { owner = "digitalsleuth"; repo = "time_decode"; tag = "v${version}"; - hash = "sha256-K60xIQ6TWPYlsR6YjIquey5Ioaw4oAId59CPlQNK4yk="; + hash = "sha256-kydH5WN2PELq6YnoSBFRsyVnxL+0r09WxXuqFANXuNs="; }; - nativeBuildInputs = with python3.pkgs; [ - setuptools - ]; + nativeBuildInputs = with python3.pkgs; [ setuptools ]; propagatedBuildInputs = with python3.pkgs; [ colorama - python-dateutil + juliandate pyqt6 + python-dateutil + pytz + tzdata ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ - "time_decode" - ]; + pythonImportsCheck = [ "time_decode" ]; meta = with lib; { description = "Timestamp and date decoder"; homepage = "https://github.com/digitalsleuth/time_decode"; changelog = "https://github.com/digitalsleuth/time_decode/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "time-decode"; }; diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index b2a642628d9c..bd1e241f3c65 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.13.8"; + version = "0.13.10"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-dKLHZyFkTo6iCw/s73asJqXoNBpYx7UC/r2qVp5dLjs="; + hash = "sha256-/mlocw9AYoaR3meGYbSJ/qCrusxIIC3Gtmz+doXTDXI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-XbPqddmVv5zubnbT5IewAcvPJWQMIumWgGI+q/r1Ip4="; + cargoHash = "sha256-L1Krw6dbH3M1SU1ei4GYEJVMkuv2OOk2QrAJpoSHeP4="; nativeBuildInputs = [ installShellFiles @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=semantic_tokens_full::tests::test" ]; - postInstall = + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( let emulator = stdenv.hostPlatform.emulator buildPackages; in @@ -74,7 +74,8 @@ rustPlatform.buildRustPackage (finalAttrs: { --bash <(${emulator} $out/bin/tinymist completion bash) \ --fish <(${emulator} $out/bin/tinymist completion fish) \ --zsh <(${emulator} $out/bin/tinymist completion zsh) - ''; + '' + ); nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/tl/tlafmt/package.nix b/pkgs/by-name/tl/tlafmt/package.nix index f7d5ee71a8b1..9eb4952f8aec 100644 --- a/pkgs/by-name/tl/tlafmt/package.nix +++ b/pkgs/by-name/tl/tlafmt/package.nix @@ -5,18 +5,18 @@ }: rustPlatform.buildRustPackage rec { pname = "tlafmt"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "domodwyer"; repo = "tlafmt"; tag = "v${version}"; - hash = "sha256-jBY7erB2LuKwCkshVHLV5kFVRJ8lkT63z1gt1Tikei4="; + hash = "sha256-V7KTzjCLOdt31UO01iTHVk2zpPc+GdSpsrEfwwbjZrk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-765tp4wUh7G92vaoViufo6Kk2c/w2d1XjZ3aN5UUAv0="; + cargoHash = "sha256-KUN7Et3wW5oLu+FK7ySWKSqpo1IL0ggww74IpFX0aSQ="; meta = { description = "Formatter for TLA+ specs"; diff --git a/pkgs/by-name/to/toxiproxy/package.nix b/pkgs/by-name/to/toxiproxy/package.nix index 104399ce64f1..b4ea12ad2178 100644 --- a/pkgs/by-name/to/toxiproxy/package.nix +++ b/pkgs/by-name/to/toxiproxy/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "toxiproxy"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "Shopify"; repo = "toxiproxy"; rev = "v${version}"; - sha256 = "sha256-1z4a69KnBurTrudqXiOPgrlICICu1ts86WrnFUlRWXE="; + sha256 = "sha256-CqJr3h2n+fzN6Ves38H7fYXd5vlpDVfF3kg4Tr8ThPc="; }; - vendorHash = "sha256-LQV+TFFcrq4Px580yOWU+8EuGt/7bFJYi35He2es6Q8="; + vendorHash = "sha256-4nKWTjB9aV5ILgHVceV76Ip0byBxlEY5TTAQwNLvL2s="; excludedPackages = [ "test/e2e" ]; diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 7d2d2772b74d..3baf0df2c700 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "tpnote"; - version = "1.25.4"; + version = "1.25.5"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; tag = "v${version}"; - hash = "sha256-1KcTY98QNOic0riHhLi4HcSREboMaXq7lb1+LsB0HL0="; + hash = "sha256-UNWnjcwIVRCmRp+i02sDKE9nF2YBc9TQuXLNjkpRZhc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-c6Kz6Z8yfdh7QaDlgI2qSCoG+4c/g9rjBikjN31JftM="; + cargoHash = "sha256-/VRVFDzUqMS3y6e5I+ZX8ULxJ2kL8ycesWEYUeZSujo="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/tr/traefik-certs-dumper/package.nix b/pkgs/by-name/tr/traefik-certs-dumper/package.nix index f86409a9e17c..521e56259ddb 100644 --- a/pkgs/by-name/tr/traefik-certs-dumper/package.nix +++ b/pkgs/by-name/tr/traefik-certs-dumper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "traefik-certs-dumper"; - version = "2.9.3"; + version = "2.10.0"; src = fetchFromGitHub { owner = "ldez"; repo = pname; rev = "v${version}"; - sha256 = "sha256-krJ2oPz72mqlmJxQTZaFbyDtUaprRLJGZMSS7ZuvPfA="; + sha256 = "sha256-zXbtabh5ZziELZHzvYisXETPUmhHAVo6sMuF4O3crBY="; }; - vendorHash = "sha256-CmqeIQk7lAENMDNWAG7XylnXRXvgyRN5GMt0ilwJX0U="; + vendorHash = "sha256-WpYxI+7qBYibojPtYlWmDrmJYlRlVwTaqCMI5Vzh1RI="; excludedPackages = "integrationtest"; meta = with lib; { diff --git a/pkgs/by-name/tr/translatelocally/package.nix b/pkgs/by-name/tr/translatelocally/package.nix index 4249331b2b08..3ade4781eca9 100644 --- a/pkgs/by-name/tr/translatelocally/package.nix +++ b/pkgs/by-name/tr/translatelocally/package.nix @@ -12,6 +12,7 @@ runCommand, translatelocally, translatelocally-models, + buildArch ? "x86-64", }: let @@ -65,6 +66,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBLAS_LIBRARIES=-lblas" "-DCBLAS_LIBRARIES=-lcblas" + + # See the following for context: + # https://github.com/NixOS/nixpkgs/pull/385549 + (lib.optionalString stdenv.hostPlatform.isx86_64 "-DBUILD_ARCH=${buildArch}") ]; passthru.tests = { diff --git a/pkgs/by-name/tr/triforce-lv2/package.nix b/pkgs/by-name/tr/triforce-lv2/package.nix new file mode 100644 index 000000000000..f6f156347537 --- /dev/null +++ b/pkgs/by-name/tr/triforce-lv2/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "triforce-lv2"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "chadmed"; + repo = "triforce"; + rev = version; + hash = "sha256-Rv4FHDmmTELYwrxfWDt/TghspLQBGgiREaq3KV98EQY="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-ltrvwvrzRPtgB4y/TeIHhIQdWAfo2NHTeDYvDqTuPXE="; + + installPhase = '' + export LIBDIR=$out/lib + mkdir -p $LIBDIR + + make + make install + ''; + + meta = with lib; { + homepage = "https://github.com/chadmed/triforce"; + description = "Minimum Variance Distortionless Response adaptive beamformer for the microphone array found in some Apple Silicon laptops"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ yuka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index 09cb809c7fc4..999cd1eb5ae9 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -18,21 +18,22 @@ cargo, dbus, desktop-file-utils, + versionCheckHook, }: stdenv.mkDerivation rec { pname = "tsukimi"; - version = "0.19.4"; + version = "0.20.0"; src = fetchFromGitHub { owner = "tsukinaha"; repo = "tsukimi"; tag = "v${version}"; - hash = "sha256-7Us+mz0FHetka4uVDCWkAGyGMZRhQDotRsySljYZgCo="; + hash = "sha256-OxRxl/+JP3eqxc5b0pb6QbAAHrZgHrq1cawas2UrUro="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-JaBFL7XHVjf4NP41n9qtb5oQyaP1bYQETPYMCR9XEvQ="; + hash = "sha256-kt3otu5N3KAzJT992v80Mbgr0sOoPnonc1+pu5ANIxE="; }; nativeBuildInputs = [ @@ -64,7 +65,9 @@ stdenv.mkDerivation rec { gst-libav ]); - doCheck = false; # tests require networking + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tt/ttyplot/package.nix b/pkgs/by-name/tt/ttyplot/package.nix index 3e332e4d9dcc..2b3fad58f44b 100644 --- a/pkgs/by-name/tt/ttyplot/package.nix +++ b/pkgs/by-name/tt/ttyplot/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - hash = "sha256-B95pd0hoesBDQwzN0h3kMBVcUFJVWQrpOKizKpdoiok="; + hash = "sha256-XPWfSL1395TBkUmAO5kB9TdAZHL011o6t/2s01W/kk8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 6c2d6f4c7549..f01de7e53a1d 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -15,19 +15,19 @@ zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "turbo-unwrapped"; - version = "2.4.2"; + version = "2.4.5-canary.4"; src = fetchFromGitHub { owner = "vercel"; - repo = "turbo"; - tag = "v${version}"; - hash = "sha256-wXQY9W15J7+Plv3IvB8XaZd+Hn0TP2qDOB36bPJwfpY="; + repo = "turborepo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-tQ/Xocpk48eRhCyfRZx2rkAVqNn115rO3MRYF5fC2nI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-L56ubw2tQ3y2KBbbnUdnS9xZzQNMDKdCzKC0n12yl6o="; + cargoHash = "sha256-pngzlmkntTCv5/aw1UNbDGNQOVtMgFZHc2woj6R0vys="; nativeBuildInputs = [ @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "'v(\\d+\\.\\d+\\.\\d+)'" + "v(\\d+\\.\\d+\\.\\d+)$" ]; }; }; @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "High-performance build system for JavaScript and TypeScript codebases"; homepage = "https://turbo.build/"; - changelog = "https://github.com/vercel/turbo/releases/tag/v${version}"; + changelog = "https://github.com/vercel/turborepo/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dlip @@ -79,4 +79,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "turbo"; }; -} +}) diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index e499661dd786..fe76e4aad375 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "turn-rs"; - version = "3.3.4"; + version = "3.4.0"; src = fetchFromGitHub { owner = "mycrl"; repo = "turn-rs"; tag = "v${version}"; - hash = "sha256-GAmer7uSCgHdVVvTafMfAgdvMCp/FUT/quF88VLcWgo="; + hash = "sha256-BW5dNPkf/JGrf00BI41rEoZRmqftoz+RMGiP6ECVEec="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vLx6bvhb/Xq5BzKPOEqfx1BzGeDHx+47okdcW5Pu5YM="; + cargoHash = "sha256-wnbovuxh3wc1TU8BYZEOG/8SO9bCUd0eWRC81MtAdqo="; # By default, no features are enabled # https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1 diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 4419a621f759..7714a10691f3 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -6,19 +6,19 @@ versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "typstyle"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; - tag = "v${version}"; - hash = "sha256-lrGqNc9SJ6TlTTqiwzVWrHndY/oxY8t3mOfGBMF7vac="; + tag = "v${finalAttrs.version}"; + hash = "sha256-dYhdrxyyndGhJID0WKwvW6KFQ3ubC917UG9rhDnrAfM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-V79jKheEms0CBTzt9h7+9/+F+TXSTlp8NGXe5OeFCX4="; + cargoHash = "sha256-Eb+qN7hBECESlTElN0uQtOg4uyuaWQw3ikFb8po+ubQ="; # Disabling tests requiring network access checkFlags = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { @@ -36,11 +36,11 @@ rustPlatform.buildRustPackage rec { }; meta = { - changelog = "https://github.com/Enter-tainer/typstyle/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Enter-tainer/typstyle/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "Format your typst source code"; homepage = "https://github.com/Enter-tainer/typstyle"; license = lib.licenses.asl20; mainProgram = "typstyle"; maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/by-name/ud/udftools/package.nix b/pkgs/by-name/ud/udftools/package.nix index 4d908eccb03c..c1f46bea9955 100644 --- a/pkgs/by-name/ud/udftools/package.nix +++ b/pkgs/by-name/ud/udftools/package.nix @@ -5,48 +5,49 @@ ncurses, readline, autoreconfHook, + pkg-config, }: stdenv.mkDerivation rec { pname = "udftools"; - version = "2.0"; + version = "2.3"; + src = fetchFromGitHub { owner = "pali"; repo = "udftools"; - rev = version; - sha256 = "0mz04h3rki6ljwfs15z83gf4vv816w7xgz923waiqgmfj9xpvx87"; + tag = version; + hash = "sha256-SUdwJpJfbs6LhcyNMPJUhhpp/3htwT/EVep7+4PRgto="; }; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ ncurses readline ]; - nativeBuildInputs = [ autoreconfHook ]; hardeningDisable = [ "fortify" ]; - env.NIX_CFLAGS_COMPILE = "-std=gnu90"; + env.NIX_CFLAGS_COMPILE = "-std=gnu99"; preConfigure = '' sed -e '1i#include ' -i cdrwtool/cdrwtool.c -i pktsetup/pktsetup.c sed -e 's@[(]char[*][)]spm [+]=@spm = ((char*) spm) + @' -i wrudf/wrudf.c - sed -e '27i#include ' -i include/udf_endian.h sed -e '38i#include ' -i wrudf/wrudf-cdrw.c sed -e '12i#include ' -i wrudf/wrudf-cdr.c sed -e '37i#include ' -i wrudf/ide-pc.c sed -e '46i#include ' -i mkudffs/main.c - sed -e "s@\$(DESTDIR)/lib/udev/rules.d@$out/lib/udev/rules.d@" -i pktsetup/Makefile.am ''; - postFixup = '' - sed -i -e "s@/usr/sbin/pktsetup@$out/sbin/pktsetup@" $out/lib/udev/rules.d/80-pktsetup.rules - ''; - - meta = with lib; { + meta = { description = "UDF tools"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.gpl2Plus; + homepage = "https://github.com/pali/udftools"; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix index 967103de982f..cb5f94e2922c 100644 --- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix +++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, hatch, lib, + nix-update-script, python3Packages, rustPlatform, scdoc, @@ -13,18 +14,18 @@ }: python3Packages.buildPythonPackage rec { pname = "umu-launcher-unwrapped"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "Open-Wine-Components"; repo = "umu-launcher"; tag = version; - hash = "sha256-bZ6Ywc524NrapkFrwFiWbqmVe1j0hunEH9YKrYQ8R2E="; + hash = "sha256-DkfB78XhK9CXgN/OpJZTjwHB7IcLC4h2HM/1JW42ZO0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-nU4xZn9NPd7NgexiaNYLdo4BCbH98duZ07XYeUiceP0="; + hash = "sha256-JhNErFDJsM20BhgIgJSUBeNzAst8f+s1NzpLfl2m2es="; }; nativeCheckInputs = [ @@ -83,6 +84,8 @@ python3Packages.buildPythonPackage rec { "test_parse_args_noopts" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Unified launcher for Windows games on Linux using the Steam Linux Runtime and Tools"; changelog = "https://github.com/Open-Wine-Components/umu-launcher/releases/tag/${version}"; diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 7ac532b693c9..ac5ae13f39f9 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.94.1"; + version = "0.95.1"; src = fetchFromGitHub { owner = "updatecli"; repo = "updatecli"; rev = "v${version}"; - hash = "sha256-zS9QxU9tciHT2t/Kn1g+1SOlC109kHB1lgzyK6+cDxI="; + hash = "sha256-ShiknNLbBAyNcXK3k+yhnqilkAovuwFaY3iWa5Plsbo="; }; - vendorHash = "sha256-RnuA5bUZg5BgSCebxupRW+J1TyIoi4CGz247M1bdj4k="; + vendorHash = "sha256-iuE8rphRnedYg0G2kG1WGXL1rJ/k54Oc4fp2ExP2Rro="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix index 302c68271cd6..5dcd620579e3 100644 --- a/pkgs/by-name/ur/url-parser/package.nix +++ b/pkgs/by-name/ur/url-parser/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "url-parser"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; tag = "v${version}"; - hash = "sha256-eAfe23aATve9d9Nhxi49ZatpbfzeZLnfPZN+ZV/tD1I="; + hash = "sha256-GIJj4t6xDXfXMWfSpUR1iI1Ju/W/2REedgtyEFgbylE="; }; - vendorHash = "sha256-Znt8C7B+tSZnzq+3DaycEu0VtkltKhODG9sB5aO99rc="; + vendorHash = "sha256-gYkuSBgkDdAaJArsvTyZXkvYCKXkhic5XzLqPbbGVOw="; ldflags = [ "-s" diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 076c9316c158..c71abfeeca7d 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -8,6 +8,11 @@ capabilitiesSupport ? stdenv.hostPlatform.isLinux, libcap_ng, libxcrypt, + # Disable this by default because `mount` is setuid. However, we also support + # "dlopen" as a value here. Note that the nixpkgs setuid wrapper and ld-linux.so will filter out LD_LIBRARY_PATH + # if you set this to dlopen, so ensure you're accessing it without the wrapper if you depend on that. + cryptsetupSupport ? false, + cryptsetup, ncursesSupport ? true, ncurses, pamSupport ? true, @@ -24,9 +29,11 @@ gitUpdater, }: +let + isMinimal = cryptsetupSupport == false && !nlsSupport && !ncursesSupport && !systemdSupport; +in stdenv.mkDerivation rec { - pname = - "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; + pname = "util-linux" + lib.optionalString isMinimal "-minimal"; version = "2.40.4"; src = fetchurl { @@ -88,6 +95,14 @@ stdenv.mkDerivation rec { "--disable-su" # provided by shadow (lib.enableFeature writeSupport "write") (lib.enableFeature nlsSupport "nls") + (lib.withFeatureAs (cryptsetupSupport != false) "cryptsetup" ( + if cryptsetupSupport == true then + "yes" + else if cryptsetupSupport == "dlopen" then + "dlopen" + else + throw "invalid cryptsetupSupport value: ${toString cryptsetupSupport}" + )) (lib.withFeature ncursesSupport "ncursesw") (lib.withFeature systemdSupport "systemd") (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/") @@ -105,6 +120,10 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Doesn't build on Darwin, also doesn't really make sense on Darwin "--disable-liblastlog2" + ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ + # Mandatory shared library. + "--disable-pam-lastlog2" ]; makeFlags = [ @@ -113,10 +132,13 @@ stdenv.mkDerivation rec { "usrsbin_execdir=${placeholder "bin"}/sbin" ]; - nativeBuildInputs = [ - pkg-config - installShellFiles - ] ++ lib.optionals translateManpages [ po4a ]; + nativeBuildInputs = + [ + pkg-config + installShellFiles + ] + ++ lib.optionals translateManpages [ po4a ] + ++ lib.optionals (cryptsetupSupport == "dlopen") [ cryptsetup ]; buildInputs = [ @@ -124,6 +146,7 @@ stdenv.mkDerivation rec { libxcrypt sqlite ] + ++ lib.optionals (cryptsetupSupport == true) [ cryptsetup ] ++ lib.optionals pamSupport [ pam ] ++ lib.optionals capabilitiesSupport [ libcap_ng ] ++ lib.optionals ncursesSupport [ ncurses ] @@ -174,12 +197,12 @@ stdenv.mkDerivation rec { hasCol = stdenv.hostPlatform.libc == "glibc"; }; - meta = with lib; { + meta = { homepage = "https://www.kernel.org/pub/linux/utils/util-linux/"; description = "Set of system utilities for Linux"; changelog = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${lib.versions.majorMinor version}/v${version}-ReleaseNotes"; # https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing - license = with licenses; [ + license = with lib.licenses; [ gpl2Only gpl2Plus gpl3Plus @@ -188,7 +211,8 @@ stdenv.mkDerivation rec { bsdOriginalUC publicDomain ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ numinit ]; + platforms = lib.platforms.unix; pkgConfigModules = [ "blkid" "fdisk" diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 8545a293db7b..fe7ff4ba7f41 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.6.6"; + version = "0.6.9"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-KsPfAOEpD47/kqcN9M7lOtS8hSr0dXP3Y3b4x9yh1as="; + hash = "sha256-i/NnJpLAf7pDxzIuV+30yhbPJT9+2iZcr8x4qDfxUXc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vcddP6EaNhJNK6UZUPxrABieJf2BPTAIs8r2uppP7N0="; + cargoHash = "sha256-NcSXp0KhNREyqA59MmzcZJ6UzJzlynGz+PUXA22pLi8="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json index 65f3fc9b17e5..bfb4fe2f56f2 100644 --- a/pkgs/by-name/v2/v2rayn/deps.json +++ b/pkgs/by-name/v2/v2rayn/deps.json @@ -11,8 +11,8 @@ }, { "pname": "Avalonia", - "version": "11.2.4", - "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4=" + "version": "11.2.5", + "hash": "sha256-DGTMzInnfvJUJWu2SXiRBercxxe1/paQkSlBHMahp4g=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -31,38 +31,38 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.4", - "hash": "sha256-21Wfb4p0dCevw8Iu/Fchngt1teAnBaxEWgiUpFkerTo=" + "version": "11.2.5", + "hash": "sha256-gWGIqXrac0fOnmGbovcFWv5Uj14hOyC+n0l45N7owMg=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.4", - "hash": "sha256-fqQBKzHcL0CwuOQ90Gp+UUZZP9OQ9U6H41bvikxQJpo=" + "version": "11.2.5", + "hash": "sha256-eGKc+UnsO5nNiUd7+n3CQW6vIWq2qpazYvYXrVTQY7s=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.4", - "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo=" + "version": "11.2.5", + "hash": "sha256-rDJ1NJM3tEqB7sRszj0AfplwkkvtE3Hvn7acrIsq+yw=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.4", - "hash": "sha256-MUSfRXeJ1bstO2rTqWWCQyVq2EpjM5b5bxe0KxVAEU4=" + "version": "11.2.5", + "hash": "sha256-WsAMBmNfUKMB2II3AfM8A0klfJR/vgEtRUTGpgC6F3A=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.4", - "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk=" + "version": "11.2.5", + "hash": "sha256-rLzsxUQS1LLLcLWkDR8SLLwLY53vUMqgiKoDWM6PjtM=" }, { "pname": "Avalonia.Native", - "version": "11.2.4", - "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" + "version": "11.2.5", + "hash": "sha256-XQQgcfbRRHPzH432M1KzkSEtLQof40yCt+KIrQREBY0=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.2.4", - "hash": "sha256-LqwLUDCIbJowol6BNTTsK7a7KjcLLbCM3y3KKvuHRGw=" + "version": "11.2.5", + "hash": "sha256-p3ELTiH4kYdcrUF87zZzRMsOU41Q3XBCBKRmQYWdLBs=" }, { "pname": "Avalonia.Remote.Protocol", @@ -76,33 +76,33 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.4", - "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc=" + "version": "11.2.5", + "hash": "sha256-Mpml6U6Fl8FUvENGQxpxuw0+pOPvoWbZXV4V1bLUS9w=" }, { "pname": "Avalonia.Skia", - "version": "11.2.4", - "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI=" + "version": "11.2.5", + "hash": "sha256-su1K1RmQ+syE6ufjrzpQR1yiUa6GEtY5QPlW0GOVKnU=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.4", - "hash": "sha256-rnF2/bzN8AuOFlsuekOxlu+uLI7n1kIAmC36FFXMKak=" + "version": "11.2.5", + "hash": "sha256-EjQ2XA81SS91h8oGUwVxLYewm3Lp5Sa2Lmbj0c8y8BU=" }, { "pname": "Avalonia.Win32", - "version": "11.2.4", - "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY=" + "version": "11.2.5", + "hash": "sha256-ljgJgXDxmHOUQ+p8z62mtaK4FTmYAI+c+6gL2lczD/8=" }, { "pname": "Avalonia.X11", - "version": "11.2.4", - "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk=" + "version": "11.2.5", + "hash": "sha256-wHEHcEvOUyIBgBtQZOIs330KajSv8DSEsJP7w4M9i4E=" }, { "pname": "CliWrap", - "version": "3.8.1", - "hash": "sha256-9XmdodZ2Is+LkuMlc/BNFiBUNWA5tDwBl9kYnReJIhU=" + "version": "3.8.2", + "hash": "sha256-sZQqu03sJL0LlnLssXVXHTen9marNbC/G15mAKjhFJU=" }, { "pname": "DialogHost.Avalonia", @@ -111,8 +111,8 @@ }, { "pname": "Downloader", - "version": "3.3.3", - "hash": "sha256-H8HJKL71qC+nHVmuhhPDEHy434/NXJNqPeitJOe856k=" + "version": "3.3.4", + "hash": "sha256-QbbWlP3IzDzPWuZcQCfqpKQZMPSMETL/+6AXlhcjVc8=" }, { "pname": "DynamicData", @@ -196,13 +196,13 @@ }, { "pname": "Semi.Avalonia", - "version": "11.2.1.4", - "hash": "sha256-X1YIonqLNySnMMope2/+O2HfpArc8AhT/gNBOI+0Ts8=" + "version": "11.2.1.5", + "hash": "sha256-xomim/K3C6F0/105KCVc054AG80Z4cQw1bycHF9MD/U=" }, { "pname": "Semi.Avalonia.DataGrid", - "version": "11.2.1.4", - "hash": "sha256-UDb+Gw8nDsuxbMlV8CJaGItfJ85k+p3XPGPuZrIl0KM=" + "version": "11.2.1.5", + "hash": "sha256-xebEht0T5hPSYhyuqbZEzHw3D7/9K920SZhnIXDrM3s=" }, { "pname": "SkiaSharp", @@ -321,8 +321,8 @@ }, { "pname": "TaskScheduler", - "version": "2.12.0", - "hash": "sha256-zkaWlCHzUrexHMtXVitbNsgZrbgoLrJ4BBrhujvZr+4=" + "version": "2.12.1", + "hash": "sha256-eM4vgA+/ukoXCX3y4Ad5WPeIPiwLLDfhh4P0ukWf4lQ=" }, { "pname": "Tmds.DBus.Protocol", diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index 42b8eda79d04..e15b100c337b 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -21,13 +21,13 @@ buildDotnetModule rec { pname = "v2rayn"; - version = "7.10.0"; + version = "7.10.5"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = version; - hash = "sha256-j2s88MRyKcrNbUN+Ypewk+vRbhMtFwHpBy2xbabOe1w="; + hash = "sha256-5tLO7KVHj0DXQdJg02Jxs6fgRLJSfFWPbARg9dqKcSI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 4fb520baedaf..32f0993d4eb2 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -8,14 +8,14 @@ buildGoModule rec { pname = "vacuum-go"; - version = "0.16.3"; + version = "0.16.4"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${version}"; - hash = "sha256-wlxEKAP8A8T+rBQ2HqoOdBlkqFBqrIxuuEidPAeUO3E="; + hash = "sha256-7nVDKR2H84SW6s97jgShylcc1degLzkjkeldlGBcQ/o="; }; vendorHash = "sha256-1lr1VQU4JHg0PZbjAUmALFZJiYc+HTwrk0E/t/1qXqE="; diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix index fa2f8de31a83..a3dd78ea4c21 100644 --- a/pkgs/by-name/va/vale/package.nix +++ b/pkgs/by-name/va/vale/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { pname = "vale"; - version = "3.9.6"; + version = "3.10.0"; subPackages = [ "cmd/vale" ]; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-KerHI0+0oHwKrAbE5JIi50+L20It9ubhhIaTJMKnh3I="; + hash = "sha256-aZ+ihq4ft6HpKBZu7idq0m298WSxBubuEsIPNLvu1RU="; }; - vendorHash = "sha256-ivHOUkX9a4mRsw/ruYr3CzVbAovYMGQI+ExmaB+lP5E="; + vendorHash = "sha256-Zhhp/qbwGTQEZ28S+p7GJodwQcnkFNqNU7WCZKdeoz0="; ldflags = [ "-s" diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index 463cec95f523..bca8fa9c5302 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { description = "High-performance data structure server that primarily serves key/value workloads"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ rucadi ]; + maintainers = with maintainers; [ ]; changelog = "https://github.com/valkey-io/valkey/releases/tag/${finalAttrs.version}"; mainProgram = "valkey-cli"; }; diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix index 00166bb33597..806ed73c53ca 100644 --- a/pkgs/by-name/va/vals/package.nix +++ b/pkgs/by-name/va/vals/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "vals"; - version = "0.39.2"; + version = "0.39.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-FRFkr3bic2bXC+k+Zbbi9Oni/m4uiOqY6cIgzuJZiqU="; + sha256 = "sha256-UHiVAT7EE+rH+fcTDtTrTTVYktsePUojfAQgPWRNui0="; }; - vendorHash = "sha256-DOnoO5LaLilqlEfbZQw46l1LtHuxj6OfuwVZZNYuQB8="; + vendorHash = "sha256-5Wg5cRr470GikN1cuot4HkErK0VPHYPfQiC4d/frSsc="; proxyVendor = true; diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 6c1dc3119ee9..48c98890d081 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.11.6"; + version = "1.11.7"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-8KAt7yFGT/DBlg2VJ7ejsOJ67Sp5cuuaKEWK3+VpL4E="; + hash = "sha256-WzmRz0wf/Ss90FmXXp6gaylC0k/k/QkFaFddlnLo+Xk="; }; pnpmDeps = pnpm_10.fetchDeps { diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix index a0c46e8b68f6..6420508bb7a7 100644 --- a/pkgs/by-name/ve/versitygw/package.nix +++ b/pkgs/by-name/ve/versitygw/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "versitygw"; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "versity"; repo = "versitygw"; tag = "v${version}"; - hash = "sha256-K0w9BoKqwVsEoxCuRvmKtuHYyCzZhVt/OZQ3vElHPdE="; + hash = "sha256-wKD06yyXxV41Lbr2scvTR+fhd4uy6EIlArAVoNxMbzU="; }; - vendorHash = "sha256-xFj4IGCCDhgIbBA1qIm9J06BUNYJiQQZYPSe6Uthm6w="; + vendorHash = "sha256-rgZJn3WvsoV4QfLpceAxVWuBncQGdH5oKnR12FqhyCE="; doCheck = false; # Require access to online S3 services diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix index 864eeccab417..21e3e3ab6641 100644 --- a/pkgs/by-name/ve/veryl/package.nix +++ b/pkgs/by-name/ve/veryl/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "veryl"; - version = "0.13.5"; + version = "0.14.1"; src = fetchFromGitHub { owner = "veryl-lang"; repo = "veryl"; rev = "v${version}"; - hash = "sha256-rZ2Psbs3s5NfY1Mktr3RLGwQYciMh5FCs4d0I1zBaA8="; + hash = "sha256-J1FYgVrpiczTTaMvE7IBdd4aqNI4XXXqvgR7SWaVen0="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-syvW5Lm2ed/AXksDmIAEAbrw+mW1aA0FugJirBZLtLw="; + cargoHash = "sha256-2AWVmdVQAA0+h9xegcWSAjnpa68A+2zazHwKzNKqaTo="; nativeBuildInputs = [ pkg-config @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Modern Hardware Description Language"; homepage = "https://veryl-lang.org/"; - changelog = "https://github.com/veryl-lang/veryl/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/veryl-lang/veryl/releases/tag/v${version}"; license = with lib.licenses; [ mit asl20 diff --git a/pkgs/by-name/vh/vhdl-ls/package.nix b/pkgs/by-name/vh/vhdl-ls/package.nix index 2c95fb32cdb5..6c427cf3ad7c 100644 --- a/pkgs/by-name/vh/vhdl-ls/package.nix +++ b/pkgs/by-name/vh/vhdl-ls/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.83.1"; + version = "0.84.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-AO95J138d3m8CpJ7hWYeGP+rRd2009qQXwLxbuHDSDs="; + hash = "sha256-MzlsZoV09QeerpbE/Nmu5tMIvgscu84fk2bYlWn7bjg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7+isSSjF4V1FQaWRzmNAAW0q3/x/Tqkt8jNzGXsJHAo="; + cargoHash = "sha256-nKA38HbFFYRGd48VGqd7SHMY8fvTLE8to3iturKgWqM="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index 8c59ae716d33..17ba8a23d8ad 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.20.4"; + version = "1.20.6"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-Hgp2u/y2uPnJhAmPpwof76/woFGz4ISUXU+FIRMjMuQ="; + hash = "sha256-/4ITVd/vdQaM9uWgpp1//XF2W+HgEBKkZlGvW2csECk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix index fc9f165f6369..f949538cff57 100644 --- a/pkgs/by-name/vi/virglrenderer/package.nix +++ b/pkgs/by-name/vi/virglrenderer/package.nix @@ -11,8 +11,12 @@ libX11, libdrm, libgbm, + nativeContextSupport ? stdenv.hostPlatform.isLinux, vaapiSupport ? !stdenv.hostPlatform.isDarwin, libva, + vulkanSupport ? stdenv.hostPlatform.isLinux, + vulkan-headers, + vulkan-loader, gitUpdater, }: @@ -32,6 +36,10 @@ stdenv.mkDerivation rec { libepoxy ] ++ lib.optionals vaapiSupport [ libva ] + ++ lib.optionals vulkanSupport [ + vulkan-headers + vulkan-loader + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libX11 @@ -46,9 +54,14 @@ stdenv.mkDerivation rec { python3 ]; - mesonFlags = [ - (lib.mesonBool "video" vaapiSupport) - ]; + mesonFlags = + [ + (lib.mesonBool "video" vaapiSupport) + (lib.mesonBool "venus" vulkanSupport) + ] + ++ lib.optionals nativeContextSupport [ + (lib.mesonOption "drm-renderers" "amdgpu-experimental,msm") + ]; passthru = { updateScript = gitUpdater { diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index f286972bf63d..38bb14b8b89c 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -1,7 +1,5 @@ { lib, - SDL, - SDL_image, a52dec, alsa-lib, autoreconfHook, @@ -12,11 +10,7 @@ fetchpatch, fetchurl, # Please unpin FFmpeg on the next upstream release. - # Currently FFmpeg is pinned to 4.x because VAAPI acceleration is broken when - # building with newer versions: - # https://code.videolan.org/videolan/vlc/-/issues/26772 - # This is intentional by upstream but VLC 4.0 will support newer FFmpeg. - ffmpeg_4, + ffmpeg_6, flac, fluidsynth, freefont_ttf, @@ -136,14 +130,12 @@ stdenv.mkDerivation (finalAttrs: { # needing them buildInputs = [ - SDL - SDL_image a52dec alsa-lib avahi dbus faad2 - ffmpeg_4 + ffmpeg_6 flac fluidsynth fribidi @@ -247,6 +239,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch"; hash = "sha256-qs3gY1ksCZlf931TSZyMuT2JD0sqrmcRCZwL+wVG0U8="; }) + # support VAAPI hardware video decoding with newer ffmpeg + # upstream merge request: https://code.videolan.org/videolan/vlc/-/merge_requests/6606 (will be included in the next release) + (fetchpatch { + url = "https://code.videolan.org/videolan/vlc/-/commit/ba5dc03aecc1d96f81b76838f845ebde7348cf62.diff"; + hash = "sha256-s6AI9O0V3AKOyw9LbQ9CgjaCi5m5+nLacKNLl5ZLC6Q="; + }) ]; postPatch = diff --git a/pkgs/by-name/vo/vowpal-wabbit/package.nix b/pkgs/by-name/vo/vowpal-wabbit/package.nix index dec53f160610..fa17a0eba94b 100644 --- a/pkgs/by-name/vo/vowpal-wabbit/package.nix +++ b/pkgs/by-name/vo/vowpal-wabbit/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, boost, eigen, @@ -13,32 +12,23 @@ stdenv.mkDerivation rec { pname = "vowpal-wabbit"; - version = "9.6.0"; + version = "9.10.0"; src = fetchFromGitHub { owner = "VowpalWabbit"; repo = "vowpal_wabbit"; - rev = version; - sha256 = "sha256-iSsxpeTRZjIhZaYBeoKLHl9j1aBIXWjONmAInmKvU/I="; + tag = version; + hash = "sha256-HKxhEB4ph2tOWgvYngYTcv0OCMISj3KqZpP2zsEUPs0="; + fetchSubmodules = true; }; - patches = [ - # Fix x86_64-linux build by adding missing include - # https://github.com/VowpalWabbit/vowpal_wabbit/pull/4275 - (fetchpatch { - url = "https://github.com/VowpalWabbit/vowpal_wabbit/commit/0cb410dfc885ca1ecafd1f8a962b481574fb3b82.patch"; - sha256 = "sha256-bX3eJ+vMTEMAo3EiESQTDryBP0h2GtnMa/Fz0rTeaNY="; - }) - - # Fix gcc-13 build: - # https://github.com/VowpalWabbit/vowpal_wabbit/pull/4657 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/VowpalWabbit/vowpal_wabbit/commit/a541d85a66088d2b74fa2562d32fecb68af33c58.patch"; - includes = [ "vowpalwabbit/core/include/vw/core/named_labels.h" ]; - hash = "sha256-JAuLDe5JtlE7/043RSIKM20Qr77rmuE0rVg/DGc95MY="; - }) - ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "set(VW_CXX_STANDARD 11)" "set(VW_CXX_STANDARD 14)" + # Avoid duplicate add RapidJSON + substituteInPlace ext_libs/ext_libs.cmake \ + --replace-fail "add_library(RapidJSON INTERFACE)" "" + ''; nativeBuildInputs = [ cmake ]; @@ -61,15 +51,15 @@ stdenv.mkDerivation rec { "-DVW_EIGEN_SYS_DEP=ON" ]; - meta = with lib; { + meta = { description = "Machine learning system focused on online reinforcement learning"; homepage = "https://github.com/VowpalWabbit/vowpal_wabbit/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; longDescription = '' Machine learning system which pushes the frontier of machine learning with techniques such as online, hashing, allreduce, reductions, learning2search, active, and interactive and reinforcement learning ''; - maintainers = with maintainers; [ jackgerrits ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ jackgerrits ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index 525100f2e2f5..ffb6cfe30a37 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "vpl-gpu-rt"; - version = "25.1.3"; + version = "25.1.4"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${version}"; - hash = "sha256-9ycPPdXEa1bSpVG3mIJc8bq3pNNf0Iie1LGBRpv/Lto="; + hash = "sha256-pu9iEAhQE7eHmrjzsyWtIecT79vcZyr5QfPq/Ce3Xxg="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix index 03a741a5398f..e51004b0b77d 100644 --- a/pkgs/by-name/vp/vpp/package.nix +++ b/pkgs/by-name/vp/vpp/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { patchShebangs ../vpp-api/ ''; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; enableParallelBuilding = true; env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized"; diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix index 1a2367ccd420..485530212e51 100644 --- a/pkgs/by-name/vu/vuls/package.nix +++ b/pkgs/by-name/vu/vuls/package.nix @@ -1,22 +1,22 @@ { lib, - buildGoModule, + buildGo124Module, fetchFromGitHub, }: -buildGoModule rec { +buildGo124Module rec { pname = "vuls"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "future-architect"; repo = "vuls"; tag = "v${version}"; - hash = "sha256-aQwQgQPuzsqm05m4Qf4cJBPrKU/TLai88CbDOWs9s58="; + hash = "sha256-lDLT5GNFL2LtooHNlpKrewzxVK5W8u+0U47BDvMG8l4="; fetchSubmodules = true; }; - vendorHash = "sha256-OOU4m3qo6AFAXzCZMQyhdwj9USE9PV4zv4NjDwgZnxE="; + vendorHash = "sha256-X9PWg4vB07Bh9w8Lw3cdEaciVvRhvQD0L5n4cFKf880="; ldflags = [ "-s" diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix index 87aa0da39261..af0f7680fe4d 100644 --- a/pkgs/by-name/wa/wakapi/package.nix +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -2,9 +2,11 @@ lib, buildGoModule, fetchFromGitHub, + nixosTests, + nix-update-script, }: let - version = "2.12.3"; + version = "2.13.1"; in buildGoModule { pname = "wakapi"; @@ -14,10 +16,10 @@ buildGoModule { owner = "muety"; repo = "wakapi"; tag = version; - hash = "sha256-kgzxeU5hM9fSidyJEmdTr26/w5OaBk1VdjSztmOgMYs="; + hash = "sha256-zasMqEvSqylJWKjS5TKYKmGJnGfCUEOq2UvsVUeizBw="; }; - vendorHash = "sha256-q5o88fwc1S14ZwGyDS9aFtJMfPZ4pmMjffmeXODhajg="; + vendorHash = "sha256-b2FOdCXmSgFzdXLnxt/V7+cuESWXVXVRmT53DgLwZYI="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; @@ -30,6 +32,11 @@ buildGoModule { "-w" ]; + passthru = { + nixos = nixosTests.wakapi; + updateScript = nix-update-script { }; + }; + meta = { homepage = "https://wakapi.dev/"; changelog = "https://github.com/muety/wakapi/releases/tag/${version}"; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 997ce79f0399..ded654d8a88c 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-Reni9yNh4Z2aXrl3Z1jJrkLk6BkEfiFIayr58/K5H0k=", - "version": "0.2025.03.05.08.02.stable_02" + "hash": "sha256-2pvls8XZq870YFnNwgRTOzDiLZLJZHuEjENF4BKoSq0=", + "version": "0.2025.03.12.08.02.stable_03" }, "linux_x86_64": { - "hash": "sha256-8z2FZVi4xLTDMSTgNE/Yxy/wZRRxRdjRrI/5dXcUdRA=", - "version": "0.2025.03.05.08.02.stable_02" + "hash": "sha256-ZeRrzl6ZLgi+ybiof7mPuIhqPKT9uVRWBXEYCGwfhxE=", + "version": "0.2025.03.12.08.02.stable_03" }, "linux_aarch64": { - "hash": "sha256-7rwfxhrE4cROHfU3Z/VIoMbqn3EZJcEeTTPzmCbXdbw=", - "version": "0.2025.03.05.08.02.stable_02" + "hash": "sha256-vDoQOec1lKhG2cd9L6ekWubnn9Ion7GeyyccDCm4HuU=", + "version": "0.2025.03.12.08.02.stable_03" } } diff --git a/pkgs/by-name/wa/wasmi/package.nix b/pkgs/by-name/wa/wasmi/package.nix index 0aa836683950..bb35f4dfb282 100644 --- a/pkgs/by-name/wa/wasmi/package.nix +++ b/pkgs/by-name/wa/wasmi/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wasmi"; - version = "0.40.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "wasmi"; tag = "v${version}"; - hash = "sha256-O+8qBYxmiDQtmL2ThkQYenIXSf2wCoYFqLMJOtLP3Ic="; + hash = "sha256-i8i0kd3Zmx7hIaJy8zSAgu0++1kRfLB/MkKpy0ImUrM="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-b3mjGjOfIBHcQTIpA2obdCsjC1p0gjfatKmYI01vYME="; + cargoHash = "sha256-dlMYChYUB2141+sOSHsZuM8QaaRM/rs9FNagCJeopao="; passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index eb0da83a3907..3b8e300d2696 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "wastebin"; - version = "2.7.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "matze"; repo = "wastebin"; rev = version; - hash = "sha256-O0nWjRiQBDclfbeulGjCZANXwQypV8uHHR5syuki5xE="; + hash = "sha256-DuIT4jIxk+L7c+rWIzrNjNEs2Lv5mYqLeCAaBMsBCBg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-WMofTTkJCcx+6vicrYfxJWTo1YCzheeGOE7LC5JQ8mM="; + cargoHash = "sha256-Ui4Bns5A25VrNer6wpD0agYJQwxuIYWSOO26u1K8Vmc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix index 9e7a704e0c0c..ef94daa0d320 100644 --- a/pkgs/by-name/wa/wavebox/package.nix +++ b/pkgs/by-name/wa/wavebox/package.nix @@ -156,11 +156,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wavebox"; - version = "10.133.4-2"; + version = "10.134.15-2"; src = fetchurl { url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb"; - hash = "sha256-E7Hvz8HrWLTs7H6wPVN89PVTPWL0T+DjpnIGS17xw2s="; + hash = "sha256-lWwePNEobz+bx6JqLG6CVGmtQsUos+WlkBgIhpfl3LI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix index 57e8a0d3eabe..6f7e609321a3 100644 --- a/pkgs/by-name/wa/waydroid-helper/package.nix +++ b/pkgs/by-name/wa/waydroid-helper/package.nix @@ -16,6 +16,7 @@ dbus, systemd, bash, + gobject-introspection, }: python3Packages.buildPythonApplication rec { @@ -53,6 +54,7 @@ python3Packages.buildPythonApplication rec { pkg-config wrapGAppsHook4 desktop-file-utils + gobject-introspection ]; buildInputs = [ diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix index 63a9a0343518..d97feb4bd87d 100644 --- a/pkgs/by-name/wa/waydroid/package.nix +++ b/pkgs/by-name/wa/waydroid/package.nix @@ -57,7 +57,6 @@ python3Packages.buildPythonApplication rec { dontUseSetuptoolsBuild = true; dontUsePipInstall = true; - dontUseSetuptoolsCheck = true; dontWrapPythonPrograms = true; dontWrapGApps = true; diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 1e30d40a9776..ab060dce9ad7 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -1,17 +1,17 @@ -{ lib, fetchFromGitHub, buildGo123Module }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGo123Module rec { +buildGoModule rec { pname = "webdav"; - version = "5.7.3"; + version = "5.7.4"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${version}"; - hash = "sha256-f/EYuaLuF9HuoC2S4JHjtgau2ZmOocRIAtxXqnUpUE8="; + hash = "sha256-f4Z5DiwrcF18ZSfDeSf1kwQIRmVNK4K5WrkQJYfquIs="; }; - vendorHash = "sha256-x5CUy46c4SunzMw/v2DWpdahuXFZnJdGInQ0lSho/es="; + vendorHash = "sha256-8M25/Pfu175CYsO+bvLN5wxT7OciUUt7iQV0BkezTVw="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index f9f80bada2ed..6eceade528b3 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -27,7 +27,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.10.3"; + version = "5.10.4"; pyproject = true; @@ -40,7 +40,7 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${version}"; - hash = "sha256-x+DSt0uhElbNeDvO9CqdAJO8r7+Kkt/Hbh6dMPlAdfk="; + hash = "sha256-ReODTMaKMkvbaR8JETSeOrXxQIsL1Vy1pjKYWo5mw+A="; }; patches = [ diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix index 8c31cb0b22a0..16fe178ac36f 100644 --- a/pkgs/by-name/we/weston/package.nix +++ b/pkgs/by-name/we/weston/package.nix @@ -31,7 +31,7 @@ pipewireSupport ? true, pipewire, rdpSupport ? true, - freerdp, + freerdp3, remotingSupport ? true, gst_all_1, vaapiSupport ? true, @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ++ lib.optional lcmsSupport lcms2 ++ lib.optional pangoSupport pango ++ lib.optional pipewireSupport pipewire - ++ lib.optional rdpSupport freerdp + ++ lib.optional rdpSupport freerdp3 ++ lib.optionals remotingSupport [ gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/by-name/wg/wgpu-native/package.nix b/pkgs/by-name/wg/wgpu-native/package.nix index 696b4ac4afdf..95988dddf8f3 100644 --- a/pkgs/by-name/wg/wgpu-native/package.nix +++ b/pkgs/by-name/wg/wgpu-native/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "wgpu-native"; - version = "24.0.0.2"; + version = "24.0.3.1"; src = fetchFromGitHub { owner = "gfx-rs"; repo = "wgpu-native"; tag = "v${version}"; - hash = "sha256-3Z9LBmFBVZD8e65OwBuzg1S/q/5Qq9Zu0tjiWPm2inc="; + hash = "sha256-0GPwTm23i/UMoGQ71qybQS9sHN7XTtiPAZWG229Tn2k="; fetchSubmodules = true; }; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-F+EQVg2Ud/nzrWBbsLo9pCS2nfubaicyI/njDbcFtWo="; + cargoHash = "sha256-sYwDbSglOS8h8XG5sC6yX5JfRmmmc8v8mxPBicoKxEU="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/wg/wgsl-analyzer/package.nix b/pkgs/by-name/wg/wgsl-analyzer/package.nix index 5ebbedc76ee1..9829631855d3 100644 --- a/pkgs/by-name/wg/wgsl-analyzer/package.nix +++ b/pkgs/by-name/wg/wgsl-analyzer/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "wgsl-analyzer"; - version = "0.9.5"; + version = "0.9.8"; src = fetchFromGitHub { owner = "wgsl-analyzer"; repo = "wgsl-analyzer"; tag = "v${version}"; - hash = "sha256-j9UUikbJojksR6Ak9mh32T4H5mZmtPfj1m7sItUiXY4="; + hash = "sha256-UizD6cTRs6M5GaOX3wvacMr5JWwyHrQS6L19fRnw6Xo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5eq/MvdtLl7wlSTwUkGRv1WurYMIBd6lmQYCDK96V1U="; + cargoHash = "sha256-W1WQ00SFpYOm4J1C65Jg1Yb3pujdcDQFdrpIgqKRLk4="; checkFlags = [ # Imports failures diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix index 365416e7e3a0..46f5c7f8f9f4 100644 --- a/pkgs/by-name/wh/whisparr/package.nix +++ b/pkgs/by-name/wh/whisparr/package.nix @@ -29,16 +29,16 @@ let ."${system}" or (throw "Unsupported system: ${system}"); hash = { - arm64-linux-hash = "sha256-CRZp8nUs35uM5VFhinR0IQcf/t624kIRvxuXuJ0eaE4="; - arm64-osx-hash = "sha256-nrJxQg0Qzp1cJZttpX+e2CwsniXeDV7ow8JvJX0gi4c="; - x64-linux-hash = "sha256-m3KyHPe+A3iO4MosFNeTYPWzyzXTFRU/0in+Tvxnamw="; - x64-osx-hash = "sha256-zvx3PTcTvIT2l32AheY8SN419ewUdmhyQ1O9GgVs2zI="; + arm64-linux-hash = "sha256-GQSDButJqPmWbxhDIYqIZxhL2Bn4IpFP8Vinv6OsI9Q="; + arm64-osx-hash = "sha256-6e2Pqb/V02I+9ZTxR2er+zMLEBE4ZnJcwkVEgqO04eU="; + x64-linux-hash = "sha256-KZ24XPz1WwL4dK1wFT7x6jH2WU3NgFYLiSx2QfmstkA="; + x64-osx-hash = "sha256-p749/sc7aAzuvwwlCOx+pNh4J7DIJIZlvsFRa/mIlMk="; } ."${arch}-${os}-hash"; in stdenv.mkDerivation rec { pname = "whisparr"; - version = "2.0.0.819"; + version = "2.0.0.891"; src = fetchurl { name = "${pname}-${arch}-${os}-${version}.tar.gz"; diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index eb32f3500c78..e18df78ee660 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.4.6", + "version": "1.5.6", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/724a915b3b4c73cea3d2c93fc85672d6aa3961e0/Windsurf-darwin-arm64-1.4.6.zip", - "sha256": "156d4d4d54033e15fb0edd0c8f17a30ae26c622692cfcb915fd548a1596ec103" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-darwin-arm64-1.5.6.zip", + "sha256": "174fcd06dc73a760edf06105678af9b427303c8091cbe0f1454207107383076a" }, "x86_64-darwin": { - "version": "1.4.6", + "version": "1.5.6", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/724a915b3b4c73cea3d2c93fc85672d6aa3961e0/Windsurf-darwin-x64-1.4.6.zip", - "sha256": "f41e4ab9d79062357765064993fdf993a05358aae675fdf511996fa3fdf01e55" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-darwin-x64-1.5.6.zip", + "sha256": "a3891e831ab43452f791a6856f0fd3c63535348583ae673bfcdae4466f36f8df" }, "x86_64-linux": { - "version": "1.4.6", + "version": "1.5.6", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/724a915b3b4c73cea3d2c93fc85672d6aa3961e0/Windsurf-linux-x64-1.4.6.tar.gz", - "sha256": "116e1fcefe98321764f4d6a5e36a8e16282b20d994c385fd3e3826dd9945e8f4" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-linux-x64-1.5.6.tar.gz", + "sha256": "5b01ce09139d7d8932be5c297a1c71a891a299825b2d5304f3fed22367188ecb" } } diff --git a/pkgs/by-name/wi/windsurf/package.nix b/pkgs/by-name/wi/windsurf/package.nix index 3e4d6f4f1dc5..c2138ae24d31 100644 --- a/pkgs/by-name/wi/windsurf/package.nix +++ b/pkgs/by-name/wi/windsurf/package.nix @@ -47,6 +47,7 @@ callPackage vscode-generic { homepage = "https://codeium.com/windsurf"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ + sarahec xiaoxiangmoe ]; platforms = [ diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index 1c797c7c16d0..43f88744ce42 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-TWs4fpUAsrDmIIM7ZaCEyGRd9siILn3d92loWwheZfI="; + hash = "sha256-ePrtWOCta9UtoEtSJ1NZb6iJricfsc2YtRF8hi///3c="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RD60tyiMxWoKhEYVJ7HiwVfkf2oKerUP38PVmIr2tIk="; + cargoHash = "sha256-vhhonclq6UGkygHoNIRkB4BIjMAdkSbu2qPXNb2y8pI="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index 3b4d7b99d146..a55ee1dc5cf4 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false) (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute") - (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${opencomposite}") + (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${opencomposite}/lib/opencomposite") (lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}") ] diff --git a/pkgs/by-name/wl/wlock/package.nix b/pkgs/by-name/wl/wlock/package.nix index beee1d75a1d6..b6870e7fd0ff 100644 --- a/pkgs/by-name/wl/wlock/package.nix +++ b/pkgs/by-name/wl/wlock/package.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation { homepage = "https://codeberg.org/sewn/wlock"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fliegendewurst ]; + mainProgram = "wlock"; }; } diff --git a/pkgs/by-name/wm/wmutils-libwm/package.nix b/pkgs/by-name/wm/wmutils-libwm/package.nix index 723e78772e88..39ed3f337435 100644 --- a/pkgs/by-name/wm/wmutils-libwm/package.nix +++ b/pkgs/by-name/wm/wmutils-libwm/package.nix @@ -3,28 +3,32 @@ stdenv, fetchFromGitHub, libxcb, + xcb-util-cursor, }: stdenv.mkDerivation rec { pname = "wmutils-libwm"; - version = "1.0"; + version = "1.3"; src = fetchFromGitHub { owner = "wmutils"; repo = "libwm"; - rev = "v${version}"; - sha256 = "1lpbqrilhffpzc0b7vnp08jr1wr96lndwc7y0ck8hlbzlvm662l0"; + tag = "v${version}"; + hash = "sha256-ROWRgTn33c5gH4ZdkwZ05rRg/Z9e2NppAQSNExSGZ4s="; }; - buildInputs = [ libxcb ]; + buildInputs = [ + libxcb + xcb-util-cursor + ]; installFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { description = "Small library for X window manipulation"; homepage = "https://github.com/wmutils/libwm"; - license = licenses.isc; - maintainers = with maintainers; [ bhougland ]; - platforms = platforms.unix; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ bhougland ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix index 801dcd2cc3da..a89b8104b8f8 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { # We do not use or modify files outside of the xar subdirectory. patchFlags = [ "-p2" ]; - sourceRoot = "source/xar"; + sourceRoot = "${finalAttrs.src.name}/xar"; outputs = [ "out" diff --git a/pkgs/by-name/xa/xarchiver/package.nix b/pkgs/by-name/xa/xarchiver/package.nix index e8814895aa32..4ad98e7fb6c7 100644 --- a/pkgs/by-name/xa/xarchiver/package.nix +++ b/pkgs/by-name/xa/xarchiver/package.nix @@ -20,14 +20,14 @@ }: stdenv.mkDerivation rec { - version = "0.5.4.23"; + version = "0.5.4.24"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = version; - hash = "sha256-aNUpuePU6nmrralp+j8GgVPuxv9ayRVoKicPZkC4nTE="; + hash = "sha256-OTm53kUZa/65JHRAiN3VWEGWhKwzstNZ1dxwTSPZ04g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix index 4db0badbdda0..2cc28e37711d 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gtk"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "flatpak"; repo = "xdg-desktop-portal-gtk"; rev = finalAttrs.version; - sha256 = "sha256-L9kt3HAoEezYARH5JekyXhxf9Xkbzy1U2srXD7Yg/a8="; + sha256 = "sha256-aeSm6Wd0EMaZb7tYpnKT/QBt9l/fVyQLgvn5aBqQOAc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xd/xdg-terminal-exec/package.nix b/pkgs/by-name/xd/xdg-terminal-exec/package.nix index 99c68b70fd00..276840d57dbd 100644 --- a/pkgs/by-name/xd/xdg-terminal-exec/package.nix +++ b/pkgs/by-name/xd/xdg-terminal-exec/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "xdg-terminal-exec"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "xdg-terminal-exec"; rev = "v${finalAttrs.version}"; - hash = "sha256-5rmYSvFQDFXaa6k9lqy6mOm7d8GJD137uUAIqhrFl2c="; + hash = "sha256-mA/azPl4pB7vW1dB+Are5WbIf/eLmU91iwjC/V0+Xh8="; }; nativeBuildInputs = [ scdoc ]; diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix index 0d90b91caf18..8c6d0fb636fb 100644 --- a/pkgs/by-name/xf/xfsprogs/package.nix +++ b/pkgs/by-name/xf/xfsprogs/package.nix @@ -3,6 +3,7 @@ stdenv, buildPackages, fetchurl, + fetchpatch, autoreconfHook, gettext, pkg-config, @@ -29,6 +30,12 @@ stdenv.mkDerivation rec { url = "https://lore.kernel.org/linux-xfs/20250212081649.3502717-1-hi@alyssa.is/raw"; hash = "sha256-Z7BW0B+/5eHWXdHre++wRtdbU/P6XZqudYx6EK5msIU="; }) + # Backport which fixes pkgsCross.armv7l-hf-multiplatform.xfsprogs + (fetchpatch { + name = "32-bit.patch"; + url = "https://web.git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/patch/mkfs/proto.c?id=a5466cee9874412cfdd187f07c5276e1d4ef0fea"; + hash = "sha256-svC7pSbblWfO5Khots2kWWfDMBXUrU35fk5wsdYuPQI="; + }) ]; outputs = [ diff --git a/pkgs/by-name/xl/xlink/001-remove-hunter.patch b/pkgs/by-name/xl/xlink/001-remove-hunter.patch new file mode 100644 index 000000000000..170888f35302 --- /dev/null +++ b/pkgs/by-name/xl/xlink/001-remove-hunter.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6be6e8..057a056 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,12 +4,12 @@ + + cmake_minimum_required(VERSION 3.2) + +-include("cmake/HunterGate.cmake") +-HunterGate( +- URL "https://github.com/cpp-pm/hunter/archive/9d9242b60d5236269f894efd3ddd60a9ca83dd7f.tar.gz" +- SHA1 "16cc954aa723bccd16ea45fc91a858d0c5246376" +- LOCAL # Local config for dependencies +-) ++# include("cmake/HunterGate.cmake") ++# HunterGate( ++# URL "https://github.com/cpp-pm/hunter/archive/9d9242b60d5236269f894efd3ddd60a9ca83dd7f.tar.gz" ++# SHA1 "16cc954aa723bccd16ea45fc91a858d0c5246376" ++# LOCAL # Local config for dependencies ++# ) + + ### Constants + set(TARGET_NAME "XLink") diff --git a/pkgs/by-name/xl/xlink/package.nix b/pkgs/by-name/xl/xlink/package.nix new file mode 100644 index 000000000000..111091c03f07 --- /dev/null +++ b/pkgs/by-name/xl/xlink/package.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libusb1, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xlink"; + version = "0-unstable-2025-14-03"; + + src = fetchFromGitHub { + owner = "luxonis"; + repo = "XLink"; + rev = "fe8b5450f545a2ebf26dbc093e98c0265d7f4029"; + hash = "sha256-OTqJfTDudiNrdsDBe1Pg0T1dJcfneGXO/+AIbXpVfxk="; + }; + + outputs = [ + "out" + "share" + ]; + + # Remove CMake Hunter package manager - needs network connection + patches = [ + ./001-remove-hunter.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libusb1 + ]; + + cmakeFlags = [ + (lib.cmakeBool "XLINK_ENABLE_LIBUSB" true) + (lib.cmakeBool "XLINK_BUILD_EXAMPLES" true) + (lib.cmakeBool "XLINK_BUILD_TESTS" true) + (lib.cmakeBool "XLINK_LIBUSB_SYSTEM" true) + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + ]; + + postInstall = '' + mkdir -p $out/include + mkdir -p $share/examples + mkdir -p $share/tests + + cp -r $src/include/* $out/include/ + + examples=( + "boot_firmware" + "list_devices" + "boot_bootloader" + "search_devices" + "Makefile" + "device_connect_reset" + ) + + tests=( + "multiple_open_stream" + "multithreading_search_test" + ) + + find $buildDir + for file in "''${examples[@]}"; do + cp examples/$file $share/examples/$file + done + for file in "''${tests[@]}"; do + cp tests/$file $share/tests/$file + done + ''; + + meta = { + description = "XLink library for communication with Myriad VPUs"; + homepage = "https://github.com/luxonis/XLink"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ phodina ]; + }; +}) diff --git a/pkgs/by-name/xm/xmedcon/package.nix b/pkgs/by-name/xm/xmedcon/package.nix index 2528a860e905..9add423324dc 100644 --- a/pkgs/by-name/xm/xmedcon/package.nix +++ b/pkgs/by-name/xm/xmedcon/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "xmedcon"; - version = "0.25.0"; + version = "0.25.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UKM68H2AGfe4+keW/0ZxQwPsF2tTAZQCEZT9var+MHs="; + sha256 = "sha256-WKyX65LQe/UbaE6jQi36kTgi4IXjgY1ZkE1aPQ+o0Tk="; }; buildInputs = [ diff --git a/pkgs/by-name/xm/xmountains/package.nix b/pkgs/by-name/xm/xmountains/package.nix index 4f242f712f3c..bb9e70d88f1c 100644 --- a/pkgs/by-name/xm/xmountains/package.nix +++ b/pkgs/by-name/xm/xmountains/package.nix @@ -2,36 +2,40 @@ lib, stdenv, fetchFromGitHub, - xorg, + xbitmaps, + libX11, + imake, + gccmakedep, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "xmountains"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "spbooth"; repo = "xmountains"; - rev = "aa3bcbfed228adf3fff0fe4295589f13fc194f0b"; - sha256 = "0dx4n2y736lv04sj41cp1dw8n5zkw5gyd946a6zsiv0k796s9ra9"; + tag = "v${finalAttrs.version}"; + hash = "sha256-q2+aJ5ISoSXUW4BaAf9Qq/d+DEBSylceZNKKmN4SbQQ="; }; buildInputs = [ - xorg.xbitmaps - xorg.libX11 + xbitmaps + libX11 ]; - nativeBuildInputs = with xorg; [ + + nativeBuildInputs = [ imake gccmakedep ]; installPhase = "install -Dm755 xmountains -t $out/bin"; - meta = with lib; { + meta = { description = "X11 based fractal landscape generator"; homepage = "https://spbooth.github.io/xmountains"; - license = licenses.hpndSellVariant; - maintainers = with maintainers; [ djanatyn ]; + license = lib.licenses.hpndSellVariant; + maintainers = with lib.maintainers; [ djanatyn ]; mainProgram = "xmountains"; }; -} +}) diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 236562e8065f..da1361b602bc 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "xonsh"; - version = "0.19.2"; + version = "0.19.3"; pyproject = true; # PyPI package ships incomplete tests @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "xonsh"; repo = "xonsh"; tag = version; - hash = "sha256-h5WK/7PZQKHajiaj3BTHLeW4TYhSB/IV0eRZPCSD6qg="; + hash = "sha256-2ZxNVyONA9eFyasMK+49T98zl67/95BNfDp/gINPc1U="; }; build-system = [ @@ -91,6 +91,7 @@ buildPythonPackage rec { # https://github.com/xonsh/xonsh/issues/5569 "test_spec_decorator_alias_output_format" + "test_trace_in_script" ]; disabledTestPaths = [ diff --git a/pkgs/by-name/xs/xsnow/package.nix b/pkgs/by-name/xs/xsnow/package.nix index b8f733edd484..16052b16223d 100644 --- a/pkgs/by-name/xs/xsnow/package.nix +++ b/pkgs/by-name/xs/xsnow/package.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "sha256-v7ZlzW3uFc9sLU9F3kmGW5qhgsiat4A/p7LwP4lB06E="; + sha256 = "sha256-ixfX/EGdwMOYu6nzcRUp7gjii0+T14CcqHCHIWmR2f8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xu/xunlei-uos/package.nix b/pkgs/by-name/xu/xunlei-uos/package.nix new file mode 100644 index 000000000000..02cc121439c3 --- /dev/null +++ b/pkgs/by-name/xu/xunlei-uos/package.nix @@ -0,0 +1,102 @@ +{ + lib, + dpkg, + stdenv, + fetchurl, + buildFHSEnv, + autoPatchelfHook, + writeShellScript, + zenity, + nss, + gtk2, + alsa-lib, + dbus-glib, + libXtst, + libXdamage, + libXScrnSaver, +}: + +let + sources = import ./sources.nix; + + xunlei-unwrapped = stdenv.mkDerivation rec { + pname = "xunlei-uos"; + version = sources.version; + + src = + { + x86_64-linux = fetchurl { + url = sources.amd64_url; + hash = sources.amd64_hash; + }; + aarch64-linux = fetchurl { + url = sources.arm64_url; + hash = sources.arm64_hash; + }; + loongarch64-linux = fetchurl { + url = sources.loongarch64_url; + hash = sources.loongarch64_hash; + }; + } + .${stdenv.hostPlatform.system} + or (throw "${pname}-${version}: ${stdenv.hostPlatform.system} is unsupported."); + + buildInputs = [ + nss + gtk2 + alsa-lib + dbus-glib + libXtst + libXdamage + libXScrnSaver + ]; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -r opt/apps/com.xunlei.download/files $out/lib/xunlei + cp -r opt/apps/com.xunlei.download/entries $out/share + mv $out/share/icons/hicolor/scalable/apps/com.thunder.download.svg \ + $out/share/icons/hicolor/scalable/apps/com.xunlei.download.svg + substituteInPlace $out/share/applications/com.xunlei.download.desktop \ + --replace-fail "Categories=net" "Categories=Network" \ + --replace-fail "/opt/apps/com.xunlei.download/files/start.sh" "xunlei-uos" \ + --replace-fail "/opt/apps/com.xunlei.download/entries/icons/hicolor/256x256/apps/com.xunlei.download.png" "com.xunlei.download" + + runHook postInstall + ''; + + meta = { + description = "Download manager supporting HTTP, FTP, BitTorrent, and eDonkey network protocols"; + homepage = "https://www.xunlei.com"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.linuxwhata ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "loongarch64-linux" + ]; + }; + }; +in +buildFHSEnv { + inherit (xunlei-unwrapped) pname version meta; + runScript = writeShellScript "xunlei-launcher" '' + exec ${xunlei-unwrapped}/lib/xunlei/thunder -start $1 "$@" + ''; + extraInstallCommands = '' + mkdir -p $out + ln -s ${xunlei-unwrapped}/share $out/share + ''; + + passthru.updateScript = ./update.sh; + + includeClosures = true; + targetPkgs = pkgs: [ zenity ]; # system tray click events +} diff --git a/pkgs/by-name/xu/xunlei-uos/sources.nix b/pkgs/by-name/xu/xunlei-uos/sources.nix new file mode 100644 index 000000000000..eb08be168268 --- /dev/null +++ b/pkgs/by-name/xu/xunlei-uos/sources.nix @@ -0,0 +1,11 @@ +# Generated by ./update.sh - do not update manually! +# Last updated: 2025-03-19 +{ + version = "1.0.0.5"; + amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_1.0.0.5_amd64.deb"; + arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_1.0.0.5_arm64.deb"; + loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_1.0.0.5_loongarch64.deb"; + amd64_hash = "sha256-K+eHPmG2tT5Z+RWxigg03itw6Rcnk5MZlODqS/JtAnk="; + arm64_hash = "sha256-iA9mbp0wSe66qC5lphMTFPzmOJjzHfWKubGRPiKcVdg="; + loongarch64_hash = "sha256-44QPnB/1uWHaQkd3DBMDvYXfXwch9HywZUvg71z8fts="; +} diff --git a/pkgs/by-name/xu/xunlei-uos/update.sh b/pkgs/by-name/xu/xunlei-uos/update.sh new file mode 100644 index 000000000000..d931853a1c3d --- /dev/null +++ b/pkgs/by-name/xu/xunlei-uos/update.sh @@ -0,0 +1,60 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert nix-prefetch-git gzip + +base_url_suffix="https://pro-store-packages.uniontech.com/appstore/dists/eagle/appstore/binary-" +base_url_appendix="/Packages.gz" +target_package="com.xunlei.download" +packages_file="Packages.gz" + +url=() +version=() # TODO: Currently, there is no version differences between archs. This is reserved for future use. +hash=() + +for i in amd64 arm64 loongarch64 +do + current_url=$base_url_suffix$i$base_url_appendix + curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:125.0) Gecko/20100101 Firefox/125.0" -v -L -O $current_url + current_version=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" ' + BEGIN { found = 0 } + { + if ($0 ~ "^Package: "pkg) { + found = 1; + } + if (found && $1 == "Version:") { + print $2; + exit; + } + } + ') + version+=("$current_version") + sha256sum=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" ' + BEGIN { found = 0 } + { + if ($0 ~ "^Package: "pkg) { + found = 1; + } + if (found && $1 == "SHA256:") { + print $2; + exit; + } + } + ') + url+=("https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_"$version"_"$i".deb") + hash+=("$(nix hash convert --to sri --hash-algo sha256 $sha256sum)") +done + +cat >sources.nix <= 2.0.1) @@ -10,12 +10,10 @@ GEM unicode_plot (>= 0.0.5) PLATFORMS - x86_64-linux - arm64-darwin-22 ruby DEPENDENCIES youplot BUNDLED WITH - 2.5.16 + 2.6.2 diff --git a/pkgs/by-name/yo/youplot/gemset.nix b/pkgs/by-name/yo/youplot/gemset.nix index 627338314559..c93e752d6a9f 100644 --- a/pkgs/by-name/yo/youplot/gemset.nix +++ b/pkgs/by-name/yo/youplot/gemset.nix @@ -1,41 +1,44 @@ { csv = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0kmx36jjh2sahd989vcvw74lrlv07dqc3rnxchc5sj2ywqsw3w3g"; type = "gem"; }; - version = "3.3.0"; + version = "3.3.2"; }; enumerable-statistics = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1cqksgv0cf69cd30kxk2r0lq1y784wn5nvlyabfqilf1vvy6j38y"; type = "gem"; }; version = "2.0.8"; }; unicode_plot = { - dependencies = ["enumerable-statistics"]; - groups = ["default"]; - platforms = []; + dependencies = [ "enumerable-statistics" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0fzpg1zizf19xgfzqw6lmb38xir423wwxb2mjsb3nym6phvn5kli"; type = "gem"; }; version = "0.0.5"; }; youplot = { - dependencies = ["csv" "unicode_plot"]; - groups = ["default"]; - platforms = []; + dependencies = [ + "csv" + "unicode_plot" + ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1p1vbb7p4h5a4r2rwl64gwv6cmf350grjn97zrpjhvrjih81y3yg"; type = "gem"; }; diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index 14bc8906b607..9f07c1468050 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2025.1.62967"; + version = "2025.1.66652"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-6uKlbyVtYF4UZVi2bgX2iZSfqJJEEZ86FJ55TXnbQ1o="; + hash = "sha256-2w/7NR2GPqP6tLvzU9xIO3OXzwqa06BzHWBnmMDFvbQ="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index baa38c319ea5..3ed3ef032c9f 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2025.2.19"; + version = "2025.3.21"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-8zynbfLk2zGIDy/kCNRPUFjZ8TUBWxPlBhDfvngkW+o="; + hash = "sha256-W89HsolyVOo4FpNajd5H0kO/9VZ4LM7WsWorhea2gro="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix index e9642c764146..f53e9493cc30 100644 --- a/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/pkgs/by-name/yt/ytmdesktop/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ytmdesktop"; - version = "2.0.7"; + version = "2.0.8"; desktopItems = [ (makeDesktopItem { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/v${finalAttrs.version}/youtube-music-desktop-app_${finalAttrs.version}_amd64.deb"; - hash = "sha256-bdP6vIAUoFYLvEvxtG69tBuL94EQQVwNyeuQibRMMbk="; + hash = "sha256-CwidVf4i9CeD/a8u5sZrBpoYzlZqi9ptFxljr9VmKq8="; }; unpackPhase = '' diff --git a/pkgs/by-name/yu/yubikey-manager/package.nix b/pkgs/by-name/yu/yubikey-manager/package.nix index 43e849068630..6f3192774a1d 100644 --- a/pkgs/by-name/yu/yubikey-manager/package.nix +++ b/pkgs/by-name/yu/yubikey-manager/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "5.5.1"; + version = "5.6.1"; pyproject = true; src = fetchFromGitHub { owner = "Yubico"; repo = "yubikey-manager"; rev = version; - hash = "sha256-m/B5G83XZROoCNq/ZT0U0MUth2IC99e3LWc8FcOq1ig="; + hash = "sha256-qEEAByg6Smn1Wk8U4VA6MIJDLWBtM+S+qTDIcgPUGA0="; }; postPatch = '' diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix index 81dcd5990978..ccbb8aa3788f 100644 --- a/pkgs/by-name/za/zammad/package.nix +++ b/pkgs/by-name/za/zammad/package.nix @@ -14,7 +14,7 @@ nodejs, pnpm_9, cacert, - redis, + valkey, dataDir ? "/var/lib/zammad", }: @@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation { ]; nativeBuildInputs = [ - redis + valkey postgresql pnpm_9.configHook nodejs diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix index 882f72805bb1..cd665e81cbc0 100644 --- a/pkgs/by-name/za/zap-chip/package.nix +++ b/pkgs/by-name/za/zap-chip/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "zap-chip"; - version = "2024.09.27"; + version = "2025.02.26"; src = fetchFromGitHub { owner = "project-chip"; repo = "zap"; rev = "v${version}"; - hash = "sha256-Dc5rU4jJ6aJpk8mwL+XNSmtisYxF86VzXd/Aacd4p0o="; + hash = "sha256-oYw1CxeCr4dUpw7hhXjtB+QwTfBI7rG9jgfxWKZYsSc="; }; - npmDepsHash = "sha256-ZFksGwKlXkz6XTs2QdalGB0hR16HfB69XQOFWI9X/KY="; + npmDepsHash = "sha256-dcnJfxgF1S2gyR+wPnBD4AFzix5Sdq2ZqDlXvWAFb8s="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; env.CYPRESS_INSTALL_BINARY = "0"; diff --git a/pkgs/by-name/za/zaz/package.nix b/pkgs/by-name/za/zaz/package.nix index 166048c8689d..43047af5895f 100644 --- a/pkgs/by-name/za/zaz/package.nix +++ b/pkgs/by-name/za/zaz/package.nix @@ -6,6 +6,7 @@ SDL, SDL_image, libgbm, + libGL, libtheora, libvorbis, libogg, @@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.getDev SDL) SDL_image libgbm + libGL libtheora libvorbis.dev libogg diff --git a/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch deleted file mode 100644 index d3f566488090..000000000000 --- a/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/script/generate-licenses b/script/generate-licenses -index 368f63b..c2bf3a5 100644 ---- a/script/generate-licenses -+++ b/script/generate-licenses -@@ -18,17 +18,9 @@ echo -n "" > "$OUTPUT_FILE" - echo -e "\n# ###### CODE LICENSES ######\n" - } >> "$OUTPUT_FILE" - --if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then -- echo "Installing cargo-about@$CARGO_ABOUT_VERSION..." -- cargo install "cargo-about@$CARGO_ABOUT_VERSION" --else -- echo "cargo-about@$CARGO_ABOUT_VERSION is already installed." --fi -- - echo "Generating cargo licenses" - - cargo about generate \ -- --fail \ - -c script/licenses/zed-licenses.toml \ - "$TEMPLATE_FILE" >> "$OUTPUT_FILE" - diff --git a/pkgs/by-name/ze/zed-editor/0002-linux-linker.patch b/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch similarity index 100% rename from pkgs/by-name/ze/zed-editor/0002-linux-linker.patch rename to pkgs/by-name/ze/zed-editor/0001-linux-linker.patch diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 51218cf5c6e1..7de37ef6d685 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -98,7 +98,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.177.9"; + version = "0.178.5"; outputs = [ "out" ] @@ -110,33 +110,33 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-E8gIM8Jsxq7GvNZI4fDYzBMi1uqsxl0mYv2kxjwUFHc="; + hash = "sha256-YkoIOBoR5hMt99D1bJ1yWLv7C/rY6VKC5J/7c5SMUFs="; }; patches = [ - # Zed uses cargo-install to install cargo-about during the script execution. - # We provide cargo-about ourselves and can skip this step. - # Until https://github.com/zed-industries/zed/issues/19971 is fixed, - # we also skip any crate for which the license cannot be determined. - ./0001-generate-licenses.patch - # Upstream delegates linking on Linux to clang to make use of mold, # but builds fine with our standard linker. # This patch removes their linker override from the cargo config. - ./0002-linux-linker.patch + ./0001-linux-linker.patch # See https://github.com/zed-industries/zed/pull/21661#issuecomment-2524161840 "script/patches/use-cross-platform-livekit.patch" ]; - # Dynamically link WebRTC instead of static - postPatch = '' - substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \ - --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" - ''; + postPatch = + # Dynamically link WebRTC instead of static + '' + substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \ + --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" + '' + # nixpkgs ships cargo-about 0.7, which is a seamless upgrade from 0.6 + + '' + substituteInPlace script/generate-licenses \ + --replace-fail 'CARGO_ABOUT_VERSION="0.6"' 'CARGO_ABOUT_VERSION="0.7"' + ''; useFetchCargoVendor = true; - cargoHash = "sha256-7qSymOFLR/hEJx0dxkp7YsDyPLP6KVCf8yE0rkx5+w4="; + cargoHash = "sha256-xJaiHngsm74RdcEUXaDrc/Hwy4ywZrEiJt7JYTc/NpM="; nativeBuildInputs = [ @@ -192,6 +192,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ]; env = { + ALLOW_MISSING_LICENSES = true; ZSTD_SYS_USE_PKG_CONFIG = true; FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ diff --git a/pkgs/by-name/ze/zeekstd/package.nix b/pkgs/by-name/ze/zeekstd/package.nix index 40b283922f5d..424954b4823c 100644 --- a/pkgs/by-name/ze/zeekstd/package.nix +++ b/pkgs/by-name/ze/zeekstd/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "zeekstd"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "rorosen"; repo = "zeekstd"; tag = "v${finalAttrs.version}"; - hash = "sha256-Blyp5GpnytB3S4k6lp2fAwXueaUtXqPW+WLEmFNPZc0="; + hash = "sha256-URQ8UiCy8qnm0VM55BqPgIthR4AIyRk+fgowAFxvXwM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bbl0zHxd2HYkctX029mtxDciC2tnPVTlHxYyetmtuw0="; + cargoHash = "sha256-lS4RQuwvY6bRpsev7RI3XWBPbrdek5im/rkzP+Cmgpc="; meta = { description = "CLI tool that works with the zstd seekable format"; diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index 3ba274737a82..65c7e5b406d1 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zellij"; - version = "0.42.0"; + version = "0.42.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; tag = "v${finalAttrs.version}"; - hash = "sha256-qvm8mRm/YYcuNX2Rv0tYjcIXjaF9dkwd7wpL++ho3t0="; + hash = "sha256-EK+eQfNhfVxjIsoyj43tcRjHDT9O8/n7hUz24BC42nw="; }; # Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-cAO8A/e6tkUY7pm/T4Riz4UPIc22oj5FFC6sQL1QIuc="; + cargoHash = "sha256-0+cU2C6zjVv2G8h7oK0ztMDdukVR6QRzN81/SfLZapY="; env.OPENSSL_NO_VENDOR = 1; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; # Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs diff --git a/pkgs/games/0ad/data.nix b/pkgs/by-name/ze/zeroad-data/package.nix similarity index 100% rename from pkgs/games/0ad/data.nix rename to pkgs/by-name/ze/zeroad-data/package.nix diff --git a/pkgs/games/0ad/fix-build-script.patch b/pkgs/by-name/ze/zeroad-unwrapped/fix-build-script.patch similarity index 100% rename from pkgs/games/0ad/fix-build-script.patch rename to pkgs/by-name/ze/zeroad-unwrapped/fix-build-script.patch diff --git a/pkgs/games/0ad/game.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix similarity index 100% rename from pkgs/games/0ad/game.nix rename to pkgs/by-name/ze/zeroad-unwrapped/package.nix diff --git a/pkgs/games/0ad/rootdir_env.patch b/pkgs/by-name/ze/zeroad-unwrapped/rootdir_env.patch similarity index 100% rename from pkgs/games/0ad/rootdir_env.patch rename to pkgs/by-name/ze/zeroad-unwrapped/rootdir_env.patch diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/by-name/ze/zeroad/package.nix similarity index 100% rename from pkgs/games/0ad/wrapper.nix rename to pkgs/by-name/ze/zeroad/package.nix diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix index cf363b0c02c3..3df263375833 100644 --- a/pkgs/by-name/zi/zile/package.nix +++ b/pkgs/by-name/zi/zile/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "zile"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "mirror://gnu/zile/${pname}-${version}.tar.gz"; - hash = "sha256-d+t9r/PJi9yI2qGsBA3MynK4HcMvwxZuB53Xpj5Cx0E="; + hash = "sha256-ZnILBiwVCiqW+igx9Vz5XfohycLWwEh/qSpaHkB0AG8="; }; buildInputs = [ diff --git a/pkgs/by-name/zk/zk/package.nix b/pkgs/by-name/zk/zk/package.nix index 78cfb7ae281a..fe1116ccf1ef 100644 --- a/pkgs/by-name/zk/zk/package.nix +++ b/pkgs/by-name/zk/zk/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zk"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-h6qQcaAgxWeBzMjxGk7b8vrVu5NO/V6b/ZvZMWtZTpg="; + sha256 = "sha256-aFpn3luIp5tMp9jpBxVCmU+IU9eJg3/5UZFIklauFjI="; }; vendorHash = "sha256-2PlaIw7NaW4pAVIituSVWhssSBKjowLOLuBV/wz829I="; diff --git a/pkgs/by-name/zo/zoraxy/package.nix b/pkgs/by-name/zo/zoraxy/package.nix index 0b92a4188293..9247c252102f 100644 --- a/pkgs/by-name/zo/zoraxy/package.nix +++ b/pkgs/by-name/zo/zoraxy/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "zoraxy"; - version = "3.1.1"; + version = "3.1.8"; src = fetchFromGitHub { owner = "tobychui"; repo = "zoraxy"; - tag = version; - hash = "sha256-ZjsBGtY6M5jIXylzg4k8U4krwqx5d5VuMiVHAeUIbXY="; + tag = "v${version}"; + hash = "sha256-0BJuomRz/ZnvHQXPZBBrVv1nk2UFPGGdjsZ/FpUAtwk="; }; sourceRoot = "${src.name}/src"; - vendorHash = "sha256-p2nczUMT3FfYX32yvbR0H5FyHV2v9I18yvn0lwUwy+A="; + vendorHash = "sha256-gqDgM+xyvzrpQEQz0fju8GEtQhJOaL6FeuwYxgeSRmo="; checkFlags = let @@ -27,6 +27,8 @@ buildGoModule rec { "TestReplaceLocationHostRelative" "TestHandleTraceRoute" "TestHandlePing" + "TestListTable" + "TestWriteAndRead" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/by-name/zs/zsh-autocomplete/package.nix b/pkgs/by-name/zs/zsh-autocomplete/package.nix index 286b7174b715..4d14345098b8 100644 --- a/pkgs/by-name/zs/zsh-autocomplete/package.nix +++ b/pkgs/by-name/zs/zsh-autocomplete/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "zsh-autocomplete"; - version = "24.09.04"; + version = "25.03.19"; src = fetchFromGitHub { owner = "marlonrichert"; repo = "zsh-autocomplete"; rev = version; - sha256 = "sha256-o8IQszQ4/PLX1FlUvJpowR2Tev59N8lI20VymZ+Hp4w="; + sha256 = "sha256-eb5a5WMQi8arZRZDt4aX1IV+ik6Iee3OxNMCiMnjIx4="; }; strictDeps = true; diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix index fbaeaa59a1a8..542e337ef0d2 100644 --- a/pkgs/data/fonts/maple-font/default.nix +++ b/pkgs/data/fonts/maple-font/default.nix @@ -6,18 +6,21 @@ }: let + + hashes = lib.importJSON ./hashes.json; + maple-font = { pname, - sha256, + hash, desc, }: stdenv.mkDerivation rec { inherit pname; - version = "6.4"; + version = "7.0"; src = fetchurl { url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip"; - inherit sha256; + inherit hash; }; # Work around the "unpacker appears to have produced no directories" @@ -41,41 +44,105 @@ let }; }; + typeVariants = { + truetype = { + suffix = "TTF"; + desc = "monospace TrueType"; + }; + + truetype-autohint = { + suffix = "TTF-AutoHint"; + desc = "monospace ttf autohint"; + }; + + variable = { + suffix = "Variable"; + desc = "monospace variable"; + }; + + woff2 = { + suffix = "Woff2"; + desc = "WOFF2.0"; + }; + + opentype = { + suffix = "OTF"; + desc = "OpenType"; + }; + + NF = { + suffix = "NF"; + desc = "Nerd Font"; + }; + + NF-unhinted = { + suffix = "NF-unhinted"; + desc = "Nerd Font unhinted"; + }; + + CN = { + suffix = "CN"; + desc = "monospace CN"; + }; + + CN-unhinted = { + suffix = "CN-unhinted"; + desc = "monospace CN unhinted"; + }; + + NF-CN = { + suffix = "NF-CN"; + desc = "Nerd Font CN"; + }; + + NF-CN-unhinted = { + suffix = "NF-CN-unhinted"; + desc = "Nerd Font CN unhinted"; + }; + }; + + ligatureVariants = { + No-Ligature = { + suffix = "NL"; + desc = "No Ligature"; + }; + Normal-Ligature = { + suffix = "Normal"; + desc = "Normal Ligature"; + }; + Normal-No-Ligature = { + suffix = "NormalNL"; + desc = "Normal No Ligature"; + }; + }; + + combinedFonts = + lib.concatMapAttrs ( + ligName: ligVariant: + lib.concatMapAttrs ( + typeName: typeVariant: + let + pname = "MapleMono${ligVariant.suffix}-${typeVariant.suffix}"; + in + { + "${ligVariant.suffix}-${typeVariant.suffix}" = maple-font { + inherit pname; + desc = "${ligVariant.desc} ${typeVariant.desc}"; + hash = hashes.${pname}; + }; + } + ) typeVariants + ) ligatureVariants + // lib.mapAttrs ( + _: value: + let + pname = "MapleMono-${value.suffix}"; + in + maple-font { + inherit pname; + inherit (value) desc; + hash = hashes.${pname}; + } + ) typeVariants; in -{ - Mono = maple-font { - pname = "MapleMono-ttf"; - sha256 = "sha256-a06JLIP5aVb9SeEz6kw+LqKy0ydCgaUlPDFWA2Y0G8Q="; - desc = "monospace TrueType"; - }; - - NF = maple-font { - pname = "MapleMono-NF"; - sha256 = "sha256-fy+hdUYZDW5nkMVirhkmys3tIkWezPDrlpNxnRMl4WU="; - desc = "Nerd Font"; - }; - - SC-NF = maple-font { - pname = "MapleMono-SC-NF"; - sha256 = "sha256-SbXWkrpLJUrq+Jt1h3GBP9md5TbYpPchdiR0oEDMAgY="; - desc = "Nerd Font SC"; - }; - - opentype = maple-font { - pname = "MapleMono-otf"; - sha256 = "sha256-fwfFlNbaWXFCjcno7NK3dZqAzsHLh9rdGkSq26xc9qw="; - desc = "OpenType"; - }; - - woff2 = maple-font { - pname = "MapleMono-woff2"; - sha256 = "sha256-4akpZGGth4yZjI5wjO3ZXrXcWNxb7/6YChU7T5fNVKs="; - desc = "WOFF2.0"; - }; - - autohint = maple-font { - pname = "MapleMono-ttf-autohint"; - sha256 = "sha256-rSYIC42Bt+KFgxhwRhXS4sbh4etKYkCOo5nP2J2BHt4="; - desc = "ttf autohint"; - }; -} +combinedFonts diff --git a/pkgs/data/fonts/maple-font/hashes.json b/pkgs/data/fonts/maple-font/hashes.json new file mode 100644 index 000000000000..3a4453136ec6 --- /dev/null +++ b/pkgs/data/fonts/maple-font/hashes.json @@ -0,0 +1,46 @@ +{ + "MapleMono-CN-unhinted": "sha256-L2EasFES9EYmNtOs/CKwqqQNzkxAZgoBT8qN1dWipBc=", + "MapleMono-CN": "sha256-vQkZD1wa/pzAZR8b9krfApGCUS+ARkZNvhqJ/ZGpnLs=", + "MapleMono-NF-CN-unhinted": "sha256-x7ZnObDkGMR4nPpMbBfRfE6M4o19rZgApQeG69P6TZg=", + "MapleMono-NF-CN": "sha256-IUBHSBIW//vWwlumefFW48eSULJmY9e8F9Ymhbt/KU0=", + "MapleMono-NF-unhinted": "sha256-5P42BHDnIv4ZN4rDtEWFCWEc+NfPd0qHT2VOW2Jhn+Q=", + "MapleMono-NF": "sha256-HgZkIrEV5zmRhBvAI4/uT+nfUhDaD0H81upTXfJNhaA=", + "MapleMono-OTF": "sha256-4zPKejWZS52bhw0FLJX69kMr8kbv6P5l5cQ8orYcT5o=", + "MapleMono-TTF-AutoHint": "sha256-Xa7cSDXKby0UILmxj96xbD6ZhDDwBee9lymOx7FPmoE=", + "MapleMono-TTF": "sha256-FglonkbnphiwmxGj7Z0ozfHMwpJj7+96g6WMtMe3rIo=", + "MapleMono-Variable": "sha256-EILfODQ8DJiyTwgmTogwcNlz+YBIdmlk/mnfFZ4Eme8=", + "MapleMono-Woff2": "sha256-S7lWI+Xr7LxdFvjnngktx5uaixEVlxdLUDKMmFlARCk=", + "MapleMonoNL-CN-unhinted": "sha256-0wKF/0hUj45aApnHbp0jQqPtw8YcIsvE88HFob0U8n0=", + "MapleMonoNL-CN": "sha256-JUCHV2TkDTFxpZXibLq8/ENyn7KER5AqT5Yx4tK6eW8=", + "MapleMonoNL-NF-CN-unhinted": "sha256-t7pOo8YsewYR31AB2J4BIZU+JW3Qp770Esbpy38Y2Ts=", + "MapleMonoNL-NF-CN": "sha256-S9a8qXpebYMmJmSr+JG945GYuucQC5bbURf3h0jwH40=", + "MapleMonoNL-NF-unhinted": "sha256-j2M6kLSALRzdOl8vyMsX+4wvGVcVDYvlYRLuX1XYhic=", + "MapleMonoNL-NF": "sha256-k+FsBxlZheaAzJFdpdKtr4NUTnSue6GNgNa/U5B6dPI=", + "MapleMonoNL-OTF": "sha256-TV+6rZ3MNabt+1n33UeElP2zcGktYIYOos3dF4XlQaM=", + "MapleMonoNL-TTF-AutoHint": "sha256-VD4d0BdUzRiAUao9sGJKIeLkD3AAuhfJoIdrvdJPP0s=", + "MapleMonoNL-TTF": "sha256-bbJxcIYarftrinBO9rLAqUz3jLoWzkcZ+qZCmLeko8U=", + "MapleMonoNL-Variable": "sha256-+6WgaUddD2LSYsaVajpYNw+ypuQI27stjc6hPnQtHrw=", + "MapleMonoNL-Woff2": "sha256-bbMqjLHRI0aMTa7pxMvRU2RsiE97e3pavkJuMfVXctA=", + "MapleMonoNormal-CN-unhinted": "sha256-Ew/7KwKPWluFtYRDD/0hg26tQCVKYCIUTNqClYndVfI=", + "MapleMonoNormal-CN": "sha256-ODTWB+9nTMmgEaqlv1/Fq4GABh45CLTA0HKWHM9G9Aw=", + "MapleMonoNormal-NF-CN-unhinted": "sha256-vOlFwb0a97ydJPR7YeEJqnmTjK9pKE2O6szGGQJHShQ=", + "MapleMonoNormal-NF-CN": "sha256-5Jk/Fqd7pMuDghhaFvIegPJqK21iMJuN/nJt9y5hebc=", + "MapleMonoNormal-NF-unhinted": "sha256-9FhbDhBnGEFwX2YE2GEeyteIWA5z3b4VJwURTWsWf3k=", + "MapleMonoNormal-NF": "sha256-SMntZ0XVRsdLocSd9BsN3/ORmkUi8XgTSicULqEG0po=", + "MapleMonoNormal-OTF": "sha256-flHGOMuURNehlLw0JzbIPNLXNb7B7g8YXl8PoN/Wqt0=", + "MapleMonoNormal-TTF-AutoHint": "sha256-/giwB5H0FQ8NTYViqz81Bed+uWuOL9ipH+CKS1p34vU=", + "MapleMonoNormal-TTF": "sha256-vL6fRwEP2GSORBrOGvEgSA+fxjrZyYmpbNeuIMpVvYM=", + "MapleMonoNormal-Variable": "sha256-S/76i2fj1e+KAxQlAjngGDmOMx8t6Y7Zn8487zJJJXw=", + "MapleMonoNormal-Woff2": "sha256-gsyUKyibV5q0llNi0Inwqk/ZOEEF+pH1ZCf9sMadkc8=", + "MapleMonoNormalNL-CN-unhinted": "sha256-ht/MwZcc2RvEzZ1mpqCMkfU6J6OD8F4V4lMlrsuo1/E=", + "MapleMonoNormalNL-CN": "sha256-pGxsKUFSO5hzOPWW0rgYG8fpgunmPkswnZ8a+C5A+TM=", + "MapleMonoNormalNL-NF-CN-unhinted": "sha256-N+JSUc8reu2Sile2ivHu325zzg7MFKJBzbggUg4orZA=", + "MapleMonoNormalNL-NF-CN": "sha256-li/xPAHJIFtWDEK1TttQuOjZ7OJqXk+dncHFpwsh3FY=", + "MapleMonoNormalNL-NF-unhinted": "sha256-xBRiZaXswGy+DcT3h2m8nCxZBjLgq/5eX6ST4496hw0=", + "MapleMonoNormalNL-NF": "sha256-j8Li+I/NgdNSwTAY31YbBJFTc2IXffyqQnv/KVfBeMU=", + "MapleMonoNormalNL-OTF": "sha256-+exfPalJXhHScVArcdwLVde5JhxPAyxyebQAE2yBkos=", + "MapleMonoNormalNL-TTF-AutoHint": "sha256-Cdo0FhIIp7c+OIlz7D66G8xsBk0JaNq9vn6GugUJiZM=", + "MapleMonoNormalNL-TTF": "sha256-xbp1ZhbYysHHOKkoUyu0Tv76/jDqCbo2U6fzHiFPt50=", + "MapleMonoNormalNL-Variable": "sha256-mQdYcLT/30kJjPGm4j2pZXrJ8EuiY7M/gsQuI+i1Y3A=", + "MapleMonoNormalNL-Woff2": "sha256-WQp+/sKQg/QHYeeFP5k9IPPcQJKGULlmCyrAOUOvfmk=" +} diff --git a/pkgs/data/fonts/maple-font/update.py b/pkgs/data/fonts/maple-font/update.py new file mode 100644 index 000000000000..bc0335dcdbe9 --- /dev/null +++ b/pkgs/data/fonts/maple-font/update.py @@ -0,0 +1,60 @@ +import re +import json +import base64 +import argparse +import requests +from urllib.parse import urlparse + +def process_github_release(url, token=None): + parsed = urlparse(url) + path_parts = parsed.path.strip('/').split('/') + if len(path_parts) < 5 or parsed.netloc != 'github.com': + raise ValueError("Invalid GitHub release URL format") + owner, repo, _, _, tag = path_parts[:5] + headers = {"Accept": "application/vnd.github.v3+json"} + if token: + headers["Authorization"] = f"Bearer {token}" + response = requests.get( + f"https://api.github.com/repos/{owner}/{repo}/releases/tags/{tag}", + headers=headers + ) + if response.status_code != 200: + raise RuntimeError(f"Failed to fetch release info: {response.status_code} ({response.json().get('message')})") + release_data = response.json() + assets = release_data.get('assets', []) + result = {} + sha256_pattern = re.compile(r"^[a-fA-F0-9]{64}$") + for asset in assets: + if not asset['name'].endswith('.sha256'): + continue + download_url = asset['browser_download_url'] + content_response = requests.get(download_url, headers=headers) + if content_response.status_code != 200: + raise RuntimeError( + f"Failed to download {asset['name']}: " + f"{content_response.status_code} {content_response.text}" + ) + hex_hash = content_response.text.strip() + if not sha256_pattern.match(hex_hash): + raise ValueError(f"Invalid SHA256 format in {asset['name']}") + try: + byte_data = bytes.fromhex(hex_hash) + base64_hash = base64.b64encode(byte_data).decode('utf-8') + except Exception as e: + raise RuntimeError(f"Error processing {asset['name']}: {str(e)}") + filename = asset['name'][:-7] + result[filename] = f"sha256-{base64_hash}" + output_file = f"{repo}_{tag}_hashes.json" + with open(output_file, 'w', encoding='utf-8') as f: + json.dump(result, f, indent=2, ensure_ascii=False) + print(f"Successfully generated {output_file}") +if __name__ == "__main__": + parser = argparse.ArgumentParser(description='Process GitHub release hashes') + parser.add_argument('url', help='GitHub release URL') + parser.add_argument('-t', '--token', help='GitHub API token (optional)') + args = parser.parse_args() + try: + process_github_release(args.url, args.token) + except Exception as e: + print(f"Error: {str(e)}") + sys.exit(1) diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index fc5853479f46..686bb68e0215 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -60,11 +60,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.28.0"; + version = "1.28.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-8JpD1rSGG+BswOKEnFMpZBPU5SyOMfUvyV6epfHFmjY="; + sha256 = "sha256-hM9hRfnMgr//aQAFviQ5LI88UvjgD/BNjuo3FCnAlCQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index c723ce7b137e..bbc7246e0491 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "enlightenment"; - version = "0.27.0"; + version = "0.27.1"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-W2a5FMbZCpFrP+ZrX/cKn9kSCIqmOZvd4bOlBarlAzE="; + sha256 = "sha256-tB34dx9g47lqGXOuVm10JcU6gznxjlTjEjAhh4HaL6k="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix b/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix index c26a40c003dc..377d2a0a92c7 100644 --- a/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix @@ -15,13 +15,13 @@ buildPythonApplication rec { pname = "gnome-extensions-cli"; - version = "0.10.4"; + version = "0.10.5"; format = "pyproject"; src = fetchPypi { pname = "gnome_extensions_cli"; inherit version; - hash = "sha256-S+kSVvWVbg/ATaF0xacPeUnu84Xx2ot6AOLmdGQIeWo="; + hash = "sha256-Rli4gsxbD84SSyx6hdPz5MKHsYw4jX7XgAkAydg0lGI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix index 3fc7c5432716..0e8f0c0fc636 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-terminal-app"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-terminal-app"; - rev = "v${finalAttrs.version}"; - hash = "sha256-374ATxF+XhoALzYv6DEyj6IYgb82Ch4zcmqK0RXmlzI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-X+bq/6QPjNfHrOuSvNhFsKALoj9DSvxuyC3YoXBgBHE="; }; postPatch = '' @@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DINSTALL_TESTS=OFF" - "-DCLICK_MODE=OFF" + (lib.cmakeBool "INSTALL_TESTS" false) + (lib.cmakeBool "CLICK_MODE" false) ]; passthru = { @@ -72,12 +72,15 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Terminal app for desktop and mobile devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app"; - license = licenses.gpl3Only; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/blob/${ + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; + license = lib.licenses.gpl3Only; mainProgram = "lomiri-terminal-app"; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix index 710792e3a813..7f2a58625385 100644 --- a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix @@ -2,8 +2,8 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, + nixosTests, cmake, cmake-extras, dbus, @@ -18,51 +18,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-polkit-agent"; - version = "0.1"; + version = "0.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-polkit-agent"; - rev = finalAttrs.version; - hash = "sha256-nA2jkyNQC1YIMpJkfJt2F97txGUT4UO7+aSgzr7IUU0="; + tag = finalAttrs.version; + hash = "sha256-U4NNPBuLhe+m5WvfOYq5ZFE70OYJ/mn69wyK+ALebRE="; }; - patches = [ - # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/2 merged & in release - (fetchpatch { - name = "0001-lomiri-polkit-agent-Fix-authentication-test-with-libnotify-gteq-0.8.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/415d897735b9005426ec29348a882b9080fcd808.patch"; - hash = "sha256-fAJJ5Bz4P76arhSmiWVa/8S+mb/NqPr65Nm3MkwKtjA="; - }) - - # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/9 merged & in release - (fetchpatch { - name = "0002-lomiri-polkit-agent-Make-tests-optional-and-use-BUILD_TESTING.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/908177fa24b79b06161116c3c274357122984d36.patch"; - hash = "sha256-duHx4iNqgAlS649BO1s6D5E2SX9MPRCKb+mit+2cybM="; - }) - - # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/10 merged & in release - (fetchpatch { - name = "0003-lomiri-polkit-agent-Explicitly-look-for-properties-cpp.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/08bf36e50025aeefc5ba388d6d0f84d760add9cb.patch"; - hash = "sha256-OFzj/FFXm1fX6+1GY97CON7Nne9wVPmQAxVFpP9rIpU="; - }) - ]; - - postPatch = '' - # Partial application of still-under-discussion https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/8 - substituteInPlace data/lomiri-polkit-agent.service.in \ - --replace-fail 'After=lomiri-full-greeter.service lomiri-full-shell.service lomiri-greeter.service lomiri-shell.service' 'After=graphical-session.target' \ - --replace-fail 'PartOf=' 'PartOf=lomiri.service ' \ - --replace-fail 'WantedBy=' 'WantedBy=lomiri.service ' - - # Workaround to avoid coredump on logout - # https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/issues/1 - substituteInPlace service/main.cpp \ - --replace-fail 'retval.set_value(0);' 'try { retval.set_value(0); } catch (const std::future_error& ex) {}' - ''; - strictDeps = true; nativeBuildInputs = [ @@ -92,11 +56,20 @@ stdenv.mkDerivation (finalAttrs: { # Parallelism breaks dbus during tests enableParallelChecking = false; - passthru.updateScript = gitUpdater { }; + passthru = { + # Involves a test to check polkit agent functionality. + # The pop-up dialogue times out after awhile, and OCR can't find it in time. + # Please check the screenshots after running that test, to verify that the pop-up actually happened! + tests.vm = nixosTests.lomiri.desktop-appinteractions; + updateScript = gitUpdater { }; + }; meta = { description = "Policy kit agent for the Lomiri desktop"; homepage = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/blob/${ + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = lib.licenses.gpl3Only; maintainers = lib.teams.lomiri.members; platforms = lib.platforms.linux; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 4b2026436f4b..b39f302274a3 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -46,12 +46,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-update-mimedb" ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 6f680692aa97..01566f483a6b 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -50,12 +50,6 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace-warn 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index e6de3cd6f006..ee3a6fe51cee 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, pkg-config, gettext, itstool, @@ -25,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "1GU2ZoKvj+uGGCg8l4notw22/RfKj6lQrG9xAQIxWoE="; }; + patches = [ + # Fix an invalid pointer crash with glib 2.83.2 + # https://github.com/mate-desktop/mate-sensors-applet/pull/137 + (fetchpatch { + url = "https://github.com/mate-desktop/mate-sensors-applet/commit/9b74dc16d852a40d37f7ce6c236406959fd013e5.patch"; + hash = "sha256-PjMc2uEFMljaiKOM5lf6MsdWztZkMfb2Vuxs9tgdaos="; + }) + ]; + nativeBuildInputs = [ pkg-config gettext diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 33d4af936305..9ef513c325a6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -22,15 +22,15 @@ libgee, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "elementary-mail"; version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "mail"; - rev = version; - sha256 = "sha256-6T/OTiuDVAPBqp8BPawf/MVEuWTPrLa3/N1Blvt/7Q8="; + tag = finalAttrs.version; + hash = "sha256-6T/OTiuDVAPBqp8BPawf/MVEuWTPrLa3/N1Blvt/7Q8="; }; nativeBuildInputs = [ @@ -64,16 +64,15 @@ stdenv.mkDerivation rec { ) ''; - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Mail app designed for elementary OS"; homepage = "https://github.com/elementary/mail"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ethancedwards8 ] ++ teams.pantheon.members; + changelog = "https://github.com/elementary/mail/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ethancedwards8 ] ++ lib.teams.pantheon.members; mainProgram = "io.elementary.mail"; }; -} +}) diff --git a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix index 29cf6c6be691..5a3e7192def2 100644 --- a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix @@ -11,28 +11,28 @@ let commonPackages = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-7JQ6RIV2MP62co7llxdJaHfHxZ1dovwMT0OZ8hqZTOIDBzvhsw5ZVZNIRO+YIPSRcN8sOJDbo9j0NZ6CwNBDEg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-fYMkzeTDQC6UjLHMh1JDzKYXWvW3OZQ5HTAweiYasSypdxtYrFtGvMdnxjjaFEpNJER4fwfu9MWxIymARm7QgQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-0B8cvn3YHXRu3o8/I7zRvkvtu0wWis4LW7SV/+H90egLHZPaOfovoGNCvhbHjoTXCghv7S1xqqm4hMgoM6VLGw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-OurybReC2ZIBbIplQvtMCtjnEMp43xHp6rE8J37LLdax5H1XBP5o5uU5B54Y1H+SHf3nzPrgeIBlNFvfTyTWxA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-WM7Vx5qhHEoHVSlzwLHcJhKdlGgva0JWQB9sIdPPfxrb41pOYbTZd5NkU6iUx4rOCeVDz4qFKiluFt5GSR2Pow=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-YQJi7qj+OivviA7f1jCEH1+VIL7EEtC53gGqo07Sf+j86lcEDZyKSWfmk+rdRU2j/4vZ0lLf1jcio/mpJl0txQ=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-RuW6CgFdHTLjSuPlkXv1HVAOHhuaLlmMi31SjfuhvkiAXoXeDYV9VkNGAD6vv7pg1BPsuFfibhk4R6GYjjaW/A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-/qHuLGJzGlMwxGtsIFJVLWHVy08e/h8IDOiRlOjqluSAwcqCrC8ds0kL+o7eurQJp1YyPQgdkT73/dmmcsEagw=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-bUaQhF05n2j74fvvQmXlJZmqJfb/YXltOHps8XQZ2HKp5EOY3e6ijEFqXnD1R91ZRghqy2ADwUp5qVarOaMdXA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-EQMhyJBOpIlH1PwyV6FL1Yjfh9v6SFltGdVsiJfkBFd8b99VlTfqobiqDum/GJRw4m8PXo+bkaNz8o/Jd2ebZQ=="; }) ]; @@ -40,118 +40,118 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-qY9/zo3KRmK2ArwHghHuL7R/a6BUvDq874D4+EK78k1sU/vHc5sl5vkkxEu7vRrwG0UUXurvxwXve3cGPjB6dg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Cieasw2gZJ+iZS8lqQVIwhsDEem5ReGEZ0LkRPZ7dybi9fHCK6LT2B46muLsUikx2HBPezMV2mN7ZGw/l3lIdQ=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-vgkB8yUmJw1w/n0uP4FhvFOZDWIkPNJAfakhvn5yVZMh5VqnCCHyfCLb9edXtFWmpC+SMEyCT0bqSHTcLMZfNQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-gQ/sJVpO4ruqIMG4clnWzp7CWzOlrXklBYA/DlBHUYlms/SZcqUBV4vva1Sk9L8zln2RAagokBWQYoO9pStYHQ=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-c9EJZR2W+xHmCLrS59Bdkp2/Fw4DSAVzwBt1uuNAQ9XXt/f2REt/osXj/EkbOCyQAnxQ4J5v26BG1lpxkZ1IVw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-tVvw3o2ilquZQKFvm24rrBEXR0pscFY5qUakJ30tl29JfNaUIotJUG2fWZ/kD96wCqnACVB5zp2D2wi/STQhcg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-kMS00bMWu+Coioesh6AGeBekk/nKt/UMCwsC+xsvScdGjGJ1Tjv8BMsNwAshMGEwdlbB6EqJyO1J4CPPPK5yVg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ZcqAA6krkkydoMtk3J2syxpt2r7bzR+iqc+IMFWG4yKfALGHIkuz9XoYTnhAki+rwtL0A/BaDpEc3xA3PpOR9Q=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-qJBeqbHV0876+3iAeBt0bIigrcZYIAqU2cay50LnTUmTYFN2GJdhRFwQIKjHtH8O0vxQaP9Y5tGfe7U9Re6YPQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-/XqJkXi9hfn7wP7psJBfzFlML/pkWs52ZkxLaQwwXBt3YcbAccCKPz4TPenB/wJ3tN174lxrL5zIvD5+HawAPQ=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-DoJiWclBLGaS+xcf8R0lrYex7c9DnUB/2OOthOnHeUdeuvlEr7CyKf5tAeBbO5yGTyMFP4UnhLtDmA3j1NXYpw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-vXwLf5c8GVhgOPGu9nxSwFVMvCtZULVvbMguMXoLDBfWvHSER/0whkDgWdJVsTGEFiCkhET984EQR+jKj8u3Tw=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-eVTyfSgkeihFFPfkX0HsRWbgVE6JTQxBfZbke79J5Aw6r6kWS3FR+GkloTRmsw50hEhxsNug8B/3a/v+Hq2qxg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-oGf1jMjRs4H+HKrbkPSnBCYLYcmM/aMGAp4PC48cwq4b5EkYWL4t9RUcf02oOkO/ZH0Y3aeZmEau6RBp3VqsPw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-U6G5uLB4Gt+QSRVt9tHGpgK9u/h0Kg8gbR3lfmC/TJmPEGd+7pMdG76IxEIi4kF6FLrHMphriD1vtKbfCIKQBA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-VvZndNtHe8lNC5Y0A1fbrESCYNKvpf26qyyNJ3RYh/NmpjVGXsGXqHUodLkhlVf2c9JTbQ1fIKCHw8H+V7YGeg=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-1YWLHPYBEXma5rFvZFu500hxmDTs/wSC++zYZ1oUkMbtas9Tzsi+F28bkH0n98QwDoxjAet9vub90XIpQIUm5A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-O5mWnNxmW3sfzYzuF1Oajvxb4dF4t+F0MdxVWfgyNkxzlKDgSwPiJ4Xg8hElN+istQJiYFw2Bhy9siqTEaCGWg=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-3k1Oh2b70m3yQh1T05Xl42is8gw/p+7tMGtXmj93PDorqZe7kjGT8l2kNBBCjLsCzBu7PW6Y+88zTzi1yyh/Zw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-HwLZs4+in99u3TEsFZM66Kgzqqqp/gZxvFPNWChGdcGkewAzIo24k5odFXUjaV4rxjEe1rMS0D8nsxspJiv/qA=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-HwBS0FRJFpEqrTELxYh/zKEHH9/q/DbrBVzrHZ9RdHRX2Ft15oioe33oInecTO/+Vh5AEXF8n1afc34RCPJluw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-B/eqU8l6X24aA6NW3ipNhsJchu2iLkOGr+w0YNmkwiHlwW2N0TWF5O9necwlyQ00guGt3ziyBtPjvm973+VaKQ=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-ITbXjFbm5fN66SYHuNeukyBo2cHlXqGvp/1aajSyK348QDtBnD7mH7r7jQHzKBwHsFJrcGGFju/vf08/ENi3ZA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-jByRZh3dn2XWkdn9Wfkq4dX9zpTewMkEoRU7UxM1WTsXqwYl5EaSOb+u2C+b8eKTrwLi5D5hUJR8/h1ZmowE3g=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-bp432DB0NVMIlz9LRohJkF4gc+AJlW/+6nEveEuFmZlIjPxN2KaQvu7QYOHkb8z/J9G4jXJyyrKjNs9AlcGXzg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-nQ7ny7gnwIvjj2f8wEgdfdVusCtH9Av9AeSxZWgmLEKWqlcE1h0JhPhRQx68cuU7aLlUZ3I8fMRkkPk8ZWPryg=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-fVNRllQBrnS3t6LX/RMGBcJc0CnBTAxtS77qA4jX52bso5EB5MfPbCi4BxZxWzjEMf8pSSevX1RXvUGhdJldHA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Iu1L4i7aNaY+h+ZEMBKJrqBmLnPjexOIKNAwh2GJlPP/ybXAKLm+3+F1MhRZ/XllEyZpxDCb4KsJd735nOTsuA=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-ugo0QgUPcj4wN42lR5jEZZSahxDp7caQhT4MGHHxzEu10U+dSuEiG0Wf+YuiHsrcrFUEeFhgLcdkUw2S/Anppg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-4ESnA9qlBd+Mil9+Aq9bC7/iLyr2RMdOcpTZdb4JfvzEyGlS/eO/jgx96TG7DExbhdvts+7Bip44r+bSVhukUQ=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-IDQ3HJxDYMV6SYnkSWGfy0eEH3MmP4YonaRVBxDmxLT0Rytv8ZJoWPbDWs52RXeI8y3dAhjYD84ZaOeREwQ9YQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-JfRI6RnrnPdMDVktXNG2xihQyfKjkk3JyNadkUuGaPO8sY6zH8/ETluFV4iA1VwXira9wmaz3s+c8w4GRdtqbA=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-VWg5J5BNzoDeIZ491JkY6anNjuKQaUr5TgCszNnCp3jPPiDVSeCf3Mhk4EZ1fKC/trNcEYgW785b9URshQhTvQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-K6cqb1rspwgKAhSrUhw35r6peEfv/zZ//jQtlzIx/IS03z/xXUYYUSdI612dlkwAcB5Fc9xOhuvVX2n3fKfykg=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-TEMZtKCvJhq7P/CCIzISYvxDaW1o1jcseepquCbrYSsrLCKJ7WNE2zStqu5HNh4VqiszQ1BWjLTdbTPKjdptWw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-QiElAQWko8o3XcVi7d+OKMbe9LVHu9oZ+yrQHMmia8j/eT2IJh0qTd6tLwXP6zdQ4XIKWsU2KXO/UbJAN1w//w=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-vx4NS+RHj+ZEvhqJMhMvfKTWAL799sKjFaR0PY20C2hSXxdMyxi5rIR/XGgdPwF0PcXMul36KVWFssKA9y3NNw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-GQujUNYZiu7URKlNquKouh71dzVwllx7fpQnQc6LTYljDeEUKJYub8cWL1XpE7nagtHQEpk7cgGkOi8Mj2uJ1A=="; }) ]; }; @@ -160,361 +160,361 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-NYnDi9YcfGAZ1qXK6knwsldUTR+92tw7Q6MXq7Sted3rNXRWc6xy/zezOrFP8OjAdn8Slz5PUHFDz9BdGiOuLg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-yHOu2Pa3I00ufGOKdhGvzMvbeTbbSTEpovFmV1eiPlAs331lZjneCnxf5/jdGpY3bA2ZyzkIIvCdQCONG5vgxg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2tYWNqQJibUOWHwjkTsxfwRd+u8BphDEdxNVBU8HLjcoSZbONXsKHx+RgBS4J52mRBVM65BArJzZ8toIenEaHA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-9WlHGvn2LER6YnMZUXlhjYdZedtpglBnOJXnAm1T6fDXE7SXdNoKanyIMurp7CIcSzIUnTxtlpYFSWPo2ELMtQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-E6FcxsPYNxn1E60s6jnxFTRxm2thvgE4Iy/rt4mgNk/+mQ+zmwLnZiDiVCAnxD6Cl/7OWRPCp4Yy6csl4PVN4w=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-9+JnLRfcTbGcdHvFkMSH9RonNMg018RN1b3gmV8EGUk5euQdFekozbrDv0/gcgHtczkJU76o2FYnmTnfTgtR0A=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-FNAL8V9jD16HGrYatWUxN/IjaipGYC0WJ5tMPgC+ZseDNnDU1XT7hE9AW6ZGnJRkB6pEBSl/D+sCurrLPWFNWw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-xAJuJZzQSjTgJxhHo5mXdsf2IJyP0hTJEUUlqd+HOmkYMUurgjhyzN9U1j7oHX54rZ0a7MNMqbaLLXJVduJdBA=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-5xXwUnVyIedqRN2/u6mJTYQ2aEmL5UjAILayabKaVfbfjSDKyrtNEZlrHYxGASh9nkPRP/TesYDkPnOOXCdW6w=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-N7tOTYXkPMYFqvLXbBKMPvjcCRdRMiCRYS6wV/x1JNSbrSSBMF84Ev7jbXrSpQVi0j+Do4Z2pxrOnLDU8JZ+Hw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-4Y0KWHx7QySSb9oTuqpQ0rFEwmbW7DC8BMYzXE9wYkCCg1ErXZxdrNCWhuYj/lp7T9AYsFC3DFvbzAZidGj4/A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-nJxaKLr14lGnGigfS0IIqReXhJkeb6rCntUkPY+x9cjuBAtz8YUe9f2WHAenk6snYqWbRqR861I+/IASnHZLxw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-w3WGynXeGdTuap8DrGOh84JUHNpwKJKnMt9U9MZx+zBpaB+76TV3JqL78w7fJWoA0UbAuUsmXXc45FwiEsYhvA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ZGTkoeYsP8WdgJ4S8vBRF+UeiLjUk52M6JAqq40cTsjKl8ivQq7zfrqFyGRdfFnC9376GF3Lsg+Z2fbNWRb7Lw=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2rGKD4/VJ5Xn9F4oBB6vV7QNeKi4+QEf5DPii5WmSD9K3Z+iDq06JFH5zejgzWy6O+rczaPtm7f3DOl3XxHZyw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ghYZEwoP73mW/X8+SlKmhBrpbXap2NzPfRsqEsDR0q4MX6KuGMNiMyBJ7I32mUpbj8bxYOWBktv2Ghy5v4Rdxg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-PFumrKSdBGAKYEaEENnEy4PpZSZp8t8RYWkgUyY7QkZ+ZcqYEWc9dvzvoMlscVKb4/NoYrB2REkNtCu+zb+vcA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-L7IYzdd29Njp3cpZVVSgHsspUlhGqFljg3hwxLiAJjNw2hMwZM1SIhdK14IxFC1zTpwrUlcpsbXTrDVZRwMLZA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Zfwi2Gesww6LjQwXT1jqHNIqhj2fLb0woea3RLKec9JvynzazLPu6G40GzrsZ4wLl00EX1aLbjUCJOp3VsO93g=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-zbgLSb7iVnFEfaqlkj0mBozpr7EZy/gQXlH+MLmjKqeUu8URiA5P+qDwSxkSBy3tjHdypydtRwr3yzSI5Y14oQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-+q8UP3DgyTEGgAbYjhbTOZ2u7TzLENugBm3TWjotZiKEKR4xXn+ZifmVbQ2NZ/eTBNbdi6Fi+TQUAvCCjAwU/w=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-8ub8FpQ+KFKdhscpMQmlGwH2GsgF3I8aNEyvFoyeGPJvqD3cXIijZK26aTjH848E4tJV4AO7tJEFk7TdKXnwxQ=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-YXCvPERukDSzy+drLG+9f3haR61XsRLM6hjk6eutb0LCew5pAc3Yh/DYR+W9qCmPwkzlkGYuyfDyo/FaLU4HEQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-qiCczti3W/bhI50Tp5r9NOOlDoCjtaBo498wNzIfRhEt/nzBe8Q1Fnr4w9w1WiW1wIFQPwAI8UEHFN+CPkwlqw=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-7TCyhwPin4fR7Nf6ggP/ngDaZtjQEdkowM6NJUa5wAsLvz1l/WcIDaWDvaZKyrNnfrvlWecKbjOx0PxOgVOoJw=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-dqGfk7Dp3LW7+o4wQPbVqi0brEJuubJzlsbvCDEF3ISapgmo4IVdaIFIdajEeK0CYDv9ro6CpKLOAILXhfT9QA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-N8fL0vrL6dbaDB0ogelbF3fEEOLGkQf95xSOEdq/Pi+S8esNNwrfrZfjlHZ1dOc0EUXZDgxvrJwTc5FazKYBdg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-klCs8GuMTDnn99J3NuUhGgfrZ8USjXFvUmb29YovrXbIYEBEWwHAu8dkK9mupBiSXkXale8Fgve2SZ2lic49dg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-RX/Fj9yHn9lXeHN87JgR0aAWCNQKcdk1omYs4yE6Gtbk7ORl1CXkq6VHy8UT9ULUC0wIo3+7OX36ciVU5nRXsQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Z8ABfKzezrD8oQnTFa0s9tQASL+wsHrrXSLQDu4djyiclc1N18kBRCcj1hBwa4V6Qs+daZqZl5f64B+eTZDlmw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Hj9OwrnKZJbo2leR/Df+BfmntQCdnZbXoaZMtTpNzN7npHptiVaOv7bQ51hIC+qNp8MbvPeMbaN6rC2d1IR3iA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-KflBz+weDQwzryX2ManDUioAra06ojwq8NgAUEpKiuPdFO2w5aLxNLs35ayMxQg27HxmiUYzgFU2XyzY2EqsYg=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-lrDg2jv7Qyu7aD4COB0pwRGy7DgYgYRjDw6QRuRsbuMghTkyGYzEaQB78JwBqBYwqrXKQ+a+8qvQbpuRXpF42A=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-5IHjU+if8HXHLcC+eYJkkIj02GIwO2DQMY1uXM+P4PisHwD6bDkojHDH6Eo51LnwGZkKttMSUZ5FU+oI2SJXeQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-goUOx6hlUIgfru/Nl4luQOW1NW7RjXFcnT1sQWfZfMcof72yG785+TvAjGsxbZAafT7Hqqle+KjVizkZvw8jnQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-244dky5rKXLRbqUrR0CSgjkdNoQCQJTMCe3B5chtMEZBkk0UCsQ3la0i6QoaGgHOVnyZAfDLGty5Xahl9Zxkyg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-joQATwpqLurBgrYw9GgJvyh4rOHK74x39RWTGnEimEAIhe+99uCO/OM8JcSzucfXnu3+lZwM/8Ki85kBpsJ5kw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-1s7p86jY7ahEa1TvjVk+sJFqF6sRDirl05nJ3JVKZ9vOVdZjO9SHZkdZzOS6o91T179Yve6vS4ejXIn16LVWDg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-evYMyp8jNrr3+g1k52MqugUgrhyMR6RFVdMX0j9lBW+jWzRKmCJ4AEEWgYVLfX/p6XN60Vq5F+AvsxLmV6vCxA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-toF1P9FT+YMxulAzCc7k0Ig2K4y7Bz4pzJ4woQwCbx23AUIzHj+SR9u0MCnYY53McAkZ6Xrd7iebFdzCILLQRA=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-H+At/cuv8JLoP6XSmSSXWwn5fZ3ZJVjHbqXmi56ANSyyJxOll2/yjbY2H4WmyKQdBL0qJdr5zdf0XSqnqPdbdg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-ZcVz2V5BVwsm6JLLvd0ZUwkF6qd02/EM6HRCjcG66xjmClffLqVyz0FyDhgFf4sjub2o+y0VVphMwpKaVjeEKQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-fFvpxLMzN9K0tIPI4W+9LVC3WP0svv5KOPzhKSj5QOXTvOKsJTo8WMHKjjElg3kLTz9TqgtpQbgRcfzwqyOgaA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-7+0KqOJXhUv7HXGhIOrh+W/Wg1p9okac+fMu6D1IG//dpA/dTh52gFRa39s/Di7p3czUG9Fw9CAg3ayLc9FAVw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-pEHWmu67oLGKeg/fP3dzrt//L8/icvlSGueBufScK7/sITr9ecIolcqPqBRAYG740QM/p9hrTQhCVUppmhjjhA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-kzhqF4a3QgdUIUShjH2y+uzZGFqjiRxcX4dEjBNBz9uTLw39ESAUzc9/0OzBqeQf34bndcdWg3RCjl++DSO4IQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-h3qfi/9UNZtgLOmuwa/AUDwjzutwrJ/CDUOcKeFjCut8vo5lNEBQ40AdCRDkwfMPRtZynnrRbHunsiADqEbAnA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-FxEfJnXNNTZGdoIkXnlbECdH4Ey/aFQTTkKLwUtIULbW7STri3KLmU0rc5htalma/u0TMoaKjoNFfM8FKhbKXw=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-QzdaJymI2UF8sLTmGIV5KkWF6wEhX+T45L8uju5/oEDuufPLr7Up3d5uxf+5uh8+aqH8fwlu48Tt//LsYzKEaA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-ia6NWtmLd+Vaini/F85LdVzHb+yl4RRYbMdqvoRYHuIOhz7m84NEf1rqnukkV6W0CDZBWcJXCEhxN1H1jlvBfA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2sb6VbprC5U83LBpd5DOPhvbBY1DtFBSvhCh3ppDAx4Gzcka4QAJZcYH9JRKt5EtTybdb0Pce6dRxRZ7aQqW4Q=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-OrJWaFXVGFuABTnlHpzLE/oSlYTGCpgVQ2XipZO4IdQwLN2t21xdrmYlhNBKFBO92dQyikoIjAROjlcrWE1jfA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Y+8kJD2C8l4mejEFP5QneRsgQm/otzX+Dl4nVZLTbi05O/NEJkUmA/oWlluxE5Oe0ZyGi5/sfACcgzQ3E6nGVg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-GMyWth75S1zN/YC8vFuCFzjGcoXB6YTwnVp0sv8bGhyeAamjMt/qB4qCPkrrw/Lt6DF1D2K1J8k3Fsr1Qlp96w=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-hhj3jdVtsAh9jkMQWWuhpKA1za64OUsGD/mGiFl2KNpi1HGhxxHPwfT32ElX5GrqhmCs7l5iUszGBqK2uVYPBw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-v/g5FTqPmNdTYPWUFmOsJvf/VoxYe4Uzi9AxoW1xfoCfG5rqdkYfI8aIZzPLVXMAzDl5+ksVQOJIlrXujidBCg=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-ZUDP2dv59marjwXPSwIkZh7qtSsYlkFvyFSU2LvlVz9qUX5cPGJROdLgmIDj45vr9EcSDWUzyiDuuSR9o6Uxxw=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-WcJsD6RRe45HnJ4cUOvW0FEGgC3JyCioPLHBivJMcDaXcphlSsJpeJWH3jQ34YBcmJyirZHcA696nert1mQLKg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-jWwOXYCQQLUMSKog2tK6ZJbnDhE4t0jeyc1vUjHfDHmEo3HQdHtrRf7fvJGroqMHK7novNOiGUllJ6qTAWnYFQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-DM/5ZZI9lEF3d2fpj3Yy/w+9aptB2kRtIrcc2DQpVAZXAiMxpZz0mc7+EgkBsV8y7SijBi1i4E/gsfcmuxUxOg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-DmTYpekFmL0mhyEBGU5yw2DScIf7LNKE3S2A/UwWSqpWTTdSZwHd4avbyVQPtD5IayqjeAGxmrVY02X281l9Wg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-d0g9fHBn3W0RTBggWPWaUGb0VkhCLmeDfRtf00vRAKvBLqwaVv5uHMlpSCNktT+2dq3tIEJshtvHmtCGOUOiZA=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-nnT44goUsGrlCdNODhKEjS4F2GtcdSVCTpPkGWJaKaxcKngClTk99f9H3d4EbDugNKGNsQQwro3Yo+DFizwc/Q=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-uUT3ZDtdu5F2R2G05QomGeraLrPz56NuFg+pfBnloIMihQ1mKLnPrOCXZ8z6F4U/WPEs50B0lrk8ck7RNvYpDA=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-Owmxgn5CZxwfhK6VUWjGAS1V00/9mrPb/VseFBsQXn2A/5brX83+jAhxVaXqEd6+k8j45DGJ4eutlBO6JPCDaA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-UpRM0FNAeRnxPXakMWmn64Hw4gTnFDksUEmaW5Q+uiq+lTHy27bGsa9/qo1GT07WlwlrnSGEL4Os89UQi7fpCw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-hcYIHXVYDFIIVEqf8gRLr2CEeJrqRJjY+I2jMeRg0JIk6cxQ6aNb6364QOVRckOrREiuGuHi1d2/zD/DiSWvFw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-v5zXnXy+J5ll82nnFl1ra3QQ+YrUKnBavGG6cuzutJ0HVyQ50i1ggv/yiQbisZB+DCNn97mSg+RBfe8ybsV5VA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-YMP3AD/o8ZFRu1hoFnVbxgG8PEGDNUg6ENCu38GhJp/MDVNOT1r3G+0iuoI2lHvyhPv2qzCT6m26hZxqVHQxAg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-skTKyHmXHtPv0SQMSNdq9/tFRNNS3er9yMIaMnaXl6PDQo1FnO7xQ8Akt+VyRvkVCNat0dNeM0EQ0CEOb92kKw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-CFq8TbbTQeexS+e9YZiujvMDQkbSkGCxgCN7h2aqEQAXRSRy9kgApAuzLlQov2wLrSqXGLyp1BwpQFejBoqmtQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-b0LeHwc+HxwFR6PHFpJPGy3pAhyXwpJe4+Bm0l9HOWTpaTZsbMh9tp4WxnvsZi8NRkTcyLqJJ3HuiojM1+kArQ=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-zEiRA0vBh3H/siaL9g6mbzIvUr7UO6cg6EDHeV8ODiaV2qx5Bk/B8XR8OK3/gl61mSTn6mU2ObAG08aMpsyKnA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-aEhd15xrWBEM1eta0rE+9qRuUERxISKnqlTktCuwAHJQGt3zn9HN8bmjIKw1EoegqvjxQxjVSnt7KY9g8oHZhA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-jFasdaZcNTwFwclOKhNpsV09IyqoQXQ4iaOQIXQr3UAm3YQwrNtWguemHu1CrrivSBDBGjUkX1INmO1robymWQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-yiZROfX2xzEI6pJFjL0IvXnc2YYxgSghNW107ZNx2VRE9glMEUVyvS2UkfoPJgt+9ID75FG2t/gW5jGdlgRoDQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-rgNo4vT50WUb3YwZZ81oJnUvD6kJVn7PGinLDTpQC+ayBi0wdJ6m8uRXpCTZ+yt4Rz6KR68LYWotMGdzAKfwuQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ML1iK4UD1IJ93oPSLNGKsP5tPIrWK6mUOPMBE5Ilcf3JesVVUN7gPvtUfFgcPzkUbB5LC8gTZpnw+0OCPURNiw=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-3eN6DUdMKPHC46ANhDQv3Rg4saLj9zX7IvogtwQPQHP097z6m8mDhbMuuH+Fqa3VkxDc4pnDzEUnbXC/pvW+iQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-cX9SJnO4M2ybHKwnwNTcyuCaO2ddwMo7nBIHzE/tpM/4Yn8i9ujlzDBFWb/6QLfopkcTEwbXNvIV+8096TM3oA=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-/OT3JlrxpuMsBeQMn4Gsj2y9r2d+gwsSC87cvvA4hRCbw3+PHBndvFfO5Aquj0O9MPNXiFhz/J7JRYDw47uIUA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-/rW+Iyj8J2xe+EgOkvtIBG+ZBW3BW2QrU9tSGPXV+eH9U9DPn4zqIA/lY559A0v128XSGW4s39YKFMsd5LGtAQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-B/bP6DvMvk8YGbomVkdRy0tJuZsN/eLSQYy5INxaSINbNjaNjkg3Og6ZmL02Nt5PQtzz/bcAhPedrtGwEcIslA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-LCeX8NNZVbXLdCbPQ7/w8BB70TpUrn2QNc6Ur2BMTYoLJ8vf04PwjAYubRstscxr1ZTH8GSZMhWex3Wi2Pk1sg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-xQzXl7a5PmXx8PA26a3+ixE5JiEXJeIhcYv7dMulfixcWkRmTIiENIOHb8BrggTYHNo8ebRydSwg2EZYkfyCSw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-XGQika67R1l8sZu89nEEgL6MasIjKdWCWTnpgoGGvEHPnYLXUKU5KhPDrUpuj8pQTyXfze0pQ2YdFFUoOtaJHQ=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-oYeNNsXVwEbxlxYvla26qHjxoH/9CQRQMIrGKZHibznwXq4R6Q8yKS0+Z1zPGyYf4BC/01kjZ8pzwohfMS7DfQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-aaT/dlm95IEGlM9iVu8FQbIC7lBZuwWRuzIlvyDGm4gsPDaH7OQgkhdhLO+yho7xri65NVI040Zzyz/x9elvbA=="; }) ]; }; in rec { - release_10_0 = "10.0.0-preview.1"; + release_10_0 = "10.0.0-preview.2"; aspnetcore_10_0 = buildAspNetCore { - version = "10.0.0-preview.1.25120.3"; + version = "10.0.0-preview.2.25164.1"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/33517412-d354-4852-a9e2-d6c7c83297e9/361cd00f354832d42bcdf19fd2094a36/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm.tar.gz"; - hash = "sha512-JTw+GHBZVBIchD02fjssu4/8RmSfLg2yVbNYMxY+XexrXfQcSXAQIoGvaM+NkSIi2xaN454hca85sMwWO8F+tw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/72b23af4-a627-463c-886b-3f574dc446d0/5369bc93033911562cfd5d8cda4cd2a3/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-arm.tar.gz"; + hash = "sha512-zuvxkIUVkXXmAATbqI5GmCN8BwjfXdY7IlF3xwyR32vhEKRunuaTAB4nkzBQ2GN8/ItznR5RDQncpWIDHIZszA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/0b4a8c7d-9b85-49d4-82b0-e2f45f1f61ac/4286d964b1600e1f3ee5d56f7c3b65cd/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm64.tar.gz"; - hash = "sha512-T5lvSP0hW2O4Ta8kpKsI3Vtod9q2vvDmw17JRRUrblsi3LqdUKwRmNWHYxPwvNDIAKpajMg+x2R+d0ZvdNrCLg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7eb1b280-570f-460e-8805-5d55cb06493b/8091831bf8764e9a78eab4ae8bc41d5b/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-arm64.tar.gz"; + hash = "sha512-IWHlPzBBPye+moGnrtrOEq1SPZ5os11qBR5BdwHSOLE1NWniJ4Rap2qciJt+zRtee6/TpnjivylDja5UDpcNCg=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/de4894a9-20d4-4c58-a748-a2594d097279/bb332c7d3bbec4a642bee7ddc01b86f9/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-x64.tar.gz"; - hash = "sha512-v11PXB36Y+k39NDmuAAoNDej31xVsuQmw++wuNyXlLpwT11EaKzBMPDzuBrOPj1G7hGUW7xfNLvSnXtUw2Yw/A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/495feb02-b2fd-4849-9803-43c5d758e72b/60fa3840af9bb27595f6f7b4b818f89c/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-x64.tar.gz"; + hash = "sha512-3hTauXgTO57JedNxxfvQHnixBswzDBaNYhbsipewzP7rDU9EOGGHSZdg22A0g9wAFiedxMs/lL+wQsxj0lKW+g=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/5cdd9ee9-cf13-4db5-bb3e-a09183be4ef2/3236e065b593cc2bb0bffc0c976f8e87/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm.tar.gz"; - hash = "sha512-RleXs7jRVS6aRgkkgfHIFoJ78BxTLLi3quEQhwpOyfElAK25Htr7y78a5GM4pIUYRdVt4hJ01cbCtsyzldlRTw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8bf44e44-7677-4766-8486-c6b2891a4c0c/a616e598413adafe4ad43d5d5be6f8bf/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-arm.tar.gz"; + hash = "sha512-63zgdkzIi6AL3JV7mLgRBXNNpZZCMplvrqqE5PEytmXDF3Y2oKJ5TSt6AeN9lj6S1Zu+am7jcXoB6AVNdEDUjA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/eedaffd0-7baf-49e2-9291-c9f57233d639/34f0f6b835f35306649977fe772e510c/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm64.tar.gz"; - hash = "sha512-dwmkoFoOVqSlhQiQURWduEDAqNMHK7k2B2sccMicLxoLVHg+ZNdiotDdYba7UUTbrK1We6RpkhlsQQFKUbrczw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b32bcf9d-2390-42bd-88f1-709747ac6bbc/ad9bee446b2682530b9e9af62770ddbf/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-arm64.tar.gz"; + hash = "sha512-zcF5IytWiO8HmT16eMVIHyVvjO/oFvyRPjhAj63sm18BCpBijW/QTRLhjMw1G2JSpWYXYVShEd9rbaFDCaoNQQ=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4fe69b65-885c-4235-9aa6-5758e6ac76a0/90be90ae3aab95d59b60f5889c5c6062/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-x64.tar.gz"; - hash = "sha512-AVVkrZaLCRbxIqrrzHG9aACsSAF5y3Qj3KRUULnmHScSB6hr5afMDBYosef6SQYTOBnUe+qhgMp1wEEBr87puA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c87f5ec8-9569-4894-be65-8f3cf322c251/b655d57fd66869687306e1e7fe31cce9/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-x64.tar.gz"; + hash = "sha512-eT46PEnCIehUOFCFiyc/byDf2BzYMVJfNNa+KhzuVJS60hDHPMBy2UfJP8gg/yrXCbCiJGK/P+LJIzGeAHhNGQ=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/87990395-a0a2-472f-a255-cc2639a9f5cb/06dd746d44a37da5325ab260dfa4e5f0/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-arm64.tar.gz"; - hash = "sha512-Q7JCQqV9pnNb7yb0oDmqHJvHlx9NLYuiiowBnaEzIH8YDWchROThIuJ0p9oRxl74ky6VRNZz1Qa54l7B3nQGFg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/351a56ca-b55b-4c5f-be20-1081edb848d7/de67ebf7b8859d4efde0c849de061a4e/aspnetcore-runtime-10.0.0-preview.2.25164.1-osx-arm64.tar.gz"; + hash = "sha512-nk5txKoZR/3iS9efbi2RxD3+EzB8wgN/g+gEjf95VkXbBDloTnUN1vnOwwSJnl57K19NlhMJNF0PbjKoTQD7fg=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c7e3044f-0976-4051-ac6a-019982f4f4c7/58a188f7893c276ca2ab0f3b95c94756/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-x64.tar.gz"; - hash = "sha512-WDO9Z/HH4rFqO6yrZslMIKPO4u2WGceVTmvhZLgCQ47vYC1K2vBXoTxym241f/KekjxL4WuFKDYTKEi5DCLtYg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/dd3d568c-e94c-4ea0-b95b-e1d4ae804ed7/68ac36aa68bbeb472c042af07e0e95f4/aspnetcore-runtime-10.0.0-preview.2.25164.1-osx-x64.tar.gz"; + hash = "sha512-6JlBZ3Veyju2kfQxTaa3AiF9KFrFj6h0DstlepriFHijQariEXQCORCnhOJoPlNt9UWJU8SM2IHGUeIoR76LMA=="; }; }; }; runtime_10_0 = buildNetRuntime { - version = "10.0.0-preview.1.25080.5"; + version = "10.0.0-preview.2.25163.2"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2280fc3-6358-4f89-8671-3d3535b3e14d/1e3ec98a6c92c9494e7012b80565b886/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm.tar.gz"; - hash = "sha512-jpHpZerOOsG0cvjZ0sulFTdgbLCumyJF3efy+dlfhmCADLYJpxUrPv6x4BZjBwyARU5hgIkMy4HWUz/MiR0STg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f54c9c06-3809-49c7-a47e-dc9e63bce7d4/9d64e0d3a360e8846432efb907c87cea/dotnet-runtime-10.0.0-preview.2.25163.2-linux-arm.tar.gz"; + hash = "sha512-/orwyaw9OeVZFVlQzsv6J0UFIfjl+qRGQ43j3MjEv1H7E1MjysO6W7BF/BNCN3auZq5O2dag3zMelZoO00F5pA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/67154807-282d-4a26-9fe6-16e561b763e9/1d556e1d17d9157dcbdcf09f1c523df8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm64.tar.gz"; - hash = "sha512-hA0in8GTIgk+1aGMEjtaMi6SytJpJr23Ce44IHaGSp6JpN0OzBPl5IVCsXMuvRm6ZcrRwbY7lCaNOOeLvmtrdQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a228c7bc-8b4f-4f52-a517-ed143f8a7b75/006334cb7587884a9aabe63bd298e61b/dotnet-runtime-10.0.0-preview.2.25163.2-linux-arm64.tar.gz"; + hash = "sha512-BcpaAhJgD6LHnDUmxnOCLXntiWXlEyY+6pBPLQn830IwWDIZYbyTD9uQgU7kHvQlRaOyfAgcyXMe5GAsUUh5xQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/527fa5e3-8b4b-482e-9c1f-c3cbf8cc0edc/259b1cf466fa1da69dafb26ef142b4cc/dotnet-runtime-10.0.0-preview.1.25080.5-linux-x64.tar.gz"; - hash = "sha512-twTf7Qg9NiMCTulupsuP9tXX4db0OiextHUKiRk/ZKlmoyEbcfnne8dgFTLbmS3zjDTR0VQvBgCCrgENUyQ3qg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/005ab929-04e3-4c38-8134-0b57f86f82e2/bee77f190ace377f3a164814ae5cf34b/dotnet-runtime-10.0.0-preview.2.25163.2-linux-x64.tar.gz"; + hash = "sha512-pkzMyYCfpbL0zLF4lkv/qSuEnEPdKyw5gddT5z8rBaK24YmowqUPxnZSut9mljMTREwI6iLkzRj+h5cElXE0Hg=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/0bb2df4f-2569-41d3-9543-f23cfbb25ce8/a64254fbc283ce409edb78d001561517/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm.tar.gz"; - hash = "sha512-uQfZdISWYmbCZzL7thQeu5FL6CJYn+2tJq3ZaArW4Nx9AGhQckHA+64SSp9KlXGDgIA4fiHegYM/xzmb4b3WiA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b07dae9d-0407-4ddf-9792-1a902edf93ac/caacc56b747e8096b126aef4e26802a9/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-arm.tar.gz"; + hash = "sha512-EpjURujLJ3aNvdUSV2zdZSba0pp2du50i8kvpkQwdgzb6BfKbGLEhyqyAIuEVYDUcJVxpZxsPzMmUKyu6GQ1Rg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6ecc182b-eb3a-4d4f-ab75-5c6c565d643a/70922b6f9f596549975d0c6c7672d558/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm64.tar.gz"; - hash = "sha512-LMP3cV722ZhttzN2vL58bNu596WLQ+e+BRwu1Ff378JIo8Tch3OEZ62ZqCyjhe6lPryK8RwYkA9fmAyLdtmkdQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/207578e7-0ba7-4785-997e-339ac96dbb07/9380485cffaaca7cb6bd9a6b4bd4306f/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-arm64.tar.gz"; + hash = "sha512-Y8xhpb1TsTJ/1n1XsEhBwKjnlQtdUx/HiQNS5WqioJsIOoCMyLm+Gv1CQmQ3HVH8Myl5H9wEeYiM7vrdpS4nIw=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a580cb7d-1394-4571-9779-b62520571fa5/0ddc6d2478352d792caef0a21c8682e8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-x64.tar.gz"; - hash = "sha512-k2OKXnZrWFmuWOw7pd2BpgoObi5CZdCbG9ceQphyFt7x6Uqhw5jjPSC69rfAIYGM7hERc7V3H/DOK89WzJZMAQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7ee3d1e8-df5d-4233-9a69-6b2d6e9efcfa/f1988a54e940a1a6decc08b8771cdd24/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-x64.tar.gz"; + hash = "sha512-2Rv7WDmzA3fQmElRHIZoIwvlH64NBeB9dhKX2kDJlNgA3lzm/F9zB8vfXPbn+n3XIOyrg1TslDbGYs1P4UhR3Q=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a51a8de7-b1c0-4453-913b-b7421273ce3f/fef20f679bb688529545845a64f7ba2d/dotnet-runtime-10.0.0-preview.1.25080.5-osx-arm64.tar.gz"; - hash = "sha512-dOphwWoG+GxniNRsTXVyb23Vf75MRZPv9SqLFHL9+AWr5hgwhz/T70F4p1I499z994e3HjmoQV7Q9s4ExLoeQA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2542cacb-b45a-4071-b75d-da8faf0be4dc/2d36ccebaa81348d4cfb4dd6af8ed685/dotnet-runtime-10.0.0-preview.2.25163.2-osx-arm64.tar.gz"; + hash = "sha512-NJsqnzTfzRq4GUhO4JzDLvYcMWKalSAlbWQ5FuS9XROE88uvjQMWvejJDNjurGGhcMxIa+OWC5USrHnlZ+5UtQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c0eb2952-c1e2-4d70-bdd6-96e7ff3f1350/efad700ef7526e474ed91611c1765272/dotnet-runtime-10.0.0-preview.1.25080.5-osx-x64.tar.gz"; - hash = "sha512-bqHaR7YOU2GWT/95ufo9zMCHyXc9NCw03vfuiY6vben0baZmRIR9mBYV3t85aYYQ+FDdZPIJvUQQ4FX1Czt+CQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e209e166-f1ed-4d03-8218-70b46e38b2cc/c0cbc2088f7fda9b584dca195e4fb455/dotnet-runtime-10.0.0-preview.2.25163.2-osx-x64.tar.gz"; + hash = "sha512-o5je7K9AF4HK3skZ9IdqqRTZPDjwganB8bhQ4uv+SVKRn5Cr1yPY+qXPN6FJsoHjkXQrqOc2E+Kx5CdnVdjYHg=="; }; }; }; sdk_10_0_1xx = buildNetSdk { - version = "10.0.100-preview.1.25120.13"; + version = "10.0.100-preview.2.25164.34"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/421388aa-682e-4ac0-b001-235c68ac75c6/2823384aea24f8fb43d0e8cf14b4c479/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm.tar.gz"; - hash = "sha512-06dnE4VQJryxMbl1lnUOJqQxgL6fh1gRIIo7G32IyB6WzHael99Mc5ejuqzjCY+EioNF32VgcDrOdl24shCS2A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c1d0c660-7cbd-400a-97cd-508289238f07/ce3b3a3546e5356d4c32f0e5f4d03038/dotnet-sdk-10.0.100-preview.2.25164.34-linux-arm.tar.gz"; + hash = "sha512-CEFosilqVJ/LoZDWnNVlzEjvpeowy/5htb7Z5BWsrkOkFrU92OW/FqWYvu7RsLqW27e8VUouDizgDHY0oaWh8A=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/1889d4a2-7d5a-4048-b53f-b47ec6f73bbe/f550d0103110905cc472afa3ecf4223e/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm64.tar.gz"; - hash = "sha512-ZFthirf7zOOPgrLKml+raxF0LcnKU/S7ZWVNvoOF4Xia7QNBYkNq+ZjFnkGLUDFgfnGFbcOISHF6dPjzKS4MSw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a7eebbc3-e249-4266-94e8-b48a519630fa/86780770348edc13c7ad5476645b4aff/dotnet-sdk-10.0.100-preview.2.25164.34-linux-arm64.tar.gz"; + hash = "sha512-BJE4E2b1DWoiEfkl9cWy4TZPOzpFB2xwbazTr6aFbdle+2uszMiHRxi943Q553YU/yv9WAw8LpdzfULbMR215g=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ed3f7a1c-0aeb-4bff-8f93-db1b48c13dbc/dbd62e4564414b7de38e32ca47a0e9e3/dotnet-sdk-10.0.100-preview.1.25120.13-linux-x64.tar.gz"; - hash = "sha512-mGh8uJhZ/hhHoMrmx1LOIwkjHl7ybuUoWJOltXlPv9Ud34UQ3rX3AOopjO/9nLwPnybJx7TZAESoK90rmKv8xA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c526dc3b-5240-4449-ba07-ed9a3610fe09/442f1cf6e4e832eea0b045f9e108c8b7/dotnet-sdk-10.0.100-preview.2.25164.34-linux-x64.tar.gz"; + hash = "sha512-Zk5WGIJ8T55dUVDNftf4xARPha576Nx3mo2GNNzJYrWecxepUz5XsmgzNLEwT3tm5ZteaOGlARR6wU4fIvRrxA=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/0a51b91a-f741-4903-8d01-29d81817c839/549fb11b7fc5bd0859adbf47f229dcbb/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm.tar.gz"; - hash = "sha512-NhxG/rBTUNB8lpyIzBqCEVLLIVNdVEgXx7rFSRS4TVJuPlqmQvucxdwzHvAIuyBROIQa0iLsO5oGuNCHQfrpXQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/665e8b2a-9823-46f5-9469-005f1e9e52c4/a291524f20b417d0179b1d44fa345342/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-arm.tar.gz"; + hash = "sha512-gs/H+ppkkeYlit8z64GwvLG2n1lg1jG/vR6ctZ4LVVDC/9JiBGHkZDDRIVuMygl6Z6whXg96nJZYANMHpbuNcA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8044b967-d629-406b-accd-6fccc09e9ae0/9d67c958431f0eb0f45b3c0f1bff81bc/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm64.tar.gz"; - hash = "sha512-kWgHEHze5WH1MNOT2Awfw75VCZQ28yTvA9KpJ5Kzyrffn8PMyHxYqtVSAjL4B94sQlivSiTrE3FcNgzc9U76Pg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e637ed7f-4651-4e2f-853f-4e81354659ae/b9022529e8dac680f4abf5da4a20b755/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-arm64.tar.gz"; + hash = "sha512-wUGbcT1VEYNf/m5h7/4Xgq9ahCn6vVF9PYQNIZdSJlaByxp6FaHwa2xaiQ3VDnRhs7Du6gok1cIGa/rz1S7sQg=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ece436cd-7c74-4c96-8d7b-bbca4f3f2dad/d50fac6150ce404dbb6ba7d779545f7c/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-x64.tar.gz"; - hash = "sha512-NaLOk7p/OaCP0XcRiqDM/oyQBVuN+Y0+E0BkSpHD6pCvwCAb/7DOtUiCMT/dnTqwGsI9b4zLPvBnChr4Jc0yVw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/bcc19fec-7eac-4ff7-a8b5-e5a2150ce497/cc4b1c4d475f054a57ac78c333be567c/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-x64.tar.gz"; + hash = "sha512-eJh2U171Zmnb/mORN4/PQNwrj0rfE3vduLNYojQD7K/lvby7DHcVz7DSbtBhrbIFIK0asSUF+WTcgIsrEC9llA=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/22d09ef4-cec4-48e7-be48-e105c9037dd4/33763054cbe2bbefd7d59c1d66e67122/dotnet-sdk-10.0.100-preview.1.25120.13-osx-arm64.tar.gz"; - hash = "sha512-XpjbKsqs+z6Rq1b9NppCJYcGDNTN87ZBG8UhTVm5hRQsRZ9lDqa2O2r48f/9L1451oWxeVCBSosTHlezDhwvSA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d53c9666-d853-41f0-9063-3343a366022e/769c062074b7d520dbc46f0103b1fd8f/dotnet-sdk-10.0.100-preview.2.25164.34-osx-arm64.tar.gz"; + hash = "sha512-VeySisULCzR4OHGn2GYqrb+UQ8uSF7kF/ER+a0beF5piIr/fwlpr3T6Au4InvN3wiLQeYdWl0earkx/II31ajQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8462c34b-dc1e-4793-aab0-449bd1419d1c/bac3f5d229638e0d8600b9d4b304c26e/dotnet-sdk-10.0.100-preview.1.25120.13-osx-x64.tar.gz"; - hash = "sha512-X2C9WgE+Wc+2dLfS6TM7TojYvIZF6NGMynUeNWKGmG83HZ8hdnX3A8hcUVFZ4PdO9U1g5cf3F8HuRpp2hKV/XQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c382791c-4480-465d-9bfe-c311a41f9945/2acdfbcc4a3762cf516868177d92296b/dotnet-sdk-10.0.100-preview.2.25164.34-osx-x64.tar.gz"; + hash = "sha512-zFc9wPnYRiDwyQ3XTwU455ell9rtI2XC8xGhYrD72S0DGml8icgGrbqKwiPD4/NxnebSJD6gRGRsYsu4uhgocw=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/pkgs/development/compilers/dotnet/10/deps.json b/pkgs/development/compilers/dotnet/10/deps.json index 119379ca0e80..99d89b05a4dd 100644 --- a/pkgs/development/compilers/dotnet/10/deps.json +++ b/pkgs/development/compilers/dotnet/10/deps.json @@ -1,50 +1,50 @@ [ { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", - "sha256": "d38531cbaa10ee29e2d7fdcbfdb3475ab98656cf61eb7e8cac7776b591f14087", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "7a65c4fa06064df37a3be4bb0c578dc3ef947c13fec953317cffe3f0666387d7", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-preview.2.25111.15/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "723a02d68af031016f2f714614a6c2fb71bd11213a8b47748c2d35a61a5b62c0", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "77f4e85fe201e9b4ce5dbcadf0a47bc54ff49ea65cdfa3ea03e5d4fc529a59e5", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-preview.2.25111.15/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { - "hash": "sha256-E7StxfoPJuDc5I7z/QKuiqHT4kthGQ2EvI2o408NhHw=", + "hash": "sha256-X3wHrhQhjEZoK0i0R61hL6DTtztx3SWbfnxXDR6JI/c=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-preview.2.25111.15/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { - "hash": "sha256-U3FiCdmLIJxvd7dy2A2Tn2XVjOE/ZfUt88VavrfGoqY=", + "hash": "sha256-vJOv0C5cd4ICR3O1t3+KDKrCuAS1xIc/habWN24uQSQ=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-preview.2.25111.15/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", - "sha256": "11c7151ad97cb1af9b3f4ea0f19424090b9c52eae70cc6f4f2a89e456c060753", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "d3f8456003cfa7a6d32b1472103a19de76c0a1b34cdffef73f8e7efe4868cb6a", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-preview.2.25111.15/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "6b61e2867d03df14c7093cdbe96b059f4fb6384678d75244cb0107d5f6a8dc90", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "fe9c228d42dea6a2c96f36db3220b64bd55ab647feb5e39f4e80327b6dc78e85", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-preview.2.25111.15/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", - "sha256": "f3e226d57403e870edd98516dbed0f540a9a1b7d9442edc2059245a7ef00ffdc", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "e2387270b965f57b29b83eea85eba5703d1c6a19d3679d9a9a1ee676a3dd2e07", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-preview.2.25111.15/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", - "sha256": "712c9f21199f1707a890a190b30dfb5e7e24a918751209d45f4ce2ca80b0d7c6", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "d6a073b4ae19c68eddede138afffd8922b0d32291c31edb5d7ce09b714a79e1e", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-preview.2.25111.15/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" } ] diff --git a/pkgs/development/compilers/dotnet/10/release-info.json b/pkgs/development/compilers/dotnet/10/release-info.json index cbd52e03f7fd..1e3415dc4e8d 100644 --- a/pkgs/development/compilers/dotnet/10/release-info.json +++ b/pkgs/development/compilers/dotnet/10/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-JJMGyXFJPJYOD9c+V6M8ZkHXjvbBgfeUSqRatuMhhWQ=", - "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.1.25078.1.centos.9-x64.tar.gz", - "artifactsHash": "sha256-q8wMaUmbcDbvCKjm1oliz7/HGqf5X4rnympuG18HzgE=" + "tarballHash": "sha256-pTGkjxQ4T0PhpBkb+R+qKuA7n66JVi+V6VB18W5RfR0=", + "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.2.25113.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-1vm1bsHMe9ynKBhJE7Xkwnjc2JYVT/lK/EaKywycnXE=" } diff --git a/pkgs/development/compilers/dotnet/10/release.json b/pkgs/development/compilers/dotnet/10/release.json index a76ab39b388c..31c9d7306625 100644 --- a/pkgs/development/compilers/dotnet/10/release.json +++ b/pkgs/development/compilers/dotnet/10/release.json @@ -1,10 +1,10 @@ { - "release": "10.0.0-preview.1", + "release": "10.0.0-preview.2", "channel": "10.0", - "tag": "v10.0.0-preview.1.25080.5", - "sdkVersion": "10.0.100-preview.1.25121.1", - "runtimeVersion": "10.0.0-preview.1.25080.5", - "aspNetCoreVersion": "10.0.0-preview.1.25120.3", + "tag": "v10.0.0-preview.2.25163.2", + "sdkVersion": "10.0.100-preview.2.25164.1", + "runtimeVersion": "10.0.0-preview.2.25163.2", + "aspNetCoreVersion": "10.0.0-preview.2.25164.1", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "cd6837f843092ac26057787149a098851e8dc9c9" + "sourceVersion": "7c509c46e0f6df3473129f2dcb7ae7710c200c3e" } diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix index c9ec2ae9a930..1dbae65eb168 100644 --- a/pkgs/development/compilers/dotnet/9/default.nix +++ b/pkgs/development/compilers/dotnet/9/default.nix @@ -4,7 +4,6 @@ releaseManifestFile = ./release.json; releaseInfoFile = ./release-info.json; bootstrapSdkFile = ./bootstrap-sdk.nix; - allowPrerelease = true; depsFile = ./deps.json; fallbackTargetPackages = dotnetCorePackages.sdk_9_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 4c9e868dc4f5..d040faab1069 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -20,50 +20,57 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' `with dotnetCorePackages; combinePackages [ sdk_9_0 aspnetcore_8_0 ];`''; -mkWrapper "sdk" (buildEnv { - name = "dotnet-combined"; - paths = dotnetPackages; - pathsToLink = map (x: "/share/dotnet/${x}") [ - "host" - "packs" - "sdk" - "sdk-manifests" - "shared" - "templates" - ]; - ignoreCollisions = true; - nativeBuildInputs = [ makeWrapper ]; - postBuild = - '' - mkdir -p "$out"/share/dotnet - cp "${cli}"/share/dotnet/dotnet $out/share/dotnet - cp -R "${cli}"/nix-support "$out"/ - mkdir "$out"/bin - ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet - '' - + lib.optionalString (cli ? man) '' - ln -s ${cli.man} $man - ''; - passthru = { - pname = "dotnet"; - version = "combined"; - inherit (cli) icu; +mkWrapper "sdk" ( + (buildEnv { + name = "dotnet-combined"; + paths = dotnetPackages; + pathsToLink = map (x: "/share/dotnet/${x}") [ + "host" + "packs" + "sdk" + "sdk-manifests" + "shared" + "templates" + ]; + ignoreCollisions = true; + nativeBuildInputs = [ makeWrapper ]; + postBuild = + '' + mkdir -p "$out"/share/dotnet + cp "${cli}"/share/dotnet/dotnet $out/share/dotnet + cp -R "${cli}"/nix-support "$out"/ + mkdir "$out"/bin + ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet + '' + + lib.optionalString (cli ? man) '' + ln -s ${cli.man} $man + ''; + passthru = { + pname = "dotnet"; + version = "combined"; + inherit (cli) icu; - versions = lib.catAttrs "version" dotnetPackages; - packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages); - targetPackages = lib.zipAttrsWith (_: lib.concatLists) ( - lib.catAttrs "targetPackages" dotnetPackages - ); - }; + versions = lib.catAttrs "version" dotnetPackages; + packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages); + targetPackages = lib.zipAttrsWith (_: lib.concatLists) ( + lib.catAttrs "targetPackages" dotnetPackages + ); + }; - meta = { - description = "${cli.meta.description or "dotnet"} (combined)"; - inherit (cli.meta) - homepage - license - mainProgram - maintainers - platforms - ; - }; -}) + meta = { + description = "${cli.meta.description or "dotnet"} (combined)"; + inherit (cli.meta) + homepage + license + mainProgram + maintainers + platforms + ; + }; + }).overrideAttrs + { + propagatedSandboxProfile = toString ( + lib.unique (lib.concatLists (lib.catAttrs "__propagatedSandboxProfile" dotnetPackages)) + ); + } +) diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 1a8112c3da2c..fc939045c0f6 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -91,7 +91,7 @@ writeScript "update-dotnet-vmr.sh" '' ( curl -fsSL https://api.github.com/repos/dotnet/dotnet/releases | \ - jq -r "$query" \ + jq -er "$query" \ ) | ( read tagName read releaseUrl @@ -140,7 +140,7 @@ writeScript "update-dotnet-vmr.sh" '' artifactsHash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$artifactsUrl")") - sdkVersion=$(jq -r .tools.dotnet global.json) + sdkVersion=$(jq -er .tools.dotnet global.json) # below needs to be run in nixpkgs because toOutputPath uses relative paths cd - diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 415efcd13598..be3e5c6f9086 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -10,14 +10,14 @@ release () { local content="$1" local version="$2" - jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" + jq -er '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" } release_files () { local release="$1" local expr="$2" - jq -r '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" + jq -er '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" } release_platform_attr () { @@ -25,7 +25,7 @@ release_platform_attr () { local platform="$2" local attr="$3" - jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files" + jq -er '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files" } platform_sources () { @@ -53,7 +53,7 @@ platform_sources () { nuget_index="$(curl -fsSL "https://api.nuget.org/v3/index.json")" get_nuget_resource() { - jq -r '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index" + jq -er '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index" } nuget_package_base_url="$(get_nuget_resource "PackageBaseAddress/3.0.0")" @@ -256,12 +256,12 @@ update() { content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) if [[ -n $sdk ]]; then major_minor_patch=$( - jq -r --arg version "$sem_version" ' + jq -er --arg version "$sem_version" ' .releases[] | select(.sdks[].version == $version) | ."release-version"' <<< "$content") else - major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") + major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -er '."latest-release"' <<< "$content") fi local major_minor_underscore=${major_minor/./_} @@ -269,13 +269,13 @@ update() { local -a sdk_versions release_content=$(release "$content" "$major_minor_patch") - aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") - runtime_version=$(jq -r '.runtime.version' <<< "$release_content") + aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content") + runtime_version=$(jq -er '.runtime.version' <<< "$release_content") if [[ -n $sdk ]]; then sdk_versions=("$sem_version") else - mapfile -t sdk_versions < <(jq -r '.sdks[] | .version' <<< "$release_content" | sort -rn) + mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn) fi # If patch was not specified, check if the package is already the latest version @@ -291,7 +291,7 @@ update() { }); (x: builtins.deepSeq x x) [ runtime_${major_minor_underscore}.version sdk_${major_minor_underscore}.version - ]" --argstr output "$output" | jq --raw-output0 .[]) + ]" --argstr output "$output" | jq -e --raw-output0 .[]) if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then echo "Nothing to update." return @@ -303,8 +303,8 @@ update() { runtime_files="$(release_files "$release_content" .runtime)" local channel_version support_phase - channel_version=$(jq -r '."channel-version"' <<< "$content") - support_phase=$(jq -r '."support-phase"' <<< "$content") + channel_version=$(jq -er '."channel-version"' <<< "$content") + support_phase=$(jq -er '."support-phase"' <<< "$content") local aspnetcore_sources runtime_sources aspnetcore_sources="$(platform_sources "$aspnetcore_files")" diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/versions/10.0.nix index 1c5b9d85a271..7cf033bca556 100644 --- a/pkgs/development/compilers/dotnet/versions/10.0.nix +++ b/pkgs/development/compilers/dotnet/versions/10.0.nix @@ -11,28 +11,28 @@ let commonPackages = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-7JQ6RIV2MP62co7llxdJaHfHxZ1dovwMT0OZ8hqZTOIDBzvhsw5ZVZNIRO+YIPSRcN8sOJDbo9j0NZ6CwNBDEg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-fYMkzeTDQC6UjLHMh1JDzKYXWvW3OZQ5HTAweiYasSypdxtYrFtGvMdnxjjaFEpNJER4fwfu9MWxIymARm7QgQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-0B8cvn3YHXRu3o8/I7zRvkvtu0wWis4LW7SV/+H90egLHZPaOfovoGNCvhbHjoTXCghv7S1xqqm4hMgoM6VLGw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-OurybReC2ZIBbIplQvtMCtjnEMp43xHp6rE8J37LLdax5H1XBP5o5uU5B54Y1H+SHf3nzPrgeIBlNFvfTyTWxA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-WM7Vx5qhHEoHVSlzwLHcJhKdlGgva0JWQB9sIdPPfxrb41pOYbTZd5NkU6iUx4rOCeVDz4qFKiluFt5GSR2Pow=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-YQJi7qj+OivviA7f1jCEH1+VIL7EEtC53gGqo07Sf+j86lcEDZyKSWfmk+rdRU2j/4vZ0lLf1jcio/mpJl0txQ=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-RuW6CgFdHTLjSuPlkXv1HVAOHhuaLlmMi31SjfuhvkiAXoXeDYV9VkNGAD6vv7pg1BPsuFfibhk4R6GYjjaW/A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-/qHuLGJzGlMwxGtsIFJVLWHVy08e/h8IDOiRlOjqluSAwcqCrC8ds0kL+o7eurQJp1YyPQgdkT73/dmmcsEagw=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-bUaQhF05n2j74fvvQmXlJZmqJfb/YXltOHps8XQZ2HKp5EOY3e6ijEFqXnD1R91ZRghqy2ADwUp5qVarOaMdXA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-EQMhyJBOpIlH1PwyV6FL1Yjfh9v6SFltGdVsiJfkBFd8b99VlTfqobiqDum/GJRw4m8PXo+bkaNz8o/Jd2ebZQ=="; }) ]; @@ -40,118 +40,118 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-qY9/zo3KRmK2ArwHghHuL7R/a6BUvDq874D4+EK78k1sU/vHc5sl5vkkxEu7vRrwG0UUXurvxwXve3cGPjB6dg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Cieasw2gZJ+iZS8lqQVIwhsDEem5ReGEZ0LkRPZ7dybi9fHCK6LT2B46muLsUikx2HBPezMV2mN7ZGw/l3lIdQ=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-vgkB8yUmJw1w/n0uP4FhvFOZDWIkPNJAfakhvn5yVZMh5VqnCCHyfCLb9edXtFWmpC+SMEyCT0bqSHTcLMZfNQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-gQ/sJVpO4ruqIMG4clnWzp7CWzOlrXklBYA/DlBHUYlms/SZcqUBV4vva1Sk9L8zln2RAagokBWQYoO9pStYHQ=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-c9EJZR2W+xHmCLrS59Bdkp2/Fw4DSAVzwBt1uuNAQ9XXt/f2REt/osXj/EkbOCyQAnxQ4J5v26BG1lpxkZ1IVw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-tVvw3o2ilquZQKFvm24rrBEXR0pscFY5qUakJ30tl29JfNaUIotJUG2fWZ/kD96wCqnACVB5zp2D2wi/STQhcg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-kMS00bMWu+Coioesh6AGeBekk/nKt/UMCwsC+xsvScdGjGJ1Tjv8BMsNwAshMGEwdlbB6EqJyO1J4CPPPK5yVg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ZcqAA6krkkydoMtk3J2syxpt2r7bzR+iqc+IMFWG4yKfALGHIkuz9XoYTnhAki+rwtL0A/BaDpEc3xA3PpOR9Q=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-qJBeqbHV0876+3iAeBt0bIigrcZYIAqU2cay50LnTUmTYFN2GJdhRFwQIKjHtH8O0vxQaP9Y5tGfe7U9Re6YPQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-/XqJkXi9hfn7wP7psJBfzFlML/pkWs52ZkxLaQwwXBt3YcbAccCKPz4TPenB/wJ3tN174lxrL5zIvD5+HawAPQ=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-DoJiWclBLGaS+xcf8R0lrYex7c9DnUB/2OOthOnHeUdeuvlEr7CyKf5tAeBbO5yGTyMFP4UnhLtDmA3j1NXYpw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-vXwLf5c8GVhgOPGu9nxSwFVMvCtZULVvbMguMXoLDBfWvHSER/0whkDgWdJVsTGEFiCkhET984EQR+jKj8u3Tw=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-eVTyfSgkeihFFPfkX0HsRWbgVE6JTQxBfZbke79J5Aw6r6kWS3FR+GkloTRmsw50hEhxsNug8B/3a/v+Hq2qxg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-oGf1jMjRs4H+HKrbkPSnBCYLYcmM/aMGAp4PC48cwq4b5EkYWL4t9RUcf02oOkO/ZH0Y3aeZmEau6RBp3VqsPw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-U6G5uLB4Gt+QSRVt9tHGpgK9u/h0Kg8gbR3lfmC/TJmPEGd+7pMdG76IxEIi4kF6FLrHMphriD1vtKbfCIKQBA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-VvZndNtHe8lNC5Y0A1fbrESCYNKvpf26qyyNJ3RYh/NmpjVGXsGXqHUodLkhlVf2c9JTbQ1fIKCHw8H+V7YGeg=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-1YWLHPYBEXma5rFvZFu500hxmDTs/wSC++zYZ1oUkMbtas9Tzsi+F28bkH0n98QwDoxjAet9vub90XIpQIUm5A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-O5mWnNxmW3sfzYzuF1Oajvxb4dF4t+F0MdxVWfgyNkxzlKDgSwPiJ4Xg8hElN+istQJiYFw2Bhy9siqTEaCGWg=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-3k1Oh2b70m3yQh1T05Xl42is8gw/p+7tMGtXmj93PDorqZe7kjGT8l2kNBBCjLsCzBu7PW6Y+88zTzi1yyh/Zw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-HwLZs4+in99u3TEsFZM66Kgzqqqp/gZxvFPNWChGdcGkewAzIo24k5odFXUjaV4rxjEe1rMS0D8nsxspJiv/qA=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-HwBS0FRJFpEqrTELxYh/zKEHH9/q/DbrBVzrHZ9RdHRX2Ft15oioe33oInecTO/+Vh5AEXF8n1afc34RCPJluw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-B/eqU8l6X24aA6NW3ipNhsJchu2iLkOGr+w0YNmkwiHlwW2N0TWF5O9necwlyQ00guGt3ziyBtPjvm973+VaKQ=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-ITbXjFbm5fN66SYHuNeukyBo2cHlXqGvp/1aajSyK348QDtBnD7mH7r7jQHzKBwHsFJrcGGFju/vf08/ENi3ZA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-jByRZh3dn2XWkdn9Wfkq4dX9zpTewMkEoRU7UxM1WTsXqwYl5EaSOb+u2C+b8eKTrwLi5D5hUJR8/h1ZmowE3g=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-bp432DB0NVMIlz9LRohJkF4gc+AJlW/+6nEveEuFmZlIjPxN2KaQvu7QYOHkb8z/J9G4jXJyyrKjNs9AlcGXzg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-nQ7ny7gnwIvjj2f8wEgdfdVusCtH9Av9AeSxZWgmLEKWqlcE1h0JhPhRQx68cuU7aLlUZ3I8fMRkkPk8ZWPryg=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-fVNRllQBrnS3t6LX/RMGBcJc0CnBTAxtS77qA4jX52bso5EB5MfPbCi4BxZxWzjEMf8pSSevX1RXvUGhdJldHA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Iu1L4i7aNaY+h+ZEMBKJrqBmLnPjexOIKNAwh2GJlPP/ybXAKLm+3+F1MhRZ/XllEyZpxDCb4KsJd735nOTsuA=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-ugo0QgUPcj4wN42lR5jEZZSahxDp7caQhT4MGHHxzEu10U+dSuEiG0Wf+YuiHsrcrFUEeFhgLcdkUw2S/Anppg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-4ESnA9qlBd+Mil9+Aq9bC7/iLyr2RMdOcpTZdb4JfvzEyGlS/eO/jgx96TG7DExbhdvts+7Bip44r+bSVhukUQ=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-IDQ3HJxDYMV6SYnkSWGfy0eEH3MmP4YonaRVBxDmxLT0Rytv8ZJoWPbDWs52RXeI8y3dAhjYD84ZaOeREwQ9YQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-JfRI6RnrnPdMDVktXNG2xihQyfKjkk3JyNadkUuGaPO8sY6zH8/ETluFV4iA1VwXira9wmaz3s+c8w4GRdtqbA=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-VWg5J5BNzoDeIZ491JkY6anNjuKQaUr5TgCszNnCp3jPPiDVSeCf3Mhk4EZ1fKC/trNcEYgW785b9URshQhTvQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-K6cqb1rspwgKAhSrUhw35r6peEfv/zZ//jQtlzIx/IS03z/xXUYYUSdI612dlkwAcB5Fc9xOhuvVX2n3fKfykg=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-TEMZtKCvJhq7P/CCIzISYvxDaW1o1jcseepquCbrYSsrLCKJ7WNE2zStqu5HNh4VqiszQ1BWjLTdbTPKjdptWw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-QiElAQWko8o3XcVi7d+OKMbe9LVHu9oZ+yrQHMmia8j/eT2IJh0qTd6tLwXP6zdQ4XIKWsU2KXO/UbJAN1w//w=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-vx4NS+RHj+ZEvhqJMhMvfKTWAL799sKjFaR0PY20C2hSXxdMyxi5rIR/XGgdPwF0PcXMul36KVWFssKA9y3NNw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-GQujUNYZiu7URKlNquKouh71dzVwllx7fpQnQc6LTYljDeEUKJYub8cWL1XpE7nagtHQEpk7cgGkOi8Mj2uJ1A=="; }) ]; }; @@ -160,361 +160,361 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-NYnDi9YcfGAZ1qXK6knwsldUTR+92tw7Q6MXq7Sted3rNXRWc6xy/zezOrFP8OjAdn8Slz5PUHFDz9BdGiOuLg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-yHOu2Pa3I00ufGOKdhGvzMvbeTbbSTEpovFmV1eiPlAs331lZjneCnxf5/jdGpY3bA2ZyzkIIvCdQCONG5vgxg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2tYWNqQJibUOWHwjkTsxfwRd+u8BphDEdxNVBU8HLjcoSZbONXsKHx+RgBS4J52mRBVM65BArJzZ8toIenEaHA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-9WlHGvn2LER6YnMZUXlhjYdZedtpglBnOJXnAm1T6fDXE7SXdNoKanyIMurp7CIcSzIUnTxtlpYFSWPo2ELMtQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-E6FcxsPYNxn1E60s6jnxFTRxm2thvgE4Iy/rt4mgNk/+mQ+zmwLnZiDiVCAnxD6Cl/7OWRPCp4Yy6csl4PVN4w=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-9+JnLRfcTbGcdHvFkMSH9RonNMg018RN1b3gmV8EGUk5euQdFekozbrDv0/gcgHtczkJU76o2FYnmTnfTgtR0A=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-FNAL8V9jD16HGrYatWUxN/IjaipGYC0WJ5tMPgC+ZseDNnDU1XT7hE9AW6ZGnJRkB6pEBSl/D+sCurrLPWFNWw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-xAJuJZzQSjTgJxhHo5mXdsf2IJyP0hTJEUUlqd+HOmkYMUurgjhyzN9U1j7oHX54rZ0a7MNMqbaLLXJVduJdBA=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-5xXwUnVyIedqRN2/u6mJTYQ2aEmL5UjAILayabKaVfbfjSDKyrtNEZlrHYxGASh9nkPRP/TesYDkPnOOXCdW6w=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-N7tOTYXkPMYFqvLXbBKMPvjcCRdRMiCRYS6wV/x1JNSbrSSBMF84Ev7jbXrSpQVi0j+Do4Z2pxrOnLDU8JZ+Hw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-4Y0KWHx7QySSb9oTuqpQ0rFEwmbW7DC8BMYzXE9wYkCCg1ErXZxdrNCWhuYj/lp7T9AYsFC3DFvbzAZidGj4/A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-nJxaKLr14lGnGigfS0IIqReXhJkeb6rCntUkPY+x9cjuBAtz8YUe9f2WHAenk6snYqWbRqR861I+/IASnHZLxw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-w3WGynXeGdTuap8DrGOh84JUHNpwKJKnMt9U9MZx+zBpaB+76TV3JqL78w7fJWoA0UbAuUsmXXc45FwiEsYhvA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ZGTkoeYsP8WdgJ4S8vBRF+UeiLjUk52M6JAqq40cTsjKl8ivQq7zfrqFyGRdfFnC9376GF3Lsg+Z2fbNWRb7Lw=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2rGKD4/VJ5Xn9F4oBB6vV7QNeKi4+QEf5DPii5WmSD9K3Z+iDq06JFH5zejgzWy6O+rczaPtm7f3DOl3XxHZyw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ghYZEwoP73mW/X8+SlKmhBrpbXap2NzPfRsqEsDR0q4MX6KuGMNiMyBJ7I32mUpbj8bxYOWBktv2Ghy5v4Rdxg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-PFumrKSdBGAKYEaEENnEy4PpZSZp8t8RYWkgUyY7QkZ+ZcqYEWc9dvzvoMlscVKb4/NoYrB2REkNtCu+zb+vcA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-L7IYzdd29Njp3cpZVVSgHsspUlhGqFljg3hwxLiAJjNw2hMwZM1SIhdK14IxFC1zTpwrUlcpsbXTrDVZRwMLZA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Zfwi2Gesww6LjQwXT1jqHNIqhj2fLb0woea3RLKec9JvynzazLPu6G40GzrsZ4wLl00EX1aLbjUCJOp3VsO93g=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-zbgLSb7iVnFEfaqlkj0mBozpr7EZy/gQXlH+MLmjKqeUu8URiA5P+qDwSxkSBy3tjHdypydtRwr3yzSI5Y14oQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-+q8UP3DgyTEGgAbYjhbTOZ2u7TzLENugBm3TWjotZiKEKR4xXn+ZifmVbQ2NZ/eTBNbdi6Fi+TQUAvCCjAwU/w=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-8ub8FpQ+KFKdhscpMQmlGwH2GsgF3I8aNEyvFoyeGPJvqD3cXIijZK26aTjH848E4tJV4AO7tJEFk7TdKXnwxQ=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-YXCvPERukDSzy+drLG+9f3haR61XsRLM6hjk6eutb0LCew5pAc3Yh/DYR+W9qCmPwkzlkGYuyfDyo/FaLU4HEQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-qiCczti3W/bhI50Tp5r9NOOlDoCjtaBo498wNzIfRhEt/nzBe8Q1Fnr4w9w1WiW1wIFQPwAI8UEHFN+CPkwlqw=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-7TCyhwPin4fR7Nf6ggP/ngDaZtjQEdkowM6NJUa5wAsLvz1l/WcIDaWDvaZKyrNnfrvlWecKbjOx0PxOgVOoJw=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-dqGfk7Dp3LW7+o4wQPbVqi0brEJuubJzlsbvCDEF3ISapgmo4IVdaIFIdajEeK0CYDv9ro6CpKLOAILXhfT9QA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-N8fL0vrL6dbaDB0ogelbF3fEEOLGkQf95xSOEdq/Pi+S8esNNwrfrZfjlHZ1dOc0EUXZDgxvrJwTc5FazKYBdg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-klCs8GuMTDnn99J3NuUhGgfrZ8USjXFvUmb29YovrXbIYEBEWwHAu8dkK9mupBiSXkXale8Fgve2SZ2lic49dg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-RX/Fj9yHn9lXeHN87JgR0aAWCNQKcdk1omYs4yE6Gtbk7ORl1CXkq6VHy8UT9ULUC0wIo3+7OX36ciVU5nRXsQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Z8ABfKzezrD8oQnTFa0s9tQASL+wsHrrXSLQDu4djyiclc1N18kBRCcj1hBwa4V6Qs+daZqZl5f64B+eTZDlmw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Hj9OwrnKZJbo2leR/Df+BfmntQCdnZbXoaZMtTpNzN7npHptiVaOv7bQ51hIC+qNp8MbvPeMbaN6rC2d1IR3iA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-KflBz+weDQwzryX2ManDUioAra06ojwq8NgAUEpKiuPdFO2w5aLxNLs35ayMxQg27HxmiUYzgFU2XyzY2EqsYg=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-lrDg2jv7Qyu7aD4COB0pwRGy7DgYgYRjDw6QRuRsbuMghTkyGYzEaQB78JwBqBYwqrXKQ+a+8qvQbpuRXpF42A=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-5IHjU+if8HXHLcC+eYJkkIj02GIwO2DQMY1uXM+P4PisHwD6bDkojHDH6Eo51LnwGZkKttMSUZ5FU+oI2SJXeQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-goUOx6hlUIgfru/Nl4luQOW1NW7RjXFcnT1sQWfZfMcof72yG785+TvAjGsxbZAafT7Hqqle+KjVizkZvw8jnQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-244dky5rKXLRbqUrR0CSgjkdNoQCQJTMCe3B5chtMEZBkk0UCsQ3la0i6QoaGgHOVnyZAfDLGty5Xahl9Zxkyg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-joQATwpqLurBgrYw9GgJvyh4rOHK74x39RWTGnEimEAIhe+99uCO/OM8JcSzucfXnu3+lZwM/8Ki85kBpsJ5kw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-1s7p86jY7ahEa1TvjVk+sJFqF6sRDirl05nJ3JVKZ9vOVdZjO9SHZkdZzOS6o91T179Yve6vS4ejXIn16LVWDg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-evYMyp8jNrr3+g1k52MqugUgrhyMR6RFVdMX0j9lBW+jWzRKmCJ4AEEWgYVLfX/p6XN60Vq5F+AvsxLmV6vCxA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-toF1P9FT+YMxulAzCc7k0Ig2K4y7Bz4pzJ4woQwCbx23AUIzHj+SR9u0MCnYY53McAkZ6Xrd7iebFdzCILLQRA=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-H+At/cuv8JLoP6XSmSSXWwn5fZ3ZJVjHbqXmi56ANSyyJxOll2/yjbY2H4WmyKQdBL0qJdr5zdf0XSqnqPdbdg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-ZcVz2V5BVwsm6JLLvd0ZUwkF6qd02/EM6HRCjcG66xjmClffLqVyz0FyDhgFf4sjub2o+y0VVphMwpKaVjeEKQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-fFvpxLMzN9K0tIPI4W+9LVC3WP0svv5KOPzhKSj5QOXTvOKsJTo8WMHKjjElg3kLTz9TqgtpQbgRcfzwqyOgaA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-7+0KqOJXhUv7HXGhIOrh+W/Wg1p9okac+fMu6D1IG//dpA/dTh52gFRa39s/Di7p3czUG9Fw9CAg3ayLc9FAVw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-pEHWmu67oLGKeg/fP3dzrt//L8/icvlSGueBufScK7/sITr9ecIolcqPqBRAYG740QM/p9hrTQhCVUppmhjjhA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-kzhqF4a3QgdUIUShjH2y+uzZGFqjiRxcX4dEjBNBz9uTLw39ESAUzc9/0OzBqeQf34bndcdWg3RCjl++DSO4IQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-h3qfi/9UNZtgLOmuwa/AUDwjzutwrJ/CDUOcKeFjCut8vo5lNEBQ40AdCRDkwfMPRtZynnrRbHunsiADqEbAnA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-FxEfJnXNNTZGdoIkXnlbECdH4Ey/aFQTTkKLwUtIULbW7STri3KLmU0rc5htalma/u0TMoaKjoNFfM8FKhbKXw=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-QzdaJymI2UF8sLTmGIV5KkWF6wEhX+T45L8uju5/oEDuufPLr7Up3d5uxf+5uh8+aqH8fwlu48Tt//LsYzKEaA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-ia6NWtmLd+Vaini/F85LdVzHb+yl4RRYbMdqvoRYHuIOhz7m84NEf1rqnukkV6W0CDZBWcJXCEhxN1H1jlvBfA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2sb6VbprC5U83LBpd5DOPhvbBY1DtFBSvhCh3ppDAx4Gzcka4QAJZcYH9JRKt5EtTybdb0Pce6dRxRZ7aQqW4Q=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-OrJWaFXVGFuABTnlHpzLE/oSlYTGCpgVQ2XipZO4IdQwLN2t21xdrmYlhNBKFBO92dQyikoIjAROjlcrWE1jfA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Y+8kJD2C8l4mejEFP5QneRsgQm/otzX+Dl4nVZLTbi05O/NEJkUmA/oWlluxE5Oe0ZyGi5/sfACcgzQ3E6nGVg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-GMyWth75S1zN/YC8vFuCFzjGcoXB6YTwnVp0sv8bGhyeAamjMt/qB4qCPkrrw/Lt6DF1D2K1J8k3Fsr1Qlp96w=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-hhj3jdVtsAh9jkMQWWuhpKA1za64OUsGD/mGiFl2KNpi1HGhxxHPwfT32ElX5GrqhmCs7l5iUszGBqK2uVYPBw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-v/g5FTqPmNdTYPWUFmOsJvf/VoxYe4Uzi9AxoW1xfoCfG5rqdkYfI8aIZzPLVXMAzDl5+ksVQOJIlrXujidBCg=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-ZUDP2dv59marjwXPSwIkZh7qtSsYlkFvyFSU2LvlVz9qUX5cPGJROdLgmIDj45vr9EcSDWUzyiDuuSR9o6Uxxw=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-WcJsD6RRe45HnJ4cUOvW0FEGgC3JyCioPLHBivJMcDaXcphlSsJpeJWH3jQ34YBcmJyirZHcA696nert1mQLKg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-jWwOXYCQQLUMSKog2tK6ZJbnDhE4t0jeyc1vUjHfDHmEo3HQdHtrRf7fvJGroqMHK7novNOiGUllJ6qTAWnYFQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-DM/5ZZI9lEF3d2fpj3Yy/w+9aptB2kRtIrcc2DQpVAZXAiMxpZz0mc7+EgkBsV8y7SijBi1i4E/gsfcmuxUxOg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-DmTYpekFmL0mhyEBGU5yw2DScIf7LNKE3S2A/UwWSqpWTTdSZwHd4avbyVQPtD5IayqjeAGxmrVY02X281l9Wg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-d0g9fHBn3W0RTBggWPWaUGb0VkhCLmeDfRtf00vRAKvBLqwaVv5uHMlpSCNktT+2dq3tIEJshtvHmtCGOUOiZA=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-nnT44goUsGrlCdNODhKEjS4F2GtcdSVCTpPkGWJaKaxcKngClTk99f9H3d4EbDugNKGNsQQwro3Yo+DFizwc/Q=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-uUT3ZDtdu5F2R2G05QomGeraLrPz56NuFg+pfBnloIMihQ1mKLnPrOCXZ8z6F4U/WPEs50B0lrk8ck7RNvYpDA=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-Owmxgn5CZxwfhK6VUWjGAS1V00/9mrPb/VseFBsQXn2A/5brX83+jAhxVaXqEd6+k8j45DGJ4eutlBO6JPCDaA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-UpRM0FNAeRnxPXakMWmn64Hw4gTnFDksUEmaW5Q+uiq+lTHy27bGsa9/qo1GT07WlwlrnSGEL4Os89UQi7fpCw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-hcYIHXVYDFIIVEqf8gRLr2CEeJrqRJjY+I2jMeRg0JIk6cxQ6aNb6364QOVRckOrREiuGuHi1d2/zD/DiSWvFw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-v5zXnXy+J5ll82nnFl1ra3QQ+YrUKnBavGG6cuzutJ0HVyQ50i1ggv/yiQbisZB+DCNn97mSg+RBfe8ybsV5VA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-YMP3AD/o8ZFRu1hoFnVbxgG8PEGDNUg6ENCu38GhJp/MDVNOT1r3G+0iuoI2lHvyhPv2qzCT6m26hZxqVHQxAg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-skTKyHmXHtPv0SQMSNdq9/tFRNNS3er9yMIaMnaXl6PDQo1FnO7xQ8Akt+VyRvkVCNat0dNeM0EQ0CEOb92kKw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-CFq8TbbTQeexS+e9YZiujvMDQkbSkGCxgCN7h2aqEQAXRSRy9kgApAuzLlQov2wLrSqXGLyp1BwpQFejBoqmtQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-b0LeHwc+HxwFR6PHFpJPGy3pAhyXwpJe4+Bm0l9HOWTpaTZsbMh9tp4WxnvsZi8NRkTcyLqJJ3HuiojM1+kArQ=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-zEiRA0vBh3H/siaL9g6mbzIvUr7UO6cg6EDHeV8ODiaV2qx5Bk/B8XR8OK3/gl61mSTn6mU2ObAG08aMpsyKnA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-aEhd15xrWBEM1eta0rE+9qRuUERxISKnqlTktCuwAHJQGt3zn9HN8bmjIKw1EoegqvjxQxjVSnt7KY9g8oHZhA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-jFasdaZcNTwFwclOKhNpsV09IyqoQXQ4iaOQIXQr3UAm3YQwrNtWguemHu1CrrivSBDBGjUkX1INmO1robymWQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-yiZROfX2xzEI6pJFjL0IvXnc2YYxgSghNW107ZNx2VRE9glMEUVyvS2UkfoPJgt+9ID75FG2t/gW5jGdlgRoDQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-rgNo4vT50WUb3YwZZ81oJnUvD6kJVn7PGinLDTpQC+ayBi0wdJ6m8uRXpCTZ+yt4Rz6KR68LYWotMGdzAKfwuQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ML1iK4UD1IJ93oPSLNGKsP5tPIrWK6mUOPMBE5Ilcf3JesVVUN7gPvtUfFgcPzkUbB5LC8gTZpnw+0OCPURNiw=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-3eN6DUdMKPHC46ANhDQv3Rg4saLj9zX7IvogtwQPQHP097z6m8mDhbMuuH+Fqa3VkxDc4pnDzEUnbXC/pvW+iQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-cX9SJnO4M2ybHKwnwNTcyuCaO2ddwMo7nBIHzE/tpM/4Yn8i9ujlzDBFWb/6QLfopkcTEwbXNvIV+8096TM3oA=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-/OT3JlrxpuMsBeQMn4Gsj2y9r2d+gwsSC87cvvA4hRCbw3+PHBndvFfO5Aquj0O9MPNXiFhz/J7JRYDw47uIUA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-/rW+Iyj8J2xe+EgOkvtIBG+ZBW3BW2QrU9tSGPXV+eH9U9DPn4zqIA/lY559A0v128XSGW4s39YKFMsd5LGtAQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-B/bP6DvMvk8YGbomVkdRy0tJuZsN/eLSQYy5INxaSINbNjaNjkg3Og6ZmL02Nt5PQtzz/bcAhPedrtGwEcIslA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-LCeX8NNZVbXLdCbPQ7/w8BB70TpUrn2QNc6Ur2BMTYoLJ8vf04PwjAYubRstscxr1ZTH8GSZMhWex3Wi2Pk1sg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-xQzXl7a5PmXx8PA26a3+ixE5JiEXJeIhcYv7dMulfixcWkRmTIiENIOHb8BrggTYHNo8ebRydSwg2EZYkfyCSw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-XGQika67R1l8sZu89nEEgL6MasIjKdWCWTnpgoGGvEHPnYLXUKU5KhPDrUpuj8pQTyXfze0pQ2YdFFUoOtaJHQ=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-oYeNNsXVwEbxlxYvla26qHjxoH/9CQRQMIrGKZHibznwXq4R6Q8yKS0+Z1zPGyYf4BC/01kjZ8pzwohfMS7DfQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-aaT/dlm95IEGlM9iVu8FQbIC7lBZuwWRuzIlvyDGm4gsPDaH7OQgkhdhLO+yho7xri65NVI040Zzyz/x9elvbA=="; }) ]; }; in rec { - release_10_0 = "10.0.0-preview.1"; + release_10_0 = "10.0.0-preview.2"; aspnetcore_10_0 = buildAspNetCore { - version = "10.0.0-preview.1.25120.3"; + version = "10.0.0-preview.2.25164.1"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/33517412-d354-4852-a9e2-d6c7c83297e9/361cd00f354832d42bcdf19fd2094a36/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm.tar.gz"; - hash = "sha512-JTw+GHBZVBIchD02fjssu4/8RmSfLg2yVbNYMxY+XexrXfQcSXAQIoGvaM+NkSIi2xaN454hca85sMwWO8F+tw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/72b23af4-a627-463c-886b-3f574dc446d0/5369bc93033911562cfd5d8cda4cd2a3/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-arm.tar.gz"; + hash = "sha512-zuvxkIUVkXXmAATbqI5GmCN8BwjfXdY7IlF3xwyR32vhEKRunuaTAB4nkzBQ2GN8/ItznR5RDQncpWIDHIZszA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/0b4a8c7d-9b85-49d4-82b0-e2f45f1f61ac/4286d964b1600e1f3ee5d56f7c3b65cd/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm64.tar.gz"; - hash = "sha512-T5lvSP0hW2O4Ta8kpKsI3Vtod9q2vvDmw17JRRUrblsi3LqdUKwRmNWHYxPwvNDIAKpajMg+x2R+d0ZvdNrCLg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7eb1b280-570f-460e-8805-5d55cb06493b/8091831bf8764e9a78eab4ae8bc41d5b/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-arm64.tar.gz"; + hash = "sha512-IWHlPzBBPye+moGnrtrOEq1SPZ5os11qBR5BdwHSOLE1NWniJ4Rap2qciJt+zRtee6/TpnjivylDja5UDpcNCg=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/de4894a9-20d4-4c58-a748-a2594d097279/bb332c7d3bbec4a642bee7ddc01b86f9/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-x64.tar.gz"; - hash = "sha512-v11PXB36Y+k39NDmuAAoNDej31xVsuQmw++wuNyXlLpwT11EaKzBMPDzuBrOPj1G7hGUW7xfNLvSnXtUw2Yw/A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/495feb02-b2fd-4849-9803-43c5d758e72b/60fa3840af9bb27595f6f7b4b818f89c/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-x64.tar.gz"; + hash = "sha512-3hTauXgTO57JedNxxfvQHnixBswzDBaNYhbsipewzP7rDU9EOGGHSZdg22A0g9wAFiedxMs/lL+wQsxj0lKW+g=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/5cdd9ee9-cf13-4db5-bb3e-a09183be4ef2/3236e065b593cc2bb0bffc0c976f8e87/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm.tar.gz"; - hash = "sha512-RleXs7jRVS6aRgkkgfHIFoJ78BxTLLi3quEQhwpOyfElAK25Htr7y78a5GM4pIUYRdVt4hJ01cbCtsyzldlRTw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8bf44e44-7677-4766-8486-c6b2891a4c0c/a616e598413adafe4ad43d5d5be6f8bf/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-arm.tar.gz"; + hash = "sha512-63zgdkzIi6AL3JV7mLgRBXNNpZZCMplvrqqE5PEytmXDF3Y2oKJ5TSt6AeN9lj6S1Zu+am7jcXoB6AVNdEDUjA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/eedaffd0-7baf-49e2-9291-c9f57233d639/34f0f6b835f35306649977fe772e510c/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm64.tar.gz"; - hash = "sha512-dwmkoFoOVqSlhQiQURWduEDAqNMHK7k2B2sccMicLxoLVHg+ZNdiotDdYba7UUTbrK1We6RpkhlsQQFKUbrczw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b32bcf9d-2390-42bd-88f1-709747ac6bbc/ad9bee446b2682530b9e9af62770ddbf/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-arm64.tar.gz"; + hash = "sha512-zcF5IytWiO8HmT16eMVIHyVvjO/oFvyRPjhAj63sm18BCpBijW/QTRLhjMw1G2JSpWYXYVShEd9rbaFDCaoNQQ=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4fe69b65-885c-4235-9aa6-5758e6ac76a0/90be90ae3aab95d59b60f5889c5c6062/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-x64.tar.gz"; - hash = "sha512-AVVkrZaLCRbxIqrrzHG9aACsSAF5y3Qj3KRUULnmHScSB6hr5afMDBYosef6SQYTOBnUe+qhgMp1wEEBr87puA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c87f5ec8-9569-4894-be65-8f3cf322c251/b655d57fd66869687306e1e7fe31cce9/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-x64.tar.gz"; + hash = "sha512-eT46PEnCIehUOFCFiyc/byDf2BzYMVJfNNa+KhzuVJS60hDHPMBy2UfJP8gg/yrXCbCiJGK/P+LJIzGeAHhNGQ=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/87990395-a0a2-472f-a255-cc2639a9f5cb/06dd746d44a37da5325ab260dfa4e5f0/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-arm64.tar.gz"; - hash = "sha512-Q7JCQqV9pnNb7yb0oDmqHJvHlx9NLYuiiowBnaEzIH8YDWchROThIuJ0p9oRxl74ky6VRNZz1Qa54l7B3nQGFg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/351a56ca-b55b-4c5f-be20-1081edb848d7/de67ebf7b8859d4efde0c849de061a4e/aspnetcore-runtime-10.0.0-preview.2.25164.1-osx-arm64.tar.gz"; + hash = "sha512-nk5txKoZR/3iS9efbi2RxD3+EzB8wgN/g+gEjf95VkXbBDloTnUN1vnOwwSJnl57K19NlhMJNF0PbjKoTQD7fg=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c7e3044f-0976-4051-ac6a-019982f4f4c7/58a188f7893c276ca2ab0f3b95c94756/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-x64.tar.gz"; - hash = "sha512-WDO9Z/HH4rFqO6yrZslMIKPO4u2WGceVTmvhZLgCQ47vYC1K2vBXoTxym241f/KekjxL4WuFKDYTKEi5DCLtYg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/dd3d568c-e94c-4ea0-b95b-e1d4ae804ed7/68ac36aa68bbeb472c042af07e0e95f4/aspnetcore-runtime-10.0.0-preview.2.25164.1-osx-x64.tar.gz"; + hash = "sha512-6JlBZ3Veyju2kfQxTaa3AiF9KFrFj6h0DstlepriFHijQariEXQCORCnhOJoPlNt9UWJU8SM2IHGUeIoR76LMA=="; }; }; }; runtime_10_0 = buildNetRuntime { - version = "10.0.0-preview.1.25080.5"; + version = "10.0.0-preview.2.25163.2"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2280fc3-6358-4f89-8671-3d3535b3e14d/1e3ec98a6c92c9494e7012b80565b886/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm.tar.gz"; - hash = "sha512-jpHpZerOOsG0cvjZ0sulFTdgbLCumyJF3efy+dlfhmCADLYJpxUrPv6x4BZjBwyARU5hgIkMy4HWUz/MiR0STg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f54c9c06-3809-49c7-a47e-dc9e63bce7d4/9d64e0d3a360e8846432efb907c87cea/dotnet-runtime-10.0.0-preview.2.25163.2-linux-arm.tar.gz"; + hash = "sha512-/orwyaw9OeVZFVlQzsv6J0UFIfjl+qRGQ43j3MjEv1H7E1MjysO6W7BF/BNCN3auZq5O2dag3zMelZoO00F5pA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/67154807-282d-4a26-9fe6-16e561b763e9/1d556e1d17d9157dcbdcf09f1c523df8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm64.tar.gz"; - hash = "sha512-hA0in8GTIgk+1aGMEjtaMi6SytJpJr23Ce44IHaGSp6JpN0OzBPl5IVCsXMuvRm6ZcrRwbY7lCaNOOeLvmtrdQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a228c7bc-8b4f-4f52-a517-ed143f8a7b75/006334cb7587884a9aabe63bd298e61b/dotnet-runtime-10.0.0-preview.2.25163.2-linux-arm64.tar.gz"; + hash = "sha512-BcpaAhJgD6LHnDUmxnOCLXntiWXlEyY+6pBPLQn830IwWDIZYbyTD9uQgU7kHvQlRaOyfAgcyXMe5GAsUUh5xQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/527fa5e3-8b4b-482e-9c1f-c3cbf8cc0edc/259b1cf466fa1da69dafb26ef142b4cc/dotnet-runtime-10.0.0-preview.1.25080.5-linux-x64.tar.gz"; - hash = "sha512-twTf7Qg9NiMCTulupsuP9tXX4db0OiextHUKiRk/ZKlmoyEbcfnne8dgFTLbmS3zjDTR0VQvBgCCrgENUyQ3qg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/005ab929-04e3-4c38-8134-0b57f86f82e2/bee77f190ace377f3a164814ae5cf34b/dotnet-runtime-10.0.0-preview.2.25163.2-linux-x64.tar.gz"; + hash = "sha512-pkzMyYCfpbL0zLF4lkv/qSuEnEPdKyw5gddT5z8rBaK24YmowqUPxnZSut9mljMTREwI6iLkzRj+h5cElXE0Hg=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/0bb2df4f-2569-41d3-9543-f23cfbb25ce8/a64254fbc283ce409edb78d001561517/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm.tar.gz"; - hash = "sha512-uQfZdISWYmbCZzL7thQeu5FL6CJYn+2tJq3ZaArW4Nx9AGhQckHA+64SSp9KlXGDgIA4fiHegYM/xzmb4b3WiA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b07dae9d-0407-4ddf-9792-1a902edf93ac/caacc56b747e8096b126aef4e26802a9/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-arm.tar.gz"; + hash = "sha512-EpjURujLJ3aNvdUSV2zdZSba0pp2du50i8kvpkQwdgzb6BfKbGLEhyqyAIuEVYDUcJVxpZxsPzMmUKyu6GQ1Rg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6ecc182b-eb3a-4d4f-ab75-5c6c565d643a/70922b6f9f596549975d0c6c7672d558/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm64.tar.gz"; - hash = "sha512-LMP3cV722ZhttzN2vL58bNu596WLQ+e+BRwu1Ff378JIo8Tch3OEZ62ZqCyjhe6lPryK8RwYkA9fmAyLdtmkdQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/207578e7-0ba7-4785-997e-339ac96dbb07/9380485cffaaca7cb6bd9a6b4bd4306f/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-arm64.tar.gz"; + hash = "sha512-Y8xhpb1TsTJ/1n1XsEhBwKjnlQtdUx/HiQNS5WqioJsIOoCMyLm+Gv1CQmQ3HVH8Myl5H9wEeYiM7vrdpS4nIw=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a580cb7d-1394-4571-9779-b62520571fa5/0ddc6d2478352d792caef0a21c8682e8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-x64.tar.gz"; - hash = "sha512-k2OKXnZrWFmuWOw7pd2BpgoObi5CZdCbG9ceQphyFt7x6Uqhw5jjPSC69rfAIYGM7hERc7V3H/DOK89WzJZMAQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7ee3d1e8-df5d-4233-9a69-6b2d6e9efcfa/f1988a54e940a1a6decc08b8771cdd24/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-x64.tar.gz"; + hash = "sha512-2Rv7WDmzA3fQmElRHIZoIwvlH64NBeB9dhKX2kDJlNgA3lzm/F9zB8vfXPbn+n3XIOyrg1TslDbGYs1P4UhR3Q=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a51a8de7-b1c0-4453-913b-b7421273ce3f/fef20f679bb688529545845a64f7ba2d/dotnet-runtime-10.0.0-preview.1.25080.5-osx-arm64.tar.gz"; - hash = "sha512-dOphwWoG+GxniNRsTXVyb23Vf75MRZPv9SqLFHL9+AWr5hgwhz/T70F4p1I499z994e3HjmoQV7Q9s4ExLoeQA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2542cacb-b45a-4071-b75d-da8faf0be4dc/2d36ccebaa81348d4cfb4dd6af8ed685/dotnet-runtime-10.0.0-preview.2.25163.2-osx-arm64.tar.gz"; + hash = "sha512-NJsqnzTfzRq4GUhO4JzDLvYcMWKalSAlbWQ5FuS9XROE88uvjQMWvejJDNjurGGhcMxIa+OWC5USrHnlZ+5UtQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c0eb2952-c1e2-4d70-bdd6-96e7ff3f1350/efad700ef7526e474ed91611c1765272/dotnet-runtime-10.0.0-preview.1.25080.5-osx-x64.tar.gz"; - hash = "sha512-bqHaR7YOU2GWT/95ufo9zMCHyXc9NCw03vfuiY6vben0baZmRIR9mBYV3t85aYYQ+FDdZPIJvUQQ4FX1Czt+CQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e209e166-f1ed-4d03-8218-70b46e38b2cc/c0cbc2088f7fda9b584dca195e4fb455/dotnet-runtime-10.0.0-preview.2.25163.2-osx-x64.tar.gz"; + hash = "sha512-o5je7K9AF4HK3skZ9IdqqRTZPDjwganB8bhQ4uv+SVKRn5Cr1yPY+qXPN6FJsoHjkXQrqOc2E+Kx5CdnVdjYHg=="; }; }; }; sdk_10_0_1xx = buildNetSdk { - version = "10.0.100-preview.1.25120.13"; + version = "10.0.100-preview.2.25164.34"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/421388aa-682e-4ac0-b001-235c68ac75c6/2823384aea24f8fb43d0e8cf14b4c479/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm.tar.gz"; - hash = "sha512-06dnE4VQJryxMbl1lnUOJqQxgL6fh1gRIIo7G32IyB6WzHael99Mc5ejuqzjCY+EioNF32VgcDrOdl24shCS2A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c1d0c660-7cbd-400a-97cd-508289238f07/ce3b3a3546e5356d4c32f0e5f4d03038/dotnet-sdk-10.0.100-preview.2.25164.34-linux-arm.tar.gz"; + hash = "sha512-CEFosilqVJ/LoZDWnNVlzEjvpeowy/5htb7Z5BWsrkOkFrU92OW/FqWYvu7RsLqW27e8VUouDizgDHY0oaWh8A=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/1889d4a2-7d5a-4048-b53f-b47ec6f73bbe/f550d0103110905cc472afa3ecf4223e/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm64.tar.gz"; - hash = "sha512-ZFthirf7zOOPgrLKml+raxF0LcnKU/S7ZWVNvoOF4Xia7QNBYkNq+ZjFnkGLUDFgfnGFbcOISHF6dPjzKS4MSw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a7eebbc3-e249-4266-94e8-b48a519630fa/86780770348edc13c7ad5476645b4aff/dotnet-sdk-10.0.100-preview.2.25164.34-linux-arm64.tar.gz"; + hash = "sha512-BJE4E2b1DWoiEfkl9cWy4TZPOzpFB2xwbazTr6aFbdle+2uszMiHRxi943Q553YU/yv9WAw8LpdzfULbMR215g=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ed3f7a1c-0aeb-4bff-8f93-db1b48c13dbc/dbd62e4564414b7de38e32ca47a0e9e3/dotnet-sdk-10.0.100-preview.1.25120.13-linux-x64.tar.gz"; - hash = "sha512-mGh8uJhZ/hhHoMrmx1LOIwkjHl7ybuUoWJOltXlPv9Ud34UQ3rX3AOopjO/9nLwPnybJx7TZAESoK90rmKv8xA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c526dc3b-5240-4449-ba07-ed9a3610fe09/442f1cf6e4e832eea0b045f9e108c8b7/dotnet-sdk-10.0.100-preview.2.25164.34-linux-x64.tar.gz"; + hash = "sha512-Zk5WGIJ8T55dUVDNftf4xARPha576Nx3mo2GNNzJYrWecxepUz5XsmgzNLEwT3tm5ZteaOGlARR6wU4fIvRrxA=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/0a51b91a-f741-4903-8d01-29d81817c839/549fb11b7fc5bd0859adbf47f229dcbb/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm.tar.gz"; - hash = "sha512-NhxG/rBTUNB8lpyIzBqCEVLLIVNdVEgXx7rFSRS4TVJuPlqmQvucxdwzHvAIuyBROIQa0iLsO5oGuNCHQfrpXQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/665e8b2a-9823-46f5-9469-005f1e9e52c4/a291524f20b417d0179b1d44fa345342/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-arm.tar.gz"; + hash = "sha512-gs/H+ppkkeYlit8z64GwvLG2n1lg1jG/vR6ctZ4LVVDC/9JiBGHkZDDRIVuMygl6Z6whXg96nJZYANMHpbuNcA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8044b967-d629-406b-accd-6fccc09e9ae0/9d67c958431f0eb0f45b3c0f1bff81bc/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm64.tar.gz"; - hash = "sha512-kWgHEHze5WH1MNOT2Awfw75VCZQ28yTvA9KpJ5Kzyrffn8PMyHxYqtVSAjL4B94sQlivSiTrE3FcNgzc9U76Pg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e637ed7f-4651-4e2f-853f-4e81354659ae/b9022529e8dac680f4abf5da4a20b755/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-arm64.tar.gz"; + hash = "sha512-wUGbcT1VEYNf/m5h7/4Xgq9ahCn6vVF9PYQNIZdSJlaByxp6FaHwa2xaiQ3VDnRhs7Du6gok1cIGa/rz1S7sQg=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ece436cd-7c74-4c96-8d7b-bbca4f3f2dad/d50fac6150ce404dbb6ba7d779545f7c/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-x64.tar.gz"; - hash = "sha512-NaLOk7p/OaCP0XcRiqDM/oyQBVuN+Y0+E0BkSpHD6pCvwCAb/7DOtUiCMT/dnTqwGsI9b4zLPvBnChr4Jc0yVw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/bcc19fec-7eac-4ff7-a8b5-e5a2150ce497/cc4b1c4d475f054a57ac78c333be567c/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-x64.tar.gz"; + hash = "sha512-eJh2U171Zmnb/mORN4/PQNwrj0rfE3vduLNYojQD7K/lvby7DHcVz7DSbtBhrbIFIK0asSUF+WTcgIsrEC9llA=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/22d09ef4-cec4-48e7-be48-e105c9037dd4/33763054cbe2bbefd7d59c1d66e67122/dotnet-sdk-10.0.100-preview.1.25120.13-osx-arm64.tar.gz"; - hash = "sha512-XpjbKsqs+z6Rq1b9NppCJYcGDNTN87ZBG8UhTVm5hRQsRZ9lDqa2O2r48f/9L1451oWxeVCBSosTHlezDhwvSA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d53c9666-d853-41f0-9063-3343a366022e/769c062074b7d520dbc46f0103b1fd8f/dotnet-sdk-10.0.100-preview.2.25164.34-osx-arm64.tar.gz"; + hash = "sha512-VeySisULCzR4OHGn2GYqrb+UQ8uSF7kF/ER+a0beF5piIr/fwlpr3T6Au4InvN3wiLQeYdWl0earkx/II31ajQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8462c34b-dc1e-4793-aab0-449bd1419d1c/bac3f5d229638e0d8600b9d4b304c26e/dotnet-sdk-10.0.100-preview.1.25120.13-osx-x64.tar.gz"; - hash = "sha512-X2C9WgE+Wc+2dLfS6TM7TojYvIZF6NGMynUeNWKGmG83HZ8hdnX3A8hcUVFZ4PdO9U1g5cf3F8HuRpp2hKV/XQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c382791c-4480-465d-9bfe-c311a41f9945/2acdfbcc4a3762cf516868177d92296b/dotnet-sdk-10.0.100-preview.2.25164.34-osx-x64.tar.gz"; + hash = "sha512-zFc9wPnYRiDwyQ3XTwU455ell9rtI2XC8xGhYrD72S0DGml8icgGrbqKwiPD4/NxnebSJD6gRGRsYsu4uhgocw=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index 914084d5821e..b1aecc866b8c 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -482,39 +482,39 @@ rec { }; sdk_9_0_2xx = buildNetSdk { - version = "9.0.201"; + version = "9.0.202"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2cf96fc-f298-41e2-9dc6-8c0861916597/d505f4b28a7765d7bea6d2883a7fe170/dotnet-sdk-9.0.201-linux-arm.tar.gz"; - hash = "sha512-aBIYY1ghrUlYayCg7rA9Ap0V8s8seVB0vT4np3P5CheotrrJ30TggyM87PNiu/7n0Ma4OiSRfmlr3orX5S8RVQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e41720b8-c635-4b25-bcb1-dcf307a917d6/fea66a31e0dec0411b3e123661f443fc/dotnet-sdk-9.0.202-linux-arm.tar.gz"; + hash = "sha512-LohoPuOJS3JYHOOCnv0sxSFJaPB4Lhf1BKebyA7MMe/p1TYDA1ReRVN/mS9ayMR6rsjspeqKTvrN6XQt5sj/4A=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6d91bd91-9bb6-4b3f-9256-83f8c982e817/9248655502cac509f9c738509913770c/dotnet-sdk-9.0.201-linux-arm64.tar.gz"; - hash = "sha512-TreMdgg1XKJ4CZCTRZLElXntWfCYM3fEwsmaQJGXAmRkK4/uksZekbrrbGvCIGbWlYCF6s0ahQBVtS9tBENtWw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/52daf653-e6d8-4915-aea1-9c2e2be169a5/9f3e289918eb9054770b69c0b100bb8f/dotnet-sdk-9.0.202-linux-arm64.tar.gz"; + hash = "sha512-aRb9N5B8ZWO667XJ+CpnYdE9U6BEJFG65zrWKjanJ0R3EBei0/Zl7sqlx29qADbd1QPC4ZWo6jB5c6KSdIuH1Q=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/82a7fc96-b53b-4af4-ac3a-ef0a6c9325d5/84e522c31482538cddf696d03c5b20af/dotnet-sdk-9.0.201-linux-x64.tar.gz"; - hash = "sha512-k6gITvONqBDDyWUEwg6iAgprdVtzoZ96zGzXOotirOCt2hRFLRHmRY9z3H1Y/60i/NFR8RHSMgyyOhD9VNy3cg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c2220b38-c512-4447-b564-a18048d14327/965cdfe500a937c2d28bc9d2db45cd1f/dotnet-sdk-9.0.202-linux-x64.tar.gz"; + hash = "sha512-DrUjAAI9nfZJSq372DgN3fhOLyF9RErZ/ogCkq+/N4vjcA1/vsoxNuyVliujVeRKv8n4pnnNDQjmj4XLAyDOcw=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/905c96fd-1e89-4024-834f-dd2690ec6eab/6b3cec8a13b42bf55f65f65badf0b89f/dotnet-sdk-9.0.201-linux-musl-arm.tar.gz"; - hash = "sha512-ONvoFPTs1SgfeCEFlmHuAmX7IZzeCF+s/M1Z6fs0DAOBhEkGTf6kYi3gwMbjkMoZeVFb3ne/MMvnquYUwc1PKw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c2399a26-a81c-4039-bc90-62a6ac27416e/25e7626b936ba69c2f0fcf1c5403f172/dotnet-sdk-9.0.202-linux-musl-arm.tar.gz"; + hash = "sha512-OBlNZ0l9xy6/fVp+pnZGJNHFJKwmJhzoiKEK+UCrZhlzMGywC/iQmjaUIVwME0rpAZXm7hGBgEb5IOD/Zag2Yg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/26b8a5c2-b79c-425f-8356-d8f0d231bf45/0da5d6f19a28a5d07ebda7fe5a1ec536/dotnet-sdk-9.0.201-linux-musl-arm64.tar.gz"; - hash = "sha512-DKnTE6zKGUcW/62/ck4yV3AEKOkrW9CSBV2d9jHNOiZ/PFe6dV115B+3sCeEgyG7Crbf7gN04OReVJkLNLxnqA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/fc1b0d83-d63a-4469-b0a4-d36b3c2d7c65/c8522a9bf1a9e3c1c8ee3d1e65153641/dotnet-sdk-9.0.202-linux-musl-arm64.tar.gz"; + hash = "sha512-IQcf9GhTtBVVacWnD9gYa4JQdZ2x15RRmOUjAjvjzQ6XBYSZSR8fLS13FWphkZtih8cN9VILTsASqp7BcoifbQ=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/1de65d68-6aaf-46dc-b103-5461e03b8d81/160ce3ce92da0cc3eaf465279b6b61f1/dotnet-sdk-9.0.201-linux-musl-x64.tar.gz"; - hash = "sha512-dW/ohdWRYEDHeZXO7QLoUqk+7pRIn7JSHZYT2oCxoGbAVTUmxbPWwkvNAxwQ6YSK2A0nt1lF5GmZCeat/Tm6yw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c99de83d-6caa-4ec0-ae22-b542cef5833a/90ef16f45a552623155d86732478f958/dotnet-sdk-9.0.202-linux-musl-x64.tar.gz"; + hash = "sha512-i2U40wVt2fIx2WTaotB61xQJtObrmR1AasHwdiYAEIVXNya6NSlLVPLoWW06d+AY1y6l307GH7t5+qBFEKSfow=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/2dfd9746-db33-464f-93f7-6101f0f85968/6d20c7591ed80ad5c8b8039860b4626d/dotnet-sdk-9.0.201-osx-arm64.tar.gz"; - hash = "sha512-Il3C3Gfx/EHAUgnkmjFWUbIBlv8Ch/le4IPkyTLJDu17ePaCh6iJpB+z7RH0jQt19ihf0OgWEvmEtZz6c9Cnww=="; + url = "https://download.visualstudio.microsoft.com/download/pr/98cc1e45-e17c-4e63-afb1-86583dce24fe/948df23085579a4ce3f38620540eb088/dotnet-sdk-9.0.202-osx-arm64.tar.gz"; + hash = "sha512-Y7rd4WFK6op1UfjlbEt7o3mxXzfmwAgTPiLAjfBgfquMPC8DBuRB6f5gwhZt7JUycqDL0VDrWwt32sWyh4gBFQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/abc40bfa-5976-482c-9143-e8ac8ed267dd/8ec0035953d18fcb07aa3bb033ca35a2/dotnet-sdk-9.0.201-osx-x64.tar.gz"; - hash = "sha512-azGDM5p7T81pdXMfDEB5p/oaYYvPejNYOqNe2NvtXYQeXxfOEYQWwh/qcrq/q9D8LMBCZvNq+dbHvIxVIMtagQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/bc0334a2-641c-4e60-b07b-b1f65c05da0f/f1e9820b1ad0ddf0104103cd5d4fe69b/dotnet-sdk-9.0.202-osx-x64.tar.gz"; + hash = "sha512-+ke1cSRipwSu7TeiOZB0ER5vX2+wN3ypO/qpF3sx+VCM3X9JLV6iTgzTw6D7l3u7XlgqDr/YS6oOxNCnq9BRjQ=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index d6b92ecdb547..f7f42bfad9ad 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -156,7 +156,8 @@ stdenv.mkDerivation rec { postPatch = '' # set the sdk version in global.json to match the bootstrap sdk - jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${bootstrapSdk}/bin/dotnet --version)" > global.json~ + sdk_version=$(HOME=$(mktemp -d) ${bootstrapSdk}/bin/dotnet --version) + jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$sdk_version" > global.json~ mv global.json{~,} patchShebangs $(find -name \*.sh -type f -executable) @@ -312,7 +313,6 @@ stdenv.mkDerivation rec { src/aspnetcore/Directory.Build.props '' + '' - # stop passing -sdk without a path # stop using xcrun # add -module-cache-path to fix swift errors, see sandboxProfile @@ -322,22 +322,21 @@ stdenv.mkDerivation rec { src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \ --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \ --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' - '' - + lib.optionalString (lib.versionAtLeast version "9") ( - '' - # fix: strip: error: unknown argument '-n' - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ - src/runtime/src/native/managed/native-library.targets \ - --replace-fail ' -no_code_signature_warning' "" - # ld: library not found for -ld_classic - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ - '' - + lib.optionalString (lib.versionOlder version "10") " src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \\\n" - + " --replace-fail 'Include=\"-ld_classic\"' \"\"\n" - ) + # fix: strip: error: unknown argument '-n' + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ + '' + + lib.optionalString (lib.versionAtLeast version "9") " src/runtime/src/native/managed/native-library.targets \\\n" + + '' + --replace-fail ' -no_code_signature_warning' "" + + # ld: library not found for -ld_classic + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ + '' + + lib.optionalString (lib.versionOlder version "10") " src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \\\n" + + " --replace-fail 'Include=\"-ld_classic\"' \"\"\n" + lib.optionalString (lib.versionOlder version "9") '' # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index 2ac14b665fea..655bd017a782 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -76,7 +76,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installCheckPhase = '' runHook preInstallCheck - $out/bin/dotnet --info + HOME=$(mktemp -d) $out/bin/dotnet --info runHook postInstallCheck ''; @@ -282,14 +282,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { in unwrapped.passthru.tests or { } // { - version = testers.testVersion ( - { - package = finalAttrs.finalPackage; - } - // lib.optionalAttrs (type != "sdk") { - command = "dotnet --info"; - } - ); + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "HOME=$(mktemp -d) dotnet " + (if type == "sdk" then "--version" else "--info"); + }; } // lib.optionalAttrs (type == "sdk") ({ console = lib.recurseIntoAttrs { diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 3bf3df125075..580c4b83cc29 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -278,7 +278,6 @@ originalAttrs: targetLibDir="''${targetConfig+$targetConfig/}lib" moveToOutput "$targetLibDir/lib*.so*" "''${!outputLib}" - moveToOutput "$targetLibDir/lib*.la" "''${!outputLib}" moveToOutput "$targetLibDir/lib*.dylib" "''${!outputLib}" moveToOutput "$targetLibDir/lib*.dll.a" "''${!outputLib}" moveToOutput "$targetLibDir/lib*.dll" "''${!outputLib}" @@ -288,19 +287,18 @@ originalAttrs: moveToOutput "$targetLibDir/lib*.a" "''${!outputLib}" fi - for i in "''${!outputLib}"/$targetLibDir/*.{la,py}; do + for i in "''${!outputLib}"/$targetLibDir/*.py; do substituteInPlace "$i" --replace "$out" "''${!outputLib}" done # Multilib and cross can't exist at the same time, so just use lib64 here if [ -n "$enableMultilib" ]; then moveToOutput "lib64/lib*.so*" "''${!outputLib}" - moveToOutput "lib64/lib*.la" "''${!outputLib}" moveToOutput "lib64/lib*.dylib" "''${!outputLib}" moveToOutput "lib64/lib*.dll.a" "''${!outputLib}" moveToOutput "lib64/lib*.dll" "''${!outputLib}" - for i in "''${!outputLib}"/lib64/*.{la,py}; do + for i in "''${!outputLib}"/lib64/*.py; do substituteInPlace "$i" --replace "$out" "''${!outputLib}" done fi @@ -313,6 +311,12 @@ originalAttrs: # More dependencies with the previous gcc or some libs (gccbug stores the build command line) rm -rf $out/bin/gccbug + # Remove .la files, they're not adjusted for the makeCompatibilitySymlink magic, + # which confuses libtool and leads to weird linking errors. + # Removing the files just makes libtool link .so files directly, which is usually + # what we want anyway. + find $out -name '*.la' -delete + if type "install_name_tool"; then for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do install_name_tool -id "$i" "$i" || true diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 390745fe5290..14d2f699e3d7 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -29,23 +29,23 @@ in { }); julia_110-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.10.8"; + version = "1.10.9"; sha256 = { - x86_64-linux = "0410175aeec3df63173c15187f2083f179d40596d36fd3a57819cc5f522ae735"; - aarch64-linux = "8d63dd12595a08edc736be8d6c4fea1840f137b81c62079d970dbd1be448b8cd"; - x86_64-darwin = "8dae60def14db9e9b0f70891f15483d05785ae27a2c14f8f4b1ce27010e4015f"; - aarch64-darwin = "cdd5891a7b143bde835a79155471b82c5482d4dc5576f719351810548242e64b"; + x86_64-linux = "5a2d2c5224594b683c97e7304cb72407fbcf0be4a0187789cba1a2f73f0cbf09"; + aarch64-linux = "be222882e3674f960f43b6842f7bbb52a369977e40d5dcd26498793e1cd2dfb6"; + x86_64-darwin = "f80c93c30a18d8a5dc7f37d0cc94757fd3857651268e4a9e2d42d3b1ea3372f1"; + aarch64-darwin = "e62e00b22408159cba3d669f2d9e8b60c1d23b5c2d1c22ec25f4957d15ca98ef"; }; }) { }); julia_111-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.11.3"; + version = "1.11.4"; sha256 = { - x86_64-linux = "7d48da416c8cb45582a1285d60127ee31ef7092ded3ec594a9f2cf58431c07fd"; - aarch64-linux = "0c1f2f60c3ecc37ae0c559db325dc64858fb11d6729b25d63f23e5285f7906ef"; - x86_64-darwin = "5220aade1b43db722fb4e287f1c5d25aa492267b86a846db1546504836cca1be"; - aarch64-darwin = "554fb0ddb4d94d623c83ca5e9d309fe1a7a0924445cb18ec3b863fb3367b0ba8"; + x86_64-linux = "fb3d3c5fccef82158a70677c0044ac5ae40410eceb0604cdc8e643eeff21df8d"; + aarch64-linux = "859f1a8cc4bce6911bc912f0e226a6ba2b1c144110b9d559d88f5077513d0e37"; + x86_64-darwin = "7e693914399f2ebe1fafe5c670af0373474145cfe2bfda661f370559a680720a"; + aarch64-darwin = "5adfb4482bba9610405c0f9b5a3c1aa09cabf70c8751d75970f2dab0fa819488"; }; }) { }); @@ -60,8 +60,8 @@ in { }); julia_110 = wrapJulia (callPackage (import ./generic.nix { - version = "1.10.8"; - hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc="; + version = "1.10.9"; + hash = "sha256-u9by+X76fcXs+w159KTSvw43JeYwJ9Wvn0VyoEfniTM="; patches = [ ./patches/1.10/0002-skip-failing-and-flaky-tests.patch # Revert https://github.com/JuliaLang/julia/pull/55354 @@ -77,8 +77,8 @@ in { }); julia_111 = wrapJulia (callPackage (import ./generic.nix { - version = "1.11.3"; - hash = "sha256-Ansli0e04agdHs3TVa3v/bbAGBya2YjnF/XkdaEqHeg="; + version = "1.11.4"; + hash = "sha256-xJNlYtBRKIQtf+K+MHNDM1GeqUpUhhtdC/440QPpa1s="; patches = [ ./patches/1.11/0002-skip-failing-and-flaky-tests.patch ]; diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index a33d8db3ad48..c32fced3fc8e 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -10,9 +10,9 @@ rec { llvm_meta = { license = with lib.licenses; [ ncsa ] ++ - # Contributions after June 1st, 2024 are only licensed under asl20-llvm: - # https://github.com/llvm/llvm-project/pull/92394 - lib.optional (lib.versionAtLeast release_version "19") asl20-llvm; + # Contributions after June 1st, 2024 are only licensed under asl20 and + # llvm-exception: https://github.com/llvm/llvm-project/pull/92394 + lib.optionals (lib.versionAtLeast release_version "19") [ asl20 llvm-exception ]; maintainers = lib.teams.llvm.members; # See llvm/cmake/config-ix.cmake. diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index 2ba098da2814..6ccc7e44ff61 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = llvm_meta // { + broken = stdenv.hostPlatform.isDarwin; homepage = "https://libc.llvm.org/"; description = "Standard C library for LLVM"; }; diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index f9986621df4a..345e466412c2 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -513,12 +513,19 @@ stdenv.mkDerivation (finalAttrs: { ] ++ [ "-DLLVM_TABLEGEN=${buildLlvmTools.tblgen}/bin/llvm-tblgen" ]; + + triple = + if stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "20" then + # JIT tests expect the triple to use Darwin arch's naming for CPU architectures. + "${stdenv.hostPlatform.darwinArch}-apple-${stdenv.hostPlatform.darwinPlatform}" + else + stdenv.hostPlatform.config; in flagsForLlvmConfig ++ [ "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_HOST_TRIPLE=${triple}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${triple}" "-DLLVM_ENABLE_DUMP=ON" (lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo) ] ++ optionals (!finalAttrs.finalPackage.doCheck) [ diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index 8f2f28c72c65..40eff60e4495 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { "-DLLVM_ENABLE_DUMP=ON" "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.tblgen}/bin/llvm-tblgen" "-DMLIR_TABLEGEN_EXE=${buildLlvmTools.tblgen}/bin/mlir-tblgen" + (lib.cmakeBool "LLVM_BUILD_LLVM_DYLIB" (!stdenv.hostPlatform.isStatic)) ] ++ lib.optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" @@ -71,6 +72,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; meta = llvm_meta // { + # Very broken since the dependencies aren't propagating at all with tblgen through the CMake. + broken = lib.versionAtLeast release_version "20"; homepage = "https://mlir.llvm.org/"; description = "Multi-Level IR Compiler Framework"; longDescription = '' diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index c3d31450830e..30825787132a 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -31,11 +31,11 @@ let "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; - "20.1.0-rc3".officialRelease.sha256 = "sha256-mLSBoyq24FD+khynC6sC5IkDFqizgAn07lR9+ZRXlV0="; + "20.1.1".officialRelease.sha256 = "sha256-hDFYi5wAUDQ8xfjvbGFi05KdawrN9lwrrSC8AcTpCEE="; "21.0.0-git".gitRelease = { - rev = "58fc4b13cb5ff7e877c52c11f71328ed12e6a89c"; - rev-version = "21.0.0-unstable-2025-03-09"; - sha256 = "sha256-ioZubgLW+GpnA3DPe01YDxELnIJhXDGskCUAKZlDvUo="; + rev = "4fde8c341f9166e6ec6dff6e7704be175e382f5b"; + rev-version = "21.0.0-unstable-2025-03-16"; + sha256 = "sha256-LOQdDYbWvPfUxaR7G3UFQlGzmwaUxHuLDOXgixKB18g="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 7a8e4afe0a74..2ef403205aaa 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "reason"; - version = "3.14.0"; + version = "3.15.0"; minimalOCamlVersion = "4.11"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-HQm6JKBZR0Wrazi01fgerYVltzy2mtRq8cLCb40yTwA="; + hash = "sha256-7D0gJfQ5Hw0riNIFPmJ6haoa3dnFEyDp5yxpDgX7ZqY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 88f7ea48fdc8..fec3603260ed 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -20,12 +20,12 @@ let }; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.5.0" = { - sha256 = "sha256-Lhiv0Ijkot8ht3uuLhcM5XDRHabSdgcpImXxzGqKGbE="; - }; "2.5.1" = { sha256 = "sha256-QTOzbNFtFNYzlpw3/VHCyJqOpdbhYRVSgZ2R9xshn4s="; }; + "2.5.2" = { + sha256 = "sha256-XcJ+un3aQz31P9dEHeixFHSoLNrBaJwfbOVfoGXWX6w="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch index db4feeb9af66..eb9a44038666 100644 --- a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch +++ b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch @@ -1,7 +1,7 @@ diff --git a/GNUmakefile b/GNUmakefile --- a/GNUmakefile +++ b/GNUmakefile -@@ -14,11 +14,6 @@ LLVM_VERSIONS = 18 17 16 15 +@@ -14,11 +14,6 @@ LLVM_VERSIONS = 19 18 17 16 15 errifempty = $(if $(1),$(1),$(error $(2))) detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2))) toolSearchPathsVersion = $(1)-$(2) @@ -13,26 +13,27 @@ diff --git a/GNUmakefile b/GNUmakefile # First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name. findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1)) CLANG ?= $(call findLLVMTool,clang) -@@ -848,9 +843,8 @@ endif +@@ -939,10 +934,9 @@ endif wasmtest: $(GO) test ./tests/wasm -build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen) +build/release: @mkdir -p build/release/tinygo/bin + @mkdir -p build/release/tinygo/lib/bdwgc - @mkdir -p build/release/tinygo/lib/clang/include @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS @mkdir -p build/release/tinygo/lib/macos-minimal-sdk @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common -@@ -871,7 +865,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN - ifneq ($(USE_SYSTEM_BINARYEN),1) +@@ -964,7 +958,6 @@ ifneq ($(USE_SYSTEM_BINARYEN),1) @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin endif + @cp -rp lib/bdwgc/* build/release/tinygo/lib/bdwgc - @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk -@@ -927,8 +920,7 @@ endif +@@ -1026,8 +1019,7 @@ endif @cp -rp lib/wasi-libc/libc-top-half/musl/include build/release/tinygo/lib/wasi-libc/libc-top-half/musl @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot @cp -rp lib/wasi-cli/wit build/release/tinygo/lib/wasi-cli/wit @@ -43,5 +44,5 @@ diff --git a/GNUmakefile b/GNUmakefile @cp -rp targets build/release/tinygo/targets -- -2.37.2 +2.48.1 diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index ea4a10ae09c8..e32871b6a40d 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -34,13 +34,13 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.35.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - hash = "sha256-oy6797o3lMMRJ+bPHY59Bv7mX25aEwBn4OslAohfY2g="; + hash = "sha256-I/9JXjt6aF/80Mh3iRgUYXv4l+m3XIpmKsIBviOuWCo="; fetchSubmodules = true; # The public hydra server on `hydra.nixos.org` is configured with # `max_output_size` of 3GB. The purpose of this `postFetch` step @@ -51,7 +51,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-aY1gX++Dc5/G6VFXnP7sBdekk2IKHlenOC0erlB/Quw="; + vendorHash = "sha256-juADakh+s8oEY9UXUwxknvVeL1TgB/zRi8Xtzt/4qPA="; patches = [ ./0001-GNUmakefile.patch diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 781af2b32dcc..708d1fd40d10 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -81,13 +81,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.50"; + version = "0.51"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; tag = "v${finalAttrs.version}"; - hash = "sha256-5dV/RUNnCpBQp7tP2U7t/pqGP/v3vKiIKQG9fbf1Tfg="; + hash = "sha256-Y2Gf3CXd1em+4dlIo2+dwfZbqahM3kqG0rZUTjkIZak="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/development/coq-modules/Vpl/default.nix b/pkgs/development/coq-modules/Vpl/default.nix index 7a6b9d2ec3d6..f3075e20e737 100644 --- a/pkgs/development/coq-modules/Vpl/default.nix +++ b/pkgs/development/coq-modules/Vpl/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { release."0.5".sha256 = "sha256-mSD/xSweeK9WMxWDdX/vzN96iXo74RkufjuNvtzsP9o="; - sourceRoot = "source/coq"; + setSourceRoot = "sourceRoot=$(echo */coq)"; meta = { description = "Coq interface to VPL abstract domain of convex polyhedra"; diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix index 43d2bece88c9..4302830ac200 100644 --- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix +++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix @@ -4,17 +4,30 @@ fetchFromGitHub, cmake, addDriverRunpath, + autoAddDriverRunpath, cudatoolkit, cutensor, + cusparselt, + cudaPackages, + setupCudaHook, + autoPatchelfHook, }: let - rev = "5aab680905d853bce0dbad4c488e4f7e9f7b2302"; + inherit (cudaPackages) + cuda_cccl + cuda_cudart + cuda_nvcc + libcusparse + cudaAtLeast + cudaOlder + ; + rev = "e57b9c483c5384b7b97b7d129457e5a9bdcdb5e1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "CUDALibrarySamples"; inherit rev; - sha256 = "0gwgbkq05ygrfgg5hk07lmap7n7ampxv0ha1axrv8qb748ph81xs"; + sha256 = "0g17afsmb8am0darxchqgjz1lmkaihmnn7k1x4ahg5gllcmw8k3l"; }; commonAttrs = { version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version; @@ -83,4 +96,50 @@ in CUTENSOR_ROOT = cutensor; } ); + + cusparselt = backendStdenv.mkDerivation ( + commonAttrs + // { + pname = "cuda-library-samples-cusparselt"; + + src = "${src}/cuSPARSELt"; + + sourceRoot = "cuSPARSELt/matmul"; + + buildInputs = lib.optionals (cudaOlder "11.4") [ cudatoolkit ]; + + nativeBuildInputs = + [ + cmake + addDriverRunpath + (lib.getDev cusparselt) + (lib.getDev libcusparse) + ] + ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ] + ++ lib.optionals (cudaAtLeast "11.4") [ + cuda_nvcc + (lib.getDev cuda_cudart) # + ] + ++ lib.optionals (cudaAtLeast "12.0") [ + cuda_cccl # + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt.so" "${lib.getLib cusparselt}/lib/libcusparseLt.so" \ + --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt_static.a" "${lib.getStatic cusparselt}/lib/libcusparseLt_static.a" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp matmul_example $out/bin/ + cp matmul_example_static $out/bin/ + runHook postInstall + ''; + + CUDA_TOOLKIT_PATH = lib.getLib cudatoolkit; + CUSPARSELT_PATH = lib.getLib cusparselt; + } + ); } diff --git a/pkgs/development/cuda-modules/cusparselt/extension.nix b/pkgs/development/cuda-modules/cusparselt/extension.nix new file mode 100644 index 000000000000..f7ecfb0f12b6 --- /dev/null +++ b/pkgs/development/cuda-modules/cusparselt/extension.nix @@ -0,0 +1,144 @@ +# Support matrix can be found at +# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html +{ + lib, + stdenv, + cudaVersion, + flags, + mkVersionedPackageName, +}: +let + inherit (lib) + attrsets + lists + modules + versions + strings + trivial + ; + + inherit (stdenv) hostPlatform; + + redistName = "cusparselt"; + pname = "libcusparse_lt"; + + cusparseltVersions = [ + "0.7.1" + ]; + + # Manifests :: { redistrib, feature } + + # Each release of cusparselt gets mapped to an evaluated module for that release. + # From there, we can get the min/max CUDA versions supported by that release. + # listOfManifests :: List Manifests + listOfManifests = + let + configEvaluator = + fullCusparseltVersion: + modules.evalModules { + modules = [ + ../modules + # We need to nest the manifests in a config.cusparselt.manifests attribute so the + # module system can evaluate them. + { + cusparselt.manifests = { + redistrib = trivial.importJSON (./manifests + "/redistrib_${fullCusparseltVersion}.json"); + feature = trivial.importJSON (./manifests + "/feature_${fullCusparseltVersion}.json"); + }; + } + ]; + }; + # Un-nest the manifests attribute set. + releaseGrabber = evaluatedModules: evaluatedModules.config.cusparselt.manifests; + in + lists.map (trivial.flip trivial.pipe [ + configEvaluator + releaseGrabber + ]) cusparseltVersions; + + # Our cudaVersion tells us which version of CUDA we're building against. + # The subdirectories in lib/ tell us which versions of CUDA are supported. + # Typically the names will look like this: + # + # - 10.2 + # - 11 + # - 11.0 + # - 12 + + # libPath :: String + libPath = + let + cudaMajorMinor = versions.majorMinor cudaVersion; + cudaMajor = versions.major cudaVersion; + in + if cudaMajorMinor == "10.2" then cudaMajorMinor else cudaMajor; + + # A release is supported if it has a libPath that matches our CUDA version for our platform. + # LibPath are not constant across the same release -- one platform may support fewer + # CUDA versions than another. + # redistArch :: String + redistArch = flags.getRedistArch hostPlatform.system; + # platformIsSupported :: Manifests -> Boolean + platformIsSupported = + { feature, redistrib, ... }: + (attrsets.attrByPath [ + pname + redistArch + ] null feature) != null; + + # TODO(@connorbaker): With an auxiliary file keeping track of the CUDA versions each release supports, + # we could filter out releases that don't support our CUDA version. + # However, we don't have that currently, so we make a best-effort to try to build TensorRT with whatever + # libPath corresponds to our CUDA version. + # supportedManifests :: List Manifests + supportedManifests = builtins.filter platformIsSupported listOfManifests; + + # Compute versioned attribute name to be used in this package set + # Patch version changes should not break the build, so we only use major and minor + # computeName :: RedistribRelease -> String + computeName = { version, ... }: mkVersionedPackageName redistName version; +in +final: _: +let + # buildCusparseltPackage :: Manifests -> AttrSet Derivation + buildCusparseltPackage = + { redistrib, feature }: + let + drv = final.callPackage ../generic-builders/manifest.nix { + inherit pname redistName; + redistribRelease = redistrib.${pname}; + featureRelease = feature.${pname}; + }; + fixedDrv = drv.overrideAttrs (prevAttrs: { + buildInputs = + prevAttrs.buildInputs + ++ lists.optionals (strings.versionOlder cudaVersion "11.4") [ final.cudatoolkit ] + ++ lists.optionals (strings.versionAtLeast cudaVersion "11.4") ( + [ final.libcublas.lib ] + # For some reason, the 1.4.x release of cusparselt requires the cudart library. + ++ lists.optionals (strings.hasPrefix "1.4" redistrib.${pname}.version) [ final.cuda_cudart.lib ] + ); + meta = prevAttrs.meta // { + description = "cuSPARSELt: A High-Performance CUDA Library for Sparse Matrix-Matrix Multiplication"; + homepage = "https://developer.nvidia.com/cusparselt-downloads"; + + maintainers = prevAttrs.meta.maintainers ++ [ lib.maintainers.sepiabrown ]; + license = lib.licenses.unfreeRedistributable // { + shortName = "cuSPARSELt EULA"; + fullName = "cuSPARSELt SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS"; + url = "https://docs.nvidia.com/cuda/cusparselt/license.html"; + }; + }; + }); + in + attrsets.nameValuePair (computeName redistrib.${pname}) fixedDrv; + + extension = + let + nameOfNewest = computeName (lists.last supportedManifests).redistrib.${pname}; + drvs = builtins.listToAttrs (lists.map buildCusparseltPackage supportedManifests); + containsDefault = attrsets.optionalAttrs (drvs != { }) { cusparselt = drvs.${nameOfNewest}; }; + in + drvs // containsDefault; +in +extension diff --git a/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json b/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json new file mode 100644 index 000000000000..0b368e22bb24 --- /dev/null +++ b/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json @@ -0,0 +1,44 @@ +{ + "libcusparse_lt": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json b/pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json new file mode 100644 index 000000000000..b9609bd4532a --- /dev/null +++ b/pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json @@ -0,0 +1,35 @@ +{ + "release_date": "2025-02-25", + "release_label": "0.7.1", + "release_product": "cusparselt", + "libcusparse_lt": { + "name": "NVIDIA cuSPARSELt", + "license": "cuSPARSELt", + "license_path": "libcusparse_lt/LICENSE.txt", + "version": "0.7.1.0", + "linux-x86_64": { + "relative_path": "libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-0.7.1.0-archive.tar.xz", + "sha256": "a0d885837887c73e466a31b4e86aaae2b7d0cc9c5de0d40921dbe2a15dbd6a88", + "md5": "b2e5f3c9b9d69e1e0b55b16de33fdc6e", + "size": "353151840" + }, + "linux-sbsa": { + "relative_path": "libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.7.1.0-archive.tar.xz", + "sha256": "4a131d0a54728e53ba536b50bb65380603456f1656e7df8ee52e285618a0b57c", + "md5": "612a712c7da6e801ee773687e99af87e", + "size": "352406784" + }, + "windows-x86_64": { + "relative_path": "libcusparse_lt/windows-x86_64/libcusparse_lt-windows-x86_64-0.7.1.0-archive.zip", + "sha256": "004bcb1b700c24ca8d60a8ddd2124640f61138a6c29914d2afaa0bfa0d0e3cf2", + "md5": "a1d8df8dc8ff4b3bd0e859f992f8f392", + "size": "268594665" + }, + "linux-aarch64": { + "relative_path": "libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.7.1.0-archive.tar.xz", + "sha256": "d3b0a660fd552e0bd9a4491b15299d968674833483d5f164cfea35e70646136c", + "md5": "54e3f3b28c94118991ce54ec38f531fb", + "size": "5494380" + } + } +} diff --git a/pkgs/development/cuda-modules/modules/cusparselt/default.nix b/pkgs/development/cuda-modules/modules/cusparselt/default.nix new file mode 100644 index 000000000000..745bad811c05 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/cusparselt/default.nix @@ -0,0 +1,4 @@ +{ options, ... }: +{ + options.cusparselt.manifests = options.generic.manifests; +} diff --git a/pkgs/development/cuda-modules/modules/default.nix b/pkgs/development/cuda-modules/modules/default.nix index ccccd871479e..a173d1cae360 100644 --- a/pkgs/development/cuda-modules/modules/default.nix +++ b/pkgs/development/cuda-modules/modules/default.nix @@ -4,6 +4,7 @@ # Always after generic ./cuda ./cudnn + ./cusparselt ./cutensor ./tensorrt ]; diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix index 13c7c1a10c32..05f5594cf0a6 100644 --- a/pkgs/development/cuda-modules/tensorrt/releases.nix +++ b/pkgs/development/cuda-modules/tensorrt/releases.nix @@ -42,6 +42,22 @@ filename = "TensorRT-8.6.1.6.Ubuntu-20.04.aarch64-gnu.cuda-12.0.tar.gz"; hash = "sha256-Lc4+v/yBr17VlecCSFMLUDlXMTYV68MGExwnUjGme5E="; } + { + version = "10.8.0.43"; + minCudaVersion = "12.8"; + maxCudaVersion = "12.8"; + cudnnVersion = "9.7"; + filename = "TensorRT-10.8.0.43.Linux.aarch64-gnu.cuda-12.8.tar.gz"; + hash = "sha256-sB5d0sfGQyUhGdA9ku6pcCNBjpL0Wjvg0Ilulikj5Do="; + } + { + version = "10.9.0.34"; + minCudaVersion = "12.8"; + maxCudaVersion = "12.8"; + cudnnVersion = "9.7"; + filename = "TensorRT-10.9.0.34.Linux.aarch64-gnu.cuda-12.8.tar.gz"; + hash = "sha256-uB7CoGf2fwgsE8rsLc71Q4W0Kp3mpOyubzGKotQZZPI="; + } ]; # x86_64 linux-x86_64 = [ @@ -127,6 +143,22 @@ filename = "TensorRT-10.8.0.43.Linux.x86_64-gnu.cuda-12.8.tar.gz"; hash = "sha256-V31tivU4FTQUuYZ8ZmtPZYUvwusefA6jogbl+vvH1J4="; } + { + version = "10.9.0.34"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + cudnnVersion = "8.9"; + filename = "TensorRT-10.9.0.34.Linux.x86_64-gnu.cuda-11.8.tar.gz"; + hash = "sha256-nQtdgeOIxRA8RsL3ZvQHeBxA4dbJvyWEoFvmSxPaBLA="; + } + { + version = "10.9.0.34"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.8"; + cudnnVersion = "9.7"; + filename = "TensorRT-10.9.0.34.Linux.x86_64-gnu.cuda-12.8.tar.gz"; + hash = "sha256-M74OYeO/F3u7yrtIkr8BPwyKxx0r5z8oA4SKOCyxQnI="; + } ]; }; } diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix index 05fb205543cc..33915e1386c2 100644 --- a/pkgs/development/interpreters/erlang/28.nix +++ b/pkgs/development/interpreters/erlang/28.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "28.0-rc1"; - sha256 = "sha256-fjje31F5YW5rzetb2r4fkESwKt9N+WOH3yrqETUjJzg="; + version = "28.0-rc2"; + sha256 = "sha256-ENarmypS1rs6gG7e0/WOC9p/jabwrjbj/u1rFeWDHck="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index d1cc86697f86..01ab649261e5 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -12,18 +12,15 @@ openssl, perl, runtimeShell, - autoconf, openjdk11 ? null, # javacSupport unixODBC ? null, # odbcSupport libGL ? null, libGLU ? null, wxGTK ? null, xorg ? null, - ex_doc ? null, parallelBuild ? false, systemd, wxSupport ? true, - ex_docSupport ? false, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, # systemd support in epmd # updateScript deps writeScript, @@ -76,14 +73,6 @@ installPhase ? "", preInstall ? "", postInstall ? "", - installTargets ? - if ((lib.versionOlder version "27.0") || ex_docSupport) then - [ - "install" - "install-docs" - ] - else - [ "install" ], checkPhase ? "", preCheck ? "", postCheck ? "", @@ -104,7 +93,6 @@ assert assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk11 != null; -assert ex_docSupport -> ex_doc != null; let inherit (lib) @@ -132,7 +120,6 @@ stdenv.mkDerivation ( LANG = "C.UTF-8"; nativeBuildInputs = [ - autoconf makeWrapper perl gnum4 @@ -140,11 +127,9 @@ stdenv.mkDerivation ( libxml2 ]; - env = lib.optionalAttrs ((lib.versionAtLeast "28.0-rc1" version) && ex_docSupport) { - # erlang-28.0-rc> warning: jinterface.html redirects to ../lib/jinterface/doc/html/index.html, which does not exist - # erlang-28.0-rc> - # erlang-28.0-rc> warning: odbc.html redirects to ../lib/odbc/doc/html/index.html, which does not exist - EX_DOC_WARNINGS_AS_ERRORS = "false"; + env = { + # only build shell/IDE docs and man pages + DOC_TARGETS = "chunks man"; }; buildInputs = @@ -174,25 +159,6 @@ stdenv.mkDerivation ( --replace-fail '"sh ' '"${runtimeShell} ' ''; - # For OTP 27+ we need ex_doc to build the documentation - # When ex_docSupport is enabled, grab the raw ex_doc executable from the ex_doc - # derivation. Next, patch the first line to use the escript that will be - # built during the build phase of this derivation. Finally, building the - # documentation requires the erlang-logo.png asset. - preConfigure = - '' - ./otp_build autoconf - '' - + optionalString ex_docSupport '' - mkdir -p $out/bin - cp ${ex_doc}/bin/.ex_doc-wrapped $out/bin/ex_doc - sed -i "1 s:^.*$:#!$out/bin/escript:" $out/bin/ex_doc - export EX_DOC=$out/bin/ex_doc - - mkdir -p $out/lib/erlang/system/doc/assets - cp $src/system/doc/assets/erlang-logo.png $out/lib/erlang/system/doc/assets - ''; - configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ] ++ [ "--with-ssl-incl=${lib.getDev opensslPackage}" ] # This flag was introduced in R24 @@ -211,6 +177,10 @@ stdenv.mkDerivation ( # install-docs will generate and install manpages and html docs # (PDFs are generated only when fop is available). + installTargets = [ + "install" + "install-docs" + ]; postInstall = '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call @@ -295,7 +265,6 @@ stdenv.mkDerivation ( // optionalAttrs (preCheck != "") { inherit preCheck; } // optionalAttrs (postCheck != "") { inherit postCheck; } // optionalAttrs (installPhase != "") { inherit installPhase; } - // optionalAttrs (installTargets != [ ]) { inherit installTargets; } // optionalAttrs (preInstall != "") { inherit preInstall; } // optionalAttrs (fixupPhase != "") { inherit fixupPhase; } // optionalAttrs (preFixup != "") { inherit preFixup; } diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 0b52ff611191..c0b55e875cae 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -9,13 +9,13 @@ callPackage ./default.nix { # The patch version is the timestamp of the git commit, # obtain via `cat $(nix-build -A luajit_2_0.src)/.relver` - version = "2.0.1713483859"; + version = "2.0.1741557863"; src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; - rev = "9b5e837ac2dfdc0638830c048a47ca9378c504d3"; - hash = "sha256-GflF/sELSNanc9G4WMzoOadUBOFSs6OwqhAXa4sudWA="; + rev = "85c3f2fb6f59276ebf07312859a69d6d5a897f62"; + hash = "sha256-5UIZ650M/0W08iX1ajaHvDbNgjbzZJ1akVwNbiDUeyY="; }; extraMeta = { diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index c151512edd1a..2db105bb6327 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -8,13 +8,13 @@ callPackage ./default.nix { # The patch version is the timestamp of the git commit, # obtain via `cat $(nix-build -A luajit_2_1.src)/.relver` - version = "2.1.1713773202"; + version = "2.1.1741730670"; src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; - rev = "5790d253972c9d78a0c2aece527eda5b134bbbf7"; - hash = "sha256-WG8AWDI182/9O7NrZlQ6ZH/esyYE2pWXMuSzWUuntSA="; + rev = "538a82133ad6fddfd0ca64de167c4aca3bc1a2da"; + hash = "sha256-3DhNqVdojsWDo8mKJXIyTqFODIiKzThcAzHPdnoJaVM="; }; inherit self passthruFun; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 8a052a55b7da..6199c5d44ca1 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -434,6 +434,9 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { for path in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace-warn $path /no-such-path done + '' + optionalString (stdenv.hostPlatform.isDarwin && pythonOlder "3.12") '' + # Fix _ctypes module compilation + export NIX_CFLAGS_COMPILE+=" -DUSING_APPLE_OS_LIBFFI=1" '' + optionalString stdenv.hostPlatform.isDarwin '' # Override the auto-detection in setup.py, which assumes a universal build export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"} diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 38afdb3026b9..d8b8f661ee2a 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -146,13 +146,60 @@ in }; pytestCheckHook = callPackage ( - { makePythonHook, pytest }: + { + makePythonHook, + pytest, + # For package tests + testers, + objprint, + }: makePythonHook { name = "pytest-check-hook"; propagatedBuildInputs = [ pytest ]; substitutions = { inherit pythonCheckInterpreter; }; + passthru = { + tests = { + basic = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-basic-${previousPythonAttrs.pname}"; + }); + disabledTests = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTests-${previousPythonAttrs.pname}"; + disabledTests = [ + "test_print" + ] ++ previousPythonAttrs.disabledTests or [ ]; + }); + disabledTestPaths = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_basic.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }); + disabledTestPaths-nonexistent = testers.testBuildFailure ( + objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-nonexistent-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_foo.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }) + ); + disabledTestPaths-glob = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-glob-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_obj*.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }); + disabledTestPaths-glob-nonexistent = testers.testBuildFailure ( + objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-glob-nonexistent-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_foo*.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }) + ); + }; + }; } ./pytest-check-hook.sh ) { }; diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index 855c770e31b1..ff95f73ba20c 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -18,7 +18,7 @@ function pytestCheckPhase() { concatTo _pathsArray disabledTestPaths for path in "${_pathsArray[@]}"; do # Check if every path glob matches at least one path - @pythonCheckInterpreter@ <(cat <> fonts.conf echo "" >> fonts.conf + # N.B.: fc-cache keys its cache entries by architecture. + # We must invoke the host `fc-cache` (not the build fontconfig) if we want + # the cache to be usable by the host. mkdir -p $out - fc-cache -sv + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe' fontconfig "fc-cache"} -sv # This is not a cache dir in the normal sense -- it won't be automatically # recreated. diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 7e756b976b21..d573d2325fba 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -111,7 +111,7 @@ , microdnsSupport ? false # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc -, guiSupport ? true, directfb +, guiSupport ? true }: stdenv.mkDerivation rec { @@ -253,8 +253,6 @@ stdenv.mkDerivation rec { libGLU ] ++ lib.optionals guiSupport [ gtk3 - ] ++ lib.optionals (stdenv.hostPlatform.isLinux && guiSupport) [ - directfb ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # For unknown reasons the order is important, e.g. if # VideoToolbox is last, we get: @@ -313,14 +311,13 @@ stdenv.mkDerivation rec { "-Dbluez=${if bluezSupport then "enabled" else "disabled"}" (lib.mesonEnable "openh264" openh264Support) (lib.mesonEnable "doc" enableDocumentation) + (lib.mesonEnable "directfb" false) ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only "-Dnvcodec=disabled" # Linux-only ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !gst-plugins-base.waylandEnabled) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` - ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !guiSupport) [ - "-Ddirectfb=disabled" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Daja=disabled" "-Dchromaprint=disabled" diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 11bf17aea7a6..8bd7a4be51de 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -16,7 +16,6 @@ , isocodes , libjpeg , libpng -, libvisual , tremor # provides 'virbisidec' , libGL , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages @@ -97,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libdrm libGL - libvisual ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ] ++ lib.optionals enableAlsa [ @@ -124,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "doc" enableDocumentation) + (lib.mesonEnable "libvisual" false) ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-Dtests=disabled" ] @@ -132,10 +131,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!enableGl) "-Dgl=disabled" ++ lib.optional (!enableAlsa) "-Dalsa=disabled" ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-Ddrm=disabled" - "-Dlibvisual=disabled" - ]; + ++ lib.optional stdenv.hostPlatform.isDarwin "-Ddrm=disabled"; postPatch = '' patchShebangs \ diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index fed79a27f8d8..89121db3b5d4 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -22,12 +22,6 @@ stdenv.mkDerivation rec { sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; }; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index f2348a477285..a7c528336a9b 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -23,6 +23,10 @@ let }; in { + icu77 = make-icu { + version = "77.1"; + hash = "sha256-WI5DH3cyfDkDH/u4hDwOO8EiwhE3RIX6h9xfP6/yQGE="; + }; icu76 = make-icu { version = "76.1"; hash = "sha256-36y0a/5HR0EEcs4+EUS/KKEC/uqk44dbrJtMbPMPTz4="; diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index 26058b27579e..c90a2959644c 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -24,7 +24,9 @@ let release = lib.replaceStrings [ "." ] [ "-" ] version; # To test rc versions of ICU replace the line above with the line below. - #release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version); + #release = lib.replaceStrings [ "." ] [ "-" ] ( + # if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version + #); baseAttrs = { src = fetchurl { diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index 1225af7f67e4..627d7a43869d 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -33,5 +33,7 @@ stdenv.mkDerivation rec { ]; maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.linux; + # error: passing argument 2 of 'xmlSetStructuredErrorFunc' from incompatible pointer type [-Wincompatible-pointer-types] + broken = true; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 5a9d1a9a6121..6ae32480fd52 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -11,7 +11,6 @@ installShellFiles, pango, freetype, - harfbuzz, cairo, libxml2, bzip2, @@ -25,7 +24,6 @@ python3Packages, gnome, vala, - writeShellScript, shared-mime-info, # Requires building a cdylib. withPixbufLoader ? !stdenv.hostPlatform.isStatic, @@ -71,10 +69,28 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (fetchpatch { + # merged in 2.60.0-beta.0 name = "cross-introspection.patch"; url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/84f24b1f5767f807f8d0442bbf3f149a0defcf78.patch"; hash = "sha256-FRyAYCCP3eu7YDUS6g7sKCdbq2nU8yQdbdVaQwLrlhE="; }) + (fetchpatch { + # merged in 2.60.0-beta.0; required for cross-gdk-pixbuf-loader.patch to apply + name = "Replace-CRLF-with-just-LF-in-a-few-remaining-files-that-had-them"; + url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/8c93369806283feafd060f4507111344e1110f79.patch"; + hash = "sha256-FU6ZiWhXm8jPhGGuNKqlxDIEXu2bSfq1MWyQoADqLZA="; + }) + (fetchpatch { + # merged in 2.60.0-beta.0; required for cross-gdk-pixbuf-loader.patch to apply + name = "do-not-look-for-gdk-pixbuf-query-loaders-in-cross-builds.patch"; + url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/ce2957acb7b0b5d7f75f47a3c503f5532aa698a6.patch"; + hash = "sha256-f0Mdt4GjycIkM/k68KRsR0Hv2C+gaieQ4WnhjPbA5vs="; + }) + (fetchpatch { + name = "cross-gdk-pixbuf-loader.patch"; + url = "https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1095.patch"; + hash = "sha256-4R/DfDkNn7WhgBy526v309FzK6znCt2dV/ooz4LYrVU="; + }) ]; cargoDeps = rustPlatform.fetchCargoVendor { @@ -92,7 +108,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ - gdk-pixbuf installShellFiles pkg-config meson @@ -146,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isi686; env = { - PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = buildPackages.writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders ''; }; @@ -178,8 +193,7 @@ stdenv.mkDerivation (finalAttrs: { let emulator = stdenv.hostPlatform.emulator buildPackages; in - # Not generated when cross compiling. - lib.optionalString (lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) '' + lib.optionalString withPixbufLoader '' # Merge gdkpixbuf and librsvg loaders GDK_PIXBUF=$out/${gdk-pixbuf.binaryDir} cat ${lib.getLib gdk-pixbuf}/${gdk-pixbuf.binaryDir}/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 35256b17e939..da7ea8898fc7 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -1,26 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, python -, cmake -, ninja +{ + lib, + stdenv, + fetchFromGitHub, + python, + cmake, + ninja, }: let - pyEnv = python.withPackages (ps: [ ps.setuptools ps.tomli ps.pip ps.setuptools ]); + pyEnv = python.withPackages (ps: [ + ps.setuptools + ps.tomli + ps.pip + ps.setuptools + ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lief"; version = "0.16.4"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; - rev = version; - sha256 = "sha256-3rLnT/zs7YrAYNc8I2EJevl98LHGcXFf7bVlJJfxqRc="; + tag = finalAttrs.version; + hash = "sha256-3rLnT/zs7YrAYNc8I2EJevl98LHGcXFf7bVlJJfxqRc="; }; - outputs = [ "out" "py" ]; + outputs = [ + "out" + "py" + ]; nativeBuildInputs = [ cmake @@ -38,6 +47,8 @@ stdenv.mkDerivation rec { scikit-build-core ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) ]; + postBuild = '' pushd ../api/python ${pyEnv.interpreter} -m build --no-isolation --wheel --skip-dependency-check --config-setting=--parallel=$NIX_BUILD_CORES @@ -55,6 +66,9 @@ stdenv.mkDerivation rec { homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ lassulus genericnerdyusername ]; + maintainers = with maintainers; [ + lassulus + genericnerdyusername + ]; }; -} +}) diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index 23e5104ffcf6..eed15cbcbc93 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "25.0.1"; + version = "25.0.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo="; + hash = "sha256-NW2Xntdpt4Iec3z0E8j+omNRH/46IMYNuyD2MIFMs2M="; }; meta = { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1e2d92f1b7f6..14f98cb9d407 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,7 +6,6 @@ , expat , fetchCrate , fetchFromGitLab -, fetchpatch , file , flex , glslang @@ -142,12 +141,6 @@ in stdenv.mkDerivation { patches = [ ./opencl.patch ./system-gbm.patch - # Fix graphical corruption in FFXIV - # Remove when updating to 25.0.2 - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/0ec174afd56fe48bcfa071d4b8ed704106f46f91.patch"; - hash = "sha256-6A9AkCa+DeUO683hlsNTvSWGFJJ+zfqYA2BThaqCEoU="; - }) ]; postPatch = '' @@ -222,9 +215,6 @@ in stdenv.mkDerivation { # Required for OpenCL (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib") - # Clover, old OpenCL frontend - (lib.mesonOption "gallium-opencl" "icd") - # Rusticl, new OpenCL frontend (lib.mesonBool "gallium-rusticl" true) @@ -328,9 +318,8 @@ in stdenv.mkDerivation { moveToOutput bin/vtn_bindgen $cross_tools moveToOutput "lib/lib*OpenCL*" $opencl - # Construct our own .icd files that contain absolute paths. + # Construct our own .icd file that contains an absolute path. mkdir -p $opencl/etc/OpenCL/vendors/ - echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd moveToOutput bin/spirv2dxil $spirv2dxil diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 90ee4580532f..9b5ed2ae9b4c 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -81,7 +81,7 @@ let hash = "sha256-9oORW0YlQ6SphqfbjcYb0dTlHc+1gzy9quH/Lj6By8Q="; }; - cutlass = fetchFromGitHub { + cutlass = fetchFromGitHub { owner = "NVIDIA"; repo = "cutlass"; tag = "v3.5.1"; @@ -95,8 +95,8 @@ let hash = "sha256-YJdZ0cMtUncH5Z6TtAWBH0xtAIu2UcbjnVcCM4tfg20="; }; + isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild; in - effectiveStdenv.mkDerivation rec { pname = "onnxruntime"; inherit src version; @@ -128,6 +128,8 @@ effectiveStdenv.mkDerivation rec { ]) ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc cudaPackages.cudnn-frontend + ] ++ lib.optionals isCudaJetson [ + cudaPackages.autoAddCudaCompatRunpath ]; buildInputs = [ diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 2cf2c89db87e..921b1f6e5f63 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.312"; + version = "8.313"; src = fetchurl { url = "https://pythia.org/download/pythia83/pythia${ builtins.replaceStrings [ "." ] [ "" ] version }.tgz"; - sha256 = "sha256-utmOKWe2hwRsRWjJCR1jCgwxtih0XAIamUq6TR1Q+Oo="; + sha256 = "sha256-0H6AFQHE3LdtlI3GMoU3X1l0U8HW7GXnEodgPcd2cYw="; }; nativeBuildInputs = [ rsync ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7693d9866569..06c44206853a 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, + buildPackages, fetchFromGitLab, python3, meson, @@ -69,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pipewire"; - version = "1.4.0"; + version = "1.4.1"; outputs = [ "out" @@ -85,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-xhlRwodW79mD6Vj+NLvcWxuK9+W+4M5DeZUaU36OiQE="; + sha256 = "sha256-TnGn6EVjjpEybslLEvBb66uqOiLg5ngpNV9LYO6TfvA="; }; patches = [ @@ -96,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { ]; strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ docutils doxygen @@ -216,8 +218,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; postUnpack = '' - patchShebangs source/doc/*.py - patchShebangs source/doc/input-filter-h.sh + patchShebangs ${finalAttrs.src.name}/doc/*.py + patchShebangs ${finalAttrs.src.name}/doc/input-filter-h.sh ''; postInstall = '' diff --git a/pkgs/development/libraries/qca/default.nix b/pkgs/development/libraries/qca/default.nix index 1f9524357c34..0412c725079c 100644 --- a/pkgs/development/libraries/qca/default.nix +++ b/pkgs/development/libraries/qca/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "qca"; - version = "2.3.9"; + version = "2.3.10"; src = fetchurl { url = "mirror://kde/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-xVXVKYzde2uv4rH5YQbzDPpUOiPUWdUMipHqwzxHbk4="; + sha256 = "sha256-HFtyLak9VZNlcZImuxIccm7DwNxMZ96jTx5Q5ODRSgI="; }; buildInputs = [ diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 6acf4f1c60a1..e82952780c4d 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "quazip"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "stachenov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JPpkYvndjDcHVChAyWhpb/XiUPu/qHqDZFh5XmonXMs="; + sha256 = "sha256-AOamvy2UgN8n7EZ8EidWkVzRICzEXMmvZsB18UwxIVo="; }; buildInputs = [ diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index 3fbabba69469..1bec19bcb4e0 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "qxmpp"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - hash = "sha256-mb8JMBV5M+0hFJLTxwYE47jB/FJKi/MPUwd3Nhan+QQ="; + hash = "sha256-M3F4tNIO3RvDxk/lce8/J6kmQtnsGLILQ15uEzgyfds="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index e318aa231345..405f12dc34b0 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -1,32 +1,33 @@ -{ stdenv -, lib -, fetchFromGitHub -, bash -, cmake -, cfitsio -, libusb1 -, kmod -, zlib -, boost -, libev -, libnova -, curl -, libjpeg -, gsl -, fftw -, gtest -, indi-full +{ + stdenv, + lib, + fetchFromGitHub, + bash, + cmake, + cfitsio, + libusb1, + kmod, + zlib, + boost, + libev, + libnova, + curl, + libjpeg, + gsl, + fftw, + gtest, + indi-full, }: stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.1.1"; + version = "2.1.2.1"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-S9FXa+yBA4IYPOiiFkLUNdEFZPraVV5vjtgwDQ/FbNY="; + hash = "sha256-EaLmwPyoQfdTUURKb6bBhg9kz7wSEzRdH3QQkayJDjA="; }; nativeBuildInputs = [ @@ -46,13 +47,15 @@ stdenv.mkDerivation (finalAttrs: { fftw ]; - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" - ] ++ lib.optional finalAttrs.finalPackage.doCheck [ - "-DINDI_BUILD_UNITTESTS=ON" - "-DINDI_BUILD_INTEGTESTS=ON" - ]; + cmakeFlags = + [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" + ] + ++ lib.optional finalAttrs.finalPackage.doCheck [ + "-DINDI_BUILD_UNITTESTS=ON" + "-DINDI_BUILD_INTEGTESTS=ON" + ]; checkInputs = [ gtest ]; @@ -81,7 +84,11 @@ stdenv.mkDerivation (finalAttrs: { description = "Implementation of the INDI protocol for POSIX operating systems"; changelog = "https://github.com/indilib/indi/releases/tag/v${finalAttrs.version}"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ hjones2199 sheepforce returntoreality ]; + maintainers = with maintainers; [ + hjones2199 + sheepforce + returntoreality + ]; platforms = platforms.unix; }; }) diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index f009aef6d5d4..fa7196b09f9f 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -45,7 +45,7 @@ let owner = "indilib"; repo = "indi-3rdparty"; rev = "v${indilib.version}"; - hash = "sha256-J9WPoaULH6UXL1q1O76+IDW97ydQWkHIID6n7wvOdE4="; + hash = "sha256-WYvinfAbMxgF5Q9iB/itQTMsVmG83lY45JriUo3kzFg="; }; buildIndi3rdParty = @@ -67,7 +67,7 @@ let pname = "indi-3rdparty-${pname}"; inherit src version; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; cmakeFlags = [ @@ -172,8 +172,9 @@ let postPatch = '' substituteInPlace 99-asi.rules \ - --replace-fail "/bin/echo" "${coreutils}/bin/echo" \ - --replace-fail "/bin/sh" "${bash}/bin/sh" + --replace-fail "/bin/echo" "${lib.getBin coreutils}/bin/echo" \ + --replace-fail "/bin/sh" "${lib.getExe bash}" \ + --replace-fail "/bin/chmod" "${lib.getBin coreutils}/bin/chmod" ''; buildInputs = [ @@ -350,8 +351,8 @@ let pname = "libplayerone"; postPatch = '' substituteInPlace 99-player_one_astronomy.rules \ - --replace-fail "/bin/echo" "${coreutils}/bin/echo" \ - --replace-fail "/bin/sh" "${bash}/bin/sh" + --replace-fail "/bin/echo" "${lib.getBin coreutils}/bin/echo" \ + --replace-fail "/bin/sh" "${lib.getExe bash}" ''; buildInputs = [ @@ -376,7 +377,7 @@ let substituteInPlace 85-qhyccd.rules \ --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ --replace-fail "/lib/firmware" "$out/lib/firmware" \ - --replace-fail "/bin/sleep" "${coreutils}/bin/sleep" + --replace-fail "/bin/sleep" "${lib.getBin coreutils}/bin/sleep" sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i 85-qhyccd.rules ''; @@ -464,6 +465,15 @@ let }; }; + libsvbonycam = buildIndi3rdParty { + pname = "libsvbonycam"; + nativeBuildInputs = [ autoPatchelfHook ]; + meta = with lib; { + license = lib.licenses.unfreeRedistributable; + platforms = with platforms; x86_64 ++ aarch64 ++ arm; + }; + }; + libtoupcam = buildIndi3rdParty { pname = "libtoupcam"; nativeBuildInputs = [ autoPatchelfHook ]; @@ -490,12 +500,21 @@ in buildInputs = [ indilib ]; }; - # libahc-xc needs libdfu, which is not packaged - # indi-ahp-xc = buildIndi3rdParty { - # pname = "indi-ahp-xc"; - # buildInputs = [ cfitsio indilib libahp-xc libnova zlib ]; - # meta.platforms = libahp-xc.meta.platforms; - # }; + indi-ahp-xc = buildIndi3rdParty { + pname = "indi-ahp-xc"; + buildInputs = [ + cfitsio + indilib + libahp-xc + libnova + zlib + ]; + meta = { + platforms = libahp-xc.meta.platforms; + # libahc-xc needs libdfu, which is not packaged + broken = true; + }; + }; indi-aok = buildIndi3rdParty { pname = "indi-aok"; @@ -762,7 +781,6 @@ in meta.platforms = libinovasdk.meta.platforms; }; - # broken, wants rpicam-apps indi-libcamera = buildIndi3rdParty { pname = "indi-libcamera"; buildInputs = [ @@ -778,6 +796,7 @@ in zlib ]; meta.platforms = [ ]; + # broken, wants rpicam-apps meta.broken = true; }; @@ -879,6 +898,7 @@ in cfitsio indilib libraw + libjpeg zlib ]; propagatedBuildInputs = [ @@ -1041,6 +1061,7 @@ in libogmacam libomegonprocam libstarshootg + libsvbonycam libtoupcam libtscam ]; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 3c3fac71a1e4..998ae934a397 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -7,8 +7,9 @@ eigen, ensureNewerSourcesForZipFilesHook, fetchFromGitHub, - replaceVars, + fetchpatch, glpk, + highs, lib, pkg-config, protobuf, @@ -20,45 +21,54 @@ zlib, }: -let - pybind11_protobuf = fetchFromGitHub { - owner = "pybind"; - repo = "pybind11_protobuf"; - rev = "b713501f1da56d9b76c42f89efd00b97c26c9eac"; - hash = "sha256-f6pzRWextH+7lm1xzyhx98wCIWH3lbhn59gSCcjsBVw="; - }; -in stdenv.mkDerivation rec { pname = "or-tools"; - version = "9.7"; + version = "9.11"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; - rev = "v${version}"; - hash = "sha256-eHukf6TbY2dx7iEf8WfwfWsjDEubPtRO02ju0kHtASo="; + tag = "v${version}"; + hash = "sha256-aRhUAs9Otvra7VPJvrf0fhDCGpYhOw1//BC4dFJ7/xI="; }; patches = [ - (replaceVars ./offline.patch { - pybind11_protobuf = "../../pybind11_protobuf"; + (fetchpatch { + name = "0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch"; + url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch?rev=19"; + hash = "sha256-QHQ9E3mhTznJVKB+nP/9jct3uz+SPcOZ7w5tjOQ8iuk="; + }) + (fetchpatch { + name = "0001-Revert-python-Fix-python-install-on-windows-breaks-L.patch"; + url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Revert-python-Fix-python-install-on-windows-breaks-L.patch?rev=19"; + hash = "sha256-BNB3KlgjpWcZtb9e68Jkc/4xC4K0c+Iisw0eS6ltYXE="; + }) + (fetchpatch { + name = "0001-Fix-up-broken-CMake-rules-for-bundled-pybind-stuff.patch"; + url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Fix-up-broken-CMake-rules-for-bundled-pybind-stuff.patch?rev=19"; + hash = "sha256-r38ZbRkEW1ZvJb0Uf56c0+HcnfouZZJeEYlIK7quSjQ="; }) ]; # or-tools normally attempts to build Protobuf for the build platform when # cross-compiling. Instead, just tell it where to find protoc. - postPatch = '' - echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake - - cp -R ${pybind11_protobuf} pybind11_protobuf - chmod -R u+w pybind11_protobuf - ''; + postPatch = + '' + echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake + '' + # Patches from OpenSUSE: + # https://build.opensuse.org/projects/science/packages/google-or-tools/files/google-or-tools.spec?expand=1 + + '' + sed -i -e '/CMAKE_DEPENDENT_OPTION(INSTALL_DOC/ s/BUILD_CXX AND BUILD_DOC/BUILD_CXX/' CMakeLists.txt + find . -iname \*CMakeLists.txt -exec sed -i -e 's/pybind11_native_proto_caster/pybind11_protobuf::pybind11_native_proto_caster/' '{}' \; + sed -i -e 's/TARGET pybind11_native_proto_caster/TARGET pybind11_protobuf::pybind11_native_proto_caster/' cmake/check_deps.cmake + sed -i -e "/protobuf/ { s/.*,/'protobuf >= 5.26',/ }" ortools/python/setup.py.in + ''; cmakeFlags = [ "-DBUILD_DEPS=OFF" "-DBUILD_PYTHON=ON" "-DBUILD_pybind11=OFF" - "-DBUILD_pybind11_protobuf=ON" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" @@ -95,6 +105,8 @@ stdenv.mkDerivation rec { glpk python.pkgs.absl-py python.pkgs.pybind11 + python.pkgs.pybind11-abseil + python.pkgs.pybind11-protobuf python.pkgs.pytest python.pkgs.scipy python.pkgs.setuptools @@ -104,23 +116,18 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ abseil-cpp + highs protobuf - (python.pkgs.protobuf4.override { protobuf = protobuf; }) + (python.pkgs.protobuf.override { protobuf = protobuf; }) python.pkgs.numpy + python.pkgs.pandas + python.pkgs.immutabledict ]; nativeCheckInputs = [ python.pkgs.matplotlib - python.pkgs.pandas python.pkgs.virtualenv ]; - env.NIX_CFLAGS_COMPILE = toString [ - # fatal error: 'python/google/protobuf/proto_api.h' file not found - "-I${protobuf.src}" - # fatal error: 'pybind11_protobuf/native_proto_caster.h' file not found - "-I${pybind11_protobuf}" - ]; - # some tests fail on linux and hang on darwin doCheck = false; @@ -149,7 +156,7 @@ stdenv.mkDerivation rec { description = '' Google's software suite for combinatorial optimization. ''; - mainProgram = "fzn-ortools"; + mainProgram = "fzn-cp-sat"; maintainers = with maintainers; [ andersk ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/development/libraries/science/math/or-tools/offline.patch b/pkgs/development/libraries/science/math/or-tools/offline.patch deleted file mode 100644 index 1a2a4dbe3631..000000000000 --- a/pkgs/development/libraries/science/math/or-tools/offline.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt -index af3a28c113..ba92c3c55e 100644 ---- a/cmake/dependencies/CMakeLists.txt -+++ b/cmake/dependencies/CMakeLists.txt -@@ -177,9 +177,8 @@ if(BUILD_PYTHON AND BUILD_pybind11_protobuf) - list(APPEND CMAKE_MESSAGE_INDENT " ") - FetchContent_Declare( - pybind11_protobuf -- GIT_REPOSITORY "https://github.com/pybind/pybind11_protobuf.git" -- GIT_TAG "main" -- PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch" -+ SOURCE_DIR @pybind11_protobuf@ -+ PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch" - ) - FetchContent_MakeAvailable(pybind11_protobuf) - list(POP_BACK CMAKE_MESSAGE_INDENT) diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index b2cafcea35b7..3d605f04b1f4 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -72,7 +72,8 @@ stdenv.mkDerivation { rvolosatovs ]; license = with licenses; [ - asl20-llvm + asl20 + llvm-exception mit ]; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index e1609e6f2ed3..7efd167223f0 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -37,6 +37,7 @@ libxslt, harfbuzz, hyphen, + icu, libsysprof-capture, libpthreadstubs, nettle, @@ -79,7 +80,7 @@ # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.46.6"; + version = "2.48.0"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${ if lib.versionAtLeast gtk3.version "4.0" then "6.0" @@ -99,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-8rMd5pMiC6m6t2zm3f5bC/qyUVyysKcPPFTUBQdmwys="; + hash = "sha256-lJBKVc8S1EpONs6tr/8C1G2nPXa+m0dp80y/3w7r+I4="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ @@ -135,6 +136,7 @@ clangStdenv.mkDerivation (finalAttrs: { at-spi2-core cairo # required even when using skia enchant2 + flite libavif libepoxy libjxl @@ -143,6 +145,7 @@ clangStdenv.mkDerivation (finalAttrs: { gst-plugins-base harfbuzz hyphen + icu libGL libGLU libgbm @@ -186,7 +189,7 @@ clangStdenv.mkDerivation (finalAttrs: { geoclue2 ] ++ lib.optionals enableExperimental [ - flite + # For ENABLE_WEB_RTC openssl ] ++ lib.optionals withLibsecret [ diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index c9141b34a94d..92567d5c69e2 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, darwin }: +{ lib, stdenv, fetchurl, fetchpatch, darwin, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "webrtc-audio-processing"; @@ -20,8 +20,25 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/uploads/2994c0512aaa76ebf41ce11c7b9ba23e/webrtc-audio-processing-0.2-big-endian.patch"; hash = "sha256-zVAj9H8SJureQd0t5O5v1je4ia8/gHJOXYxuEBEB6gg="; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/2f3c3b1d9dadc25356da4b612130bf4dea27b817/audio/webrtc-audio-processing0/files/patch-configure.ac"; + hash = "sha256-IOSW3ZLIuRXY/M+MU813M9o0Vu4mcGoAtdNRlJwESHw="; + extraPrefix = ""; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/27f26f19a34755fe4b939a7210d8ba7ee9358a0d/audio/webrtc-audio-processing0/files/patch-webrtc_base_stringutils.h"; + hash = "sha256-j85CdFpDIPhhEquwA3P0r5djnMEGVnvfsPM2bYbURt8="; + extraPrefix = ""; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/0d316feccaf89c1bd804d6001274426a7135c93a/audio/webrtc-audio-processing0/files/patch-webrtc_base_platform__thread.cc"; + hash = "sha256-MsZtNWv3bwxJLxpQaMqj34XIBhqAaO2NkBHjlFWZreA="; + extraPrefix = ""; + }) ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix index eceb9c175a18..301ee66bf7cd 100644 --- a/pkgs/development/lisp-modules/asdf/2.26.nix +++ b/pkgs/development/lisp-modules/asdf/2.26.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Standard software-system definition library for Common Lisp"; + homepage = "https://asdf.common-lisp.dev/"; license = licenses.mit; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix index 4346f68ea79e..03943282c408 100644 --- a/pkgs/development/lisp-modules/asdf/3.1.nix +++ b/pkgs/development/lisp-modules/asdf/3.1.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Standard software-system definition library for Common Lisp"; + homepage = "https://asdf.common-lisp.dev/"; license = licenses.mit; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/lisp-modules/asdf/3.3.nix b/pkgs/development/lisp-modules/asdf/3.3.nix index f82a42d68b01..1ec00123ecd3 100644 --- a/pkgs/development/lisp-modules/asdf/3.3.nix +++ b/pkgs/development/lisp-modules/asdf/3.3.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Standard software-system definition library for Common Lisp"; + homepage = "https://asdf.common-lisp.dev/"; license = licenses.mit; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 9729d6d62c2d..583b087cde20 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Standard software-system definition library for Common Lisp"; + homepage = "https://asdf.common-lisp.dev/"; license = licenses.mit; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix index fb4b99e34c54..c1e3f1dbe626 100644 --- a/pkgs/development/lisp-modules/imported.nix +++ b/pkgs/development/lisp-modules/imported.nix @@ -6,6 +6,7 @@ lib, fetchzip, build-asdf-system, + stdenv, ... }: @@ -15920,6 +15921,8 @@ lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "cffi" self) ]; meta = { hydraPlatforms = [ ]; + # darwin cannot find libpango.dylib + broken = stdenv.isDarwin; }; } ); @@ -39537,6 +39540,8 @@ lib.makeScope pkgs.newScope (self: { ]; meta = { hydraPlatforms = [ ]; + # darwin cannot find libpango.dylib + broken = stdenv.isDarwin; }; } ); diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 70671a35ce94..269df0eca930 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2590,14 +2590,14 @@ buildLuarocksPackage { lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lze"; - version = "0.8.1-1"; + version = "0.9.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lze-0.8.1-1.rockspec"; - sha256 = "01pxnkijnsj7n66pni850m4x7i1jblrp7w1lw243ikl1di3dgggs"; + url = "mirror://luarocks/lze-0.9.1-1.rockspec"; + sha256 = "1w4pdacfnfwi94gmrhd13xp81bx14ggxixc1h95h47hcv5cf27p9"; }).outPath; src = fetchzip { - url = "https://github.com/BirdeeHub/lze/archive/v0.8.1.zip"; - sha256 = "179djx0d5l6390x7pdim5bs0qg4jdgjnc4bnsks3yyl3sdscwa2l"; + url = "https://github.com/BirdeeHub/lze/archive/v0.9.1.zip"; + sha256 = "1zs79rjkayfm45gdgfw8r2962apl2cr8vyq7h51cffrljldhkb58"; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index c4815d06870d..c4cbb965fedc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -127,6 +127,7 @@ mapAliases { inherit (pkgs) http-server; # added 2024-01-20 hueadm = pkgs.hueadm; # added 2023-07-31 inherit (pkgs) hyperpotamus; # added 2023-08-19 + ijavascript = throw "ijavascript has been removed because it was broken"; # added 2025-03-18 immich = pkgs.immich-cli; # added 2023-08-19 indium = throw "indium was removed because it was broken"; # added 2023-08-19 inliner = throw "inliner was removed because it was abandoned upstream"; # added 2024-08-23 @@ -141,6 +142,7 @@ mapAliases { inherit (pkgs) lerna; # added 2025-02-12 less = pkgs.lessc; # added 2024-06-15 less-plugin-clean-css = pkgs.lessc.plugins.clean-css; # added 2024-06-15 + lodash = throw "lodash was removed because it provides no executable"; # added 2025-03-18 inherit (pkgs) lv_font_conv; # added 2024-06-28 manta = pkgs.node-manta; # Added 2023-05-06 inherit (pkgs) markdown-link-check; # added 2024-06-28 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8bad14812407..c9f4f3bb20a6 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -93,7 +93,6 @@ , "gulp-cli" , "he" , "hs-airdrop" -, "ijavascript" , "imapnotify" , "joplin" , "js-beautify" @@ -112,7 +111,6 @@ , "live-server" , "livedown" , "localtunnel" -, "lodash" , "lua-fmt" , "madoko" , "mastodon-bot" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 997480177d81..20466e602ec2 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -54272,33 +54272,6 @@ in bypassCache = true; reconstructLock = true; }; - ijavascript = nodeEnv.buildNodePackage { - name = "ijavascript"; - packageName = "ijavascript"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ijavascript/-/ijavascript-5.2.1.tgz"; - sha512 = "kH7hudp+S+8++ngjUXbiyHOhp3qa4oDVUkmf6p7+7s15PIBDv5zx878pxNRdGcWhYGy5TT683EOqeKMQw8jrFA=="; - }; - dependencies = [ - sources."jmp-2.0.0" - sources."jp-kernel-2.0.0" - sources."nan-2.17.0" - sources."nel-1.3.0" - sources."node-gyp-build-4.8.4" - sources."uuid-3.4.0" - sources."zeromq-5.3.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "IJavascript is a Javascript kernel for the Jupyter notebook"; - homepage = "https://n-riesco.github.io/ijavascript"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; imapnotify = nodeEnv.buildNodePackage { name = "imapnotify"; packageName = "imapnotify"; @@ -58553,24 +58526,6 @@ in bypassCache = true; reconstructLock = true; }; - lodash = nodeEnv.buildNodePackage { - name = "lodash"; - packageName = "lodash"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Lodash modular utilities."; - homepage = "https://lodash.com/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; lua-fmt = nodeEnv.buildNodePackage { name = "lua-fmt"; packageName = "lua-fmt"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 545a907cef23..373843cb7ab5 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -54,13 +54,6 @@ final: prev: { ''; }; - ijavascript = prev.ijavascript.override (oldAttrs: { - preRebuild = '' - export npm_config_zmq_external=true - ''; - buildInputs = oldAttrs.buildInputs ++ [ final.node-gyp-build pkgs.zeromq ]; - }); - joplin = prev.joplin.override (oldAttrs:{ nativeBuildInputs = [ pkgs.pkg-config diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index dddf79fa741e..7dd1a2b0d0ae 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -13,11 +13,11 @@ buildDunePackage rec { pname = "alcotest"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz"; - hash = "sha256-y6G9AXB8jFW0dkuw34yccyvjIeHxwalqQG5W2NvKHQ4="; + hash = "sha256-4jhxNsqFTfK0FSE53U1LOVOmRugElIBz3t/gojLwihU="; }; nativeBuildInputs = [ ocaml-syntax-shims ]; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 9305760710b4..3cca0f46bd6c 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -10,14 +10,14 @@ buildDunePackage rec { pname = "fileutils"; - version = "0.6.4"; + version = "0.6.6"; src = fetchurl { url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-${version}.tbz"; - hash = "sha256-enu2vGo2tuvawrTkap6bENNmxaLUQXpfHWih+7oKRF8="; + hash = "sha256-eW1XkeK/ezv/IAz1BXp6GHhDnrzXTtDxCIz4Z1bVK+Y="; }; - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.14"; propagatedBuildInputs = [ seq diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index bd86aa8f68b9..b46f9acd8800 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -14,12 +14,12 @@ if lib.versionOlder ocaml.version "4.08" then else stdenv.mkDerivation rec { - version = "0.9.0"; + version = "0.10.0"; pname = "ocaml${ocaml.version}-fmt"; src = fetchurl { url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz"; - sha256 = "sha256-8fsggFoi3XWhN9cnBKNw53ic9r32OUjmgX0cImwUEmE="; + sha256 = "sha256-eDgec+FW2F85LzfkKFqsmYd3MWWZsBIXMhlXT3xdKZc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index 598c2dd7af9a..6092df841a4d 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -27,6 +27,11 @@ buildDunePackage rec { hash = "sha256-k4iDUJik7UTuztBw7YaFXASd8SqYMR1JgLm3JOyriGA="; }; + # Compatibility with logs 0.8.0 + postPatch = '' + substituteInPlace test/unix/dune --replace-warn logs.fmt 'logs.fmt logs.threaded' + ''; + minimalOCamlVersion = "4.08"; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/lem/default.nix b/pkgs/development/ocaml-modules/lem/default.nix index 6c1ff08f44dd..8a2ac28d8289 100644 --- a/pkgs/development/ocaml-modules/lem/default.nix +++ b/pkgs/development/ocaml-modules/lem/default.nix @@ -16,13 +16,13 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-lem"; - version = "2022-12-10"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "rems-project"; repo = "lem"; rev = version; - hash = "sha256-ZQgcuIVRkJS0KtpzjbO4OPHGg6B0TadWA6XpRir30y8="; + hash = "sha256-ZV2OiFonMlNzqtsumMQ8jzY9/ATaZxiNHZ7JzOfGluY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 1eb99037686b..2befcaa51dcc 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -11,7 +11,7 @@ cmdliner, fmt, fmtSupport ? lib.versionAtLeast ocaml.version "4.08", - js_of_ocaml, + js_of_ocaml-compiler, jsooSupport ? true, lwtSupport ? true, cmdlinerSupport ? true, @@ -22,8 +22,8 @@ let optional_deps = [ { - pkg = js_of_ocaml; - enable_flag = "--with-js_of_ocaml"; + pkg = js_of_ocaml-compiler; + enable_flag = "--with-js_of_ocaml-compiler"; enabled = jsooSupport; } { @@ -55,11 +55,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1jnmd675wmsmdwyb5mx5b0ac66g4c6gpv5s4mrx2j6pb0wla1x46"; + hash = "sha256-mmFRQJX6QvMBIzJiO2yNYF1Ce+qQS2oNF3+OwziCNtg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 6d0a1f3d95d1..4f59e1ba747c 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "lwt"; - version = "5.9.0"; + version = "5.9.1"; minimalOCamlVersion = "4.08"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "ocsigen"; repo = "lwt"; rev = version; - hash = "sha256-xYF+f489RI/nY0J48qW0jtq5GEnk68QnwxzBV2TLmLk="; + hash = "sha256-oPYLFugMTI3a+hmnwgUcoMgn5l88NP1Roq0agLhH/vI="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix index b9a72244300c..c7fa461a364a 100644 --- a/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/pkgs/development/ocaml-modules/mrmime/default.nix @@ -26,11 +26,11 @@ buildDunePackage rec { pname = "mrmime"; - version = "0.6.1"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/mirage/mrmime/releases/download/v${version}/mrmime-${version}.tbz"; - hash = "sha256-Dzsr7xPzu5RIzIdubF4OAAjHJY7CdBVnHRZxQbcCsBY="; + hash = "sha256-w23xtro9WgyLLwqdwfqLMN/ZDqwpvFcEvurbsqnsJLc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix index 3efb1bf546a1..d46a76987712 100644 --- a/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { description = "Numerical computing library for Ocaml"; homepage = "https://ocaml.xyz"; changelog = "https://github.com/owlbarn/owl/releases"; - platforms = platforms.x86_64; + platforms = platforms.x86_64 ++ platforms.aarch64; maintainers = [ maintainers.bcdarwin ]; license = licenses.mit; }; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 1e5042d1ee5d..8d01acc1afb9 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { pname = "reactiveData"; - version = "0.3"; + version = "0.3.1"; duneVersion = "3"; minimalOCamlVersion = "4.08"; @@ -15,7 +15,7 @@ buildDunePackage rec { owner = "ocsigen"; repo = "reactiveData"; rev = version; - sha256 = "sha256-imUphE1vMe3bYqHhgTuGT+B7uLn75acX6fAwBLh1tz4="; + sha256 = "sha256-MO9WMe1k2QcC5RynE6uZHohmu3QlpTHvAkvQNgu3P90="; }; propagatedBuildInputs = [ react ]; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 36dbdcc31023..4830a9e91607 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -9,13 +9,13 @@ buildDunePackage rec { pname = "sqlite3"; - version = "5.3.0"; + version = "5.3.1"; duneVersion = "3"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz"; - hash = "sha256-+XuR3ovI5soNXMNgTxYcEbx26lV+3i7q8XaKCI6ueAo="; + hash = "sha256-Ox8eZS4r6PbJh8nei52ftUyf25SKwIUMi5UEv4L+6mE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 7c389f87f651..77ca17170585 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -7,7 +7,7 @@ ocamlbuild, topkg, cmdliner, - version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.9" else "0.9.8", + version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.10" else "0.9.8", }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") @@ -21,7 +21,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; hash = { - "0.9.9" = "sha256-jOgNF05dpoU/XQEefSZhn3zSlQ1BA1b/U4Ib9j2mvFo="; + "0.9.10" = "sha256-kWVZSofWMyky5nAuxoh1xNhwMKZ2qUahL3Dh27J36Vc="; "0.9.8" = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM="; } ."${version}"; diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix index 2c5e51dbd451..348991dca958 100644 --- a/pkgs/development/ocaml-modules/webbrowser/default.nix +++ b/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-webbrowser"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; - sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3"; + sha256 = "sha256-4SYAf1Qo7aUiCp5587wO1VvjcQHP3NBXeFfAaHE/s+A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/octave-modules/image/default.nix b/pkgs/development/octave-modules/image/default.nix index e8748558f9ef..7b4800be02db 100644 --- a/pkgs/development/octave-modules/image/default.nix +++ b/pkgs/development/octave-modules/image/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "image"; - version = "2.14.0"; + version = "2.16.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-dRXqIRqMuO9dnTurhaNunfVHXosFqRmgeODVJ0YHcTM="; + sha256 = "sha256-m7JsyljrH77fs/hOPS5+HuteFtfr4yNbfBB9lPWNFBc="; }; meta = with lib; { diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 5266ca622e20..0c190e47578d 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "grumphp"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "phpro"; repo = "grumphp"; rev = "v${finalAttrs.version}"; - hash = "sha256-JRLx9laFdtHSwyUmnAQY4Rcaac6buhbA2vfBCIAzk04="; + hash = "sha256-uA+s3ZOZIlgO2yD5jsjJUKPy3u66K/8kazDL3TUVyF8="; }; - vendorHash = "sha256-ptRWX0W0UylsaDjpjdaYq+KBx9aAxYzKGeI44lby+OY="; + vendorHash = "sha256-F+9/Avu+36pN0U9meUJppo4YqyCKEblQx2rCJ7uD8PU="; meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/php-codesniffer/default.nix b/pkgs/development/php-packages/php-codesniffer/default.nix index c5bd03de8a1a..3da3c55795e7 100644 --- a/pkgs/development/php-packages/php-codesniffer/default.nix +++ b/pkgs/development/php-packages/php-codesniffer/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "php-codesniffer"; - version = "3.11.3"; + version = "3.12.0"; src = fetchFromGitHub { owner = "PHPCSStandards"; repo = "PHP_CodeSniffer"; tag = "${finalAttrs.version}"; - hash = "sha256-yOi3SFBZfE6WhmMRHt0z86UJPnDnc9hXHtzYe5Ess6c="; + hash = "sha256-wlI/ylBeSkeg96sDwvDV9EedSLILFqsl96yWIOFtDQo="; }; - vendorHash = "sha256-XAyRbfISIpIa4H9IX4TvpDnHhLj6SdqyKlpyG68mnUM="; + vendorHash = "sha256-RY/GOMK+Qq36du8GLXXiwjDjKD49gNN02OugwjOvrJ4="; meta = { changelog = "https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index edec3e46290b..b1b76bb2034d 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "2.1.8"; + version = "2.1.10"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; tag = finalAttrs.version; - hash = "sha256-skJx4kFbVtHaCOhOWM2dds1ext7wuy6YvMaYAI9IxJM="; + hash = "sha256-CeIRc/37HnKQIzcGxiuy5nXopS+PopNSnLSJiA3Mx5I="; }; - vendorHash = "sha256-51CB2i4oD4BtXRqzB8U+H/9CwWTKFP2mM2hcUlqRuPw="; + vendorHash = "sha256-QwZoEGE7oAm1Ha1EB/E1quMMSSTmsayOpO3JgGISQjE="; composerStrictValidation = false; meta = { diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index 2ecf5bde03e2..16e121531ad3 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -9,7 +9,7 @@ }: let - version = "6.0.1"; + version = "6.0.2"; in buildPecl { inherit version; @@ -19,7 +19,7 @@ buildPecl { owner = "swoole"; repo = "swoole-src"; rev = "v${version}"; - hash = "sha256-WeTl+/OVcXFl39qfYoYRk2MQ7PYKlbjHxddp/kFov6g="; + hash = "sha256-mCJj0vLpJinxK/EfPq+CeVWnoxouqClOKYbrgj7GNDc="; }; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; diff --git a/pkgs/development/php-packages/tideways/default.nix b/pkgs/development/php-packages/tideways/default.nix index 210a44bd82cf..618bd9d960eb 100644 --- a/pkgs/development/php-packages/tideways/default.nix +++ b/pkgs/development/php-packages/tideways/default.nix @@ -23,7 +23,7 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-php"; extensionName = "tideways"; - version = "5.19.0"; + version = "5.20.0"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -43,15 +43,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-x86_64.tar.gz"; - hash = "sha256-AaTrbrdi/XLeKlG+//DTjRGQEheLTtfHwx7Ztn+/Nuk="; + hash = "sha256-uAmsmz+4tsCGw4jlzyZbUNjuzBU/HcIDWrHCC+0t4Xw="; }; "aarch64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-arm64.tar.gz"; - hash = "sha256-BSXKLxh2ex7rU4vsxHWqQIca+yFQlZDbB0TyNcpYmKs="; + hash = "sha256-gPhr32G6h/U1uR/aaeIWpOaDV9HF8EbQF7p1kJ5SDis="; }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-macos-arm.tar.gz"; - hash = "sha256-a63cr/547MxyB7irVlONUpdep3M42YA2C6H9sGbEAI8="; + hash = "sha256-VfgX1SNYKoFR290gRoRXfD5CoLhDPkK+3+4o13P1kiM="; }; }; diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index 55d050b6ecaa..af0172724753 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, yarl, @@ -27,7 +28,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--cov" "" \ --replace-fail '"0.0.0"' '"${version}"' ''; @@ -43,6 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index e2fde9a08c5a..ca73e2b403da 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.146"; + version = "9.2.147"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; tag = "v${version}"; - hash = "sha256-lTodIm5p9ptEg+rEPqoGNbVRxV18wiC++qJTIaYu3EM="; + hash = "sha256-WrqkTNFhttpLG1dG05+nnqzoPUQPZUG15JooChBIKEA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index ad0f385e2048..63858b74e239 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.5.4"; + version = "9.5.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = "aio-pika"; tag = version; - hash = "sha256-/73bFhhcailC05hn0xW49oFVS6Ezaiohh3ykYOjhQOI="; + hash = "sha256-Gs01y1VRVgk5i4JI+fqtRo6mOyzBzHM/2hJPVenc+3g="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index d1e7c8b53319..1ebdfabfbdb4 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { ]; preCheck = '' - ${lib.getBin pkgs.redis}/bin/redis-server & + ${lib.getBin pkgs.valkey}/bin/redis-server & REDIS_PID=$! ${lib.getBin pkgs.memcached}/bin/memcached & diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index fd057e035489..d4a473ebeefe 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -32,13 +33,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail " --cov aioconsole --strict-markers --count 2 -vv" "" + --replace-fail " --strict-markers --count 2 -vv" "" ''; build-system = [ setuptools ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiocron/default.nix b/pkgs/development/python-modules/aiocron/default.nix index 0701fdab407a..a6a14212c761 100644 --- a/pkgs/development/python-modules/aiocron/default.nix +++ b/pkgs/development/python-modules/aiocron/default.nix @@ -7,6 +7,7 @@ croniter, tzlocal, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -28,11 +29,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub tzlocal ]; postPatch = '' - sed -i "/--cov/d" setup.cfg sed -i "/--ignore/d" setup.cfg ''; diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index fc4c9a6d3941..b27fce427cf3 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.18.0"; + version = "3.19.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; tag = "v${version}"; - hash = "sha256-3JyMkLixemKZN9XSpN/4SdpdYfR3WqGUKQ9Bfy6bB+Q="; + hash = "sha256-xdDQjH/HUVNJgSxjrqXNgc+hOKuiusAH00PRMRD+8Dw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix index 19ae19352c2b..f20c0156768b 100644 --- a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix +++ b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiohttp-asyncmdnsresolver"; - version = "0.1.0"; + version = "0.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp-asyncmdnsresolver"; rev = "v${version}"; - hash = "sha256-z0m8dlzl6mglTOW9BwLbFcRjxcF14yz8+SE8SqjNu+c="; + hash = "sha256-gtB5vnlOVeAFACnhR5DIS5p3caZkOXrollXFINl/7hQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix index 77ca01bfda4c..691166682984 100644 --- a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix +++ b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aiohttp-fast-zlib"; - version = "0.2.1"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "aiohttp-fast-zlib"; tag = "v${version}"; - hash = "sha256-OVxt1SQXOFbgnmA3FP56xixmgh5gOe/HDgzPVlr0JPg="; + hash = "sha256-PQ44XFdaolxGQTwzssv1inOUAGAyYghS3SVLq4w5SoA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 080e154ef496..57af49298227 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -5,6 +5,7 @@ fetchPypi, jinja2, pytest-aiohttp, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -31,16 +32,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-aiohttp + pytest-cov-stub pytestCheckHook ]; __darwinAllowLocalNetworking = true; - postPatch = '' - substituteInPlace pytest.ini \ - --replace-fail "--cov=aiohttp_jinja2/ --cov=tests/ --cov-report term" "" - ''; - pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 80fb02ce03ad..4f6a11849078 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -8,6 +8,7 @@ pytestCheckHook, pytest-aiohttp, pytest-asyncio, + pytest-cov-stub, pythonOlder, setuptools, }: @@ -28,8 +29,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ - --replace-fail "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; build-system = [ setuptools ]; @@ -44,6 +44,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-aiohttp + pytest-cov-stub ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix index 52289adda842..ed6251b4ce04 100644 --- a/pkgs/development/python-modules/aiokef/default.nix +++ b/pkgs/development/python-modules/aiokef/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pytest-cov-stub, pythonOlder, tenacity, }: @@ -23,7 +24,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tox.ini \ - --replace "--cov --cov-append --cov-fail-under=30 --cov-report=" "" \ --replace "--mypy" "" ''; @@ -32,7 +32,10 @@ buildPythonPackage rec { tenacity ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pytestFlagsArray = [ "tests" ]; pythonImportsCheck = [ "aiokef" ]; diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix index 1603d1009da3..f6f5dfdc575b 100644 --- a/pkgs/development/python-modules/aiolimiter/default.nix +++ b/pkgs/development/python-modules/aiolimiter/default.nix @@ -5,6 +5,7 @@ poetry-core, importlib-metadata, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, toml, @@ -30,15 +31,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook toml ]; - postPatch = '' - substituteInPlace tox.ini \ - --replace " --cov=aiolimiter --cov-config=tox.ini --cov-report term-missing" "" - ''; - pythonImportsCheck = [ "aiolimiter" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index ae8d7c7c72d8..0db3a0ba5c85 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -7,6 +7,7 @@ poetry-core, pytest-asyncio, pytest-timeout, + pytest-cov-stub, pytestCheckHook, pythonOlder, python-dotenv, @@ -26,11 +27,6 @@ buildPythonPackage rec { hash = "sha256-1xeXfhoXRfJ7vrpRPeYmwcAGjL09iNCOm/f4pPvuZLU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov --cov-report term --cov-report html" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -41,6 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytest-timeout + pytest-cov-stub pytestCheckHook python-dotenv ]; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index d6d9fe09814c..34bd31ebded3 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "13.3.0"; + version = "13.4.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-kPFTY1SDysNh64XYaW873SsZKT7uGmaugitXnkpAhA0="; + hash = "sha256-sGcI8+y/l8meYmlerWC2cEhW+LMKnZpoCw4ZWG26c6g="; }; build-system = [ setuptools ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to control Shelly"; homepage = "https://github.com/home-assistant-libs/aioshelly"; - changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}"; + changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix index 44058048114f..9dda013dff72 100644 --- a/pkgs/development/python-modules/aioshutil/default.nix +++ b/pkgs/development/python-modules/aioshutil/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools-scm, @@ -22,15 +23,11 @@ buildPythonPackage rec { hash = "sha256-hSUNx43sIUPs4YfQ+H39FXTpj3oCMUqRzDdHX2OdRdE="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail " --cov aioshutil --cov-report xml" "" - ''; - nativeBuildInputs = [ setuptools-scm ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index cf74cfca0fb1..128e8c4f2d9b 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, frozenlist, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -26,13 +27,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; postPatch = '' substituteInPlace setup.cfg \ - --replace "filterwarnings = error" "" \ - --replace "--cov=aiosignal" "" + --replace "filterwarnings = error" "" ''; pythonImportsCheck = [ "aiosignal" ]; diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index 739daea01132..29c7ad646fa3 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -18,6 +18,7 @@ proxy-py, pytest-aiohttp, pytest-asyncio, + pytest-cov-stub, pytest-django, pytest-mock, pytest-sugar, @@ -51,8 +52,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini --replace-fail \ - "addopts = --black --cov=aiosonic --cov-report term --cov-report html --doctest-modules" \ - "addopts = --doctest-modules" + "addopts = --black " \ + "addopts = " ''; build-system = [ poetry-core ]; @@ -74,6 +75,7 @@ buildPythonPackage rec { proxy-py pytest-aiohttp pytest-asyncio + pytest-cov-stub pytest-django pytest-mock pytest-sugar diff --git a/pkgs/development/python-modules/aiosonos/default.nix b/pkgs/development/python-modules/aiosonos/default.nix new file mode 100644 index 000000000000..4c0793a299e9 --- /dev/null +++ b/pkgs/development/python-modules/aiosonos/default.nix @@ -0,0 +1,57 @@ +{ + lib, + aiohttp, + orjson, + faust-cchardet, + aiodns, + brotli, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "aiosonos"; + version = "0.1.9"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "music-assistant"; + repo = "aiosonos"; + tag = version; + hash = "sha256-15zGeYspuWR5w1yGHXfXhmUeV4p+/jhXrnkZ98XW/LI="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + orjson + faust-cchardet + aiodns + brotli + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "aiosonos" + "aiosonos.api" + ]; + + meta = { + description = "Async python library to communicate with Sonos devices "; + homepage = "https://github.com/music-assistant/aiosonos"; + changelog = "https://github.com/music-assistant/aiosonos/releases/tag/${version}"; + license = [ lib.licenses.asl20 ]; + maintainers = [ lib.maintainers.autrimpo ]; + }; +} diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 8ed71cdc4825..4528d603b2a3 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "13.2"; + version = "13.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; tag = version; - hash = "sha256-GJeYh3xPKrfm2oPsNTrQXnYW75Bx8PN5/brJFslOcTw="; + hash = "sha256-FCCS91nH/HPhez+bJE7+JoFW4hKkXMdY4bAaEOZ06jU="; }; sphinxRoot = "docs/source"; diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index e96151d4df66..6c9e50a7dd6e 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -4,27 +4,24 @@ fetchFromGitHub, flit-core, pytestCheckHook, - pythonOlder, typing-extensions, }: buildPythonPackage rec { pname = "aiosqlite"; - version = "0.20.0"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + version = "0.21.0"; + pyproject = true; src = fetchFromGitHub { owner = "omnilib"; - repo = pname; + repo = "aiosqlite"; tag = "v${version}"; - hash = "sha256-JQ9iNxK7FvBhPyr825d+8P5ZYFztDIX3gOwp4FPfyU4="; + hash = "sha256-3l/uR97WuLlkAEdogL9iYoXp89bsAcpH6XEtMELsX9o="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -36,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio bridge to the standard sqlite3 module"; homepage = "https://github.com/jreese/aiosqlite"; - changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/omnilib/aiosqlite/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix index 3ab9437204ca..dc4e98180c40 100644 --- a/pkgs/development/python-modules/aiosteamist/default.nix +++ b/pkgs/development/python-modules/aiosteamist/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, poetry-core, pytestCheckHook, + pytest-cov-stub, pythonOlder, xmltodict, }: @@ -23,11 +24,6 @@ buildPythonPackage rec { hash = "sha256-e7Nt/o2A1qn2nSpWv6ZsZHn/WpcXKzol+f+JNJaSb4w="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=aiosteamist" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -37,6 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub ]; pythonImportsCheck = [ "aiosteamist" ]; diff --git a/pkgs/development/python-modules/aioweenect/default.nix b/pkgs/development/python-modules/aioweenect/default.nix index f1074a83ed59..dda6c9234ce4 100644 --- a/pkgs/development/python-modules/aioweenect/default.nix +++ b/pkgs/development/python-modules/aioweenect/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, hatchling, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -26,7 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--cov --cov-report term-missing --cov=src/aioweenect --asyncio-mode=auto" "" + --replace-fail "--asyncio-mode=auto" "" ''; pythonRelaxDeps = [ "aiohttp" ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiozoneinfo/default.nix b/pkgs/development/python-modules/aiozoneinfo/default.nix index f0f0c22aa8b6..e177eb55607e 100644 --- a/pkgs/development/python-modules/aiozoneinfo/default.nix +++ b/pkgs/development/python-modules/aiozoneinfo/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, tzdata, @@ -23,17 +24,13 @@ buildPythonPackage rec { hash = "sha256-7qd6Yk/K4BLocu8eQK0hLaw2r1jhWIHBr9W4KsAvmx8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=aiozoneinfo --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ tzdata ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 4cc93413c77f..41c124768b13 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.14.0"; + version = "1.14.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sAiStTs2QtC42+26I02/GSS2m+g6mnadWmJLAQlOMEs="; + hash = "sha256-SW6IgkWlOt8UmPyrMXE6Rpxlg2+N524BOZqhw+kN0hM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index 82c530f3cd73..b312fa217331 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amaranth-boards"; - version = "0-unstable-2025-02-07"; + version = "0-unstable-2025-03-18"; pyproject = true; # from `pdm show` realVersion = @@ -22,10 +22,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-boards"; - rev = "6e01882eefd62cf19f5740406144632fe2d21947"; + rev = "ba3b403a3391b5e306ba1ced61c3368839af61a6"; # these files change depending on git branch status postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes"; - hash = "sha256-U/+5v4wN+HfpWHnT9E9hf4XYpzqQQ7Tgq6Z09nEIBeE="; + hash = "sha256-mS3RHTWxGJIVvIVIMVDHeMxVqJyzwhlkO153+/H3WvA="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 452e7154768f..1cf65180063a 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.146"; + version = "9.2.147"; pyproject = true; disabled = pythonOlder "3.11"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; tag = "v${version}"; - hash = "sha256-bBjD+rhS8VS7JKXJyqwlxl6hmi34grO9HCuZ06SFLh0="; + hash = "sha256-ndD0NnaJtxzvb33O7/UaKi2xRuC8VRArndynZp8zCr4="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/pkgs/development/python-modules/annotatedyaml/default.nix b/pkgs/development/python-modules/annotatedyaml/default.nix new file mode 100644 index 000000000000..2e849bf1cd22 --- /dev/null +++ b/pkgs/development/python-modules/annotatedyaml/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + cython, + fetchFromGitHub, + poetry-core, + propcache, + pytest-asyncio, + pytest-codspeed, + pytest-cov-stub, + pytestCheckHook, + pyyaml, + setuptools, + voluptuous, +}: + +buildPythonPackage rec { + pname = "annotatedyaml"; + version = "0.4.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "annotatedyaml"; + tag = "v${version}"; + hash = "sha256-SKimMMqmA8twoojDncIAuUdB6DyoJsciuEneiVfTUg4="; + }; + + build-system = [ + cython + poetry-core + setuptools + ]; + + dependencies = [ + propcache + pyyaml + voluptuous + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-codspeed + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "annotatedyaml" ]; + + meta = { + description = "Annotated YAML that supports secrets for Python"; + homepage = "https://github.com/home-assistant-libs/annotatedyaml"; + changelog = "https://github.com/home-assistant-libs/annotatedyaml/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 10b3a5f958b7..7cf89891c004 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -8,7 +8,6 @@ setuptools, ansible, cryptography, - importlib-resources, jinja2, junit-xml, lxml, @@ -16,7 +15,6 @@ packaging, paramiko, ansible-pylibssh, - passlib, pexpect, psutil, pycrypto, @@ -34,6 +32,8 @@ buildPythonPackage rec { version = "2.18.3"; pyproject = true; + disabled = pythonOlder "3.11"; + src = fetchPypi { pname = "ansible_core"; inherit version; @@ -66,34 +66,30 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = - [ - # depend on ansible instead of the other way around - ansible - # from requirements.txt - cryptography - jinja2 - packaging - passlib - pyyaml - resolvelib - # optional dependencies - junit-xml - lxml - ncclient - paramiko - ansible-pylibssh - pexpect - psutil - pycrypto - requests - scp - xmltodict - ] - ++ lib.optionals windowsSupport [ pywinrm ] - ++ lib.optionals (pythonOlder "3.10") [ importlib-resources ]; + dependencies = [ + # depend on ansible instead of the other way around + ansible + # from requirements.txt + cryptography + jinja2 + packaging + pyyaml + resolvelib + # optional dependencies + junit-xml + lxml + ncclient + paramiko + ansible-pylibssh + pexpect + psutil + pycrypto + requests + scp + xmltodict + ] ++ lib.optionals windowsSupport [ pywinrm ]; - pythonRelaxDeps = lib.optionals (pythonOlder "3.10") [ "importlib-resources" ]; + pythonRelaxDeps = [ "resolvelib" ]; postInstall = '' export HOME="$(mktemp -d)" diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 893a4f569b90..df8c6e7b8400 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -3,6 +3,7 @@ pythonOlder, buildPythonPackage, fetchPypi, + setuptools, jsonschema, jxmlease, ncclient, @@ -22,25 +23,27 @@ let pname = "ansible"; - version = "11.2.0"; + version = "11.3.0"; in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-XFbXubyf2F+iDxT0gB6ImkWnq4O7EXdq11no+mdRCtQ="; + hash = "sha256-kLQJ9jDcbVWCJECaOUgxTt4bzabbLQPBdwjO9hF6YQM="; }; - postPatch = '' - # we make ansible-core depend on ansible, not the other way around - sed -Ei '/ansible-core/d' setup.py - ''; + # we make ansible-core depend on ansible, not the other way around, + # since when you install ansible-core you will not have ansible + # executables installed in the PATH variable + pythonRemoveDeps = [ "ansible-core" ]; - propagatedBuildInputs = lib.unique ( + build-system = [ setuptools ]; + + dependencies = lib.unique ( [ # Support ansible collections by default, make all others optional # ansible.netcommon @@ -62,7 +65,7 @@ buildPythonPackage { # add the dependencies for the collections you need conditionally and install # ansible using overrides to enable the collections you need. ] - ++ lib.optionals (withJunos) [ + ++ lib.optionals withJunos [ # ansible_collections/junipernetworks/junos/requirements.txt jxmlease ncclient @@ -71,7 +74,7 @@ buildPythonPackage { scp xmltodict ] - ++ lib.optionals (withNetbox) [ + ++ lib.optionals withNetbox [ # ansible_collections/netbox/netbox/pyproject.toml pynetbox ] diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 759135574dd6..639272c089f2 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "14.3.0"; + version = "14.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; tag = "v${version}"; - hash = "sha256-HcF4SjAdAPxINB0+kI1RWtKQ3VBhMNpFk6BECup7E+w="; + hash = "sha256-cFxa+QNfMk8+5jC4cxhbUs09/0tHjOgdsaE8XfxG6yk="; }; build-system = [ setuptools ]; @@ -56,6 +56,7 @@ buildPythonPackage rec { disabledTests = [ "test_preceding_whitespace" + "test_command_line_verify" # Tests expect paths below ApprovalTests.Python directory "test_received_filename" "test_pytest_namer" diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 6f9c019e0188..4d325b81d6f9 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.15"; + version = "0.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-Bg5nHvUaW+cHZEzmZ08YuXwecVx6R8tys8ZBuqUEhTg="; + hash = "sha256-/wKJOmTjMnDL9off5i3o18+2omry0h1Z88p0GV2/FGE="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index be2a8299bad2..df93a79dc8a2 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.146"; + version = "9.2.147"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; tag = "v${version}"; - hash = "sha256-8JlIhLqVPNm3P2ruJh5i7VxnnBXfubLzhtFnWF3RWf8="; + hash = "sha256-YDELaSIK4Bx0E6lxQsTd1zqyTsFrB9qxT6awuwUREXE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 382f7a5827c8..847b9eca0a38 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "asdf"; - version = "4.0.0"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "asdf-format"; repo = "asdf"; tag = version; - hash = "sha256-4fR9hc6Ez6uwi/QwOQwRyRfpbHsmGsJEtWZIj4k+9FY="; + hash = "sha256-h7OkLq9+sW507Va22cF0eez6xrI7iIaLV5D7EZFWxJQ="; }; build-system = [ @@ -60,6 +60,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # AssertionError: assert 527033 >= 1048801 + "test_update_add_array_at_end" + ]; + pythonImportsCheck = [ "asdf" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix index 7e2cf669e603..83efbef9a9cb 100644 --- a/pkgs/development/python-modules/async-modbus/default.nix +++ b/pkgs/development/python-modules/async-modbus/default.nix @@ -4,7 +4,7 @@ connio, fetchFromGitHub, fetchpatch, - pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -35,8 +35,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"--cov=async_modbus",' "" \ - --replace '"--cov-report=html", "--cov-report=term",' "" \ --replace '"--durations=2", "--verbose"' "" ''; @@ -48,7 +46,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 3ba537f7ca8e..078be97adfb7 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -11,6 +11,7 @@ pytest-mock, pytestCheckHook, python-dateutil, + pythonAtLeast, pythonOlder, pytz, setuptools, @@ -66,6 +67,11 @@ buildPythonPackage rec { # Failed: DID NOT RAISE "test_publish" ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # dbm.sqlite3.error: SQLite objects created in a thread can only be used in that same thread. + # The object was created in thread id 140737220687552 and this is thread id 140737343690560. + "test_runTest" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',... "test_anonymous_rejection" diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 5d477a3ec13c..ab4e3d41a0ed 100644 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.19"; + version = "3.41.21"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; tag = version; - hash = "sha256-i++I3sloBp0v+kB1mmS/CSlSpjOvaFYDTBh+FZr2NS0="; + hash = "sha256-m8B6t9tTlef8cdsh/wnsc0iyNLsB0RYjUhq/bA9MeII="; }; propagatedBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Atlassian REST API Wrapper"; homepage = "https://github.com/atlassian-api/atlassian-python-api"; - changelog = "https://github.com/atlassian-api/atlassian-python-api/releases/tag/${version}"; + changelog = "https://github.com/atlassian-api/atlassian-python-api/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ arnoldfarkas ]; }; diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index f8824a6fef31..2781a4bfb978 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "attrs"; - version = "24.3.0"; + version = "25.1.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-j1wHMz1UMQNUG6e+Dizhbu7oEwyws/kjirkEzh6Fuv8="; + hash = "sha256-HJcHioDIFCc6drKimKky62gch0FcEd7gppId5/GwLD4="; }; patches = [ diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index e34b1dec9ccb..fbea944cad91 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "authlib"; - version = "1.5.0"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "authlib"; tag = "v${version}"; - hash = "sha256-RrsQTrOV2v3SzdM7kqdFe1Uj7A+o/Yseq1j7CCG8qtg="; + hash = "sha256-VMihaWqR4FbnTJ50fVf5e5B9GfVwRguq5UAC+D4bpxs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix index 5c26a89ac345..2fadafe4fc22 100644 --- a/pkgs/development/python-modules/avwx-engine/default.nix +++ b/pkgs/development/python-modules/avwx-engine/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "avwx-engine"; - version = "1.9.3"; + version = "1.9.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "avwx-rest"; repo = "avwx-engine"; tag = version; - hash = "sha256-+g1q5B+s0V4UGFS6IV0aIMkfNQLTDNckCNA/bPd9+50="; + hash = "sha256-x8qb9nAAl7F+w0lHHQtLYwMZYdZ9WhAxJ63jdjlyfhQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index ce96b50ca49b..7bea254a60b9 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "44"; + version = "45"; pyproject = true; src = fetchPypi { pname = "awkward_cpp"; inherit version; - hash = "sha256-jcSZKI1tFrLqILUaJ9UEflGiR7aqz8vLOzAsrW08h9g="; + hash = "sha256-hgFM9bGqu63qKBnG5gVe5JilA+yiNO3Bn/UCkos08WI="; }; build-system = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 5b683164681e..f9e5498ebc2a 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -26,14 +25,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.7.4"; + version = "2.8.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "awkward"; tag = "v${version}"; - hash = "sha256-OXSl+8sfrx+JlLu40wHf+98WVNNwm9uxvsnGXRDztDg="; + hash = "sha256-dr8DUY6T6fvtMASdM9U+XQN0dVP8AKvwa1gwHfOz3Dw="; }; build-system = [ @@ -62,31 +61,15 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = - [ - # pyarrow.lib.ArrowInvalid - "test_recordarray" - ] - ++ lib.optionals (pythonAtLeast "3.13") [ - # AttributeError: 'FrameLocalsProxy' object has no attribute 'clear' - "test_numexpr" - ]; + disabledTests = [ + # pyarrow.lib.ArrowInvalid + "test_recordarray" + ]; - disabledTestPaths = - [ - # Need to be run on a GPU platform. - "tests-cuda" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # Fatal Python error: Segmentation fault at: - # numba/typed/typedlist.py", line 344 in append - "tests/test_0118_numba_cpointers.py" - "tests/test_0397_arrays_as_constants_in_numba.py" - "tests/test_1677_array_builder_in_numba.py" - "tests/test_2055_array_builder_check.py" - "tests/test_2349_growablebuffer_in_numba.py" - "tests/test_2408_layoutbuilder_in_numba.py" - ]; + disabledTestPaths = [ + # Need to be run on a GPU platform. + "tests-cuda" + ]; meta = { description = "Manipulate JSON-like data with NumPy-like idioms"; diff --git a/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix b/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix index 0c56ff666530..fe71a257941b 100644 --- a/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix +++ b/pkgs/development/python-modules/azure-ai-vision-imageanalysis/default.nix @@ -5,7 +5,7 @@ setuptools, azure-core, isodate, - pytestCheckHook, + typing-extensions, }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-python"; - rev = "refs/tags/azure-ai-vision-imageanalysis_${version}"; + tag = "azure-ai-vision-imageanalysis_${version}"; hash = "sha256-Hkj9mrjCc8Li8z6e1BjpzANRVx6+DjN0MhTLANMT78E="; }; @@ -27,6 +27,7 @@ buildPythonPackage rec { dependencies = [ azure-core isodate + typing-extensions ]; pythonImportsCheck = [ "azure.ai.vision.imageanalysis" ]; @@ -34,9 +35,9 @@ buildPythonPackage rec { doCheck = false; # cannot import 'devtools_testutils' meta = { - homepage = "https://github.com/Kalmat/PyMonCtl"; - license = lib.licenses.bsd3; - description = "Cross-Platform toolkit to get info on and control monitors connected"; + description = "Azure Image Analysis client library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/vision/azure-ai-vision-imageanalysis"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 2d6027b29065..2fa9f218cced 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.20.1"; + version = "12.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_storage_file_share"; inherit version; - hash = "sha256-bIn0xLyjYlW8tyuoVwXvzCysrvuTGhTnvm3n2410fFA="; + hash = "sha256-20K/a0OzwMJ8kVIgKVUnffwmpZ9/rSbAWEMaaumVgM4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index 0499c1f52c94..e8ee122cde0c 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "babel"; - version = "2.16.0"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0fNVTKJmBf4XPz3gxl91D1pC+SRJm/E03mQjWCKY4xY="; + hash = "sha256-DFTP+xn2kM3MUqO1C8v3HgeoCNHIDVSfJFm50s8K+50="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/basedmypy/default.nix b/pkgs/development/python-modules/basedmypy/default.nix index 725a2f545618..16bde590a3f7 100644 --- a/pkgs/development/python-modules/basedmypy/default.nix +++ b/pkgs/development/python-modules/basedmypy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "basedmypy"; - version = "2.9.1"; + version = "2.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "KotlinIsland"; repo = "basedmypy"; tag = "v${version}"; - hash = "sha256-0y7+9Bq/n53n2/s0yGG7IJ0UgTI3qbgrPKUOKpKFFf0="; + hash = "sha256-/43wVQoW/BbRD8j8Oypq5yz79ZTyAkLD4T8/aUg/QT8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 9d3c6f20be38..6c0919d8da2f 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.5.37"; + version = "1.5.38"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; tag = version; - hash = "sha256-uh9fxt9JdsVHCRbqNGbFxjm5pgRg4gWf2n+OYhx55RM="; + hash = "sha256-KD+ceZaUqjx8f4intjQaz3lY0a9hms6UpjwWsDu/GGM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index a8ed1cac5987..2c46f8599ff6 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "bcrypt"; - version = "4.2.1"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Z2U4bjq4f1abJ2mIdCA5uqsIeyzbAegJ1050UDwvqv4="; + hash = "sha256-Oj/SIEF4ttKtzwnLT2Qm/+9UdiV3p8m1TBWQCMsojBg="; }; cargoRoot = "src/_bcrypt"; @@ -36,7 +36,7 @@ buildPythonPackage rec { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-tCeXgypF5Tqnzv7KfoliUZeO6B83YK5cYORhwlvBVnY="; + hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix index 4a1857bfdd7e..bf21ebb68d4a 100644 --- a/pkgs/development/python-modules/beanhub-extract/default.nix +++ b/pkgs/development/python-modules/beanhub-extract/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "pytz" ]; + dependencies = [ iso8601 pytz diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 6eb47812b1df..e77dffda264b 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -19,6 +19,21 @@ grpcio-tools, }: +let + # using a older version of pytest-asyncio only for tests + # https://github.com/pytest-dev/pytest-asyncio/issues/928 + pytest-asyncio_23_8 = ( + pytest-asyncio.overridePythonAttrs (old: rec { + version = "0.23.8"; + src = fetchFromGitHub { + inherit (old.src) owner repo; + tag = "v${version}"; + hash = "sha256-kMv0crYuYHi1LF+VlXizZkG87kSL7xzsKq9tP9LgFVY="; + }; + }) + ); +in + buildPythonPackage rec { pname = "betterproto"; version = "2.0.0b6"; @@ -55,7 +70,7 @@ buildPythonPackage rec { nativeCheckInputs = [ grpcio-tools pydantic - pytest-asyncio + pytest-asyncio_23_8 pytest-mock pytest7CheckHook tomlkit diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix index af44375de93c..5ea063ff2359 100644 --- a/pkgs/development/python-modules/bidsschematools/default.nix +++ b/pkgs/development/python-modules/bidsschematools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bidsschematools"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "bidsschematools"; inherit version; - hash = "sha256-uEThihkXkC0SmFfnRmD1idA02jqI3JVZAUhWZjhWvfc="; + hash = "sha256-dEPJircy7RDRa1Q7lgUhgfj2ewVo1rsUu1A1mnSi6vw="; }; build-system = [ diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index cb49963d25bc..edd936983d4b 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-IrzFjjMNuD5UgdccHxIxZoeZpM1PGtVQRTWHOocnmAU="; }; - sourceRoot = "source/packages/biliass"; + sourceRoot = "${src.name}/packages/biliass"; cargoRoot = "rust"; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 3890c2b57da8..0f1e74be5faa 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -4,20 +4,23 @@ fetchPypi, python, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "bitarray"; - version = "3.0.0"; - format = "setuptools"; + version = "3.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ogg9wg8Ngop833oWsg2uVqqw9D3E80ejswOfZXeZKwM="; + hash = "sha256-cXVxcaRerFh4KGHEkTe6O+0NpIkVUxGFf2n06br4H6Q="; }; + build-system = [ setuptools ]; + checkPhase = '' cd $out ${python.interpreter} -c 'import bitarray; bitarray.test()' diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index 76d2b45b2605..0744302e4af5 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -6,6 +6,7 @@ wheel, parts, pytestCheckHook, + pytest-cov-stub, pythonOlder, }: @@ -21,11 +22,6 @@ buildPythonPackage rec { hash = "sha256-+/rBno+OH7yEiN4K9VC6BCEPuOv8nNp0hU+fWegjqPw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '--cov=bitlist --cov-report term-missing' "" - ''; - build-system = [ setuptools wheel @@ -35,7 +31,10 @@ buildPythonPackage rec { dependencies = [ parts ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "bitlist" ]; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index a1c17c7a4aff..d5035321e359 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bitstring"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,9 +20,11 @@ buildPythonPackage rec { owner = "scott-griffiths"; repo = pname; tag = "bitstring-${version}"; - hash = "sha256-0AaOVjroVb/maFBaB55ahwWyRHHnofja4pgSgjQMsT8="; + hash = "sha256-ZABAd42h+BqcpKTFV5PxcBN3F8FKV6Qw3rhP13eX57k="; }; + pythonRelaxDeps = [ "bitarray" ]; + build-system = [ setuptools ]; dependencies = [ bitarray ]; @@ -47,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for binary data manipulation"; homepage = "https://github.com/scott-griffiths/bitstring"; + changelog = "https://github.com/scott-griffiths/bitstring/releases/tag/${src.tag}"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 369fe4f14e73..27f18cca5279 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "black"; - version = "24.10.0"; + version = "25.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hG6mTJev47xne3YXh5k75JkYEOzHpKk3gW3Wvd7cSHU="; + hash = "sha256-M0ltXNEiKtczkTUrSujaFSU8Xeibk6gLPiyNmhnsJmY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 3ddfbf0b8503..fe09f4028541 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -92,10 +92,6 @@ buildPythonPackage rec { # TODO: Write a NixOS VM test? doCheck = false; - # Fails with: TypeError: don't know how to make test from: - # - dontUseSetuptoolsCheck = true; - meta = { description = "Python module for system storage configuration"; homepage = "https://github.com/storaged-project/blivet"; diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index eb7db86c9f35..1d56dee30547 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -5,9 +5,8 @@ cryptography, dnspython, fetchFromGitHub, - gssapi, hatchling, - ldap3, + minikerberos, msldap, pyasn1, pytestCheckHook, @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "bloodyad"; - version = "2.1.8"; + version = "2.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +25,7 @@ buildPythonPackage rec { owner = "CravateRouge"; repo = "bloodyAD"; tag = "v${version}"; - hash = "sha256-CggC7Cdw++Rgp6U4zK3er+ctBbfsxtxow9gFkYvIDds="; + hash = "sha256-XqCP2GfS8hxlFU4Mndeh+7Ll2kXJ3Dei+AGp/oy0PUg="; }; build-system = [ hatchling ]; @@ -35,10 +34,8 @@ buildPythonPackage rec { asn1crypto cryptography dnspython - gssapi - ldap3 + minikerberos msldap - pyasn1 winacl ]; diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index 0a42ad1da817..cd888a28b16b 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -23,11 +24,6 @@ buildPythonPackage rec { hash = "sha256-W+gU9YlxoCh5zRht44Ovq3Doms8UtCvUNLlSUpzsQwA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=bluetooth_sensor_state_data --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -35,7 +31,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "bluetooth_sensor_state_data" ]; diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index d0ef10d178b9..0f19424445c9 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,14 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + flit-core, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "boltons"; - version = "24.1.0"; - format = "setuptools"; + version = "25.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,11 @@ buildPythonPackage rec { owner = "mahmoud"; repo = "boltons"; tag = version; - hash = "sha256-rKBuqJ4EAm0OH97oeGOgcTcMWsloyU2u/PaBEKhm8dA="; + hash = "sha256-kBOU17/jRRAGb4MGawY0PY31OJf5arVz+J7xGBoMBkg="; }; + build-system = [ flit-core ]; + nativeCheckInputs = [ pytestCheckHook ]; # Tests bind to localhost diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix index 9ade956db688..f0d01e3756e5 100644 --- a/pkgs/development/python-modules/booleanoperations/default.nix +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -41,6 +41,18 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # started failing with fonttools update from 4.55.3 -> 4.56.0 + "test_QTail_reversed_difference" + "test_QTail_reversed_intersection" + "test_QTail_reversed_union" + "test_QTail_reversed_xor" + "test_Q_difference" + "test_Q_intersection" + "test_Q_union" + "test_Q_xor" + ]; + meta = { description = "Boolean operations on paths"; homepage = "https://github.com/typemytype/booleanOperations"; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 0d20226cee2c..99dbaa6bfd34 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.37.13"; + version = "1.37.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-vZIxrbBXis/GLIIW9j4jqdQJzSpUtl8xJo4JRw+78FM="; + hash = "sha256-MOz436qEhGn1UnnkEkj/RrHs9eLuezspLj7DkzLi+Q4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 38cdf6349819..d28e06f87e5f 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.37.13"; + version = "1.37.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-6h6aOA5BGcVwzAd6lMc3cn2MgeC4Z6PXXdlL6xe7F7c="; + hash = "sha256-k3ybeH5PeEAZ8yH6HYilBZZcJfQl6BC95F4jt8pWQoI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/brunt/default.nix b/pkgs/development/python-modules/brunt/default.nix index 232dae5cf1d3..a74b3725ba75 100644 --- a/pkgs/development/python-modules/brunt/default.nix +++ b/pkgs/development/python-modules/brunt/default.nix @@ -5,6 +5,7 @@ fetchPypi, aiohttp, requests, + pytest-cov-stub, pytestCheckHook, }: @@ -21,16 +22,15 @@ buildPythonPackage rec { sha256 = "e704627dc7b9c0a50c67ae90f1d320b14f99f2b2fc9bf1ef0461b141dcf1bce9"; }; - postPatch = '' - sed -i '/--cov/d' setup.cfg - ''; - propagatedBuildInputs = [ aiohttp requests ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; # tests require Brunt hardware doCheck = false; diff --git a/pkgs/development/python-modules/bump-my-version/default.nix b/pkgs/development/python-modules/bump-my-version/default.nix new file mode 100644 index 000000000000..afed2a855c33 --- /dev/null +++ b/pkgs/development/python-modules/bump-my-version/default.nix @@ -0,0 +1,99 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build system + hatchling, + hatch-vcs, + + # dependencies + click, + httpx, + pydantic, + pydantic-settings, + questionary, + rich-click, + rich, + tomlkit, + wcmatch, + + # test + gitMinimal, + freezegun, + pre-commit, + pytest-cov, + pytest-localserver, + pytest-mock, + pytestCheckHook, + versionCheckHook, +}: + +buildPythonPackage rec { + pname = "bump-my-version"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "callowayproject"; + repo = "bump-my-version"; + tag = version; + hash = "sha256-V5eFh2ne7ivtTH46QAxG0YPE0JN/W7Dt2fbf085hBVM="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + click + httpx + pydantic + pydantic-settings + questionary + rich-click + rich + tomlkit + wcmatch + ]; + + env = { + GIT_AUTHOR_NAME = "test"; + GIT_COMMITTER_NAME = "test"; + GIT_AUTHOR_EMAIL = "test@example.com"; + GIT_COMMITTER_EMAIL = "test@example.com"; + }; + + nativeCheckInputs = [ + gitMinimal + freezegun + pre-commit + pytest-cov + pytest-localserver + pytest-mock + pytestCheckHook + versionCheckHook + ]; + + versionCheckProgramArg = "--version"; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ "bumpversion" ]; + + meta = { + description = "Small command line tool to update version"; + longDescription = '' + This is a maintained refactor of the bump2version fork of the + excellent bumpversion project. This is a small command line tool to + simplify releasing software by updating all version strings in your source code + by the correct increment and optionally commit and tag the changes. + ''; + homepage = "https://github.com/callowayproject/bump-my-version"; + changelog = "https://github.com/callowayproject/bump-my-version/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ daspk04 ]; + mainProgram = "bump-my-version"; + }; +} diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index 4ef791086c42..8843d82df51b 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "cached-ipaddress"; - version = "0.9.2"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "cached-ipaddress"; tag = "v${version}"; - hash = "sha256-ojPza3DeeAJgUO0OS1J5YXTtzNWqLUf6YiOG9hohc+A="; + hash = "sha256-g6ffp08SXckCJthGICeuEqZ71XeLklKmz6Ziz/AHBOg="; }; build-system = [ diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 93561a2d194e..4411b9c91bf1 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cachetools"; - version = "5.5.0"; + version = "5.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tkem"; repo = "cachetools"; tag = "v${version}"; - hash = "sha256-WG9PiUMVGaEXXHKbtOFEGjLiSbNnpSI2fXCogpGj1PI="; + hash = "sha256-CWgl2UW7+rBXRQ6N/QY3vJiLsrPfmplmQbxPp2vcdU0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 0779eae1c92d..bbcdbfb5fff8 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -56,6 +56,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "cairocffi" ]; + # Cairo tries to load system fonts by default. + # It's surfaced as a Cairo "out of memory" error in tests. + __impureHostDeps = [ "/System/Library/Fonts" ]; + meta = with lib; { changelog = "https://github.com/Kozea/cairocffi/blob/v${version}/NEWS.rst"; homepage = "https://github.com/SimonSapin/cairocffi"; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 0f8db87f0ef5..b66fe8586925 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.38.0"; + version = "1.41.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "casbin"; repo = "pycasbin"; tag = "v${version}"; - hash = "sha256-HrPf56J9tKQRzdXIGYTrbyvGOAXGUovm3VaHndBw+gY="; + hash = "sha256-axW09wU/xywVui1fZKoTTIeHL0ooV1KsMhynqxiy2dI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/certauth/default.nix b/pkgs/development/python-modules/certauth/default.nix index 20fd82c2d9e8..32177d84c007 100644 --- a/pkgs/development/python-modules/certauth/default.nix +++ b/pkgs/development/python-modules/certauth/default.nix @@ -5,6 +5,7 @@ setuptools, pyopenssl, tldextract, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -24,11 +25,6 @@ buildPythonPackage { hash = "sha256-Rso5N0jb9k7bdorjPIUMNiZZPnzwbkxFNiTpsJ9pco0="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "--cov certauth " "" - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -36,7 +32,10 @@ buildPythonPackage { tldextract ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "certauth" ]; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 6fb12a08ee81..a125dc86da39 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2024.12.14"; + version = "2025.01.31"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-VXkgMqS+uDuKv/6VIfLwfTcYhupQtyB8g2q0NkkukYI="; + hash = "sha256-LHoFI9+vrrrRzyhWNchQYp4AAiFcQwZHdeNzMjTJ8jk="; }; patches = [ diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index e10440bd3d3e..e5ae3494d88b 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, click, fetchFromGitHub, + pytest-cov-stub, pytestCheckHook, pythonOlder, pyyaml, @@ -29,11 +30,10 @@ buildPythonPackage rec { six ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - sed -i "/--cov/d" tox.ini - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; disabledTests = [ # TypeError: load() missing 1 required positional argument: 'Loader' diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index ef33cb69e1ce..06ef5881e993 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -4,6 +4,7 @@ cython, fetchPypi, numpy, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -20,10 +21,6 @@ buildPythonPackage rec { hash = "sha256-UKx2zJ8Qq3vUbkSnHFGmknBRtJm0QH308pqxPXQblC8="; }; - postPatch = '' - sed -i "/--cov/d" setup.cfg - ''; - nativeBuildInputs = [ cython numpy @@ -31,7 +28,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "cftime" ]; diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index d22abf8c9164..4b4ab02edc77 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -13,6 +13,7 @@ cryptography, # tests + pytest-cov-stub, pytestCheckHook, }: @@ -46,12 +47,10 @@ buildPythonPackage { pythonImportsCheck = [ "chacha20poly1305_reuseable" ]; - preCheck = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=chacha20poly1305_reuseable --cov-report=term-missing:skip-covered" "" - ''; - - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; meta = with lib; { description = "ChaCha20Poly1305 that is reuseable for asyncio"; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 7f3bd134f29f..fbef13be43ad 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -10,6 +10,7 @@ path, portend, pyopenssl, + pytest-cov-stub, pytest-forked, pytest-services, pytestCheckHook, @@ -38,10 +39,7 @@ buildPythonPackage rec { postPatch = '' # Disable doctest plugin because times out substituteInPlace pytest.ini \ - --replace-fail "--doctest-modules" "-vvv" \ - --replace-fail "-p pytest_cov" "" \ - --replace-fail "--no-cov-on-fail" "" - sed -i "/--cov/d" pytest.ini + --replace-fail "--doctest-modules" "-vvv" ''; build-system = [ setuptools-scm ]; @@ -57,6 +55,7 @@ buildPythonPackage rec { nativeCheckInputs = [ objgraph path + pytest-cov-stub pytest-forked pytest-services pytestCheckHook diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix index 3a178e38c786..312c3ca27052 100644 --- a/pkgs/development/python-modules/chevron/default.nix +++ b/pkgs/development/python-modules/chevron/default.nix @@ -1,32 +1,37 @@ { - lib, buildPythonPackage, fetchFromGitHub, + lib, python, + setuptools, }: buildPythonPackage { pname = "chevron"; - version = "0.13.1"; - format = "setuptools"; + version = "0.14.0-unstable-2021-03-21"; + pyproject = true; # No tests available in the PyPI tarball src = fetchFromGitHub { owner = "noahmorrison"; repo = "chevron"; - rev = "0.13.1"; - sha256 = "0l1ik8dvi6bgyb3ym0w4ii9dh25nzy0x4yawf4zbcyvvcb6af470"; + rev = "5e1c12827b7fc3db30cb3b24cae9a7ee3092822b"; + hash = "sha256-44cxkliJJ+IozmhS4ekbb+pCa7tcUuX9tRNYTK0mC+w="; }; + build-system = [ + setuptools + ]; + checkPhase = '' ${python.interpreter} test_spec.py ''; - meta = with lib; { + meta = { homepage = "https://github.com/noahmorrison/chevron"; description = "Python implementation of the mustache templating language"; mainProgram = "chevron"; - license = licenses.mit; - maintainers = with maintainers; [ dhkl ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dhkl ]; }; } diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix index 799f9f0cc700..99186c91a851 100644 --- a/pkgs/development/python-modules/ciscoconfparse2/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse2/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "ciscoconfparse2"; - version = "0.8.6"; + version = "0.8.7"; pyproject = true; src = fetchFromGitHub { owner = "mpenning"; repo = "ciscoconfparse2"; tag = version; - hash = "sha256-ICv8H64aVC8Q/rl4lnSmBQ7CsaV3KtlIf/g3WZTJL9s="; + hash = "sha256-8LyGta+b18mSWbdwmnOmgbjyHmQi0dehABTXKs0RloI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ckzg/default.nix b/pkgs/development/python-modules/ckzg/default.nix index 135c354d1224..d9d1993eef1b 100644 --- a/pkgs/development/python-modules/ckzg/default.nix +++ b/pkgs/development/python-modules/ckzg/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ckzg"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "c-kzg-4844"; tag = "v${version}"; - hash = "sha256-kOoodri80p5tz8RlMz6mqsZRAuXBxZm4vr+VWJEtfA0="; + hash = "sha256-gmH3JR05LkZvjYXf25Ar3rfh9DqabqJr7Vpe1QuRqNA="; }; build-system = [ setuptools ]; @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { description = "Minimal implementation of the Polynomial Commitments API for EIP-4844 and EIP-7594"; homepage = "https://github.com/ethereum/c-kzg-4844"; - changelog = "https://github.com/ethereum/c-kzg-4844/releases/tag/v${version}"; + changelog = "https://github.com/ethereum/c-kzg-4844/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hellwolf ]; }; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 71ea691a516a..8f15bb711fee 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.146"; + version = "9.2.147"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; tag = "v${version}"; - hash = "sha256-ZGagpKzbJBuBo3E7qYNQCBid0S/JB9fenikwksdM99Y="; + hash = "sha256-Ml7BPlx4TT/jPXE0TRp2GeghB68AsanitsjD7lmEphk="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 8760db718c3d..85b9b1ff2a5c 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -17,14 +17,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.146"; + version = "9.2.147"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-VhUFGSCV8ldv42BKsYi40fz1VAqQrS6rsrrjLNY4VcU="; + hash = "sha256-Hj56jvyKceDCqYg+JdItxTKuE66ykhhSbYSUWCL5ux4="; }; in buildPythonPackage rec { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-zlgZm7ULEzrW40MZhZRMLshO7giutW+pUJpbTTom3t0="; + hash = "sha256-f4N97MFx/rfz1epFTbIQpPBGK+ioFRLZ99bINIbhktk="; }; build-system = [ setuptools ]; @@ -82,7 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python loader for many binary formats"; homepage = "https://github.com/angr/cle"; - license = with licenses; [ bsd2 ]; + license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index 0bad39ef1ed2..c9b21515f69e 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "cleo"; - version = "2.1.0"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; tag = version; - hash = "sha256-reo/7aPFU5uvZ1YPRTJDRmcMSMFru8e5ss5YmjSe3QU="; + hash = "sha256-+OvE09hbF6McdXpXdv5UBdZ0LiSOTL8xyE/+bBNIFNk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index e043ff31da29..9dba2d39ff07 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cli-helpers"; - version = "2.3.1"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cli_helpers"; inherit version; - hash = "sha256-uCqJg87uIfGA5v0N23yo2uQ8QOkglR44F/mWqyBNrmo="; + hash = "sha256-VZA7cFohKkc3Mdsg+ib1hlXjVAeLmcsTyZ7AaUAoek0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/click-option-group/default.nix b/pkgs/development/python-modules/click-option-group/default.nix index 11de4c4bc52e..93d719888186 100644 --- a/pkgs/development/python-modules/click-option-group/default.nix +++ b/pkgs/development/python-modules/click-option-group/default.nix @@ -1,31 +1,40 @@ { lib, buildPythonPackage, - pythonOlder, - fetchFromGitHub, click, + fetchFromGitHub, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "click-option-group"; version = "0.5.6"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "click-contrib"; - repo = pname; + repo = "click-option-group"; tag = "v${version}"; hash = "sha256-uR5rIZPPT6pRk/jJEy2rZciOXrHWVWN6BfGroQ3znas="; }; - propagatedBuildInputs = [ click ]; + build-system = [ setuptools ]; + + dependencies = [ click ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "click_option_group" ]; + disabledTests = [ + # https://github.com/click-contrib/click-option-group/issues/65 + "test_missing_group_decl_first_api" + ]; + meta = with lib; { description = "Option groups missing in Click"; longDescription = '' diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 66acdd9d145d..201e0d8d4253 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -12,6 +12,7 @@ six, # tests + pytest-cov-stub, pytestCheckHook, }: @@ -27,10 +28,6 @@ buildPythonPackage rec { hash = "sha256-xCT3w0DDY73dtDL5jbssXM05Zlr44OOcy4vexgHyWiE="; }; - postPatch = '' - sed -i '/--cov=/d' pyproject.toml - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -39,7 +36,10 @@ buildPythonPackage rec { six ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/click-contrib/click-repl"; diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index 9be9ce2f5aca..1d3c57b3edfc 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, click, pytest, - glibcLocales, }: buildPythonPackage rec { @@ -23,11 +22,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - glibcLocales ]; checkPhase = '' - LC_ALL=en_US.utf-8 pytest tests + pytest tests ''; meta = with lib; { diff --git a/pkgs/development/python-modules/cmake-build-extension/default.nix b/pkgs/development/python-modules/cmake-build-extension/default.nix new file mode 100644 index 000000000000..23388f7d7d50 --- /dev/null +++ b/pkgs/development/python-modules/cmake-build-extension/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + cmake, + fetchFromGitHub, + gitpython, + ninja, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "cmake-build-extension"; + version = "0.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "diegoferigo"; + repo = "cmake-build-extension"; + tag = "v${version}"; + hash = "sha256-taAwxa7Sv+xc8xJRnNM6V7WPcL+TWZOkngwuqjAslzc="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + cmake + ninja + gitpython + ]; + + dontUseCmakeConfigure = true; + + pythonImportsCheck = [ "cmake_build_extension" ]; + + doPythonRuntimeDepsCheck = false; + + meta = { + description = "Setuptools extension to build and package CMake projects"; + homepage = "https://github.com/diegoferigo/cmake-build-extension"; + changelog = "https://github.com/diegoferigo/cmake-build-extension/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ scoder12 ]; + }; +} diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index ed68d489dd2e..fe11ef7dd8e5 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "coiled"; - version = "1.82.0"; + version = "1.86.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-GNWiSv+1V++Jj8w5vLr2Ph3sSg7sHtX0kFsxEcEG9hE="; + hash = "sha256-umwAG7+ykCWLqgyQzWdrYUuslyWWP1/uKlsSci50qR4="; }; build-system = [ diff --git a/pkgs/development/python-modules/conduit/default.nix b/pkgs/development/python-modules/conduit/default.nix new file mode 100644 index 000000000000..9fd15ff2eea0 --- /dev/null +++ b/pkgs/development/python-modules/conduit/default.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + pkgs, + buildPythonPackage, + setuptools, + numpy, + pip, + + mpiSupport ? false, +}: +let + conduit = pkgs.conduit.override { inherit mpiSupport; }; +in +buildPythonPackage { + inherit (conduit) + pname + version + src + nativeBuildInputs + buildInputs + ; + pyproject = true; + + # Needed for cmake to find openmpi + strictDeps = false; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail \ + "'-j2'" \ + "f'-j{os.environ.get(\"NIX_BUILD_CORES\")}'" + ''; + + dontUseCmakeConfigure = true; + + env.ENABLE_MPI = mpiSupport; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + pip + ]; + + pythonImportsCheck = [ "conduit" ]; + + # No python tests + doCheck = false; + + meta = { + description = "Python bindings for the conduit library"; + inherit (conduit.meta) + homepage + changelog + license + platforms + ; + maintainers = with lib.maintainers; [ GaetanLepage ]; + # Cross-compilation is broken + broken = stdenv.hostPlatform != stdenv.buildPlatform; + }; +} diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 2c9981db34a6..ce7f9a3162fa 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -10,14 +9,14 @@ buildPythonPackage rec { pname = "configparser"; - version = "7.1.0"; + version = "7.2.0"; pyproject = true; src = fetchFromGitHub { owner = "jaraco"; repo = "configparser"; tag = "v${version}"; - hash = "sha256-6B1I/kS60opMDpCzy2tnlnV65Qo500G0zPHP1I5TDWA="; + hash = "sha256-ZPoHnmD0YjY3+dUW1NKDJjNOVrUFNOjQyMqamOsS2RQ="; }; nativeBuildInputs = [ @@ -27,10 +26,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preConfigure = '' - export LC_ALL=${if stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8 - ''; - meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+"; homepage = "https://github.com/jaraco/configparser"; diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell-fb/default.nix similarity index 77% rename from pkgs/development/python-modules/configshell/default.nix rename to pkgs/development/python-modules/configshell-fb/default.nix index df0a5aa19170..6fb61a2831db 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell-fb/default.nix @@ -9,15 +9,13 @@ }: buildPythonPackage rec { - pname = "configshell"; + pname = "configshell-fb"; version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "open-iscsi"; - repo = "${pname}-fb"; + repo = "configshell-fb"; tag = "v${version}"; hash = "sha256-lP3WT9ASEj6WiCrurSU/e9FhIaeoQW/n9hi1XZMnV4Q="; }; @@ -36,10 +34,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "configshell" ]; - meta = with lib; { + meta = { description = "Python library for building configuration shells"; homepage = "https://github.com/open-iscsi/configshell-fb"; - license = licenses.asl20; + changelog = "https://github.com/open-iscsi/configshell-fb/releases/tag/v${version}"; + license = lib.licenses.asl20; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cpe/default.nix b/pkgs/development/python-modules/cpe/default.nix index 58b827f23eb9..c393a6fcb5be 100644 --- a/pkgs/development/python-modules/cpe/default.nix +++ b/pkgs/development/python-modules/cpe/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { changelog = "https://github.com/nilp0inter/cpe/releases/tag/v${version}"; description = "Common platform enumeration for python"; homepage = "https://github.com/nilp0inter/cpe"; - license = lib.licenses.gpl3Only; + license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ tochiaha ]; }; } diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index bb09622b2011..8fdaa2bea823 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "craft-grammar"; - version = "2.0.2"; + version = "2.0.3"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-grammar"; tag = version; - hash = "sha256-i6dy0YNCsYIW9Uw9RcnTrOXMY6Sgwftrg27WE3tskoA="; + hash = "sha256-d7U4AAUikYcz26ZSXQwkTobSKN1PpaL20enfggHSKRM="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index ec87fbe89d23..24041f83ea99 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "cryptography"; - version = "44.0.1"; # Also update the hash in vectors.nix + version = "44.0.2"; # Also update the hash in vectors.nix pyproject = true; disabled = pythonOlder "3.7"; @@ -33,13 +33,13 @@ buildPythonPackage rec { owner = "pyca"; repo = "cryptography"; tag = version; - hash = "sha256-PM7InFrRY0ho8qcBcVqqcXV9eVP8fF0ma/y4C0gx1Ic="; + hash = "sha256-nXwW6v+U47/+CmjhREHcuQ7QQi/b26gagWBQ3F16DuQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-hjfSjmwd/mylVZKyXsj/pP2KvAGDpfthuT+w219HAiA="; + hash = "sha256-HbUsV+ABE89UvhCRZYXr+Q/zRDKUy+HgCVdQFHqaP4o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index d62321188676..0c9f40976766 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -15,10 +15,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-WphmsURl3PrxK837wzkph7tVnzesi4pMm2NZvno9fqA="; + hash = "sha256-qzLhVrbn6vbYxyejIkWWfczgSUhzAUgvyjjAxf3ITks="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index a232230b39e4..608efa1b9d5e 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.6.3"; + version = "1.6.4"; pyproject = true; src = fetchFromGitHub { owner = "cvxpy"; repo = "cvxpy"; tag = "v${version}"; - hash = "sha256-fQz9tPxSNKRSJdtyeEAE1qwK//x1U3kKozclav1G+nc="; + hash = "sha256-PV6fROIt8NsCTm2MbKr+ejgE3QC3IIU607q9MYRGnxc="; }; # we need to patch out numpy version caps from upstream diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 1e27430f6aaf..4c3f0450c0ac 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.10.0"; + version = "3.10.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-rwoyuo1xJNwtu/ox5SzfWNXjPFKGGpFJ8Htk4kSLKvs="; + hash = "sha256-OJpAY0h3MEbzm4Z3MExQjPM8RCpGW8moWLMKSvClRmw="; }; build-system = [ diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index 9921c3e86f9b..41c4230dc194 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cython"; - version = "3.0.11-1"; + version = "3.0.12"; pyproject = true; src = fetchFromGitHub { owner = "cython"; repo = "cython"; tag = version; - hash = "sha256-P2k21uNC6X+R6a1dWAIspGnUc6JwAzRXUleVfZG+vqY="; + hash = "sha256-clJXjQb6rVECirKRUGX0vD5a6LILzPwNo7+6KKYs2pI="; }; build-system = [ diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 8031a140ffbf..d639f09d883c 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -17,7 +17,6 @@ pyarrow, # tests - dask-histogram, distributed, hist, pandas, @@ -27,14 +26,14 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2025.2.0"; + version = "2025.3.0"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-awkward"; tag = version; - hash = "sha256-hhAY2cPUOYnP86FGsLvxlMeoEwY+sTrjPMKyuZrO0/M="; + hash = "sha256-z4dRGNoqwIEOwaz5U0DqCh/chZtopiLNvvvfl0bJxxI="; }; build-system = [ @@ -75,12 +74,6 @@ buildPythonPackage rec { "test_distance_behavior" ]; - disabledTestPaths = [ - # TypeError: Blockwise.__init__() got an unexpected keyword argument 'dsk' - # https://github.com/dask-contrib/dask-awkward/issues/557 - "tests/test_str.py" - ]; - __darwinAllowLocalNetworking = true; meta = { diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 0d663db68e3a..630a8f61cd0a 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -15,31 +15,27 @@ pythonOlder, requests, responses, + setuptools, tqdm, xxhash, }: - buildPythonPackage rec { pname = "datasets"; - version = "3.2.0"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + version = "3.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "huggingface"; - repo = pname; + repo = "datasets"; tag = version; - hash = "sha256-3Q4tNLA9qUb7XdxP1NftYDcVUgq5ol9OZfklhmadk5I="; + hash = "sha256-a0c5E4N1X+PtO4+UZn8l1JcLGTNpLPyfEkrrxNsjfLA="; }; - # remove pyarrow<14.0.1 vulnerability fix - postPatch = '' - substituteInPlace src/datasets/features/features.py \ - --replace "import pyarrow_hotfix" "#import pyarrow_hotfix" - ''; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp dill fsspec @@ -53,7 +49,17 @@ buildPythonPackage rec { responses tqdm xxhash - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; + + pythonRelaxDeps = [ + # https://github.com/huggingface/datasets/blob/a256b85cbc67aa3f0e75d32d6586afc507cf535b/setup.py#L117 + # "pin until dill has official support for determinism" + "dill" + "multiprocess" + # https://github.com/huggingface/datasets/blob/a256b85cbc67aa3f0e75d32d6586afc507cf535b/setup.py#L129 + # "to support protocol=kwargs in fsspec's `open`, `get_fs_token_paths`" + "fsspec" + ]; # Tests require pervasive internet access doCheck = false; @@ -63,13 +69,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "datasets" ]; - meta = with lib; { + meta = { description = "Open-access datasets and evaluation metrics for natural language processing"; mainProgram = "datasets-cli"; homepage = "https://github.com/huggingface/datasets"; changelog = "https://github.com/huggingface/datasets/releases/tag/${src.tag}"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ osbm ]; }; } diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index 9dd2125d0d37..9f44ccce7461 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "dbt-adapters"; - version = "1.14.0"; + version = "1.14.1"; pyproject = true; # missing tags on GitHub src = fetchPypi { pname = "dbt_adapters"; inherit version; - hash = "sha256-byBmlP3Gf8/olHl34L2SyMb4ZnKK5Gi1fZ3li2Acd+g="; + hash = "sha256-C6IyW/3wDwhLY103Py2J45K+JXynnEcoBoOiYSiCxhs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index f347cc0a1a5b..508382d0dd48 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; tag = version; - hash = "sha256-b1L+8xOqxY2nI8UxZHxs3x28mVAzaRuPjYlPSqSapwk="; + hash = "sha256-5RiYVNdKfTRNeqtbKwFdbB5Z12eAMNdaOFCNevR6H6w="; }; build-system = [ diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 4c2d6b1b2b95..b330d700489a 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "deprecated"; - version = "1.2.15"; + version = "1.2.18"; pyproject = true; outputs = [ @@ -23,14 +23,9 @@ buildPythonPackage rec { owner = "tantale"; repo = "deprecated"; tag = "v${version}"; - hash = "sha256-slMPL2L0TZ7L19nfHMOM4jQlkJ7HIyyDPlfC9yhhd98="; + hash = "sha256-gx5D1KAPELKfb2U93lvuztv3Ea3V+PshcfshIS6uwCo="; }; - patches = [ - # https://github.com/laurent-laporte-pro/deprecated/pull/79 - ./sphinx8-compat.patch - ]; - build-system = [ setuptools ]; nativeBuildInputs = [ sphinxHook ]; diff --git a/pkgs/development/python-modules/deprecated/sphinx8-compat.patch b/pkgs/development/python-modules/deprecated/sphinx8-compat.patch deleted file mode 100644 index 7e8a7801efdf..000000000000 --- a/pkgs/development/python-modules/deprecated/sphinx8-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/docs/source/conf.py b/docs/source/conf.py -index bed3b95..bd81db5 100644 ---- a/docs/source/conf.py -+++ b/docs/source/conf.py -@@ -173,9 +173,9 @@ texinfo_documents = [ - - # Example configuration for intersphinx: refer to the Python standard library. - intersphinx_mapping = { -- 'https://docs.python.org/3/': None, -- 'https://wrapt.readthedocs.io/en/latest/': None, -- 'http://flask.pocoo.org/docs/1.0/': None, -+ 'python': ('https://docs.python.org/3/', None), -+ 'wrapt': ('https://wrapt.readthedocs.io/en/latest/', None), -+ 'flask': ('http://flask.pocoo.org/docs/1.0/', None), - 'django': ('https://docs.djangoproject.com/en/2.1/', 'https://docs.djangoproject.com/en/2.1/_objects/'), - } - diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 70dc31735c67..988e2a5c7c7c 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -9,17 +9,16 @@ # dependencies anytree, - cached-property, cgen, click, + cloudpickle, codepy, - distributed, llvmPackages, multidict, - nbval, + numpy, + packaging, psutil, py-cpuinfo, - scipy, sympy, # tests @@ -27,18 +26,19 @@ matplotlib, pytest-xdist, pytestCheckHook, + scipy, }: buildPythonPackage rec { pname = "devito"; - version = "4.8.12"; + version = "4.8.14"; pyproject = true; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; tag = "v${version}"; - hash = "sha256-Eqyq96mVB5ZhPaLASesWhzjjHcXz/tAIOPP//8yGoBM="; + hash = "sha256-NM60H8Fx0pe4JEF7K8A+1i1MbxKhgab5cGcCD8wl9l8="; }; pythonRemoveDeps = [ "pip" ]; @@ -49,16 +49,15 @@ buildPythonPackage rec { dependencies = [ anytree - cached-property cgen click + cloudpickle codepy - distributed - nbval multidict + numpy + packaging psutil py-cpuinfo - scipy sympy ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; @@ -67,36 +66,45 @@ buildPythonPackage rec { matplotlib pytest-xdist pytestCheckHook + scipy ]; - pytestFlagsArray = [ "-x" ]; + pytestFlagsArray = + [ + "-x" + # Tests marked as 'parallel' require mpi and fail in the sandbox: + # FileNotFoundError: [Errno 2] No such file or directory: 'mpiexec' + "-m 'not parallel'" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # assert np.all(f.data == check) + # assert Data(False) + "--deselect tests/test_data.py::TestDataReference::test_w_data" + + # AssertionError: assert 'omp for schedule(dynamic,1)' == 'omp for coll...le(dynamic,1)' + "--deselect tests/test_dle.py::TestNestedParallelism::test_nested_cache_blocking_structure_subdims" + + # codepy.CompileError: module compilation failed + # FAILED compiler invocation + "--deselect tests/test_dle.py::TestNodeParallelism::test_dynamic_nthreads" + + # AssertionError: assert all(not i.pragmas for i in iters[2:]) + "--deselect tests/test_dle.py::TestNodeParallelism::test_incr_perfect_sparse_outer" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # IndexError: tuple index out of range + "--deselect tests/test_dle.py::TestNestedParallelism" + + # codepy.CompileError: module compilation failed + "--deselect tests/test_autotuner.py::test_nested_nthreads" + + # assert np.all(np.isclose(f0.data, check0)) + # assert Data(false) + "--deselect tests/test_interpolation.py::TestSubDomainInterpolation::test_inject_subdomain" + ]; - # I've had to disable the following tests since they fail while using nix-build, but they do pass - # outside the build. They mostly related to the usage of MPI in a sandboxed environment. disabledTests = [ - "test_assign_parallel" - "test_cache_blocking_structure_distributed" - "test_codegen_quality0" - "test_coefficients_w_xreplace" - "test_docstrings" - "test_docstrings[finite_differences.coefficients]" - "test_gs_parallel" - "test_if_halo_mpi" - "test_if_parallel" - "test_index_derivative" - "test_init_omp_env_w_mpi" - "test_loop_bounds_forward" - "test_min_max_mpi" - "test_mpi" - "test_mpi_nocomms" - "test_new_distributor" - "test_setupWOverQ" - "test_shortcuts" - "test_stability_mpi" - "test_subdomainset_mpi" - "test_subdomains_mpi" - # Download dataset from the internet "test_gs_2d_float" "test_gs_2d_int" @@ -111,6 +119,9 @@ buildPythonPackage rec { # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - codepy.CompileError: module compilation failed "test_v0" + + # AssertionError: assert(np.allclose(grad_u.data, grad_v.data, rtol=tolerance, atol=tolerance)) + "test_gradient_equivalence" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Numerical tests @@ -123,18 +134,12 @@ buildPythonPackage rec { ]; disabledTestPaths = - [ - "tests/test_pickle.py" - "tests/test_benchmark.py" - "tests/test_mpi.py" - "tests/test_autotuner.py" - "tests/test_data.py" - "tests/test_dse.py" - "tests/test_gradient.py" - ] - ++ lib.optionals ( - (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin - ) [ "tests/test_dle.py" ]; + lib.optionals + ((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin) + [ + # Flaky: codepy.CompileError: module compilation failed + "tests/test_dse.py" + ]; pythonImportsCheck = [ "devito" ]; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 6c79141e65f6..922d2535013d 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -2,18 +2,19 @@ lib, stdenv, aiohttp, + audioop-lts, buildPythonPackage, fetchFromGitHub, + ffmpeg, libopus, pynacl, - withVoice ? true, - ffmpeg, setuptools, + withVoice ? true, }: let pname = "discord.py"; - version = "2.4.0"; + version = "2.5.2"; in buildPythonPackage { inherit pname version; @@ -23,12 +24,15 @@ buildPythonPackage { owner = "Rapptz"; repo = "discord.py"; tag = "v${version}"; - hash = "sha256-GIwXx7bRCH2+G3zlilJ/Tb8el50SDbxGGX2/1bqL3+U="; + hash = "sha256-xaZeOkfOhm1CL5ceu9g/Vlas4jpYoQDlGMEtACFY7PE="; }; build-system = [ setuptools ]; - dependencies = [ aiohttp ] ++ lib.optionals withVoice [ pynacl ]; + dependencies = [ + aiohttp + audioop-lts + ] ++ lib.optionals withVoice [ pynacl ]; patchPhase = lib.optionalString withVoice '' substituteInPlace "discord/opus.py" \ diff --git a/pkgs/development/python-modules/dissect-fve/default.nix b/pkgs/development/python-modules/dissect-fve/default.nix index ec1137415eda..d8ffe7bbd871 100644 --- a/pkgs/development/python-modules/dissect-fve/default.nix +++ b/pkgs/development/python-modules/dissect-fve/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dissect-fve"; - version = "4.0"; + version = "4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fve"; tag = version; - hash = "sha256-R6ZrUofycEgJlwLE4/CXFZ2gTg+ETBPlBBC8+s5YN6M="; + hash = "sha256-xPjwyI134E0JWkM+S2ae9TuBGHMSrgyjooM9CGECqgg="; }; build-system = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing parsers for full volume encryption implementations"; homepage = "https://github.com/fox-it/dissect.fve"; - changelog = "https://github.com/fox-it/dissect.fve/releases/tag/${version}"; + changelog = "https://github.com/fox-it/dissect.fve/releases/tag/${src.tag}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/django-admin-datta/default.nix b/pkgs/development/python-modules/django-admin-datta/default.nix index c24693033e2f..45380c06be7a 100644 --- a/pkgs/development/python-modules/django-admin-datta/default.nix +++ b/pkgs/development/python-modules/django-admin-datta/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "django-admin-datta"; - version = "1.0.16"; + version = "1.0.17"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ef7SwKRbzuUWuwf24p5hxLXllEdCwqixoMEFy33f3Tc="; + hash = "sha256-1POh1ii6sITt2rqn+2S2B/kK1tsKsSlgxc1fEnCvSCM="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 5454eff03a19..a8151e8645f1 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "65.4.1"; + version = "65.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "pennersr"; repo = "django-allauth"; tag = version; - hash = "sha256-z5vaNopIk1CAV+TpH/V3Y6lXf7ztU4QeHZ9OTSPCgc0="; + hash = "sha256-VHMt3iX8q+tgXQ86xDhGOmlQLvmBZJN5N3w+C96J8cA="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix index 702ada6cdc1b..fe81b6122f3c 100644 --- a/pkgs/development/python-modules/django-appconf/default.nix +++ b/pkgs/development/python-modules/django-appconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-appconf"; - version = "1.0.6"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "django-compressor"; repo = "django-appconf"; tag = "v${version}"; - hash = "sha256-H9MwX5LtHkYN6TshP7rRKlX/iOJZHbQVsZeki95yks4="; + hash = "sha256-raK3Q+6cDSOiK5vrgZG65qDUiFOrRhDKxsPOQv/lz8w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-autocomplete-light/default.nix b/pkgs/development/python-modules/django-autocomplete-light/default.nix index 0faec04d3e78..74114267b425 100644 --- a/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-autocomplete-light"; - version = "3.11.0"; + version = "3.12.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yourlabs"; repo = "django-autocomplete-light"; tag = version; - hash = "sha256-Lcl14CVmpDoEdEq49sL4GFtWWqFcVoSjOJOBU7oWeH4="; + hash = "sha256-ctNbbmTUgrkLGCo7tgPIJpLn7RmkZSuj54/5RBe/sdA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 022a84e057d2..a8c6a968c7a4 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { jinja2 before-after nettools - pkgs.redis + pkgs.valkey ]; preCheck = '' diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index c175f21bc01b..44c17f782993 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "4.6.0"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = "django-cors-headers"; tag = version; - hash = "sha256-Dvsuj+U1YFC9jT5qkh2h1aL71JkRsAyXW4rxhLzEbOw="; + hash = "sha256-xKdHUGsl9H724IQn/AFtdumB/TH8m2pUUXs263gYsEg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-htmx/default.nix b/pkgs/development/python-modules/django-htmx/default.nix index 51e6f62fecf2..f5a342d66f1c 100644 --- a/pkgs/development/python-modules/django-htmx/default.nix +++ b/pkgs/development/python-modules/django-htmx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-htmx"; - version = "1.21.0"; + version = "1.23.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = "django-htmx"; rev = version; - hash = "sha256-2zmCJ+oHvw21lvCgAFja2LRPA6LNWep4uRor0z1Ft6g="; + hash = "sha256-IgVkHgTk4hC0lL6LVM16QoT2xtPWxKNu+NrcyxZ5oVY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix index 7d481e3603a8..fe1c247ca603 100644 --- a/pkgs/development/python-modules/django-mfa3/default.nix +++ b/pkgs/development/python-modules/django-mfa3/default.nix @@ -8,31 +8,20 @@ fido2, qrcode, python, - fetchpatch, }: buildPythonPackage rec { pname = "django-mfa3"; - version = "0.13.0"; + version = "0.15.1"; pyproject = true; src = fetchFromGitHub { owner = "xi"; repo = "django-mfa3"; tag = version; - hash = "sha256-O8po7VevqyHlP2isnNnLbpgfs1p4sFezxIZKMTgnwuY="; + hash = "sha256-HcurgGSzPnKVRpL9NVq0vkCmYDvj/HoWYVbnIrK5pSI="; }; - patches = [ - # Fix for tests.tests.FIDO2Test.test_origin_https - # https://github.com/xi/django-mfa3/issues/24 - (fetchpatch { - url = "https://github.com/xi/django-mfa3/commit/49003746783e32cd60e55c4593bef5d7e709c4bd.patch"; - hash = "sha256-D3fPURAB+RC16fSd2COpCIcmjZW/1h92GOOhRczSVec="; - name = "test_origin_https_fix.patch"; - }) - ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 8c8d5e0bfc3a..0d50673fd183 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -1,34 +1,34 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pythonOlder, - django, django-stubs, - pytestCheckHook, + django, + fetchFromGitHub, + parameterized, pytest-cov-stub, pytest-django, - parameterized, + pytestCheckHook, + pythonOlder, + setuptools, }: -let - # 0.18.12 was yanked from PyPI, it refers to this issue: - # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.19.12"; -in -buildPythonPackage { + +buildPythonPackage rec { pname = "django-modeltranslation"; - inherit version; + version = "0.19.13"; + pyproject = true; + + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "deschler"; repo = "django-modeltranslation"; tag = "v${version}"; - hash = "sha256-j5IKAjGes1EUNX9XE1RAPkGJGviABa4VFl789Mj2dyc="; + hash = "sha256-mn3dGSJbujULPT/PBAVvd1hlCukMItC4Z8dIZ+MWZ2w="; }; - disabled = pythonOlder "3.6"; + build-system = [ setuptools ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; nativeCheckInputs = [ django-stubs @@ -38,9 +38,12 @@ buildPythonPackage { parameterized ]; + pythonImportsCheck = [ "modeltranslation" ]; + meta = with lib; { description = "Translates Django models using a registration approach"; homepage = "https://github.com/deschler/django-modeltranslation"; + changelog = "https://github.com/deschler/django-modeltranslation/blob/v${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ augustebaum ]; }; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 25b9e1c34c8d..88c7b42bd458 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -4,22 +4,24 @@ fetchFromGitHub, django, python, + setuptools, }: buildPythonPackage rec { pname = "django-picklefield"; - version = "3.2.0"; - format = "setuptools"; + version = "3.3.0"; + pyproject = true; - # The PyPi source doesn't contain tests src = fetchFromGitHub { owner = "gintas"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UMMbJoSHWcdumZOFPhKNUjThGzU/8nhP2J8YsDjgbHo="; + repo = "django-picklefield"; + tag = "v${version}"; + hash = "sha256-/H6spsf2fmJdg5RphD8a4YADggr+5d+twuLoFMfyEac="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; checkPhase = '' runHook preCheck @@ -27,9 +29,12 @@ buildPythonPackage rec { runHook postCheck ''; + pythonImportsCheck = [ "picklefield" ]; + meta = with lib; { description = "Pickled object field for Django"; homepage = "https://github.com/gintas/django-picklefield"; + changelog = "https://github.com/gintas/django-picklefield/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/django-q2/default.nix b/pkgs/development/python-modules/django-q2/default.nix index 3f83d115764f..a3768637324a 100644 --- a/pkgs/development/python-modules/django-q2/default.nix +++ b/pkgs/development/python-modules/django-q2/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "django-q2"; - version = "1.7.4"; + version = "1.7.6"; pyproject = true; src = fetchFromGitHub { owner = "django-q2"; repo = "django-q2"; tag = "v${version}"; - hash = "sha256-mp/IZkfT64xW42B1TEO6lSHxvLQbeH4td8vqZH7wUxM="; + hash = "sha256-L2IrLKszo2UCpeioAwI8c636KwQgNCEJjHUDY2Ctv4A="; }; postPatch = '' @@ -65,7 +65,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "django_q" ]; preCheck = '' - ${pkgs.redis}/bin/redis-server & + ${pkgs.valkey}/bin/redis-server & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index 6f0bd8ee34d0..6dacbbc2e433 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { preCheck = '' export DJANGO_SETTINGS_MODULE=tests.settings.sqlite - ${pkgs.redis}/bin/redis-server & + ${pkgs.valkey}/bin/redis-server & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/django-silk/default.nix b/pkgs/development/python-modules/django-silk/default.nix index 5b91346838b3..86c3fcecdf4e 100644 --- a/pkgs/development/python-modules/django-silk/default.nix +++ b/pkgs/development/python-modules/django-silk/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "django-silk"; - version = "5.3.1"; + version = "5.3.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-silk"; tag = version; - hash = "sha256-Rm3iyEFphhDYGC7fQy+RUrbAOQQSOSiu+bOcp7TozN0="; + hash = "sha256-+JOUpjKR0rx+4+hU/5gSov5nW2aj7HR+HYr5FPbUkSA="; }; # "test_time_taken" tests aren't suitable for reproducible execution, but Django's diff --git a/pkgs/development/python-modules/django-soft-delete/default.nix b/pkgs/development/python-modules/django-soft-delete/default.nix index ee3bd1b35746..23124ff3f324 100644 --- a/pkgs/development/python-modules/django-soft-delete/default.nix +++ b/pkgs/development/python-modules/django-soft-delete/default.nix @@ -3,29 +3,33 @@ buildPythonPackage, fetchPypi, django, - setuptools, + hatchling, }: buildPythonPackage rec { pname = "django-soft-delete"; - version = "1.0.16"; + version = "1.0.18"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-zEA5jM2GnHWm1rp/Um4WxK/isMCBHCE6MY2Wu0xYp4c="; + pname = "django_soft_delete"; + inherit version; + hash = "sha256-0vnbRJpPAI6XhvgvpLr75AdfegsyhIRHNQB+mIsqTfY="; }; + build-system = [ hatchling ]; + dependencies = [ django ]; - build-system = [ setuptools ]; - # No tests doCheck = false; + pythonImportsCheck = [ "django_softdelete" ]; + meta = { description = "Soft delete models, managers, queryset for Django"; homepage = "https://github.com/san4ezy/django_softdelete"; license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix index 0f9b2a2ec6ab..7cd848fdd492 100644 --- a/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "django-two-factor-auth"; - version = "1.15.5"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-two-factor-auth"; tag = version; - hash = "sha256-Sr7L3ioeofyADHb1NSgs0GmVbzX7rro7yhhG9Gq6GJE="; + hash = "sha256-gg5QpPQbYnQr7KkCXFZ9Gnz48Cf4Nm67uV6JuyxK18c="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index b5183c00d9dd..f1e54fc8dd9a 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.19"; + version = "4.2.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-aSTrtZs8WyZ/wr01N7Mi7M3A8MlZ6rB9fBuMdCkKkok="; + hash = "sha256-RmClB0ntPzcUzsy1lKn3G5IUoNiXiYuM+/LLj0JyFfQ="; }; patches = diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 260befeb00f4..2789c78eca25 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromRepoOrCz, buildPythonPackage, @@ -34,13 +33,9 @@ let nativeCheckInputs = [ pillow ]; - # Only Darwin needs LANG, but we could set it in general. - # It's done here conditionally to prevent mass-rebuilds. - checkPhase = - lib.optionalString stdenv.hostPlatform.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' - + '' - ${python.interpreter} test/alltests.py - ''; + checkPhase = '' + ${python.interpreter} test/alltests.py + ''; # Create symlinks lacking a ".py" suffix, many programs depend on these names postFixup = '' diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix index 3eae904c2314..53f1d4319ca6 100644 --- a/pkgs/development/python-modules/dsnap/default.nix +++ b/pkgs/development/python-modules/dsnap/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "dsnap"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "RhinoSecurityLabs"; repo = "dsnap"; tag = "v${version}"; - hash = "sha256-yKch+tKjFhvZfzloazMH378dkERF8gnZEX1Som+d670="; + hash = "sha256-h5zeyfkBoHnvjqHYahDXEEbGdmMti2Y56R/8OKyxOOM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index 480998365f72..29fa27406139 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckduckgo-search"; - version = "7.2.1"; + version = "7.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "deedy5"; repo = "duckduckgo_search"; tag = "v${version}"; - hash = "sha256-6hYSABD66yfvkL8bmy84ElIWp49SMQ1R1/B2mDwWIS0="; + hash = "sha256-X2sLUXkxk3zEmA6urmlZ3tU5J0LpwT9dQDVy773U9kM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ec2-metadata/default.nix b/pkgs/development/python-modules/ec2-metadata/default.nix new file mode 100644 index 000000000000..4b4dda87eb4f --- /dev/null +++ b/pkgs/development/python-modules/ec2-metadata/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + requests, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "ec2-metadata"; + version = "2.14.0"; + pyproject = true; + + src = fetchPypi { + pname = "ec2_metadata"; + inherit version; + hash = "sha256-svgzgXIgcu+ij2XcN+cmwKvToFMvIns/pqKtaEYMf+s="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + ]; + + pythonImportsCheck = [ + "ec2_metadata" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "An easy interface to query the EC2 metadata API, with caching"; + homepage = "https://pypi.org/project/ec2-metadata/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers._9999years ]; + mainProgram = "ec2-metadata"; + }; +} diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix deleted file mode 100644 index 940fe7af28d3..000000000000 --- a/pkgs/development/python-modules/enum34/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pythonAtLeast, - unittestCheckHook, -}: - -if pythonAtLeast "3.4" then - null -else - buildPythonPackage rec { - pname = "enum34"; - version = "1.1.10"; - - src = fetchPypi { - inherit pname version; - sha256 = "cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"; - }; - - nativeCheckInputs = [ unittestCheckHook ]; - - meta = with lib; { - homepage = "https://pypi.python.org/pypi/enum34"; - description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; - license = licenses.bsd0; - }; - } diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index c3c0a9c0bc1b..1ac8fe9bef59 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - glibcLocales, pytest, }: @@ -17,13 +16,12 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - glibcLocales pytest ]; # JPLTest uses assets not distributed in package checkPhase = '' - LC_ALL="en_US.UTF-8" pytest --pyargs ephem.tests -k "not JPLTest" + pytest --pyargs ephem.tests -k "not JPLTest" ''; pythonImportsCheck = [ "ephem" ]; diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index d9bbc922431a..834e6f5d732b 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -56,6 +56,14 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # Since jax 0.5.3: + # DeprecationWarning: shape requires ndarray or scalar arguments, got at position 0. In a future JAX release this will be an error. + # https://github.com/patrick-kidger/equinox/issues/979 + "-W" + "ignore::DeprecationWarning" + ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! "test_filter" diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix index b0f56a931209..c7596aa877b6 100644 --- a/pkgs/development/python-modules/essentials-openapi/default.nix +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "essentials-openapi"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "Neoteroi"; repo = "essentials-openapi"; tag = "v${version}"; - hash = "sha256-XPsVPeKaaDwBFrUoydSa/7UPhw46JWMu3ww3MZfy7wg="; + hash = "sha256-CdDRPzRNx/5docikL8BYdFnEIr/qav8ij/1exWb24fg="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 719c7d2cbaa5..24bbd2bc6ec3 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OCGLyVUHytdWvGIaX+enekHrjZwSE4Vd6OS6Croo558="; + hash = "sha256-3GQKBkyxyf4fi5cNwgOZRaKidde37mIoS/QnI4q+Re4="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/eventkit/default.nix b/pkgs/development/python-modules/eventkit/default.nix index fb25e87fd953..c9c36d91d534 100644 --- a/pkgs/development/python-modules/eventkit/default.nix +++ b/pkgs/development/python-modules/eventkit/default.nix @@ -15,7 +15,6 @@ buildPythonPackage { src = fetchPypi { inherit pname version hash; }; propagatedBuildInputs = [ numpy ]; - dontUseSetuptoolsCheck = true; meta = with lib; { homepage = "https://github.com/erdewit/eventkit"; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 17bcbfd7e581..f36ed73d6c36 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.5.0"; + version = "5.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = "exchangelib"; tag = "v${version}"; - hash = "sha256-nu1uhsUc4NhVE08RtaD8h6KL6DFzA8mPcCJ/cX2UYME="; + hash = "sha256-HO88wM0yzETWS0eBnLABCjYHGE5wFpcjQgC8wsSumWA="; }; pythonRelaxDeps = [ "defusedxml" ]; @@ -81,7 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Microsoft Exchange Web Services (EWS)"; homepage = "https://github.com/ecederstrand/exchangelib"; - changelog = "https://github.com/ecederstrand/exchangelib/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/ecederstrand/exchangelib/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index fcd5c8a8b6f3..58c766811fe1 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonAtLeast, pythonOlder, @@ -19,8 +18,8 @@ buildPythonPackage rec { pname = "executing"; - version = "2.1.0"; - format = "pyproject"; + version = "2.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,18 +27,10 @@ buildPythonPackage rec { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - hash = "sha256-epgKMPOvPdkpRp0n5A22gZ5DeXLyI60bqzLTx5JFlLk="; + hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g="; }; - patches = [ - (fetchpatch { - name = "python-3.12.6.patch"; - url = "https://github.com/alexmojaki/executing/commit/3f11fdcd7a017fbdca8a3a9de23dab18d3ba2100.patch"; - hash = "sha256-ZnTO9lT+bj4nekPx4D0DxjhJOCkZn6lDm5xdLrziB+4="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 329e6baf2149..e612e1fe1d9b 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -26,6 +26,11 @@ buildPythonPackage rec { fetchSubmodules = true; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "scikit-build-core>=0.10.7, < 0.11" "scikit-build-core" + ''; + build-system = [ setuptools scikit-build-core diff --git a/pkgs/development/python-modules/factory-boy/default.nix b/pkgs/development/python-modules/factory-boy/default.nix index b7362eb13913..0f64af0a7992 100644 --- a/pkgs/development/python-modules/factory-boy/default.nix +++ b/pkgs/development/python-modules/factory-boy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "factory-boy"; - version = "3.3.1"; + version = "3.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "factory_boy"; inherit version; - hash = "sha256-gxeqUonN/EX5yuVw/rB6YXcxbILjTRTfPC4fIvJqvvA="; + hash = "sha256-hmhi0iYSjfrH8rQWAofomdr1TyYSd4Mn3QPQ4ssePQM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 90279e317403..968a93b8dd6e 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,18 +8,19 @@ python-dateutil, setuptools, typing-extensions, + tzdata, ukpostcodeparser, validators, }: buildPythonPackage rec { pname = "faker"; - version = "33.3.1"; + version = "36.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Sd3jsGpWAhd7wq0BMUm29gopC3FUU5GA03tvh2rnmyA="; + hash = "sha256-fLK71MjwQOSjQK5AGemki2zx22pxvaTlph2NE7e+8o0="; }; build-system = [ setuptools ]; @@ -27,6 +28,7 @@ buildPythonPackage rec { dependencies = [ python-dateutil typing-extensions + tzdata ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 0b03acd92b1f..84658d1434d0 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -12,7 +12,7 @@ pytestCheckHook, pythonOlder, redis, - redis-server, + valkey, sortedcontainers, }: @@ -57,7 +57,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-m 'not slow'" ]; preCheck = '' - ${lib.getExe' redis-server "redis-server"} --port 6390 & + ${lib.getExe' valkey "redis-server"} --port 6390 & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/fastapi-sso/default.nix b/pkgs/development/python-modules/fastapi-sso/default.nix index de57d71cf53b..1039e258f515 100644 --- a/pkgs/development/python-modules/fastapi-sso/default.nix +++ b/pkgs/development/python-modules/fastapi-sso/default.nix @@ -8,7 +8,8 @@ oauthlib, poetry-core, pydantic, - pylint, + pyjwt, + pytest-cov-stub, pytest-asyncio, pytest-xdist, pytestCheckHook, @@ -17,22 +18,18 @@ buildPythonPackage rec { pname = "fastapi-sso"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "tomasvotava"; repo = "fastapi-sso"; tag = version; - hash = "sha256-CkYAF2GmVCooyHt3Tua6ClYMbgyLosqSa8z/zkV2eIE="; + hash = "sha256-591+7Jjg3Pb0qXZsj4tEk8lHqxAzWrs5GO92jFJ4Qmo="; }; - postPatch = '' - sed -i "/--cov/d" pyproject.toml - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -40,12 +37,13 @@ buildPythonPackage rec { httpx oauthlib pydantic - pylint - ]; + pyjwt + ] ++ pydantic.optional-dependencies.email; nativeCheckInputs = [ email-validator pytest-asyncio + pytest-cov-stub pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 6fe29c6e3037..ab0e2d87992b 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.115.6"; + version = "0.115.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; tag = version; - hash = "sha256-yNYjFD77q5x5DtcYdywmScuuVdyWhBoxbLYJhu1Fmno="; + hash = "sha256-fE6Bp8iaoamVe2RrFNSVUiiNzt84P1WGum1dfWAX9hk="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 9bec5b02bfb6..cdb83a23cab7 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.29"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix index 09c03c5b433c..5d55886302b0 100644 --- a/pkgs/development/python-modules/fastdtw/default.nix +++ b/pkgs/development/python-modules/fastdtw/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "fastdtw.fastdtw" ]; nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; # looks for pytest-runner preCheck = '' echo "Temporarily moving tests to $OUT to find cython modules" export PACKAGEDIR=$out/${python.sitePackages} diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index 4b518e5f8ef1..ad250ee1715c 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -3,15 +3,15 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.19.1"; - format = "setuptools"; + version = "2.21.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,21 +20,13 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-UxcxVB4ldnGAYJKWEccivon1CwZD588mNiVJOJPNeN8="; + hash = "sha256-H/jmvm5U4RB9KuD5EgCedbc499Fl8L2S9Y5SXy51JP0="; }; - patches = [ - (fetchpatch2 { - name = "fastjsonschema-pytest8-compat.patch"; - url = "https://github.com/horejsek/python-fastjsonschema/commit/efc04daf4124a598182dfcfd497615cd1e633d18.patch"; - hash = "sha256-G1/PIpdN+KFfRP9pUFf/ANXLq3mzrocEHyBNWQMVOZM="; - }) - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - disabledTests = [ "benchmark" @@ -46,10 +38,16 @@ buildPythonPackage rec { "test_compile_to_code_custom_format" # cannot import temporary module created during test ]; + pytestFlagsArray = [ + # fastjsonschema.exceptions.JsonSchemaDefinitionException: Unknown format uuid/duration + "--deselect=tests/json_schema/test_draft2019.py::test" + ]; + pythonImportsCheck = [ "fastjsonschema" ]; meta = with lib; { description = "JSON schema validator for Python"; + downloadPage = "https://github.com/horejsek/python-fastjsonschema"; homepage = "https://horejsek.github.io/python-fastjsonschema/"; license = licenses.bsd3; maintainers = with maintainers; [ drewrisinger ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index c162a229cac2..930498cc5a6e 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "2024.5.0"; + version = "2024.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "dask"; repo = "fastparquet"; tag = version; - hash = "sha256-YiaVkpPzH8ZmTiEtCom9xLbKzByIt7Ilig/WlmGrYH4="; + hash = "sha256-GJ6dr36hGjpfEKcA96RpEqY8I1vXooLDGwc0A57yFTY="; }; build-system = [ diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 3aa7faeae458..d5d16efaeb01 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.16.1"; + version = "3.17.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wkn7/NXbR+Xi1tYhmOVlR17mXkgx4lYcjjE/p+uWFDU="; + hash = "sha256-7k53QB71duuzjNfxO5soiTGUrMIKjmjhhzC6nA5UZg4="; }; build-system = [ diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 16cb43c7d198..b755709b553a 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -16,7 +16,7 @@ let pname = "findpython"; - version = "0.6.2"; + version = "0.6.3"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-4MdbqfNaf5u0Qj6zG9FzWMzPFXYbaDcxdxkXeu/0ZyM="; + hash = "sha256-WGPqVVVtiq3Gk0gaFKxPNiSVJxnvwcVZGrsLSp6WXJQ="; }; nativeBuildInputs = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/flask-session/default.nix b/pkgs/development/python-modules/flask-session/default.nix index 3439deca8c65..9d48b8285afc 100644 --- a/pkgs/development/python-modules/flask-session/default.nix +++ b/pkgs/development/python-modules/flask-session/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; preCheck = '' - ${lib.getExe' pkgs.redis "redis-server"} & + ${lib.getExe' pkgs.valkey "redis-server"} & ${lib.getExe pkgs.memcached} & ''; diff --git a/pkgs/development/python-modules/fsspec-xrootd/default.nix b/pkgs/development/python-modules/fsspec-xrootd/default.nix index d1f3a4dc81ae..87a0f321b45f 100644 --- a/pkgs/development/python-modules/fsspec-xrootd/default.nix +++ b/pkgs/development/python-modules/fsspec-xrootd/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "fsspec-xrootd"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "fsspec-xrootd"; tag = "v${version}"; - hash = "sha256-7UUE0NtGSMmqKwD0UHvD5JFBVmajunRxDP39wjs4gUs="; + hash = "sha256-Vpe/Gcm6rmehG05h2H7BDZcBQDyie0Ww9X8LgoTgAkE="; }; build-system = [ diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index cee048cbaa87..988f6427188c 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -23,7 +23,10 @@ buildPythonPackage rec { hash = "sha256-V+i+e1McE9YFVuq2fuQtD3RKTHw9u3u0bZ2zCi9yZCM="; }; - pythonRelaxDeps = [ "withings-sync" ]; + pythonRelaxDeps = [ + "garth" + "withings-sync" + ]; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 63a00ab0a1e0..92fdef89b655 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-WUrK/ieYnao/+8hGDK8GOAI1nGsfQMmP/Tsh9prcbgk="; + hash = "sha256-cyqXCkfkpd71VqguZFOA4bO/dOkKBZkEzJ6BVLCBWFA="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index c9bd2b520c3b..439a9b5cb63b 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -1,35 +1,35 @@ { lib, buildPythonPackage, - pythonOlder, - fetchPypi, exceptiongroup, + fetchPypi, poetry-core, + pythonOlder, }: buildPythonPackage rec { pname = "generic"; - version = "1.1.3"; - disabled = pythonOlder "3.7"; + version = "1.1.4"; + pyproject = true; - format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-d4+CRv1uecIdS4t23cAI34s/PdIFYNQXfABuRWjzCUQ="; + hash = "sha256-3QcFbbWgCJcL37MwiK1Sv7LG6N60zsw93CupD4Xzp/w="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ exceptiongroup ]; + dependencies = [ exceptiongroup ]; pythonImportsCheck = [ "generic" ]; meta = with lib; { description = "Generic programming (Multiple dispatch) library for Python"; - maintainers = [ ]; homepage = "https://github.com/gaphor/generic"; changelog = "https://github.com/gaphor/generic/releases/tag/${version}"; license = licenses.bsd3; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index a6b7b7081e2b..605b7f67b1dc 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "geoip2"; - version = "4.8.1"; + version = "5.0.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-muouq0s+YlL0dFZSiunDWxBMRSd2OcE/zhvofJL4Qlc="; + hash = "sha256-kK+LbTaH877yUfJwitAXsw1ifRFEwAQOq8TJAXqAfYY="; }; build-system = [ diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix index 696e4d19feec..f773239c6118 100644 --- a/pkgs/development/python-modules/geometric/default.nix +++ b/pkgs/development/python-modules/geometric/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "leeping"; repo = "geomeTRIC"; tag = version; - hash = "sha256-8kM6zaQPxtFiJGT8ZW0ivg7bJc/8sdfoTv7NGW2wwR8="; + hash = "sha256-hxNzyuupktUWDzZXXJNsVoC6m/kyE1fbfY5K6LiO+x0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 7810c15024a5..9e6149fa77ac 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -7,27 +7,30 @@ pytest-mock, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "getmac"; version = "0.9.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "GhostofGoes"; - repo = pname; + repo = "getmac"; tag = version; hash = "sha256-ZbTCbbASs7+ChmgcDePXSbiHOst6/eCkq9SiKgYhFyM="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ py - pytestCheckHook pytest-benchmark pytest-mock + pytestCheckHook ]; disabledTests = [ @@ -42,14 +45,16 @@ buildPythonPackage rec { "test_initialize_method_cache_valid_types" ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + pythonImportsCheck = [ "getmac" ]; meta = with lib; { description = "Python package to get the MAC address of network interfaces and hosts on the local network"; - mainProgram = "getmac"; homepage = "https://github.com/GhostofGoes/getmac"; - changelog = "https://github.com/GhostofGoes/getmac/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/GhostofGoes/getmac/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "getmac"; }; } diff --git a/pkgs/development/python-modules/ghidra-bridge/default.nix b/pkgs/development/python-modules/ghidra-bridge/default.nix new file mode 100644 index 000000000000..2c50519da9bd --- /dev/null +++ b/pkgs/development/python-modules/ghidra-bridge/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + jfx-bridge, + setuptools, +}: + +buildPythonPackage rec { + pname = "ghidra-bridge"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "justfoxing"; + repo = "ghidra_bridge"; + tag = version; + hash = "sha256-VcAl1tamsuHvZRtBP0+DCl2A9d7E6aoj2AbJhEcBNMM="; + }; + + patches = [ ./no-invoke-git.patch ]; + + postPatch = '' + substituteInPlace ./setup.py --subst-var-by version ${version} + ''; + + build-system = [ setuptools ]; + + dependencies = [ jfx-bridge ]; + + # Tests require a running server instance + doCheck = false; + + pythonImportsCheck = [ "ghidra_bridge" ]; + + meta = { + description = "Python bridge to Ghidra's Python scripting"; + homepage = "https://github.com/justfoxing/ghidra_bridge"; + changelog = "https://github.com/justfoxing/ghidra_bridge/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ scoder12 ]; + }; +} diff --git a/pkgs/development/python-modules/ghidra-bridge/no-invoke-git.patch b/pkgs/development/python-modules/ghidra-bridge/no-invoke-git.patch new file mode 100644 index 000000000000..f82ebccde6ea --- /dev/null +++ b/pkgs/development/python-modules/ghidra-bridge/no-invoke-git.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 9a2abe0..75ce109 100644 +--- a/setup.py ++++ b/setup.py +@@ -6,7 +6,7 @@ with open("README.md", "r") as fh: + + # determine the version, then write it out into the bridge.py file + version = ( +- subprocess.check_output("git describe --tags", shell=True).decode("utf-8").strip() ++ "@version@" + ) + # check if this is a non-tag release and remark it as a dev release + if "-" in version: diff --git a/pkgs/development/python-modules/glyphsets/default.nix b/pkgs/development/python-modules/glyphsets/default.nix index 8643b21c0416..d2a33b40cb12 100644 --- a/pkgs/development/python-modules/glyphsets/default.nix +++ b/pkgs/development/python-modules/glyphsets/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { hash = "sha256-jza6VQ3PZAQPku2hyo0KeO59r64Q9TpqLCI0dIX/URU="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "setuptools_scm>=8.1.0,<8.2" setuptools_scm + ''; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; build-system = [ diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 671a72368381..2ac9bc3914ea 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_access_context_manager"; inherit version; - hash = "sha256-O/rGqO4ub5UQWo7s9OGJCxp5Y3AuuMZV/s8CVX00joo="; + hash = "sha256-8n+GCH+t4V32gBfHaeG5MNVZCIpTWPBwIg36l5Ss4x0="; }; build-system = [ setuptools ]; @@ -35,8 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Protobufs for Google Access Context Manager"; - homepage = "https://github.com/googleapis/python-access-context-manager"; - changelog = "https://github.com/googleapis/python-access-context-manager/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-access-context-manager"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-access-context-manager-v${version}/packages/google-cloud-access-context-manager/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ austinbutler ]; }; diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index acd83fab82aa..b6ef25fa694d 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.15.1"; + version = "1.15.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_artifact_registry"; inherit version; - hash = "sha256-k7SaOdk78EJhEwTlWRklr3+JlrRXVctekUjzgl4Xe/o="; + hash = "sha256-0w4HVBOqHnLechpkiVlnOrCPjSuQaXP84jDGtU6Q2RE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index f4548fa9c9f5..cc978da85d3a 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.29.1"; + version = "3.29.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_asset"; inherit version; - hash = "sha256-GdHmAYBXLVgwdSGq5KyqScCxA+cvnpszPcZEId2uCLg="; + hash = "sha256-fFmpPUeKgniruevGhXnJLhzwM4ymO4ERjD8BQ0/HBbs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 19415b2e19d7..eb8c15cde5f8 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.16.2"; + version = "2.16.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_automl"; inherit version; - hash = "sha256-1GSv/T3Jex2zxsK3510LOoduK+a87I6MrawIknuSvbg="; + hash = "sha256-b10WLvYAjZPKBGUal4b63rRJfUqKJL9n3ztVOVFK3y8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 9324adcc0835..7486fb4b065c 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.19.0"; + version = "3.19.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_datatransfer"; inherit version; - hash = "sha256-qQ330hnnZyC4X+QvlrSF+Z/FGCsaETzP47CgzAHHS+0="; + hash = "sha256-L7em/I7t7htI5zdGwSKDs35b2t/pvIXl1lUSMM6BdRo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 80b248980c46..ac6a036f99f0 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_logging"; inherit version; - hash = "sha256-gkozSu9UENr/4LRmHdS+efRH8t63ZO64zAx7i2cT51E="; + hash = "sha256-sVWeTqq4drPOmlUXd6R2O44PpNfcbsglhXeh6umYMZI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 6230e74c62ad..eb717e60f835 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.26.0"; + version = "1.28.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_compute"; inherit version; - hash = "sha256-ZbbHkQYKyDy4Uy+TNr1+FFiwahVZY7ViubROM+zNMDA="; + hash = "sha256-0Mc4DDTLvHzERiPDCqpn2lXUz4KeoE5gVz3va8hJ1Hg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 6a39f3f66822..6a2d0c0fb325 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.56.0"; + version = "2.56.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-BD2e/4aDhyY5Cs95YZwAO1sJK7t+s9VCYwbpsrlQDg8="; + hash = "sha256-QADuXKwndJvGDEWTftNIGRX7vwmJJdkoUjcC1w8vT6E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 8d41f9cf44f8..4ce3f4dbc3d0 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.25.1"; + version = "3.26.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_datacatalog"; inherit version; - hash = "sha256-LkCi+bzCywtmtEK/aypVeunA6/FC7tDHLVzriPhYdE0="; + hash = "sha256-rE3KvGuBi4YIwxLiICX5b1AO93NAWL6IpapNW5a/FVY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 8807f7fa9a09..70125b2cca3e 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_iam_logging"; inherit version; - hash = "sha256-+rgtIj4Q+ZL8ENeigmF0dJYzIbJ797A1bOs2mbH4AKI="; + hash = "sha256-2tpXDDqP6JN9y8wqku/C3+I9ymns5EfxvfR5eeTDstU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 08afa0a23d05..c38f3601728c 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.17.0"; + version = "2.17.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_language"; inherit version; - hash = "sha256-jOIWh7py71jOWHB67egWQlj53rR3kfJJzCqdT4yQdhs="; + hash = "sha256-vtaZaZXaIaJwl+XvOG9wEB6xw5beDdtNabhzbB91NXw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index df4d2ae4719b..f38283312b7e 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.27.0"; + version = "2.27.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_monitoring"; inherit version; - hash = "sha256-9mVSUogS57ap8vt+C3w+eQTMDBNQT0/LQgNXIrXaK8Q="; + hash = "sha256-9HAJAKZYzWybf3FLsp0Af6zvDPDWKNAHVpnDpzvOilU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 058015cb1b5f..ccfc365aa6b2 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.19"; + version = "0.3.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_netapp"; inherit version; - hash = "sha256-88A1HJbm3ngNWXS+kJ/nmX5ctwZBqAe9VckC5AMmWuU="; + hash = "sha256-ZPJMw+fOPcKrRpwoZYPSBCUpuejJsDSXLqvbhNvMWfA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix index 19f9f3c65af8..d63289ce8400 100644 --- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix +++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-network-connectivity"; - version = "2.7.1"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "google_cloud_network_connectivity"; - hash = "sha256-caOyIo4FKGQgpa0x7lKzrsaL5nrqqg8Q1iGITY3foME="; + hash = "sha256-7whrWtASCSsmPP6/gj9Jc5dvn56H2QPyEseELxbn0tg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 09808261b134..b25ff0c0cc8d 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.13.0"; + version = "1.13.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_org_policy"; inherit version; - hash = "sha256-ajFHKQI6fD/X/gYrasb1qwZNbOzrFyJg8mUaxa9CeM4="; + hash = "sha256-2yPr1sgmxMnQwk6Z1T9i2MFPeAxjb40r4IqNoAd7WZk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 91640d71efc5..e2ed80d4ff81 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.20.0"; + version = "1.20.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_os_config"; inherit version; - hash = "sha256-GczIpzo161rJ+TxU9LB9wcvtLXfopSRofeO9UyS4tMQ="; + hash = "sha256-15sKmKW9y3/JU7rTLRZJXYqxWdWvqIFmIqpXKo2tE8Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index e47b705c13c0..63d8477ec656 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.18.0"; + version = "2.18.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_redis"; inherit version; - hash = "sha256-vszvtwbVxWXNmaz+6yy3XxNop7x/f42Wtg4CuOwFToo="; + hash = "sha256-o64V2KL/Gmeg2LOXR3XCsGypf4Tz8zyHYoIiGR7+rJw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index b4dd40f0c6a3..5c1f2dacc50e 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.14.1"; + version = "1.14.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_resource_manager"; inherit version; - hash = "sha256-QenlRqqgPVFgzfojQdvoHvdZZwbDAKiblMQp8fNBH4c="; + hash = "sha256-li4tkExVDXusSDcmB5BP97syd+O7SjbYDMmjfijm63Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 2957a702f56c..7fe77846fb34 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.23.1"; + version = "2.23.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_secret_manager"; inherit version; - hash = "sha256-TXee1WZrXEpOJOUvgIsuFZtg/Gjtex8jDKSRkYYyoRQ="; + hash = "sha256-h2M3mSqredhkfbFYk3G8tztJhmK1hhlZmfjJRVpZfyk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 3b5c583fe6e0..211ab711d227 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.38.0"; + version = "1.38.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_securitycenter"; inherit version; - hash = "sha256-1FWz9wDZvehE7bg9oUpUBJXz05Xp18vOOr1IexmwBKY="; + hash = "sha256-XsR+gNtFCWhe0PEmaS8lIgGl0+ri7MR/omK+bch4Too="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix index 3710d414e70f..d5928afbaaa8 100644 --- a/pkgs/development/python-modules/google-cloud-shell/default.nix +++ b/pkgs/development/python-modules/google-cloud-shell/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-shell"; - version = "1.12.0"; + version = "1.12.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_shell"; inherit version; - hash = "sha256-PQzFvc/ZGAp6SsMGT2mMQJN5feaI5E7WSODWccRNYx4="; + hash = "sha256-nRuFxyxtJmKiI0BtV8VEu8mRZ5JU2S0gGU9aef9I6Zg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index befbea881250..0136e948a893 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.19.1"; + version = "2.19.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_tasks"; inherit version; - hash = "sha256-wvIqfdMVNp3C/3apjR9d/ah3lwraKNgpoUnL57FGPAY="; + hash = "sha256-J2tH6F9IJZI6d41UP8BzXkskvkX3P6fZZK0WVUAtB9w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 5d191bfc25ee..c5b6f750cbb3 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_testutils"; inherit version; - hash = "sha256-ds2JgVD7rbW1A6ce41hJEodqJdtWT2wiPIuvswp3kag="; + hash = "sha256-wuCpUpc5Iny6MFoh7u9d175wL9DWHz4ZLM1f+DE+V6U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index a9b597f989e2..e41978bbd126 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.25.0"; + version = "2.25.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_texttospeech"; inherit version; - hash = "sha256-d25wtYOFyMNLhCXHrbJ+lGqFg3fCJ7lRUzFddSY8HiM="; + hash = "sha256-N918PwI/WpfbcpiXGNllMOBfricOXR3kHRBLMWp3Cvw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index ad6913e56796..f2e1c6efe7fa 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.16.0"; + version = "1.16.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_trace"; inherit version; - hash = "sha256-nSexY3cVcrVh6/dTpeR5H5nSXlTtrUywEheriC899Bo="; + hash = "sha256-FTCLBPEtlY8rODGk92uXxhwMekaAS9xXDRkCSTgCnZo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 4e0228952e52..85c10647d378 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.20.1"; + version = "3.20.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_translate"; inherit version; - hash = "sha256-g6KO+XxK8nRKy9/mYkOXKHQaVtiVSFIrT6sAhmPJGQE="; + hash = "sha256-tUOE7lX0vF2WbO4OELCBT/7hN1wfKvcLkiDTvPWNhfg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 1b358234f1a2..ad71451b2fca 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.16.0"; + version = "2.16.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_videointelligence"; inherit version; - hash = "sha256-eqHNqa9pFHE+MoeH6rOro2G0E0iLCOCqxXqNoi3tH2I="; + hash = "sha256-ajYSBZhvv5b8hKS5o2aTrymRpd5bWX94ncNcGmE7/Lk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix index 5f09ae85dd2c..78364c4e2f54 100644 --- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix +++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-vpc-access"; - version = "1.13.0"; + version = "1.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_vpc_access"; inherit version; - hash = "sha256-jMZtqtbNtocz6NeUJupU+Gkk2L48S5FfrvRrQ5/SZx8="; + hash = "sha256-tgSvaJvXhEt6isC6C+w0APq2ULUYkKdva9vb6yZ4MYM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix index 5f5e8a404200..d20b53813f14 100644 --- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix +++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-webrisk"; - version = "1.17.0"; + version = "1.17.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_webrisk"; inherit version; - hash = "sha256-Qcw5LyPhu9ZbYSz3Jnkr8byXiTZfW7BtQapT7MhkEug="; + hash = "sha256-apCNF81eeLIP4nNdzm9KeUlUO7pjN6quKTrl1xsUn0Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 0f7cb6551e74..cb92c7506e1b 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.17.0"; + version = "1.17.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_websecurityscanner"; inherit version; - hash = "sha256-JqKKtjBeJ/jyGZZ9SGhQ9a89khuZKSJMPhqc5BOnFcg="; + hash = "sha256-nDjk29d1V19fUNei6lJLtmJDwfLcBSnXm4jZQV2s+vI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix index 039d0920a014..43da59df10c2 100644 --- a/pkgs/development/python-modules/google-cloud-workflows/default.nix +++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-workflows"; - version = "1.17.0"; + version = "1.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_workflows"; inherit version; - hash = "sha256-RPQLMizULGQBwxdKfvInbEA9O7+JsWjg9dFwkFj29IM="; + hash = "sha256-QXfMocOyZg/IpqJbmPyr4pCajKJ+jepHi7Gw/oVZg+A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix index 310d795eda7d..fb0e8a943c34 100644 --- a/pkgs/development/python-modules/google-cloud-workstations/default.nix +++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-workstations"; - version = "0.5.13"; + version = "0.5.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_workstations"; inherit version; - hash = "sha256-ullBxDAloLnKL/7zTfbtzRCgBcrXOAdo+TpvmIGKsCU="; + hash = "sha256-LwIsVouAh/obOaGx+EvT8gmEJ+NdQNSsfkwEtoxE07I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index 94cdd4843467..af684fe293c5 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ "websockets" ]; + dependencies = [ google-auth httpx diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index d8ea529bb1d8..7323ae9bc69d 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + brotli, buildPythonPackage, fetchPypi, google-auth, @@ -40,6 +41,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + brotli google-cloud-testutils mock pytest-asyncio diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index ce857f574982..052cc3c69cf0 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -22,7 +22,6 @@ rapidfuzz, # checks - glibcLocales, pytestCheckHook, }: @@ -91,7 +90,6 @@ buildPythonPackage rec { ]); nativeCheckInputs = [ - glibcLocales pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); @@ -104,10 +102,6 @@ buildPythonPackage rec { "test_ar" ]; - preCheck = '' - export LC_ALL=en_US.utf-8 - ''; - pythonImportsCheck = [ "gruut" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 5c745e7936f0..90b63e1e487e 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -34,8 +34,6 @@ buildPythonPackage rec { netcdf4 ]; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "h5netcdf" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index ef92a66e9eaf..9ed287b200b9 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.68"; + version = "0.69"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-Lftt4NzOZYYE7q7acdljosE0Ox/5hKbbwsYx4g2OU+Y="; + hash = "sha256-dt5f4Mu44YPKdoO6J3WKM5KXrHeAs+hKDF/c5mee6Z8="; }; build-system = [ diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index 68448485f73a..5e324589457e 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.10"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Salamek"; repo = "huawei-lte-api"; tag = version; - hash = "sha256-L6xCX+NHASunB876N1R++xMOx55Z8zc77j5QwKqHsNY="; + hash = "sha256-cSoH3g5olrcv4/IJeRWFR6Yy1ntBuL0zpO1TrnwvIwk="; }; build-system = [ setuptools ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "API For huawei LAN/WAN LTE Modems"; homepage = "https://github.com/Salamek/huawei-lte-api"; - changelog = "https://github.com/Salamek/huawei-lte-api/releases/tag/${version}"; + changelog = "https://github.com/Salamek/huawei-lte-api/releases/tag/${src.tag}"; license = licenses.lgpl3Only; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index e4368a49d191..4a2534cebe84 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "huey"; - version = "2.5.2"; + version = "2.5.3"; format = "pyproject"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; tag = version; - hash = "sha256-0X4gUIFqkE4GLW5Eqbolpk7KZdsvjkRxD20YmLPG11A="; + hash = "sha256-Avy5aMYoeIhO7Q83s2W4o6RBMaVFdRBqa7HGNIGNOqE="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - changelog = "https://github.com/coleifer/huey/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/coleifer/huey/blob/${src.tag}/CHANGELOG.md"; description = "Little task queue for python"; homepage = "https://github.com/coleifer/huey"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index ceb79e3d04a0..8abf7a6543de 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.125.2"; + version = "6.127.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-W+rTh9ymJTvq7KA4w8YrG6Z10tcfrtKGJ1MW716nVHs="; + hash = "sha256-Ef0DbK2+HnU94F2TxcotJEt3rcIU/QOhStLOUTn7o2k="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -51,9 +51,9 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ attrs sortedcontainers ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix index 3b5477200b69..ead2930ea4f5 100644 --- a/pkgs/development/python-modules/hyrule/default.nix +++ b/pkgs/development/python-modules/hyrule/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hyrule"; - version = "0.8.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "hylang"; repo = "hyrule"; tag = version; - hash = "sha256-FJ7iu+ohbe4nhADka2OC+JHAmwZkkJgFVLyHD0Fms1E="; + hash = "sha256-HSs5YUbhdaOgpBaxXe9LibJN4G3UJvEvEdnYt6ORQBo="; }; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility library for the Hy programming language"; homepage = "https://github.com/hylang/hyrule"; - changelog = "https://github.com/hylang/hyrule/releases/tag/${version}"; + changelog = "https://github.com/hylang/hyrule/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index a89c1d4c5271..93ca544d6ae6 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -41,33 +41,24 @@ buildPythonPackage rec { responses ]; - disabledTests = - [ - # Various tests try to access credential files which are not included with the source distribution - "test_configure_service" - "test_cp4d_authenticator" - "test_cwd" - "test_files_dict" - "test_files_duplicate_parts" - "test_files_list" - "test_get_authenticator" - "test_gzip_compression_external" - "test_iam" - "test_read_external_sources_2" - "test_retry_config_external" - # assertion error due to requests brotli support - "test_http_client" - # Tests require network access - "test_tls_v1_2" - ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # Tests are blocking or failing - "test_abstract_class_instantiation" - "test_abstract_class_instantiation" - ]; + disabledTests = [ + # Various tests try to access credential files which are not included with the source distribution + "test_configure_service" + "test_cp4d_authenticator" + "test_cwd" + "test_files_dict" + "test_files_duplicate_parts" + "test_files_list" + "test_get_authenticator" + "test_gzip_compression_external" + "test_iam" + "test_read_external_sources_2" + "test_retry_config_external" + # Tests require network access + "test_tls_v1_2" + ]; disabledTestPaths = [ - "test/test_container_token_manager.py" # Tests require credentials "test_integration/" ]; diff --git a/pkgs/development/python-modules/icalendar-compatibility/default.nix b/pkgs/development/python-modules/icalendar-compatibility/default.nix new file mode 100644 index 000000000000..b5969bcca32b --- /dev/null +++ b/pkgs/development/python-modules/icalendar-compatibility/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + hatch-vcs, + icalendar, + pytestCheckHook, + git, +}: + +buildPythonPackage rec { + pname = "icalendar-compatibility"; + version = "0.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "niccokunzmann"; + repo = "icalendar_compatibility"; + tag = "v${version}"; + hash = "sha256-h9rpbltNEPMteicPJ6oC32NsZS8QXQphLbC0Qiu7j5Q="; + }; + + # hatch-vcs tries to read the current git commit hash + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["urls", "version"]' 'version = "${version}"' + ''; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ icalendar ]; + + nativeCheckInputs = [ + pytestCheckHook + git + ]; + + pythonImportsCheck = [ "icalendar_compatibility" ]; + + # env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + meta = { + homepage = "https://icalendar-compatibility.readthedocs.io/en/latest/"; + changelog = "https://icalendar-compatibility.readthedocs.io/en/latest/changes.html"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ erictapen ]; + }; + +} diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index c4272412d087..3e1cc903fd56 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "8.5.0"; + version = "8.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-cVImVvCrrOHQcrnlSBpI8HwTjgDwecOMj4g4I/nCa9c="; + hash = "sha256-MQtB11VEXXRWn5k8z8IoOCldn+AFQlCU+tlT1/FchYA="; }; build-system = [ diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix index 84cf1fe0faf9..03f450d6dd10 100644 --- a/pkgs/development/python-modules/inline-snapshot/default.nix +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "inline-snapshot"; - version = "0.19.3"; + version = "0.20.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "15r10nk"; repo = "inline-snapshot"; tag = version; - hash = "sha256-bgzDjlcZOxS3OCv8xj7qKllaZcfJaxySXOu7OwY2EIQ="; + hash = "sha256-hIOavNdD2SaYuvG1rdlIkVRALjaJDfXkanrlF9TcPo0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/ipython-pygments-lexers/default.nix b/pkgs/development/python-modules/ipython-pygments-lexers/default.nix new file mode 100644 index 000000000000..e85bff660682 --- /dev/null +++ b/pkgs/development/python-modules/ipython-pygments-lexers/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + pygments, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "ipython-pygments-lexers"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ipython"; + repo = "ipython-pygments-lexers"; + tag = version; + hash = "sha256-p2WrFvCzHOuxPec9Wc1/xT6+fEUdcdDC1HTNmu5dm5Q="; + }; + + build-system = [ flit-core ]; + + dependencies = [ pygments ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "ipython_pygments_lexers" ]; + + meta = { + description = "Pygments lexers for syntax-highlighting IPython code & sessions"; + homepage = "https://github.com/ipython/ipython-pygments-lexers"; + changelog = "https://github.com/ipython/ipython-pygments-lexers/releases/tag/${src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix index 2626fe2e4ef5..bc4cca3eb2cd 100644 --- a/pkgs/development/python-modules/isal/default.nix +++ b/pkgs/development/python-modules/isal/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "isal"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-isal"; rev = "v${version}"; - hash = "sha256-KLnSE7QLM3q8DdoWnCEN6dOxsMr8eSH9k3FqFquZFlE="; + hash = "sha256-gvUVSGarPA4KupQTd61x75CfqNVqZfFC1zq0R21Clf8="; }; patches = [ diff --git a/pkgs/development/python-modules/iterfzf/default.nix b/pkgs/development/python-modules/iterfzf/default.nix index 9c06b996e040..83b6cb5c0077 100644 --- a/pkgs/development/python-modules/iterfzf/default.nix +++ b/pkgs/development/python-modules/iterfzf/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "iterfzf"; - version = "1.5.0.60.2"; + version = "1.6.0.60.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dahlia"; repo = "iterfzf"; tag = version; - hash = "sha256-9WN49tY9wWBVQGXCpvNQlRaRCZWSfV4xrZPoIOVjK9g="; + hash = "sha256-M6ri90GNHOmr0HtQ/tGxqpG7f+D5rsH/SAlbaVtmTwU="; }; postPatch = '' @@ -48,6 +48,7 @@ buildPythonPackage rec { # AttributeError "test_no_query" "test_select_one_ambiguous" + "test_supports_color_kwarg" ]; pythonImportsCheck = [ "iterfzf" ]; diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix index 6dff1eb69ef7..14c59787f06a 100644 --- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix @@ -39,7 +39,7 @@ let srcs = { "x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_x86_64.whl"; - hash = "sha256-05Xe87NP1oSOEVlu8pdaiV0fUG31EuQbH8XS3lIMjlE="; + hash = "sha256-xTeDBlaLoMgbIwp3ndMZTJ3RAzmrY2CugJKBCNN+f3U="; }; # "aarch64-linux" = fetchurl { # url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_aarch64.whl"; diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix index e9d22d155f69..a1bcf01218da 100644 --- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix @@ -40,42 +40,42 @@ let "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-ymCGSgWlzqRK51dthHtHeeTeYYUKmhgjg0H8Q6dY1Vs="; + hash = "sha256-uiVVln+bbDgci075+wPQW8Vewl7P7lz+RcWs4099QVI="; }; "3.10-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp310"; - hash = "sha256-488emSaNinBBPw+sM1krh2nBPckdch+RxYeEa+nYhAM="; + hash = "sha256-YXGu0vSzvdX8E3gt4QcsamNPzhNzG3XQywpquPTm5lA="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-NGVbjq/H2b/sMbB3rBPULgjY7YZV0kFHxa38AVFSaU8="; + hash = "sha256-qqcEpe9UdZXQItscHkh4oGdxFkEqk2DBFdZ/9LZOFZY="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-ik8Mje8QnXb1uqwbKuRpCURFzS1/vYxZf83WI+sC/1Q="; + hash = "sha256-KY0tdo8QKbdKCx0BJw5Uk0nSw33Adlh5ZULNqWfre9M="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-Fp22Rbr+whOO2YOvjxTk0RqElyivpXIC55qRBNmJLxY="; + hash = "sha256-IDDPEgjOTqcO5WysYd3SOfl5hpX8Obt3OcUKJdbp2kQ="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-wqhtVj3AR5rLTHmuz/vuwYn6vY6XAP4/cxvwOV4dbBE="; + hash = "sha256-wlF6fCGG+HCIlGluJs+W69YLeHnOyjmLLEarso0slsg="; }; "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-J0kTjLGHMZBoa7FPMxBIskwXjwXkdIo9L/fSA2c1rT0="; + hash = "sha256-GGJZWyttgVZ50R4OiJ5SMYXuVKRtRuAiaJ9w/EVU3ZE="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-C7aXl3+NbGOS9WLDQF6D68xvXLfCCBQFCE9tXPoJ4yo="; + hash = "sha256-If7BtWyYeD6gVpt0elZ1Hx+f8hh7SKzBHHANO/xeGjE="; }; }; in diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 7cf05a432916..30b6789692a9 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { @@ -48,7 +48,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! tag = "jax-v${version}"; - hash = "sha256-Z7yMV4P423Pr574QPk0bVupWj2//RelLi/eLUqN/BlE="; + hash = "sha256-t4LHwpCz08zrQGWBehyPs2JnxsOvtV3L14MCdTqMeEI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index f969f398edae..4a8bfb8d31af 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -18,7 +18,7 @@ }: let - version = "0.5.1"; + version = "0.5.3"; inherit (python) pythonVersion; # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the @@ -49,65 +49,65 @@ let "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-ZbxJAKBJHfxvubamLoEA0SFCnVjHQplF7CtCTBqCvyc="; + hash = "sha256-Ur5sl3Wv9zimEXDYwEdQXHW7eZpFUY5mp6CQgSexF4U="; }; "3.10-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp310"; - hash = "sha256-CQ/n1LyOGXaHcdvIMZ3pAkdGu1Z/XZujebUQLxdljEE="; + hash = "sha256-lyQA20r26FJw2B215uYg0xOV8EcuUQxQ381Ms/crciA="; }; "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp310"; - hash = "sha256-LavMsIZHaBj3N80OYi/YjcT1u08N9Melxow0s2bohH8="; + hash = "sha256-SP9cifuKD+BNR16d3AdLSHmpHXq2ilHOxc0eh/gebEc="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-gMDtVEZkSzg8qj5hdUCAO7DvNuVgnNd1bU0pE6jeUS4="; + hash = "sha256-KeFTD8gYMyFvHii1eNDFlpdlT3LuMcekTtd1O69axGY="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-afS54HrQdNRBuZIbeoOu5PT/09VCAz/exQvhRW0GEcY="; + hash = "sha256-pGZvgdcsBg7T5YHe0RapyqmwpwoUilTLEqHTr8o2JLU="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-M0xJrUEfOaUFXCPxOVUq4yvZr+aWq7scrfnETr72B/c="; + hash = "sha256-tivYsp5aT5v6pXyNr24EggssmU9Ejz3sYC1kJVVF6fI="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-Uee1n8QLsnBEDFBJs8gvn3/a2uMZnxaBhiDP24C5Z68="; + hash = "sha256-Wl6IqxzW/feNaavjVE6PCcziAN0zm7hfvjwupn8qXmg="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-W0ulqj9ZtfLjfVJc7dav4P7suIQW5fQ+uacJz97YslA="; + hash = "sha256-vd9jYDd6oceS5H/YfzB8NC4zHl/zWC+UCxvKAPa0vHM="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-rj3ii/m4Z4HDCjLIi3y9HTIiqMIpqpbL4hBV3NCeuIk="; + hash = "sha256-05Tb3koca9Z1Ac+ynTgZoQuQDLU0zA/GAzGfcJLyTPo="; }; "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-3BCf+mhzZAImw2DaeTqKe+r4xIdRrD/bKfprM3kB4YY="; + hash = "sha256-u3WTy3//yxOWPyL6UintlguPtK5ew7CCAEjL1n8ejjE="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-3zcE8TXP+H/Z1BkwJIkl8vFjvu1u/qqrzNl0AVgNz9g="; + hash = "sha256-6QS5Le37x+VFclqNdnaYcDCunAaQAdlHAbwQnG2rQQA="; }; "3.13-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp313"; - hash = "sha256-jFf7vnmqPOOsLsZXp/F4Z7mzwsrYhbLIOQVnzJc47ug="; + hash = "sha256-MTIcJSgqBqbfyUBQe8FNCgrIONjO1sB6oAp/rjTOez8="; }; }; in diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 35e9c56adc2d..351acbd4e318 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -23,14 +23,14 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.38"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; tag = "v${version}"; - hash = "sha256-AK0c4HCM8ExDBdnQ0y6qSNTHTF5rD6kC+OjiJtW5Mkg="; + hash = "sha256-sMJvkqlg7lNtyo7j+eD7aWrds71XwqO2VWDVsO4r4Mk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index fafcfb0df3d8..2c03136b3372 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -1,7 +1,8 @@ { lib, + stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitLab, pythonOlder, flit-core, async-timeout, @@ -15,33 +16,35 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.8.0"; + version = "0.9"; + pyproject = true; - disabled = pythonOlder "3.7"; - - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - sha256 = "5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806"; + src = fetchFromGitLab { + owner = "takluyver"; + repo = "jeepney"; + tag = version; + hash = "sha256-d8w/4PtDviTYDHO4EwaVbxlYk7CXtlv7vuR+o4LhfRs="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - nativeCheckInputs = [ - async-timeout - dbus - pytest - pytest-trio - pytest-asyncio - testpath - trio - ]; + nativeCheckInputs = + [ + dbus + pytest + pytest-trio + pytest-asyncio + testpath + trio + ] + ++ lib.optionals (pythonOlder "3.11") [ + async-timeout + ]; checkPhase = '' runHook preCheck - dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf -- pytest + dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf -- pytest ${lib.optionalString stdenv.hostPlatform.isDarwin "--ignore=jeepney/io/tests"} runHook postCheck ''; @@ -57,6 +60,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://gitlab.com/takluyver/jeepney/-/blob/${src.tag}/docs/release-notes.rst"; homepage = "https://gitlab.com/takluyver/jeepney"; description = "Pure Python DBus interface"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jfx-bridge/default.nix b/pkgs/development/python-modules/jfx-bridge/default.nix new file mode 100644 index 000000000000..2c261be4b96a --- /dev/null +++ b/pkgs/development/python-modules/jfx-bridge/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + python, + setuptools, +}: + +buildPythonPackage rec { + pname = "jfx-bridge"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "justfoxing"; + repo = "jfx_bridge"; + tag = version; + hash = "sha256-fpUrKNGqTpthhTfohCbwO1GBDAP/YnLWeapVhZftldg="; + }; + + patches = [ ./no-invoke-git.patch ]; + + postPatch = '' + substituteInPlace ./setup.py --subst-var-by version ${version} + ''; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = '' + ${python.interpreter} test_bridge_server.py & + ''; + + disabledTests = [ + # known to cause timeout with newer python (acknowledged in test comment) + "test_nonreturn_marker_local" + # the mechanisms that hook into the python import machinery seem broken on newer python + "TestBridgeHookImport" + ]; + + pythonImportsCheck = [ "jfx_bridge" ]; + + meta = { + description = "Base Python RPC bridge used for ghidra_bridge"; + homepage = "https://github.com/justfoxing/jfx_bridge"; + changelog = "https://github.com/justfoxing/jfx_bridge/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ scoder12 ]; + }; +} diff --git a/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch b/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch new file mode 100644 index 000000000000..2c1f53ca2d6c --- /dev/null +++ b/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 079cb01..c5e71b8 100644 +--- a/setup.py ++++ b/setup.py +@@ -6,7 +6,7 @@ with open("README.md", "r") as fh: + long_description = fh.read() + + # determine the version, then write it out into the bridge.py file +-version = subprocess.check_output("git describe --tags", shell=True).decode("utf-8").strip() ++version = "@version@" + # check if this is a non-tag release and remark it as a dev release + if "-" in version: + ver, commits, hash = version.split("-") diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index d6ea70b40011..efce378d706b 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - glibcLocales, python, isPy3k, }: @@ -20,15 +19,12 @@ buildPythonPackage rec { sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk"; }; - nativeCheckInputs = [ glibcLocales ]; - # UnicodeEncodeError doCheck = isPy3k; # Citing https://github.com/fxsjy/jieba/issues/384: "testcases is in a mess" # So just picking random ones that currently work checkPhase = '' - export LC_ALL=en_US.UTF-8 ${python.interpreter} test/test.py ${python.interpreter} test/test_tokenize.py ''; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index d9c5c674eb9e..ccd2577b09af 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -2,7 +2,6 @@ lib, stdenv, python, - pythonAtLeast, buildPythonPackage, pythonOlder, fetchPypi, @@ -21,14 +20,14 @@ buildPythonPackage rec { pname = "jinja2"; - version = "3.1.5"; + version = "3.1.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-j+//jcMDTie7gNZ8Zx64qbxCTA70wIJu2/8wTM7/Q7s="; + hash = "sha256-ATf7BZkNNfEnWlh+mu5tVtqCH8g0kaD7g4GDvkP2bW0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index 86ae590811bd..1f6944bcd88a 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "json5"; - version = "0.9.28"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dpranke"; repo = "pyjson5"; tag = "v${version}"; - hash = "sha256-CE9l+SOLTcdtyPZH/iz6y6K22UQS+CxC3HoLYlkIV8M="; + hash = "sha256-J5xZN6o9UwvCdrzEY6o3NxYaxbtiUhmTtCQJia4JmI4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index fbe7007b248f..b5f3da6150ff 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "jsonlines"; - version = "3.1.0"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "wbolster"; repo = pname; rev = version; - hash = "sha256-eMpUk5s49OyD+cNGdAeKA2LvpXdKta2QjZIFDnIBKC8="; + hash = "sha256-KNEJdAxEgd0NGPnk9J51C3yUN2e6Cvvevth0iKOMlhE="; }; propagatedBuildInputs = [ attrs ]; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 1bf5b065445f..cbc896e89018 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tTNhRNkClYuSywi8Hna/pHGZuK/UVDA2k4lN79L6UMU="; + hash = "sha256-PmULmFOtzaudnWKohBK2026aWbpCOwHKzwzU7oBzOso="; }; build-system = [ diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix index feaf410959c9..074d8a997993 100644 --- a/pkgs/development/python-modules/jsonschema-path/default.nix +++ b/pkgs/development/python-modules/jsonschema-path/default.nix @@ -1,35 +1,28 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, pathable, pyyaml, referencing, + pytest-cov-stub, pytestCheckHook, responses, }: buildPythonPackage rec { pname = "jsonschema-path"; - version = "0.3.3"; - - disabled = pythonOlder "3.8"; - + version = "0.3.4"; pyproject = true; src = fetchFromGitHub { owner = "p1c2u"; repo = "jsonschema-path"; tag = version; - hash = "sha256-oBzB6Ke19QDcMQm4MpnaS132/prrtnCekAXuPMloZx4="; + hash = "sha256-rCepDnVAOEsokKjWCuqDYbGIq6/wn4rsQRx5dXTUsYo="; }; - postPatch = '' - sed -i '/--cov/d' pyproject.toml - ''; - build-system = [ poetry-core ]; pythonRelaxDeps = [ "referencing" ]; @@ -43,6 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jsonschema_path" ]; nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/juliandate/default.nix b/pkgs/development/python-modules/juliandate/default.nix new file mode 100644 index 000000000000..68032d721d2a --- /dev/null +++ b/pkgs/development/python-modules/juliandate/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "juliandate"; + version = "1.0.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "seanredmond"; + repo = "juliandate"; + tag = "v${version}"; + hash = "sha256-pOWyrPBFqKmG9oKbXY/L14LblIcc8KfZSqZAEQP29V8="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "juliandate" ]; + + meta = { + description = "Conversions between Julian Dates and Julian/Gregorian calendar dates"; + homepage = "https://github.com/seanredmond/juliandate"; + changelog = "https://github.com/seanredmond/juliandate/blob/v${src.tag}/HISTORY.MD"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 1e32e25ca339..2e5742546175 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ "boto3" ]; + dependencies = [ boto3 orjson diff --git a/pkgs/development/python-modules/klayout/default.nix b/pkgs/development/python-modules/klayout/default.nix index a70f384459f6..a12bc7c83cc1 100644 --- a/pkgs/development/python-modules/klayout/default.nix +++ b/pkgs/development/python-modules/klayout/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "klayout"; - version = "0.29.8"; + version = "0.29.12"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-21EPhFb/JMZdyuHDXIxhnLTpHUPxKU24cnodH9oX2q8="; + hash = "sha256-6eJpoxdrUuMBn78QTqvh8zfUH0B8YvWTQR28hZ7HLCY="; }; build-system = [ diff --git a/pkgs/development/python-modules/krb5/default.nix b/pkgs/development/python-modules/krb5/default.nix index 5b4de628d7ca..093e45b5ce81 100644 --- a/pkgs/development/python-modules/krb5/default.nix +++ b/pkgs/development/python-modules/krb5/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "krb5"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ajCPLhfRUcOVsk5q7Hvf9qVv42J6MgQvyG1BI5ipLd0="; + hash = "sha256-7V8T1QMUibENhlXAraKKgcI5Gz7LigjG1znh5YNbxFA="; }; build-system = [ diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 68ed2081bc1c..9cfc926aca8d 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.13.0"; + version = "1.13.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-4+YA+kWdohroFO1EMw7Nwy5w+bTGRrkaOwv1iaV9pZ0="; + hash = "sha256-fMFTGzw7j4VylmKaG8K9FNFnKsyQ9R6g2c//DcUztfc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index 3fcf0d9deaa2..28668989a89d 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, # build-system poetry-core, @@ -52,6 +53,9 @@ buildPythonPackage rec { pythonRelaxDeps = [ # Boto @ 1.35 has outstripped the version requirement "boto3" + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" ]; nativeCheckInputs = [ @@ -64,10 +68,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_aws" ]; - passthru = { - inherit (langchain-core) updateScript; - # updates the wrong fetcher rev attribute - skipBulkUpdate = true; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-aws==([0-9.]+)$" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix index d38b2c604000..507a1077a492 100644 --- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix +++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, # build-system poetry-core, @@ -41,6 +42,12 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" + ]; + dependencies = [ azure-identity langchain-core @@ -65,10 +72,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_azure_dynamic_sessions" ]; - passthru = { - inherit (langchain-core) updateScript; - # updates the wrong fetcher rev attribute - skipBulkUpdate = true; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-azure-dynamic-sessions==([0-9.]+)$" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index f074d7f3f53a..bbb07eb7e686 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, chromadb, langchain-core, langchain-tests, @@ -29,7 +30,12 @@ buildPythonPackage rec { build-system = [ pdm-backend ]; - pythonRelaxDeps = [ "numpy" ]; + pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" + "numpy" + ]; dependencies = [ chromadb @@ -50,10 +56,11 @@ buildPythonPackage rec { "test_chroma_update_document" ]; - passthru = { - inherit (langchain-core) updateScript; - # updates the wrong fetcher rev attribute - skipBulkUpdate = true; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-chroma==([0-9.]+)$" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 97bb3c06e8d4..1652b899434b 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, # build-system pdm-backend, @@ -56,7 +57,10 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "langchain" # Can fail during updates where building sees the old langchain + # Each component release requests the exact latest langchain and -core. + # That prevents us from updating individul components. + "langchain" + "langchain-core" "numpy" "pydantic-settings" "tenacity" @@ -98,12 +102,6 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit_tests" ]; - passthru = { - inherit (langchain-core) updateScript; - # updates the wrong fetcher rev attribute - skipBulkUpdate = true; - }; - __darwinAllowLocalNetworking = true; disabledTests = [ @@ -124,6 +122,13 @@ buildPythonPackage rec { "test_group_dependencies" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-community==(.*)" + ]; + }; + meta = { changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-community==${version}"; description = "Community contributed LangChain integrations"; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index d6d4ccd1deac..db838f33d27e 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -30,7 +30,7 @@ syrupy, # passthru - writeScript, + nix-update-script, }: buildPythonPackage rec { @@ -94,28 +94,13 @@ buildPythonPackage rec { tests.pytest = langchain-core.overridePythonAttrs (_: { doCheck = true; }); - # Updates to core tend to drive updates in everything else - updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p nix-update - set -u -o pipefail +e - # Common core - nix-update --commit --version-regex 'langchain-core==(.*)' python3Packages.langchain-core - nix-update --commit --version-regex 'langchain-text-splitters==(.*)' python3Packages.langchain-text-splitters - nix-update --commit --version-regex 'langchain==(.*)' python3Packages.langchain - nix-update --commit --version-regex 'langchain-community==(.*)' python3Packages.langchain-community - - # Extensions - nix-update --commit --version-regex 'langchain-aws==(.*)' python3Packages.langchain-aws - nix-update --commit --version-regex 'langchain-azure-dynamic-sessions==(.*)' python3Packages.langchain-azure-dynamic-sessions - nix-update --commit --version-regex 'langchain-chroma==(.*)' python3Packages.langchain-chroma - nix-update --commit --version-regex 'langchain-huggingface==(.*)' python3Packages.langchain-huggingface - nix-update --commit --version-regex 'langchain-mongodb==(.*)' python3Packages.langchain-mongodb - nix-update --commit --version-regex 'langchain-openai==(.*)' python3Packages.langchain-openai - ''; - # updates the wrong fetcher rev attribute - skipBulkUpdate = true; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-core==([0-9.]+)$" + ]; + }; }; disabledTests = diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix index fbcb402b174a..212791cd9fed 100644 --- a/pkgs/development/python-modules/langchain-groq/default.nix +++ b/pkgs/development/python-modules/langchain-groq/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, # build-system pdm-backend, @@ -17,21 +18,25 @@ buildPythonPackage rec { pname = "langchain-groq"; - version = "0.2.5"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-groq==${version}"; - hash = "sha256-TXmAaEOK2qNglNAa02M027NXmocsxFaQi3tUFdmFQUQ="; + hash = "sha256-kdqgX2fnagVL+W6dRJwnpngcJK2q4E4nk8r4+zIwPt4="; }; sourceRoot = "${src.name}/libs/partners/groq"; build-system = [ pdm-backend ]; - pythonRelaxDeps = [ "langchain-core" ]; + pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" + ]; dependencies = [ langchain-core @@ -47,9 +52,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_groq" ]; - passthru = { - inherit (langchain-core) updateScript; - skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-groq==([0-9.]+)$" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index 1ed4271ad784..2cf86baccf0f 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, # build-system poetry-core, @@ -44,6 +45,12 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" + ]; + dependencies = [ huggingface-hub langchain-core @@ -71,10 +78,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_huggingface" ]; - passthru = { - inherit (langchain-core) updateScript; - # updates the wrong fetcher rev attribute - skipBulkUpdate = true; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-huggingface==([0-9.]+)$" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index dbe90af0c79d..5203d812d336 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, # build-system poetry-core, @@ -37,6 +38,9 @@ buildPythonPackage rec { build-system = [ poetry-core ]; pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" "numpy" ]; @@ -60,10 +64,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_mongodb" ]; - passthru = { - inherit (langchain-core) updateScript; - # updates the wrong fetcher rev attribute - skipBulkUpdate = true; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-mongodb==([0-9.]+)$" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix index dca1132a9851..b3f6baf00161 100644 --- a/pkgs/development/python-modules/langchain-ollama/default.nix +++ b/pkgs/development/python-modules/langchain-ollama/default.nix @@ -35,6 +35,12 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" + ]; + dependencies = [ langchain-core ollama @@ -57,8 +63,6 @@ buildPythonPackage rec { "langchain-ollama==(.*)" ]; }; - # updates the wrong fetcher rev attribute - passthru.skipBulkUpdate = true; meta = { changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-ollama==${version}"; diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 486894b6d142..8a44d9cb0c44 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, # build-system pdm-backend, @@ -47,6 +48,12 @@ buildPythonPackage rec { build-system = [ pdm-backend ]; + pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" + ]; + dependencies = [ langchain-core openai @@ -89,10 +96,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_openai" ]; - passthru = { - inherit (langchain-core) updateScript; - # updates the wrong fetcher rev attribute - skipBulkUpdate = true; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-openai==([0-9.]+)$" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix index 8f1b87e3f494..b4f9ee35cca7 100644 --- a/pkgs/development/python-modules/langchain-tests/default.nix +++ b/pkgs/development/python-modules/langchain-tests/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, # build-system pdm-backend, @@ -37,6 +38,13 @@ buildPythonPackage rec { build-system = [ pdm-backend ]; + pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" + "numpy" + ]; + dependencies = [ httpx langchain-core @@ -54,6 +62,13 @@ buildPythonPackage rec { pytestCheckHook ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-tests==([0-9.]+)$" + ]; + }; + meta = { description = "Build context-aware reasoning applications"; homepage = "https://github.com/langchain-ai/langchain"; diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 746c953d873b..4bcfcf159414 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update-script, # build-system pdm-backend, @@ -31,6 +32,12 @@ buildPythonPackage rec { build-system = [ pdm-backend ]; + pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" + ]; + dependencies = [ langchain-core ]; pythonImportsCheck = [ "langchain_text_splitters" ]; @@ -43,10 +50,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit_tests" ]; - passthru = { - inherit (langchain-core) updateScript; - # updates the wrong fetcher rev attribute - skipBulkUpdate = true; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain-test-splitters==([0-9.]+)$" + ]; }; meta = { diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 779b84440936..d9a8c52f5e07 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + nix-update-script, # build-system pdm-backend, @@ -62,6 +63,9 @@ buildPythonPackage rec { buildInputs = [ bash ]; pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individul components. + "langchain-core" "numpy" "tenacity" ]; @@ -144,10 +148,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain" ]; - passthru = { - updateScript = langchain-core.updateScript; - # updates the wrong fetcher rev attribute - skipBulkUpdate = true; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^langchain==([0-9.]+)$" + ]; }; meta = { diff --git a/pkgs/development/python-modules/lap/default.nix b/pkgs/development/python-modules/lap/default.nix new file mode 100644 index 000000000000..eb18a1f4bdb2 --- /dev/null +++ b/pkgs/development/python-modules/lap/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + cython, + fetchPypi, + numpy, + pytestCheckHook, + python-utils, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "lap"; + version = "0.5.12"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VwtBTqeubAS9SdDsjNrB3FY0c3dVeE1E43+fZourRP0="; + }; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ cython ]; + + dependencies = [ + numpy + python-utils + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "lap" ]; + # See https://github.com/NixOS/nixpkgs/issues/255262 + preCheck = '' + cd "$out" + ''; + + meta = { + description = "Linear Assignment Problem solver (LAPJV/LAPMOD)"; + homepage = "https://github.com/gatagat/lap"; + changelog = "https://github.com/gatagat/lap/releases/tag/v${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ + doronbehar + tebriel + ]; + }; +} diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 9e8ea3dec57c..a218eec80568 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -13,15 +13,14 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.27.0"; + version = "0.27.1"; pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "Levenshtein"; tag = "v${version}"; - hash = "sha256-kiYu46qv8sBBcPoCo3PN1q9F0EJ1s5hAMKavPaztM4s="; - fetchSubmodules = true; # # for vendored `rapidfuzz-cpp` + hash = "sha256-EFEyP7eqB4sUQ2ksD67kCr0BEShTiKWbk1PxXOUOGc4="; }; build-system = [ diff --git a/pkgs/development/python-modules/libbs/default.nix b/pkgs/development/python-modules/libbs/default.nix new file mode 100644 index 000000000000..3fb3de5bd5f8 --- /dev/null +++ b/pkgs/development/python-modules/libbs/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + filelock, + ghidra-bridge, + jfx-bridge, + networkx, + platformdirs, + prompt-toolkit, + psutil, + pycparser, + pyhidra, + pytestCheckHook, + setuptools, + toml, + tqdm, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "libbs"; + version = "2.11.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "binsync"; + repo = "libbs"; + tag = "v${version}"; + hash = "sha256-hYRRmnxA6K7O6suaP1eGRnY89gok3JNNsL70XRGWYBU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + filelock + ghidra-bridge + jfx-bridge + networkx + platformdirs + prompt-toolkit + psutil + pycparser + pyhidra + toml + tqdm + ]; + + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + pythonImportsCheck = [ "libbs" ]; + + disabledTests = [ + "test_change_watcher_plugin_cli" + "test_ghidra_artifact_watchers" + "TestHeadlessInterfaces" + ]; + + meta = { + description = "Library for writing plugins in any decompiler: includes API lifting, common data formatting, and GUI abstraction"; + homepage = "https://github.com/binsync/libbs"; + changelog = "https://github.com/binsync/libbs/releases/tag/${src.tag}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ scoder12 ]; + }; +} diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index 50623673355a..53e3fce11053 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; tag = "v${version}"; - hash = "sha256-QHE2ksoINQ0sfTSxXxM9ZVEIhEOncaq1i8ZNqznISJw="; + hash = "sha256-erjDDK7XJrq4Ast/RgQhEDQfDplUGMhWt4kakEzi8z8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 79165c27c231..6a3a0d514ac0 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.14"; + version = "0.1.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-kHQaGbqWln+iSECEko4yaulXc2eAoVtnvDrV9S6UeC0="; + hash = "sha256-/GiyRHGQeVjUhio9selzUT3nbUL1jCnZNbksBssfTj4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index db736284c427..6a331b1d0b11 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -4,7 +4,6 @@ gcc13Stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # nativeBuildInputs cmake, @@ -40,28 +39,18 @@ let in buildPythonPackage rec { pname = "llama-cpp-python"; - version = "0.3.6"; + version = "0.3.8"; pyproject = true; src = fetchFromGitHub { owner = "abetlen"; repo = "llama-cpp-python"; tag = "v${version}"; - hash = "sha256-d5nMgpS7m6WEILs222ztwphoqkAezJ+qt6sVKSlpIYI="; + hash = "sha256-F1E1c2S1iIL3HX/Sot/uIIrOWvfPU1dCrHx14A1Jn9E="; fetchSubmodules = true; }; # src = /home/gaetan/llama-cpp-python; - patches = [ - # fix segfault when running tests due to missing default Metal devices - (fetchpatch2 { - url = "https://github.com/ggml-org/llama.cpp/commit/acd38efee316f3a5ed2e6afcbc5814807c347053.patch?full_index=1"; - stripLen = 1; - extraPrefix = "vendor/llama.cpp/"; - hash = "sha256-71+Lpg9z5KPlaQTX9D85KS2LXFWLQNJJ18TJyyq3/pU="; - }) - ]; - dontUseCmakeConfigure = true; SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" ( # Set GGML_NATIVE=off. Otherwise, cmake attempts to build with @@ -72,7 +61,10 @@ buildPythonPackage rec { # -mcpu, breaking linux build as follows: # # cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’ - [ "-DGGML_NATIVE=off" ] + [ + "-DGGML_NATIVE=off" + "-DGGML_BUILD_NUMBER=1" + ] ++ lib.optionals cudaSupport [ "-DGGML_CUDA=on" "-DCUDAToolkit_ROOT=${lib.getDev cudaPackages.cuda_nvcc}" diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index da627edc9f5e..b5cfb79df1ff 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-google"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_google"; inherit version; - hash = "sha256-XS0ZYLxe7/ezeLEJE/lEUzcaIwN1TzS/bA5sCRyx/Lk="; + hash = "sha256-gMFfA/USIYkOIaNPZfpLoRzkDGnN2e+gNlylAOrTxKs="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llm-anthropic/default.nix b/pkgs/development/python-modules/llm-anthropic/default.nix index 3b8751ba0607..a7377833ff54 100644 --- a/pkgs/development/python-modules/llm-anthropic/default.nix +++ b/pkgs/development/python-modules/llm-anthropic/default.nix @@ -9,19 +9,19 @@ pytestCheckHook, pytest-asyncio, pytest-recording, - nix-update-script, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "llm-anthropic"; - version = "0.14.1"; + version = "0.15.1"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "llm-anthropic"; tag = version; - hash = "sha256-tKgcag8sBJA4QWunaFyZxkZH0mtc0SS17104YuX1Kac="; + hash = "sha256-8bVs3MJteOTCiw7n/4pMf+oXMhsQbCSzUFVQqm2ezcE="; }; build-system = [ @@ -30,22 +30,15 @@ buildPythonPackage rec { ]; dependencies = [ anthropic ]; - # Otherwise tests will fail to create directory - # Permission denied: '/homeless-shelter' - preCheck = '' - export HOME=$(mktemp -d) - ''; - nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-recording + writableTmpDirAsHomeHook ]; pythonImportsCheck = [ "llm_anthropic" ]; - passthru.updateScript = nix-update-script { }; - passthru.tests = { llm-plugin = callPackage ./tests/llm-plugin.nix { }; }; diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 16046208ea9a..87e201634e7b 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "lmfit"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Mb7q4fAnwbjBTc1/LoSIqAt1+zied/ymd1Sb3C/ll7s="; + hash = "sha256-czIea4gfL2hiNXIaffwCr2uw8DCiXv62Zjj2KxxgU6E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index d9afd8823653..e3480e9fe5d3 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, pythonAtLeast, pythonOlder, - redis-server, + valkey, redis, setuptools, }: @@ -27,7 +27,7 @@ buildPythonPackage rec { substituteInPlace tests/test_dictconfig.py \ --replace-fail "assertEquals" "assertEqual" substituteInPlace tests/test_redis.py \ - --replace-fail "'redis-server'" "'${redis-server}/bin/redis-server'" + --replace-fail "'redis-server'" "'${valkey}/bin/redis-server'" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lox/default.nix b/pkgs/development/python-modules/lox/default.nix index 5cea402143a5..f127251e8ac1 100644 --- a/pkgs/development/python-modules/lox/default.nix +++ b/pkgs/development/python-modules/lox/default.nix @@ -12,22 +12,20 @@ buildPythonPackage rec { pname = "lox"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "BrianPugh"; repo = "lox"; tag = "v${version}"; - hash = "sha256-Iv3ZdfsvFLU6lhlH1n+eQ+KIrXESsnC1S2lVFnKFV08="; + hash = "sha256-I/+/wl+H3OLAN26qJVqyqgW72GoTddm59j2Y6fsz8AM="; }; build-system = [ setuptools ]; dependencies = [ pathos ]; - pythonRemoveDeps = [ "sphinx-rtd-theme" ]; - # setup.py requires pytest-runner for setuptools, which is wrong postPatch = '' substituteInPlace setup.py --replace-fail '"pytest-runner",' "" @@ -53,7 +51,7 @@ buildPythonPackage rec { meta = { description = "Threading and Multiprocessing made easy"; - changelog = "https://github.com/BrianPugh/lox/releases/tag/v${version}"; + changelog = "https://github.com/BrianPugh/lox/releases/tag/${src.tag}"; homepage = "https://github.com/BrianPugh/lox"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.greg ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 87a225095f66..f3f520f6ffb8 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "lxml"; - version = "5.3.0"; + version = "5.3.1"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml"; tag = "lxml-${version}"; - hash = "sha256-xhKtqsh5FfgXt1fKUhN/Aib/004P7epArv3/XxDSBtw="; + hash = "sha256-TGv2ZZQ7GU+fAWRApESUL1bbxQobbmLai8wr09xYOUw="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 3e3a0438a60b..048cc8e163f7 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "lz4"; - version = "4.4.1"; + version = "4.4.3"; pyproject = true; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "python-lz4"; repo = "python-lz4"; tag = "v${version}"; - hash = "sha256-dqu1sRqvtb1eyjxrCFu1vom9//qDGhgCMnPhKnIktjw="; + hash = "sha256-Jnmi2eyTGbPuqw0llQ5xpUWlj+8QvRHMwkak/GsypU0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index ee326cc004ab..71be18913927 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -3,23 +3,24 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system setuptools, + versioneer, # dependencies - spake2, - pynacl, - six, attrs, - twisted, autobahn, automat, - tqdm, click, + cryptography, humanize, iterable-io, + pynacl, + qrcode, + spake2, + tqdm, + twisted, txtorcon, zipstream-ng, @@ -36,25 +37,16 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole"; tag = version; - hash = "sha256-BxPF4iQ91wLBagdvQ/Y89VIZBkMxFiEHnK+BU55Bwr4="; + hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU="; }; - patches = [ - # TODO: drop patch for magic-wormhole > 0.17.0 - # fix test for twisted 24.10.0 (https://github.com/magic-wormhole/magic-wormhole/pull/554) - (fetchpatch { - name = "fix-twisted-24.10.0.patch"; - url = "https://github.com/magic-wormhole/magic-wormhole/commit/d7353cad6fe9d43620a0de33a634f395757d2e5c.patch"; - hash = "sha256-mvgVFW3Fa2I8/39ron0bYYsJNm2r97jnLFCfhtHSIP0="; - }) - ]; postPatch = # enable tests by fixing the location of the wormhole binary '' @@ -67,7 +59,10 @@ buildPythonPackage rec { sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; - build-system = [ setuptools ]; + build-system = [ + setuptools + versioneer + ]; dependencies = [ @@ -75,10 +70,11 @@ buildPythonPackage rec { autobahn automat click + cryptography humanize iterable-io pynacl - six + qrcode spake2 tqdm twisted diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix index a58dfba8dbea..52700d5c168a 100644 --- a/pkgs/development/python-modules/mailsuite/default.nix +++ b/pkgs/development/python-modules/mailsuite/default.nix @@ -1,38 +1,34 @@ { - buildPythonPackage, - fetchPypi, - pythonOlder, lib, - - # pythonPackages - hatchling, + buildPythonPackage, dnspython, expiringdict, + fetchPypi, + hatchling, html2text, - mail-parser, imapclient, + mail-parser, publicsuffix2, + pythonOlder, }: buildPythonPackage rec { pname = "mailsuite"; - version = "1.9.18"; - format = "pyproject"; + version = "1.9.20"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3rK5PgcAOKVvZbFT7PaZX9lhU8yKpPQozvh2F8mTkfA="; + hash = "sha256-1DS0TzEejvviF3BPBiiCVJLOOi8RQuGoDIpKRm+CNHo="; }; - nativeBuildInputs = [ hatchling ]; + pythonRelaxDeps = [ "mail-parser" ]; - pythonRelaxDeps = [ - "mail-parser" - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ dnspython expiringdict html2text @@ -43,12 +39,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "mailsuite" ]; + # Module has no tests doCheck = false; meta = { description = "Python package to simplify receiving, parsing, and sending email"; homepage = "https://seanthegeek.github.io/mailsuite/"; - maintainers = with lib.maintainers; [ talyz ]; + changelog = "https://github.com/seanthegeek/mailsuite/blob/master/CHANGELOG.md"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ talyz ]; }; } diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 4c2f7ae8c5f3..f2d95cfff5d3 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -1,10 +1,8 @@ { - stdenv, lib, buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch, isPyPy, # build-system @@ -25,7 +23,7 @@ buildPythonPackage rec { pname = "mako"; - version = "1.3.8"; + version = "1.3.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,17 +32,9 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "mako"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-7KttExqHxv//q8ol7eOFIrgRHbQySQTvL7Rd9VooX0Y="; + hash = "sha256-BC1PSmMG9KzD+w8tDUW9WXJS25HNsELgwDpkTHYO9j0="; }; - patches = [ - (fetchpatch { - name = "float-precision.patch"; - url = "https://github.com/sqlalchemy/mako/commit/188d5431a5c93b937da03e70c4c2c8c42cd9a502.patch"; - hash = "sha256-/ROS6WkSqYXJsX6o1AejUg/faS3lUAimrRJzS74Bwws="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ markupsafe ]; diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix index fba53e41110f..d2c197a92e47 100644 --- a/pkgs/development/python-modules/manim-slides/default.nix +++ b/pkgs/development/python-modules/manim-slides/default.nix @@ -9,7 +9,6 @@ manim, ffmpeg, - av, beautifulsoup4, click, click-default-group, @@ -59,7 +58,6 @@ buildPythonPackage rec { dependencies = [ - av beautifulsoup4 click click-default-group diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index c5cf6b8408e0..fb0ec500aac6 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -183,6 +183,16 @@ let cbfonts-fd ] ); + # https://github.com/ManimCommunity/manim/pull/4037 + av_13_1 = av.overridePythonAttrs (rec { + version = "13.1.0"; + src = fetchFromGitHub { + owner = "PyAV-Org"; + repo = "PyAV"; + tag = "v${version}"; + hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60="; + }; + }); in buildPythonPackage rec { pname = "manim"; @@ -206,7 +216,7 @@ buildPythonPackage rec { buildInputs = [ cairo ]; dependencies = [ - av + av_13_1 beautifulsoup4 click cloup @@ -268,8 +278,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "manim" ]; meta = { - # https://github.com/ManimCommunity/manim/pull/4037 - broken = lib.versionAtLeast av.version "14"; description = "Animation engine for explanatory math videos - Community version"; longDescription = '' Manim is an animation engine for explanatory math videos. It's used to @@ -277,9 +285,10 @@ buildPythonPackage rec { 3Blue1Brown on YouTube. This is the community maintained version of manim. ''; + mainProgram = "manim"; changelog = "https://docs.manim.community/en/latest/changelog/${version}-changelog.html"; homepage = "https://github.com/ManimCommunity/manim"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ osbm ]; }; } diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index a8e2768f1fbd..9e520493597b 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -89,7 +89,7 @@ let in buildPythonPackage rec { - version = "3.10.0"; + version = "3.10.1"; pname = "matplotlib"; pyproject = true; @@ -97,7 +97,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-uIbQKlgblnBMnR/+VXCeSbTS1ScJzOvEvkLbhW5REng="; + hash = "sha256-6NLQ44gbEpJoWFv0dlrT7nOkWR13uaGMIUrH46efsro="; }; env.XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix new file mode 100644 index 000000000000..26de74d821ca --- /dev/null +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + jsonref, + langchain, + langgraph, + llama-index, + mcp, + pytest-asyncio, + pytestCheckHook, + python-dotenv, + smolagents, +}: + +buildPythonPackage rec { + pname = "mcpadapt"; + version = "0.0.15"; + pyproject = true; + + src = fetchFromGitHub { + owner = "grll"; + repo = "mcpadapt"; + tag = "v${version}"; + hash = "sha256-Cpm6jfdAyhMNc3bnDcF42G24VdStM2OpDTsGHS4IEMM="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + jsonref + mcp + python-dotenv + ]; + + optional-dependencies = { + langchain = [ + langchain + # langchain-anthropic + langgraph + ]; + llamaindex = [ llama-index ]; + }; + + pythonImportsCheck = [ "mcpadapt" ]; + + # Circular dependency smolagents + doCheck = false; + + meta = { + description = "MCP servers tool"; + homepage = "https://github.com/grll/mcpadapt"; + changelog = "https://github.com/grll/mcpadapt/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index e9810167d395..acb4a056ef87 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -95,7 +95,6 @@ buildPythonPackage rec { dontUseSetuptoolsBuild = true; dontUsePipInstall = true; - dontUseSetuptoolsCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 6305681ab354..17a851fb60e5 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -3,6 +3,9 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + jinja2, + poetry-core, + pytest, pythonOlder, requests, setuptools, @@ -10,7 +13,7 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.54.0"; + version = "1.56.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,16 +22,22 @@ buildPythonPackage rec { owner = "meraki"; repo = "dashboard-api-python"; tag = version; - hash = "sha256-eRGVC0M8PtK3UUuECXUXrD5rGnAK04f+3/xVl+2rjAM="; + hash = "sha256-OMoi4t7lMQF/fMV/lWg+GwSmKg5cXwiVSROfpZRtXJM="; }; - build-system = [ - setuptools + pythonRelaxDeps = [ + "pytest" + "setuptools" ]; + build-system = [ poetry-core ]; + dependencies = [ aiohttp + jinja2 + pytest requests + setuptools ]; # All tests require an API key diff --git a/pkgs/development/python-modules/mergecal/default.nix b/pkgs/development/python-modules/mergecal/default.nix new file mode 100644 index 000000000000..25d038f02b36 --- /dev/null +++ b/pkgs/development/python-modules/mergecal/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + icalendar, + rich, + typer, + x-wr-timezone, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "mergecal"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mergecal"; + repo = "python-mergecal"; + tag = "v${version}"; + hash = "sha256-Je3gFREu97Ycofszhr6pKOCiK76oBuzb3ji4LAf5aE8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + icalendar + rich + typer + x-wr-timezone + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + pythonImportChecks = [ "mergecal" ]; + + meta = { + homepage = "https://mergecal.readthedocs.io/en/latest/"; + changelog = "https://github.com/mergecal/python-mergecal/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 02f953c0ac8a..37d088234c92 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -4,25 +4,21 @@ buildPythonPackage, fetchFromGitHub, paho-mqtt, - pythonOlder, pycryptodomex, requests, - retrying, setuptools, }: buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.7.5"; + version = "0.4.9.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "albertogeniola"; repo = "MerossIot"; tag = version; - hash = "sha256-CEBZVbUkRMWw95imL1k3q7Z3Nkyzwleh5C/s0XxfhfQ="; + hash = "sha256-EBsWEsP7SzhDbMayD2903T5Q2WDJKboVtyYY4xP8AOE="; }; build-system = [ setuptools ]; @@ -32,8 +28,7 @@ buildPythonPackage rec { paho-mqtt pycryptodomex requests - retrying - ]; + ] ++ aiohttp.optional-dependencies.speedups; # Test require network access doCheck = false; @@ -41,8 +36,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "meross_iot" ]; meta = with lib; { - # https://github.com/albertogeniola/MerossIot/pull/413 - broken = lib.versionAtLeast paho-mqtt.version "2"; description = "Python library to interact with Meross devices"; homepage = "https://github.com/albertogeniola/MerossIot"; changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 45f128abb7e8..adbe92f6f151 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mistune"; - version = "3.1.0"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "mistune"; tag = "v${version}"; - hash = "sha256-gXCFBe58Ij6CiwTddsI4tkPsGBR2z9D8dnxlvTXGSMw="; + hash = "sha256-XvDp+X/+s6TsUC889qjTGzrde6s/BYoXUw2AblaATnI="; }; dependencies = lib.optionals (pythonOlder "3.11") [ diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix new file mode 100644 index 000000000000..2bb5cb2c1644 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix @@ -0,0 +1,64 @@ +{ + lib, + gitMinimal, + buildPythonPackage, + fetchFromGitHub, + flit-core, + mkdocs, + mkdocs-exclude, + mkdocs-material, + natsort, + pydantic, + pytestCheckHook, + pythonOlder, + wcmatch, + +}: +buildPythonPackage rec { + pname = "mkdocs-awesome-nav"; + version = "3.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lukasgeiter"; + repo = "mkdocs-awesome-nav"; + tag = "v${version}"; + hash = "sha256-EgHiphpMAL+1ZC+I8PxRHMk1gcyAgHcUm4eoVu67+Qc="; + }; + + build-system = [ flit-core ]; + + dependencies = [ + mkdocs + natsort + pydantic + wcmatch + ]; + + nativeCheckInputs = [ + gitMinimal + mkdocs-exclude + mkdocs-material + pytestCheckHook + ]; + + disabledTestPaths = [ + # depends on yet-unpackaged mktheapidocs plugin + "tests/compatibility/test_mktheapidocs.py" + # depends on yet-unpackaged mkdocs-monorepo-plugin + "tests/compatibility/test_monorepo.py" + # depends on yet-unpackaged mkdocs-multirepo-plugin + "tests/compatibility/test_multirepo.py" + # depends on yet-unpackaged mkdocs-static-i18n plugin + "tests/compatibility/test_static_i18n_folder.py" + "tests/compatibility/test_static_i18n_suffix.py" + ]; + + meta = with lib; { + description = "Plugin for customizing the navigation structure of your MkDocs site"; + homepage = "https://github.com/lukasgeiter/mkdocs-awesome-nav"; + changelog = "https://github.com/lukasgeiter/mkdocs-awesome-nav/blob/v${version}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ phaer ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix b/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix deleted file mode 100644 index 4f8844ee2cd9..000000000000 --- a/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - poetry-core, - mkdocs, - wcmatch, - natsort, - pytestCheckHook, - beautifulsoup4, - mock-open, - importlib-metadata, - pythonOlder, -}: -buildPythonPackage rec { - pname = "mkdocs-awesome-pages-plugin"; - version = "2.10.1"; - pyproject = true; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "lukasgeiter"; - repo = "mkdocs-awesome-pages-plugin"; - tag = "v${version}"; - hash = "sha256-p/oG2SvGZrRbIS2yhW3M1+t+OO0przeNsFUtqObNDUA="; - }; - - propagatedBuildInputs = [ - mkdocs - wcmatch - natsort - ]; - - nativeBuildInputs = [ poetry-core ]; - - nativeCheckInputs = [ - pytestCheckHook - beautifulsoup4 - mock-open - importlib-metadata - ]; - - meta = with lib; { - description = "An MkDocs plugin that simplifies configuring page titles and their order"; - homepage = "https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin"; - changelog = "https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin/blob/v${version}/CHANGELOG"; - license = licenses.mit; - maintainers = with maintainers; [ phaer ]; - }; -} diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix index 25f2106e20cb..7e9d02346c01 100644 --- a/pkgs/development/python-modules/mnist/default.nix +++ b/pkgs/development/python-modules/mnist/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - # disable tests which fail due to socket related errors disabledTests = [ "test_test_images_has_right_size" diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index 20c78bf4f18e..9f8895131c6d 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mock"; - version = "5.1.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Xpaq1czaRxjgointlLICTfdcwtVVdbpXYtMfV2e4dn0="; + hash = "sha256-TkYOgYYptLFz8y0IvzDTr4Ejr7uOBLtXB6H9R5nlA/A="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index c4d163588398..e245f281fb1c 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -29,7 +29,7 @@ pytest-cov-stub, pytestCheckHook, redis, - redis-server, + valkey, requests, sure, @@ -75,7 +75,7 @@ buildPythonPackage rec { ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' - ${redis-server}/bin/redis-server & + ${valkey}/bin/redis-server & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/motmetrics/default.nix b/pkgs/development/python-modules/motmetrics/default.nix index 235ab9fffb4b..166e80b73924 100644 --- a/pkgs/development/python-modules/motmetrics/default.nix +++ b/pkgs/development/python-modules/motmetrics/default.nix @@ -19,20 +19,20 @@ buildPythonPackage { pname = "motmetrics"; - version = "1.4.0-unstable-20240130"; + version = "1.4.0-unstable-2025-01-14"; pyproject = true; src = fetchFromGitHub { owner = "cheind"; repo = "py-motmetrics"; - # latest release is not compatible with pandas 2.0 - rev = "7210fcce0be1b76c96a62f6fe4ddbc90d944eacb"; - hash = "sha256-7LKLHXWgW4QpivAgzvWl6qEG0auVvpiZ6bfDViCKsFY="; + # Latest release is not compatible with pandas 2.0 + rev = "c199b3e853d589af4b6a7d88f5bcc8b8802fc434"; + hash = "sha256-DJ82nioW3jdIVo1B623BE8bBhVa1oMzYIkhhit4Z4dg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy pandas scipy @@ -44,11 +44,14 @@ buildPythonPackage { pytest-benchmark ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + pythonImportsCheck = [ "motmetrics" ]; meta = with lib; { - description = "Bar_chart: Benchmark multiple object trackers (MOT) in Python"; + description = "Benchmark multiple object trackers (MOT) in Python"; homepage = "https://github.com/cheind/py-motmetrics"; + changelog = "https://github.com/cheind/py-motmetrics/releases/tag/${version}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index d824661a8bcd..366004b12cdb 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "moto"; - version = "5.0.28"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "moto"; tag = version; - hash = "sha256-++kkPiI3AOTF+VlvPWhjhuiIjiHQPa3M0Nmh3+1PHSE="; + hash = "sha256-KMIOLM7KQqF2JwYWHWAD9GVKRTd2adVBubwWrnlHGoQ="; }; build-system = [ @@ -351,6 +351,9 @@ buildPythonPackage rec { # Parameter validation fails "test_conditional_write" + + # Requires newer botocore version + "test_dynamodb_with_account_id_routing" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index bf18f6a5b292..439b8403190c 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.24.0"; + version = "1.25.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-7r7TuGR8J31BZdG8wJJAgWwllbkf3wYj1xLULNm8+xQ="; + hash = "sha256-CRs9Pqgv8sVhjlMPmC8UR03b4jP1Pm39Yndn2LF51jU="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix index bbc409ecf6dc..0f01c755834f 100644 --- a/pkgs/development/python-modules/msmart-ng/default.nix +++ b/pkgs/development/python-modules/msmart-ng/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "msmart-ng"; - version = "2025.2.2"; + version = "2025.3.1"; pyproject = true; src = fetchFromGitHub { owner = "mill1000"; repo = "midea-msmart"; tag = version; - hash = "sha256-h+yWa1N5XmYdWzpEyVtdD/n+A0V1aFRvMHCaty6SnnM="; + hash = "sha256-hTYqRJn/ixseHHezfTOG0UzdQmnpn4hACijYOMtwtT8="; }; build-system = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "msmart" ]; meta = with lib; { - changelog = "https://github.com/mill1000/midea-msmart/releases/tag/${version}"; + changelog = "https://github.com/mill1000/midea-msmart/releases/tag/${src.tag}"; description = "Python library for local control of Midea (and associated brands) smart air conditioners"; homepage = "https://github.com/mill1000/midea-msmart"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 122614f5bb7c..3ebac723d412 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -66,8 +66,8 @@ rec { "sha256-rxpBCIXOkSl5UeP1e0Rz8VK4tU3qD7nqG77YiGTv/0U="; mypy-boto3-amplify = - buildMypyBoto3Package "amplify" "1.37.12" - "sha256-uUxc61azT+b/eP+nDc1l8BAVYr73sQWg9RMXBHcq7Ic="; + buildMypyBoto3Package "amplify" "1.37.17" + "sha256-Q9nHb3kc2RHQEbBzZ1H8tYAULuPZlOvEYJvZ1znOj3c="; mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.37.0" @@ -134,8 +134,8 @@ rec { "sha256-v47OKnLvmkjv8+HBRlrv+wP+MIapoiz3HGplK6SEXGM="; mypy-boto3-appsync = - buildMypyBoto3Package "appsync" "1.37.0" - "sha256-KuiUFCfIcGHwIRrKsezOcGodrA3UrqdDPI3yl5Lpkmw="; + buildMypyBoto3Package "appsync" "1.37.15" + "sha256-4eY2gziQLvX2t39e201UitkV/Cs0E2RSP4yAG6/OdbI="; mypy-boto3-arc-zonal-shift = buildMypyBoto3Package "arc-zonal-shift" "1.37.0" @@ -210,8 +210,8 @@ rec { "sha256-FINgDMmIhMn5M/qVGE3rzZJZEU121rDXNQYa39veAYk="; mypy-boto3-cleanrooms = - buildMypyBoto3Package "cleanrooms" "1.37.0" - "sha256-ovn/hkWHBBTUsDkQppzTApcVRYZXwxTOugZHIPnbCQk="; + buildMypyBoto3Package "cleanrooms" "1.37.15" + "sha256-6hJ2F3fQMPHe8VEcd4ZSb7zyeVs4rG3agDHTyICkCsE="; mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.37.0" @@ -314,8 +314,8 @@ rec { "sha256-6w2v795pNhcKZlWayROdYe5bzQvSmkITxErl2M0F5o4="; mypy-boto3-cognito-idp = - buildMypyBoto3Package "cognito-idp" "1.37.13" - "sha256-L9F74KW7z+Q+7hUoGIQR67TQyNiJF8nW4XHWBppFO4Q="; + buildMypyBoto3Package "cognito-idp" "1.37.13.post1" + "sha256-EHys56ylhnO6wwWLKMABYrjf9K3D02lZbpcghQlXxRI="; mypy-boto3-cognito-sync = buildMypyBoto3Package "cognito-sync" "1.37.0" @@ -446,8 +446,8 @@ rec { "sha256-wvOqjmqNMbCG7E1o+ZSOlWEwBdcCKjD/qVFlepZ51ec="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.37.12" - "sha256-tK8CshexXUuOPFxAkWZXtAk82CgiHVR0D5BSjgEztIU="; + buildMypyBoto3Package "ec2" "1.37.16" + "sha256-04vwzTTK0gE3yWvOVbXUXFXijf4k6/oSZXR6tqxfN3U="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.37.0" @@ -770,8 +770,8 @@ rec { "sha256-E5A6wS8kwjG1rWo1RFT7kwpqmWKGZ7UAmcR4KUvUrzg="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.37.0" - "sha256-YbGr1bfbpdFvneTZcX8vZ0OCRtEc3hwrvjHqOHUzM8g="; + buildMypyBoto3Package "lambda" "1.37.16" + "sha256-1Y8guwQWrrBP2mz6qKLywxUyylAJAEw+K8vorFCoz3w="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.37.0" @@ -858,12 +858,12 @@ rec { "sha256-nh2m7H6RlfQlqmiifwYJ3SANi73zcju/v5s9z26HIvo="; mypy-boto3-mediaconnect = - buildMypyBoto3Package "mediaconnect" "1.37.0" - "sha256-KFa0yNwhYlFGz4ADpsxt3OCZfYDBv6Hfw9Ti09f7fIc="; + buildMypyBoto3Package "mediaconnect" "1.37.16" + "sha256-TfeKy6dyjQJVyhmCjttwBxBQNi3iZdJQQwpY/HRvnf0="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.37.4" - "sha256-xBMBhCrnTV7sILg2/dXUy2PeNeCuNHkb7plAumD5Pq8="; + buildMypyBoto3Package "mediaconvert" "1.37.15" + "sha256-bs9Zvpv3AyT/zhucLMqtdhmocG4+hbHkPjyGsvviFJ8="; mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.37.11" @@ -950,8 +950,8 @@ rec { "sha256-gA8+WKvFzCegzUUWvsTbEmHkYPLIomBrqaIRJHkJqhE="; mypy-boto3-network-firewall = - buildMypyBoto3Package "network-firewall" "1.37.0" - "sha256-O9iEc3Yla0/bmvhouX1PLQQET79uJlbQtuz7aKrOekY="; + buildMypyBoto3Package "network-firewall" "1.37.17" + "sha256-Lth+Py9qwXU+mnbV21d9H7QoONrwWU1UmMCJWorypxs="; mypy-boto3-networkmanager = buildMypyBoto3Package "networkmanager" "1.37.0" @@ -1134,16 +1134,16 @@ rec { "sha256-axaTu4XmHGc3a/Uzs1/0IqLJdZFBfEQ9pzi42XW11y0="; mypy-boto3-route53 = - buildMypyBoto3Package "route53" "1.37.0" - "sha256-mI9acOp7w3pD+5eD3z7pSgTxZHjYWWbkRnWYUWy7UpE="; + buildMypyBoto3Package "route53" "1.37.15" + "sha256-sXSxaqe0kqx1ZCinJKI67ekBZW81RwoC1fSEDrlCDc4="; mypy-boto3-route53-recovery-cluster = buildMypyBoto3Package "route53-recovery-cluster" "1.37.0" "sha256-0hUuTUVv6+WqpPn+TJVgsl5bIuw0WejLarVu/hv1trk="; mypy-boto3-route53-recovery-control-config = - buildMypyBoto3Package "route53-recovery-control-config" "1.37.0" - "sha256-VW984jFkCzfG2w2XP5fa5eiUjs31yTQbX5jyKuFIS20="; + buildMypyBoto3Package "route53-recovery-control-config" "1.37.18" + "sha256-biOC1fq0Fduxbh07i/LZWTeX+FPvWmrU7asljtW3fKg="; mypy-boto3-route53-recovery-readiness = buildMypyBoto3Package "route53-recovery-readiness" "1.37.0" @@ -1158,8 +1158,8 @@ rec { "sha256-/4XdwWIkx8VYxrUp7I8IDCPZ34cFudV+gp3xR4uS8jk="; mypy-boto3-rum = - buildMypyBoto3Package "rum" "1.37.5" - "sha256-/cLHocPVefBea8g6oIRrSis6JOL7wFw+AEYyGNEOdx0="; + buildMypyBoto3Package "rum" "1.37.14" + "sha256-bcK4J78YctKUypiegFviiZ2TorcXA5SPh9dhbRigVhk="; mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.37.0" @@ -1174,8 +1174,8 @@ rec { "sha256-c0vXkW5sR7JkdzvsS/rMFme9EwY1x5eZAbRWYKew0v4="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.37.5" - "sha256-CZmB3zmQwsWy85vzK891HXuRfmgNBg2YXEasihOrbUY="; + buildMypyBoto3Package "sagemaker" "1.37.18" + "sha256-kgcGaU90+TvFcxPCotm8dutYkk/GL2qTOtmMyxNzkgs="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.37.0" @@ -1398,8 +1398,8 @@ rec { "sha256-nBigZ8YNNcy6TrQQ+dThN62xZ5IOq92EHbC3/tZbbuE="; mypy-boto3-wafv2 = - buildMypyBoto3Package "wafv2" "1.37.8" - "sha256-kFDCZkFA474JtReUOZlN3Si0qZU21sUWOAUVTNl7uFo="; + buildMypyBoto3Package "wafv2" "1.37.14" + "sha256-wfndS06dDJCEqVLceB+WMTIh1laTi9eVfTzx23K47nk="; mypy-boto3-wellarchitected = buildMypyBoto3Package "wellarchitected" "1.37.0" diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 780a3ce968dd..1ffadd2005f6 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.14.1"; + version = "1.15.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; tag = "v${version}"; - hash = "sha256-Ha7icLFc4BL7a3NECcwX4dtWmkXctANCqu/IbrEnmjw="; + hash = "sha256-y67kt5i8mT9TcSbUGwnNuTAeqjy9apvWIbA2QD96LS4="; }; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index 681a73f05723..8e1ab236ac48 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, flit-core, pythonOlder, defusedxml, @@ -21,8 +20,8 @@ }: buildPythonPackage rec { pname = "myst-parser"; - version = "4.0.0"; - format = "pyproject"; + version = "4.0.1"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -30,17 +29,9 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; tag = "v${version}"; - hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978="; + hash = "sha256-/Prauz4zuJY39EK2BmgBbH1uwjF4K38e5X5hPYwRBl0="; }; - patches = [ - (fetchpatch2 { - # Sphinx 8.1 compat - url = "https://github.com/executablebooks/MyST-Parser/commit/9fe724ebf1d02fd979632d82387f802c91e0d6f6.patch"; - hash = "sha256-KkAV9tP+dFax9KuxqkhqNlGWx6wSO6M2dWpah+GYG0E="; - }) - ]; - build-system = [ flit-core ]; dependencies = [ @@ -63,9 +54,12 @@ buildPythonPackage rec { ] ++ markdown-it-py.optional-dependencies.linkify; disabledTests = [ - # sphinx 7.4 compat - "test_amsmath" - # pygments 2.19 compat + # sphinx 8.2 compat + # https://github.com/executablebooks/MyST-Parser/issues/1030 + "test_sphinx_directives" + "test_references_singlehtml" + "test_extended_syntaxes" + "test_fieldlist_extension" "test_includes" ]; diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index e68941e7d37d..29cdab78a4d7 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -99,8 +99,6 @@ mkDerivationWith buildPythonPackage rec { wrapt ] ++ dask.optional-dependencies.array; - dontUseSetuptoolsCheck = true; - postFixup = '' wrapQtApp $out/bin/napari ''; diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 9ccb1a257b88..61f420899a2d 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -1,23 +1,30 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, fetchPypi, + + # build-system hatch-jupyter-builder, hatchling, jupyterlab, - nbformat, + + # dependencies colorama, - pygments, - tornado, - requests, gitpython, + jinja2, jupyter-server, jupyter-server-mathjax, - jinja2, + nbformat, + pygments, + requests, + tornado, + + # tests gitMinimal, pytest-tornado, pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -25,8 +32,6 @@ buildPythonPackage rec { version = "4.0.2"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchPypi { inherit pname version; hash = "sha256-2Cefj0sjbAslOyDWDEgxu2eEPtjb1uCfI06wEdNvG/I="; @@ -39,32 +44,44 @@ buildPythonPackage rec { ]; dependencies = [ - nbformat colorama - pygments - tornado - requests gitpython + jinja2 jupyter-server jupyter-server-mathjax - jinja2 + nbformat + pygments + requests + tornado ]; nativeCheckInputs = [ gitMinimal pytest-tornado pytestCheckHook + writableTmpDirAsHomeHook ]; - disabledTests = [ - "test_git_diffdriver" - "test_git_difftool" - "test_git_mergedriver" - "test_git_mergetool" - ]; + disabledTests = + [ + # subprocess.CalledProcessError: Command '['git', 'diff', 'base', 'diff.ipynb']' returned non-zero exit status 128. + # git-nbdiffdriver diff: line 1: git-nbdiffdriver: command not found + # fatal: external diff died, stopping at diff.ipynb + "test_git_diffdriver" + + # subprocess.CalledProcessError: Command '['git', 'merge', 'remote-no-conflict']' returned non-zero exit status 1. + "test_git_mergedriver" + + # Require network access + "test_git_difftool" + "test_git_mergetool" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # OSError: Could not find system gitattributes location! + "test_locate_gitattributes_syste" + ]; preCheck = '' - export HOME="$TEMP" git config --global user.email "janedoe@example.com" git config --global user.name "Jane Doe" ''; @@ -73,11 +90,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "nbdime" ]; - meta = with lib; { + meta = { homepage = "https://github.com/jupyter/nbdime"; changelog = "https://github.com/jupyter/nbdime/blob/${version}/CHANGELOG.md"; description = "Tools for diffing and merging of Jupyter notebooks"; - license = licenses.bsd3; - maintainers = with maintainers; [ tbenst ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ tbenst ]; }; } diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index cff31090db63..9dd5b5b31266 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -4,29 +4,32 @@ fetchFromGitHub, lxml, paramiko, + setuptools, pytestCheckHook, pythonOlder, - six, }: buildPythonPackage rec { pname = "ncclient"; - version = "0.6.16"; - format = "setuptools"; + version = "0.6.19"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "ncclient"; + repo = "ncclient"; tag = "v${version}"; - hash = "sha256-IMCMlGt5/G4PRz525ZomsovU55vBnGhHndBtC7ym6lc="; + hash = "sha256-ZAZMazf1PB54MbHyhSuSpg0IWSSqinE2DvHD+L8GKu8="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ paramiko lxml - six ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -36,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for NETCONF clients"; homepage = "https://github.com/ncclient/ncclient"; - changelog = "https://github.com/ncclient/ncclient/releases/tag/v${version}"; + changelog = "https://github.com/ncclient/ncclient/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; }; diff --git a/pkgs/development/python-modules/netbox-contract/default.nix b/pkgs/development/python-modules/netbox-contract/default.nix new file mode 100644 index 000000000000..852ece1fc516 --- /dev/null +++ b/pkgs/development/python-modules/netbox-contract/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + pythonAtLeast, + fetchFromGitHub, + setuptools, + python-dateutil, + drf-yasg, + netbox, +}: +buildPythonPackage rec { + pname = "netbox-contract"; + version = "2.3.2"; + pyproject = true; + + disabled = pythonAtLeast "3.13"; + + src = fetchFromGitHub { + owner = "mlebreuil"; + repo = "netbox-contract"; + tag = "v${version}"; + hash = "sha256-e3N0m+oj2CMUXwI4dF/tXA+Lz+9+ZlbJAy+zHoRDNtw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + python-dateutil + drf-yasg + ]; + + # running tests requires initialized django project + nativeCheckInputs = [ + netbox + ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + pythonImportsCheck = [ "netbox_contract" ]; + + meta = { + description = "Contract plugin for netbox"; + homepage = "https://github.com/mlebreuil/netbox-contract"; + changelog = "https://github.com/mlebreuil/netbox-contract/releases/tag/${src.rev}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix index 189bb4aa813b..64ab1608a406 100644 --- a/pkgs/development/python-modules/nethsm/default.nix +++ b/pkgs/development/python-modules/nethsm/default.nix @@ -1,30 +1,36 @@ { lib, buildPythonPackage, - fetchPypi, - flit-core, certifi, cryptography, + docker, + fetchFromGitHub, + flit-core, + podman, + pycryptodome, + pytestCheckHook, python-dateutil, typing-extensions, urllib3, }: -let +buildPythonPackage rec { pname = "nethsm"; - version = "1.2.1"; -in - -buildPythonPackage { - inherit pname version; + version = "1.3.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-EPxGJFCGGl3p3yLlM7NH7xtEVS2woRigKJhL57A0gAE="; + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nethsm-sdk-py"; + tag = "v${version}"; + hash = "sha256-vH5YjS3VO5krCMVQFcEgDhJeCUzo9EzFnBxq+zPuZ68="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = true; + + build-system = [ flit-core ]; + + dependencies = [ certifi cryptography python-dateutil @@ -32,19 +38,30 @@ buildPythonPackage { urllib3 ]; - nativeBuildInputs = [ - flit-core + nativeCheckInputs = [ + docker + podman + pycryptodome + pytestCheckHook ]; - pythonRelaxDeps = true; - pythonImportsCheck = [ "nethsm" ]; + disabledTestPaths = [ + # Tests require a running Docker instance + "tests/test_nethsm_config.py" + "tests/test_nethsm_keys.py" + "tests/test_nethsm_namespaces.py" + "tests/test_nethsm_other.py" + "tests/test_nethsm_system.py" + "tests/test_nethsm_users.py" + ]; + meta = with lib; { description = "Client-side Python SDK for NetHSM"; homepage = "https://github.com/Nitrokey/nethsm-sdk-py"; changelog = "https://github.com/Nitrokey/nethsm-sdk-py/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ frogamic ]; }; } diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 05231e965ec6..38b181c0c211 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "nexia"; tag = version; - hash = "sha256-DO6UJ/oLCLZdRR2f0rXe4R5nQtByqzHrLXhyUsvY/jw="; + hash = "sha256-vw4lUBD7VUpOkm+JGD06tLuM/g2iLQ/qFLIyMobnQS0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nglview/default.nix b/pkgs/development/python-modules/nglview/default.nix new file mode 100644 index 000000000000..d68a906e304e --- /dev/null +++ b/pkgs/development/python-modules/nglview/default.nix @@ -0,0 +1,98 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + nodejs, + notebook, + ipywidgets, + ipykernel, + numpy, + runCommand, + jupyter-packaging, + jupyter-core, + notebook-shim, + setuptools-scm, + writableTmpDirAsHomeHook, + pytestCheckHook, + mock, + pillow, + ase, +}: +let + nodeModules = runCommand "nglview-node-modules" { } '' + mkdir -p $out/node_modules/@jupyter-widgets/base + cat > $out/node_modules/@jupyter-widgets/base/package.json < at position 0. In a future JAX release this will be an error. + "-W" + "ignore::DeprecationWarning" + ]; + meta = { description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox"; homepage = "https://github.com/patrick-kidger/optimistix"; diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 1915bbb99e4b..ba221650503f 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.11.9"; + version = "0.11.10"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${version}"; - hash = "sha256-bvY/ipgVgDzzH0wAqNBdJzCRHZam0WoByRpfde0sJ1c="; + hash = "sha256-bS4JmS8NkYkf6YUN9JLcIjMco94QuAw/7H0SguCWH+Y="; }; sourceRoot = "${src.name}/checkpoint"; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2a96029a4139..122d5d1b538d 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -53,7 +53,6 @@ # tests adv_cmds, glibc, - glibcLocales, hypothesis, pytestCheckHook, pytest-xdist, @@ -179,7 +178,6 @@ let nativeCheckInputs = [ - glibcLocales hypothesis pytest-asyncio pytest-xdist @@ -231,7 +229,6 @@ let preCheck = '' export HOME=$TMPDIR - export LC_ALL="en_US.UTF-8" cd $out/${python.sitePackages}/pandas '' # TODO: Get locale and clipboard support working on darwin. diff --git a/pkgs/development/python-modules/pandoc-latex-environment/default.nix b/pkgs/development/python-modules/pandoc-latex-environment/default.nix index ec5066c1a2d8..6ccf7dd09ce6 100644 --- a/pkgs/development/python-modules/pandoc-latex-environment/default.nix +++ b/pkgs/development/python-modules/pandoc-latex-environment/default.nix @@ -2,11 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, - poetry-dynamic-versioning, panflute, pytestCheckHook, pandoc, + hatchling, + hatch-vcs, }: buildPythonPackage rec { @@ -22,9 +22,10 @@ buildPythonPackage rec { }; build-system = [ - poetry-core - poetry-dynamic-versioning + hatchling + hatch-vcs ]; + dependencies = [ panflute ]; pythonImportsCheck = [ "pandoc_latex_environment" ]; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index c439b1b04cf9..5e5663c054af 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -5,7 +5,6 @@ six, pythonOlder, scandir ? null, - glibcLocales, typing, }: @@ -25,11 +24,6 @@ buildPythonPackage rec { scandir typing ]; - nativeCheckInputs = [ glibcLocales ]; - - preCheck = '' - export LC_ALL="en_US.UTF-8" - ''; meta = with lib; { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems"; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index d500a215be11..fe52ff5b7da9 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pbr"; - version = "6.1.0"; + version = "6.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-eIGD44Lj0ddwfbCJeCOZZei55OXtQmab9HWBhnNNXyQ="; + hash = "sha256-k+pyzmmJ6y7tmdD3VyFHT2mtiBKK/e9aw3freXxL92s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index 9627f6e55c2d..b80888595eac 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pbs-installer"; - version = "2025.03.11"; + version = "2025.03.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "frostming"; repo = "pbs-installer"; tag = version; - hash = "sha256-uf74Ry/VX7PpGiOsLXU6CBj40NX4b2aYfPQ4vU6nS0I="; + hash = "sha256-4SwbxTwl0DQjtYTxFMBg4p9aTyELNIOSRQw9fiweDhg="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix index abefc287323d..471e88b912f4 100644 --- a/pkgs/development/python-modules/pebble/default.nix +++ b/pkgs/development/python-modules/pebble/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pebble"; - version = "5.1.0"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "noxdafox"; repo = "pebble"; tag = version; - hash = "sha256-Y6E+Mu5Ch+VTHryTY3pvHQD6GzaTLrtf78DqUWa7nt0="; + hash = "sha256-x0jvqH1wSAkOgxYNcXr+TL5dqZE0Vai0ZaxdnDSqRNI="; }; build-system = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "API to manage threads and processes within an application"; homepage = "https://github.com/noxdafox/pebble"; - changelog = "https://github.com/noxdafox/pebble/releases/tag/${version}"; + changelog = "https://github.com/noxdafox/pebble/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ orivej ]; }; diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 24b9cddf97b4..243cd6c6da3a 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -1,45 +1,45 @@ { lib, - fetchPypi, buildPythonPackage, - logutils, - mako, - webob, - webtest, - pythonOlder, - pytestCheckHook, + fetchPypi, genshi, gunicorn, jinja2, + mako, + pytestCheckHook, + pythonOlder, + setuptools, sqlalchemy, virtualenv, - setuptools, + webob, + webtest, }: buildPythonPackage rec { pname = "pecan"; - version = "1.5.1"; - format = "setuptools"; + version = "1.6.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YGMnLV+GB3P7tLSyrhsJ2oyVQGLvhxFQwGz9sjkdk1U="; + hash = "sha256-X9RGlYPu0t7Te00QpHDhGl3j88lj3IeYTncuJcVv7T4="; }; - propagatedBuildInputs = [ - logutils + build-system = [ setuptools ]; + + dependencies = [ mako - webob setuptools + webob ]; nativeCheckInputs = [ - pytestCheckHook genshi gunicorn jinja2 + pytestCheckHook sqlalchemy virtualenv webtest @@ -50,9 +50,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pecan" ]; meta = with lib; { - changelog = "https://pecan.readthedocs.io/en/latest/changes.html"; description = "WSGI object-dispatching web framework"; homepage = "https://www.pecanpy.org/"; + changelog = "https://github.com/pecan/pecan/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ applePrincess ]; }; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 060e3ff8ef72..5defc977a7b3 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "persim"; - version = "0.3.7"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dvcpj7ekbNvsc2+FSXfx4Xlt3y1pdO2n2FnKKEf032Q="; + hash = "sha256-4T0YWEF2uKdk0W1+Vt8I3Mi6ZsazJXoHI0W+O9WbpA0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 40f4865c49f4..fd6b9ff7003c 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.53"; + version = "8.13.55"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tzCPIYN976VntPlhkltsZS3VFI8+D629FYoQdYzGPZE="; + hash = "sha256-V8mJ3aPqurG1qePSRDijnr0DL6AXK/aL/ZCrcLPV4Is="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 9d44c2e383e0..b5491d6e3474 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pip-tools"; version = "7.4.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,9 +31,9 @@ buildPythonPackage rec { patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ build click pep517 @@ -68,6 +68,19 @@ buildPythonPackage rec { "test_cli_compile_all_extras_with_multiple_packages" # Deprecations "test_error_in_pyproject_toml" + + # pip 25.0 compat issues + # https://github.com/jazzband/pip-tools/issues/2112 + # requirement doesn't end with semicolon + "test_resolver" + "test_resolver__custom_unsafe_deps" + # constraints.txt is now in a tmpdir + "test_preserve_via_requirements_constrained_dependencies_when_run_twice" + "test_annotate_option" + # TypeError("'<' not supported between instances of 'InstallationCandidate' and 'InstallationCandidate'")>.exit_code + "test_no_candidates" + "test_no_candidates_pre" + "test_failure_of_legacy_resolver_prompts_for_backtracking" ]; pythonImportsCheck = [ "piptools" ]; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index eb946a955c67..fb3cce10c235 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,6 +10,7 @@ # docs sphinx, + sphinx-issues, # checks freezegun, @@ -30,14 +31,14 @@ let self = buildPythonPackage rec { pname = "pip"; - version = "24.0"; + version = "25.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; tag = version; - hash = "sha256-yojk2T5wuPkS1OKusilj253AT+xyKwXCWKBNUEH2Mgo="; + hash = "sha256-V069rAL6U5KBnSc09LRCu0M7qQCH5NbMghVttlmIoRY="; }; postPatch = '' @@ -53,6 +54,7 @@ let # docs sphinx + sphinx-issues ]; outputs = [ @@ -69,7 +71,7 @@ let # sphinx.ext.intersphinx requires network connection or packaged object.inv files for python and pypug # sphinxcontrib.towncrier is not currently packaged for ext in sphinx.ext.intersphinx sphinx_copybutton sphinx_inline_tabs sphinxcontrib.towncrier myst_parser; do - substituteInPlace html/conf.py --replace '"'$ext'",' "" + substituteInPlace html/conf.py --replace-fail '"'$ext'",' "" done PYTHONPATH=$src/src:$PYTHONPATH sphinx-build -v \ diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index e99565720026..0ad54bbd83fb 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -1,28 +1,27 @@ { lib, buildPythonPackage, + docutils, fetchPypi, pythonOlder, importlib-metadata, importlib-resources, setuptools, packaging, - tomli, pytestCheckHook, }: buildPythonPackage rec { pname = "pkg-about"; - version = "1.1.8"; - format = "pyproject"; + version = "1.2.9"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchPypi { pname = "pkg_about"; inherit version; - extension = "zip"; - hash = "sha256-GVV3l0rU8gkxedOiMVVAt0bEqCtyO+1LSHxIKjBlbPk="; + hash = "sha256-NXty1yFvBLSpN5e3/KNCMOU+owkCTBaX0KINzVrUgzM="; }; # tox is listed in build requirements but not actually used to build @@ -31,17 +30,17 @@ buildPythonPackage rec { sed -i "/requires/s/, 'tox>=[^']*'//" pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ packaging setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + docutils importlib-metadata importlib-resources packaging setuptools - tomli ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 0048c0a12607..da9483a54b5d 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.12.0"; + version = "1.12.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-itkaBEWgNngrk2bvi4wsUCkfg6VTR4uoWAxz0yFXAM8="; + hash = "sha256-XNlXgkrDbxQCYJZOujxr5kQqg1m4xI9K35AhDzOgS3s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 38279a37a568..6f67e8b335d5 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.28.0"; + version = "1.28.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-WgxGS54OMv6JRsB9IRmKzQIPeoVcvpl28V5vvvEQ6WU="; + hash = "sha256-zbEpTK1kH2bweQqWHPNtWekwZTdNqqLYnx0VDKyFiUA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/plotext/default.nix b/pkgs/development/python-modules/plotext/default.nix index 614a09e78bed..a7bd0e2e7568 100644 --- a/pkgs/development/python-modules/plotext/default.nix +++ b/pkgs/development/python-modules/plotext/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "plotext"; - version = "5.2.8"; + version = "5.3.2"; format = "setuptools"; src = fetchFromGitHub { owner = "piccolomo"; repo = pname; tag = version; - hash = "sha256-V7N7p5RxLKYLmJeojikYJ/tT/IpVGzG3ZPVvUisDAVs="; + hash = "sha256-4cuStXnZFTlOoBp9w+LrTZavCWEaQdZMY4apGNKvBXE="; }; # Package does not have a conventional test suite that can be run with either diff --git a/pkgs/development/python-modules/plyara/default.nix b/pkgs/development/python-modules/plyara/default.nix index 3b03163a52dd..c6b3616286b0 100644 --- a/pkgs/development/python-modules/plyara/default.nix +++ b/pkgs/development/python-modules/plyara/default.nix @@ -2,9 +2,15 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, setuptools, ply, + + pytestCheckHook, + pycodestyle, + pydocstyle, + pyflakes, + coverage, }: buildPythonPackage rec { @@ -14,9 +20,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.10"; # https://github.com/plyara/plyara: "Plyara requires Python 3.10+" - src = fetchPypi { - inherit pname version; - hash = "sha256-zmpb5r3BcveLsQ0uIgQJx2vUaz2p/0PlO76E0e7elwA="; + src = fetchFromGitHub { + owner = "plyara"; + repo = "plyara"; + tag = "v${version}"; + hash = "sha256-WaQgqx003it+D0AGDxV6aSKO89F2iR9d8L4zvHyd0iQ="; }; build-system = [ @@ -31,11 +39,27 @@ buildPythonPackage rec { "plyara" ]; + nativeCheckInputs = [ + pytestCheckHook + pycodestyle + pydocstyle + pyflakes + coverage + ]; + + disabledTests = [ + # touches network + "test_third_party_repositories" + ]; + meta = { description = "Parse YARA rules"; - homepage = "https://pypi.org/project/plyara/"; + homepage = "https://github.com/plyara/plyara"; changelog = "https://github.com/plyara/plyara/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ _13621 ]; + maintainers = with lib.maintainers; [ + _13621 + ivyfanchiang + ]; }; } diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index ce77a9b19867..33db37bc9c3f 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -177,7 +177,7 @@ buildPythonPackage rec { requiredSystemFeatures = [ "big-parallel" ]; - sourceRoot = "source/py-polars"; + sourceRoot = "${src.name}/py-polars"; postPatch = '' for f in * ; do [[ "$f" == "tests" ]] || \ diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 8e27c4e00d6b..98496c26958f 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -1,12 +1,15 @@ { lib, + anthropic, backoff, buildPythonPackage, + distro, fetchFromGitHub, freezegun, mock, monotonic, openai, + parameterized, pytestCheckHook, python-dateutil, requests, @@ -16,20 +19,21 @@ buildPythonPackage rec { pname = "posthog"; - version = "3.8.3"; + version = "3.18.1"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${version}"; - hash = "sha256-s4MVpJb5sRe4TIW9Bb068JTnUkObGOG3VlbWVuPPTM4="; + hash = "sha256-1jJACzDf8J4Vsrvtj0PgeK1Ck2Bzy5ThHm0Ohd+LyYs="; }; build-system = [ setuptools ]; dependencies = [ backoff + distro monotonic python-dateutil requests @@ -37,9 +41,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + anthropic freezegun mock openai + parameterized pytestCheckHook ]; @@ -59,7 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with PostHog"; homepage = "https://github.com/PostHog/posthog-python"; - changelog = "https://github.com/PostHog/posthog-python/releases/tag/${src.tag}"; + changelog = "https://github.com/PostHog/posthog-python/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 32257b5ffa9a..69e14b308ef5 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.12.0"; + version = "3.15.1"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "prettytable"; tag = version; - hash = "sha256-RoBPmnuAOtTET898Gdm1zzPIst26GdCY5nU1PyJ+Nro="; + hash = "sha256-18FXxC1j5EWGnKzgNOr0TRRnlRXzQ9IwSe7YGx92Gf4="; }; build-system = [ diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix index 8c8e94229551..502bb77dbbbb 100644 --- a/pkgs/development/python-modules/primp/default.nix +++ b/pkgs/development/python-modules/primp/default.nix @@ -63,20 +63,20 @@ let in buildPythonPackage rec { pname = "primp"; - version = "0.12.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "deedy5"; repo = "primp"; tag = "v${version}"; - hash = "sha256-yzcrUER+NiDfSjJ3my45IS+2GmeusvJgyX5nFSaqFUk="; + hash = "sha256-LrSygeioJlccOH1oyagw02ankkZK+H6Mzrgy8tB83mo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-gCNnP0B0D6AJ1L/E6sQKASx8BbSJU5jTNia+tL2USvU="; + hash = "sha256-iPf25DMGNHrWYByNTylB6bPpLfzs0ADwgkjfhVxiiXA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix index 3d41cd1b2b75..c4befb300c48 100644 --- a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix +++ b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "prometheus-fastapi-instrumentator"; - version = "7.0.2"; + version = "7.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "trallnag"; repo = "prometheus-fastapi-instrumentator"; tag = "v${version}"; - hash = "sha256-ObzaKWrN+9+MUpSOlqbW16KKTklMVo5nPRHodk+GEPs="; + hash = "sha256-54h/kwIdzFzxdYglwcEBPkLYno1YH2iWklg35qY2b00="; }; build-system = [ diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index caa4e679ea71..a0c274dac938 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.48"; + version = "3.0.50"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-1mI6sEd6gN905ka9vJNiEUP1yvEEIGqikpTVPeGgPZA="; + hash = "sha256-VEdI84YKJiPKXNbSeV56FPPQ4cPJcoNZAT95h3/Im6s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix index 00a03b737ed4..6c3d35544bec 100644 --- a/pkgs/development/python-modules/propcache/default.nix +++ b/pkgs/development/python-modules/propcache/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "propcache"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,9 +23,14 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "propcache"; tag = "v${version}"; - hash = "sha256-j2PjSaOx0IKijoMjhtYVNrpqEwRjVFsON5OU/Fv5idc="; + hash = "sha256-3jsQnRkXBB7/6xY44kv7JuAXz/P8oxUg8Hyg1O5w2Cg="; }; + postPatch = '' + substituteInPlace packaging/pep517_backend/_backend.py \ + --replace "Cython ~= 3.0.12" Cython + ''; + build-system = [ cython expandvars @@ -44,7 +49,7 @@ buildPythonPackage rec { meta = { description = "Fast property caching"; homepage = "https://github.com/aio-libs/propcache"; - changelog = "https://github.com/aio-libs/propcache/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/aio-libs/propcache/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 4e1cbc07fd08..84a994cc2d61 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "psutil"; - version = "6.1.1"; + version = "7.0.0"; pyproject = true; inherit stdenv; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-z4SWcowY8tC0UZjwaJW+UvNmEXEXRrfzDEZLQitQ4vU="; + hash = "sha256-e+nD66OL7Mtkleozr9mCpEB0t48oxDSh9RzAf9MVxFY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyads/default.nix b/pkgs/development/python-modules/pyads/default.nix index 0adfa7f6e61f..01ae88165ad8 100644 --- a/pkgs/development/python-modules/pyads/default.nix +++ b/pkgs/development/python-modules/pyads/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "pyads"; - version = "3.4.2"; + version = "3.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "stlehmann"; repo = "pyads"; tag = version; - hash = "sha256-OvDh92fwHW+UzEO5iqVOY7d5H0Es6CJK/f/HCyLO9J4="; + hash = "sha256-eQC2ozJ5bKuhyInZDq8ZZNa9OGIN3tRjSHEPoqIU/jc="; }; build-system = [ setuptools ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for TwinCAT ADS library"; homepage = "https://github.com/MrLeeh/pyads"; - changelog = "https://github.com/stlehmann/pyads/releases/tag/${version}"; + changelog = "https://github.com/stlehmann/pyads/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; }; diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix index 09cc27820743..62aaf30a6f59 100644 --- a/pkgs/development/python-modules/pyais/default.nix +++ b/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.9.0"; + version = "2.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; tag = "v${version}"; - hash = "sha256-rL2loTPNdCvhy/n3PTJOGjFxJX5yG+thXJBOqUDrjkU="; + hash = "sha256-iwfkdWFAPbdDNvwz449zAUpLcly0ZaTpmjJxJoyX+oA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix index ed0892acf1f4..372ac5d2903c 100644 --- a/pkgs/development/python-modules/pyaprilaire/default.nix +++ b/pkgs/development/python-modules/pyaprilaire/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyaprilaire"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "chamberlain2007"; repo = "pyaprilaire"; tag = version; - hash = "sha256-W94NsL3hPIsi0WJ9EL4Z+IuoU9e0gZq3m+ntz+vShno="; + hash = "sha256-wkeaGd76OoXF18lP+N9a2hu7KjPPg88V0S2yEQoft5g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 46a1151edd04..9b0cf844422a 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -142,8 +142,6 @@ buildPythonPackage rec { disabledTests = [ "GcsFileSystem" ]; - dontUseSetuptoolsCheck = true; - preCheck = '' shopt -s extglob diff --git a/pkgs/development/python-modules/pybind11-abseil/default.nix b/pkgs/development/python-modules/pybind11-abseil/default.nix new file mode 100644 index 000000000000..de497d6eec18 --- /dev/null +++ b/pkgs/development/python-modules/pybind11-abseil/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + cmake, + abseil-cpp, + pybind11, + python, +}: + +buildPythonPackage rec { + pname = "pybind11-abseil"; + version = "202402.0"; + pyproject = false; + + src = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11_abseil"; + rev = "v${version}"; + hash = "sha256-hFVuGzEFqAEm2p2RmfhFtLB6qOqNuVNcwcLh8dIWi0k="; + }; + + patches = [ + (fetchpatch { + name = "pybind11_abseil.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11-abseil/pybind11_abseil.patch?rev=2"; + hash = "sha256-zwxCIhYMvexdSUmKM22OMBMEo0NRDgMtSVMDySFCn6U="; + }) + (fetchpatch { + name = "use-system-packages-if-possible.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11-abseil/use-system-packages-if-possible.patch?rev=2"; + hash = "sha256-CLHOSni2ej6ICtvMtBoCIpR9CNPPibwIS+hYbOCAwBE="; + }) + (fetchpatch { + name = "0001-Install-headers-and-CMake-development-files.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11-abseil/0001-Install-headers-and-CMake-development-files.patch?rev=2"; + hash = "sha256-TU9AzvF83aROY4gwys2ITOcdtjEm4x2IbhX4cHNWp0M="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + abseil-cpp + pybind11 + ]; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_INSTALL_PYDIR" "${placeholder "out"}/${python.sitePackages}") + (lib.cmakeFeature "Python_EXECUTABLE" python.interpreter) + ]; + + meta = { + description = "Pybind11 bindings for the Abseil C++ Common Libraries"; + homepage = "https://github.com/pybind/pybind11_abseil"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/python-modules/pybind11-protobuf/default.nix b/pkgs/development/python-modules/pybind11-protobuf/default.nix new file mode 100644 index 000000000000..eef20b7c3744 --- /dev/null +++ b/pkgs/development/python-modules/pybind11-protobuf/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + cmake, + abseil-cpp_202301, + protobuf_23, + pybind11, +}: + +buildPythonPackage { + pname = "pybind11-protobuf"; + version = "0-unstable-2024-11-01"; + pyproject = false; + + src = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11_protobuf"; + rev = "90b1a5b9de768340069c15b603d467c21cac5e0b"; + hash = "sha256-3OuwRP9MhxmcfeDx+p74Fz6iLqi9FXbR3t3BtafesKk="; + }; + + patches = [ + (fetchpatch { + name = "0006-Add-install-target-for-CMake-builds.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0006-Add-install-target-for-CMake-builds.patch?rev=2"; + hash = "sha256-tjaOr6f+JCRft0SWd0Zfte7FEOYOP7RrW0Vjz34rX6I="; + }) + (fetchpatch { + name = "0007-CMake-Use-Python-Module.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/pybind11_protobuf/0007-CMake-Use-Python-Module.patch?rev=2"; + hash = "sha256-A1dhfh31FMBHBdCfoYmQrInZvO/DeuVMUL57PpUHYfA="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + abseil-cpp_202301 + protobuf_23 + pybind11 + ]; + + meta = { + description = "Pybind11 bindings for Google's Protocol Buffers"; + homepage = "https://github.com/pybind/pybind11_protobuf"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index b1f0e5eba83e..883a879d3b1f 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # Cairo tries to load system fonts by default. + # It's surfaced as a Cairo "out of memory" error in tests. + __impureHostDeps = [ "/System/Library/Fonts" ]; + mesonFlags = [ # This is only used for figuring out what version of Python is in # use, and related stuff like figuring out what the install prefix diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index dba7ba778363..97b2b32ade17 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,38 +2,28 @@ lib, buildPythonPackage, casttube, - fetchPypi, + fetchFromGitHub, pythonOlder, protobuf, setuptools, - wheel, zeroconf, }: buildPythonPackage rec { pname = "pychromecast"; - version = "14.0.5"; + version = "14.0.6"; pyproject = true; disabled = pythonOlder "3.11"; - src = fetchPypi { - pname = "PyChromecast"; - inherit version; - hash = "sha256-qGce5OpKcJXi4GcOIhUUXsHj4KoHN/901kiuTcJosrE="; + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "pychromecast"; + tag = version; + hash = "sha256-fyF/3F/K4bSOEepCArhK+v+W6tet82r1EW22g74mQlw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools~=65.6" "setuptools" \ - --replace-fail "wheel~=0.37.1" "wheel" \ - --replace-fail "protobuf>=4.25.1" "protobuf" - ''; - - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ casttube @@ -49,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Python to communicate with the Google Chromecast"; homepage = "https://github.com/home-assistant-libs/pychromecast"; - changelog = "https://github.com/home-assistant-libs/pychromecast/releases/tag/${version}"; + changelog = "https://github.com/home-assistant-libs/pychromecast/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 8f987478655d..9b3733939c02 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.12.0"; + version = "2.12.1"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "pycodestyle"; rev = version; - hash = "sha256-YN1KOJ8f+VY9vJTWm3aTOOai66dveKOKOpeBkZKkC2A="; + hash = "sha256-rQkOjDikJPHCBqrqxFQ9PLikYSeQZwJnHAmPGRUZecA="; }; pythonImportsCheck = [ "pycodestyle" ]; diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index f947b3a3e4f5..f1dc2cbe8fd7 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - # Disable tests depending on online services disabledTests = [ "ServicesTest" diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 0188af066427..2f02011893e6 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.87" +version = "0.1.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote", @@ -162,9 +162,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.170" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "lock_api" @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" [[package]] name = "parking" @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.12.9" +version = "0.12.10" dependencies = [ "pyo3", "yrs", @@ -316,9 +316,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -569,9 +569,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "yrs" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34419a20030ca6e452431d317d4d22b797507dfc380953a4f4fc01ee8491516b" +checksum = "0189b51d8ab1283e7c1f1f515c610875262e629cf258bec530da5cd4aa115d59" dependencies = [ "arc-swap", "async-lock", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index a8e6dcd5655e..9a85dce007c0 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.12.9"; + version = "0.12.10"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; tag = version; - hash = "sha256-6wIY1Wb82C0E8BA9kIrmdLPxNw4O18DPP3vrVZgSotI="; + hash = "sha256-1zW7uR5M8CfdKW5QooNi9WMjJQiLcSQI/7EUL7BJ65w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydantic-argparse-extensible/default.nix b/pkgs/development/python-modules/pydantic-argparse-extensible/default.nix new file mode 100644 index 000000000000..61c89576fc45 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-argparse-extensible/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + pydantic, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "pydantic-argparse-extensible"; + version = "1.3.6"; + pyproject = true; + + src = fetchPypi { + pname = "pydantic_argparse_extensible"; + inherit version; + hash = "sha256-DLE2eFrofCDcEPrn5g/mZlxNidVXThUumWV+u+yyvOI="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pydantic + ]; + + pythonImportsCheck = [ + "pydantic_argparse_extensible" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A typed wrapper around argparse using pydantic models"; + homepage = "https://pypi.org/project/pydantic-argparse-extensible"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers._9999years ]; + }; +} diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index 63d0e997fd7a..69b1b43cdf92 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "pydantic-settings"; - version = "2.7.1"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ let owner = "pydantic"; repo = "pydantic-settings"; tag = "v${version}"; - hash = "sha256-kxXH8GNBSF70pWXdALAAQ0Tg7Zx1VRO0Ej4xSncR0Mo="; + hash = "sha256-Bvdq4ATOhLjowkyR39y0Jxi+wuPbpVW30qtbsXa9+HA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 8d901cd1f892..4d8da843963d 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "2.10.5"; + version = "2.10.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; tag = "v${version}"; - hash = "sha256-SEgBuhof1rqnKFI7O1aajkgp17EgaPNcfJzbh/j4ebg="; + hash = "sha256-vkXvHQ5ipcLfx4qJKY6J4rKXCAfP2rj88GnwGMjM2go="; }; buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 783951abde8b..e4ec7a9b55d0 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyelftools"; - version = "0.31"; + version = "0.32"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "eliben"; repo = "pyelftools"; tag = "v${version}"; - hash = "sha256-kX89fMXqrEvhMAAjqKHzHmrYizKBt1uCWMOJtFNNhy4="; + hash = "sha256-58Twjf7ECOPynQ5KPCTDQWdD3nb7ADJZISozWGRGoXM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 1a1beb444bf8..c47f4653f556 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.71"; + version = "0.2.73"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-AE9fD7OKrpi74rXQibtmyQoAeMAO2QCagpCT3HaUGaQ="; + hash = "sha256-KpbrcCjG8F/Ktka7puh/7rSpEMSf5LvMH+Yd//UbhjQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 2eef6797cbf5..2585c7dda9f5 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, pythonOlder, + stdenv, # build-system setuptools, @@ -55,6 +56,14 @@ buildPythonPackage rec { export LANG=en_US.UTF-8 ''; + # Cairo tries to load system fonts by default. + # It's surfaced as a Cairo "out of memory" error in tests. + __impureHostDeps = [ "/System/Library/Fonts" ]; + + postCheck = '' + export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"} + ''; + meta = with lib; { description = "Module for dynamic SVG charting"; homepage = "http://www.pygal.org"; diff --git a/pkgs/development/python-modules/pygame-sdl2/default.nix b/pkgs/development/python-modules/pygame-sdl2/default.nix index e8bea65a499f..5f06206bed72 100644 --- a/pkgs/development/python-modules/pygame-sdl2/default.nix +++ b/pkgs/development/python-modules/pygame-sdl2/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, - cython_0, + cython, fetchFromGitHub, lib, libjpeg, @@ -15,18 +15,18 @@ buildPythonPackage rec { pname = "pygame-sdl2"; - version = "8.3.1.24090601"; + version = "8.3.7.25031702"; pyproject = true; src = fetchFromGitHub { owner = "renpy"; repo = "pygame_sdl2"; tag = "renpy-${version}"; - hash = "sha256-0itOmDScM+4HmWTpjkln56pv+yXDPB1KIDbE6ub2Tls="; + hash = "sha256-7MoQpCkBd20qck7eycs/MX0sjj4XRIrZmYPkKhuct6w="; }; build-system = [ - cython_0 + cython SDL2 setuptools ]; @@ -42,11 +42,20 @@ buildPythonPackage rec { doCheck = true; - preBuild = '' - substituteInPlace setup.py --replace-fail "2.1.0" "${version}" - substituteInPlace src/pygame_sdl2/version.py --replace-fail "2, 1, 0" "${ + postUnpack = '' + substituteInPlace source/setup.py --replace-fail "2.1.0" "${version}" + substituteInPlace source/src/pygame_sdl2/version.py --replace-fail "2, 1, 0" "${ builtins.replaceStrings [ "." ] [ ", " ] version }" + + headers=$(mktemp -d) + substituteInPlace source/setup.py --replace-fail \ + "pathlib.Path(sysconfig.get_paths()['include']) / \"pygame_sdl2\"" \ + "pathlib.Path(\"$headers\")" + ''; + + postInstall = '' + install -Dm644 $headers/* -t $out/include/pygame_sdl2 ''; passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=renpy-(.*)" ]; }; diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix index 1989faadbb51..b1511a9ced1c 100644 --- a/pkgs/development/python-modules/pyheos/default.nix +++ b/pkgs/development/python-modules/pyheos/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyheos"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "andrewsayre"; repo = "pyheos"; tag = version; - hash = "sha256-1Jv1889RSjuediG5RGRcNdr1OmlOhpzqodgjnNmE2RY="; + hash = "sha256-sVh0mxhC0v1xtov4UNPMXGgYgMMTLZJaai11AOCMdiU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyhidra/default.nix b/pkgs/development/python-modules/pyhidra/default.nix new file mode 100644 index 000000000000..0afc76e3e63c --- /dev/null +++ b/pkgs/development/python-modules/pyhidra/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + jpype1, + pytest-datadir, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyhidra"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dod-cyber-crime-center"; + repo = "pyhidra"; + tag = version; + hash = "sha256-8xouU+S7Apy1ySIlvOLPerTApqKy/MNdl9vuBdt+9Vk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ jpype1 ]; + + nativeCheckInputs = [ + pytest-datadir + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyhidra" ]; + + disabledTests = [ + # Tests require a running Ghidra instance + "test_invalid_jpype_keyword_arg" + "test_invalid_vm_arg_succeed" + "test_run_script" + "test_open_program" + "test_no_compiler" + "test_no_language_with_compiler" + "test_loader" + "test_invalid_loader_type" + "test_no_project" + "test_no_program" + "test_import_script" + "test_import_ghidra_base_java_packages" + ]; + + meta = { + description = "Provides direct access to the Ghidra API within a native CPython interpreter using jpype"; + homepage = "https://github.com/dod-cyber-crime-center/pyhidra"; + changelog = "https://github.com/dod-cyber-crime-center/pyhidra/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ scoder12 ]; + }; +} diff --git a/pkgs/development/python-modules/pyhomee/default.nix b/pkgs/development/python-modules/pyhomee/default.nix index c6658224f056..7f12c5c9ee4b 100644 --- a/pkgs/development/python-modules/pyhomee/default.nix +++ b/pkgs/development/python-modules/pyhomee/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyhomee"; - version = "1.2.7"; + version = "1.2.8"; pyproject = true; src = fetchFromGitHub { owner = "Taraman17"; repo = "pyHomee"; tag = "v${version}"; - hash = "sha256-ZXb8xDSV6LNcMRUlbLQgK3QTEpiA3pof8sl7uD0blbY="; + hash = "sha256-GBDnfMkQB8BSiYDyoz2l2XHPuMpf6WsjalNYvSREqK8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix index c52242f8ed5b..81839a2b7bde 100644 --- a/pkgs/development/python-modules/pyiskra/default.nix +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyiskra"; - version = "0.1.15"; + version = "0.1.17"; pyproject = true; src = fetchFromGitHub { owner = "Iskramis"; repo = "pyiskra"; tag = "v${version}"; - hash = "sha256-LIrhd2gDqa1AehnG0WVQKUNbFTuFkLcHwqNAjFejYk0="; + hash = "sha256-LpiylQe/8bBIlFLmrbIEOyeqHgHzW9SaG71O7y28Rkg="; }; build-system = [ setuptools ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { doCheck = false; meta = { - changelog = "https://github.com/Iskramis/pyiskra/releases/tag/v${version}"; + changelog = "https://github.com/Iskramis/pyiskra/releases/tag/${src.tag}"; description = "Python Iskra devices interface"; homepage = "https://github.com/Iskramis/pyiskra"; license = lib.licenses.gpl3Only; diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index c2555281a6b0..55af4374ad8a 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -41,14 +41,12 @@ buildPythonPackage rec { ]; disabledTests = [ - # We don't care about benchmarks - "test_benchmark" - "pytest_benchmark_update_machine_info" - "pytest_benchmark_update_json" # Assertion error "test_aozora" ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + pythonImportsCheck = [ "pykakasi" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index 1bdffbd6698e..2997babd3023 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pylacus"; - version = "1.13.0"; + version = "1.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "PyLacus"; tag = "v${version}"; - hash = "sha256-uN2Mw3jOoGRkWZDI1CAdFfzKfxDhp6aAFXIsQSLRetI="; + hash = "sha256-oA2AuodhRox36gSp9adTdFIHQtmSoSaWmZYpvPnoHSQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index 11d436be1ab9..12ea16c04f45 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylamarzocco"; - version = "1.4.7"; + version = "1.4.9"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pylamarzocco"; tag = "v${version}"; - hash = "sha256-H3TCuTD6T/KPUGndtYoWtFum1LTwrJe18iyKrsWFZnc="; + hash = "sha256-rEN1z+gkQjWjDkISdnn0KsxVzzPSKGPI/+VeYclIvkI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylette/default.nix b/pkgs/development/python-modules/pylette/default.nix new file mode 100644 index 000000000000..443295029ca0 --- /dev/null +++ b/pkgs/development/python-modules/pylette/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + scikit-learn, + typer, + requests, + pillow, + numpy, + pytestCheckHook, + opencv-python, + requests-mock, +}: +buildPythonPackage rec { + pname = "pylette"; + version = "4.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "qTipTip"; + repo = "Pylette"; + tag = version; + hash = "sha256-i8+QQpYoRfgoV9Nm/FvXSJV+TEvmaaPsPIeG+PU838Q="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + scikit-learn + pillow + requests + typer + numpy + ]; + + pythonImportsCheck = [ + "Pylette" + ]; + + pythonRelaxDeps = [ + "numpy" + "Pillow" + "typer" + ]; + + disabledTests = [ + # hangs forever + "test_color_extraction_deterministic_kmeans" + ]; + + nativeCheckInputs = [ + opencv-python + pytestCheckHook + requests-mock + typer + ]; + + meta = { + changelog = "https://github.com/qTipTip/Pylette/releases/tag/${version}"; + description = "Python library for extracting color palettes from images"; + homepage = "https://qtiptip.github.io/Pylette/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DataHearth ]; + }; +} diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index e662589d9621..ce93e38dd4b5 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -70,8 +70,6 @@ buildPythonPackage rec { "-v" ]; - dontUseSetuptoolsCheck = true; - preCheck = '' export HOME=$TEMPDIR ''; diff --git a/pkgs/development/python-modules/pylzma/default.nix b/pkgs/development/python-modules/pylzma/default.nix index bd0ba29d90d1..6449d2a006b8 100644 --- a/pkgs/development/python-modules/pylzma/default.nix +++ b/pkgs/development/python-modules/pylzma/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, }: buildPythonPackage rec { @@ -17,6 +18,14 @@ buildPythonPackage rec { sha256 = "074anvhyjgsv2iby2ql1ixfvjgmhnvcwjbdz8gk70xzkzcm1fx5q"; }; + patches = [ + # https://github.com/fancycode/pylzma/pull/82/ + (fetchpatch { + url = "https://github.com/fancycode/pylzma/commit/2fe0a4ed0588fd572931da4be10ad955636afde4.patch"; + hash = "sha256-sWdMAmOPVTDnxNTjzPlqQYxqnjmRpK+OqwWF6jpXvIw="; + }) + ]; + pythonImportsCheck = [ "pylzma" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 7b145228b4cf..fda09c5f6a49 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.42"; + version = "2.4.43"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3+BECLV0JeJlOKa0vZd/dyObyM5hiGF0VnsaJD98PXY="; + hash = "sha256-IcShujVcBXQtKvQVEFdtbgjboNd2AunqY1MxzQdV7nY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 016b5ee6bf24..7ebd4dbc5503 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -6,7 +6,6 @@ libmediainfo, setuptools-scm, pytest, - glibcLocales, pythonOlder, }: @@ -35,12 +34,10 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; nativeCheckInputs = [ - glibcLocales pytest ]; checkPhase = '' - export LC_ALL=en_US.UTF-8 py.test -k 'not test_parse_url' tests ''; diff --git a/pkgs/development/python-modules/pymodes/default.nix b/pkgs/development/python-modules/pymodes/default.nix index 6576479e12eb..ce88dc8ba6cf 100644 --- a/pkgs/development/python-modules/pymodes/default.nix +++ b/pkgs/development/python-modules/pymodes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pymodes"; - version = "2.19"; + version = "2.20"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "junzis"; repo = "pyModeS"; tag = "v${version}"; - hash = "sha256-rVxqtT/sBFQM2Y+GPR2Tc5J2skavvjxwPB7paDBqYRQ="; + hash = "sha256-BC1GLQW0/UBVwx3346mZsXSREGeVS+GhqH2Rl2faUoY="; }; build-system = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Mode-S and ADS-B Decoder"; homepage = "https://github.com/junzis/pyModeS"; - changelog = "https://github.com/junzis/pyModeS/releases/tag/v${version}"; + changelog = "https://github.com/junzis/pyModeS/releases/tag/${src.tag}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ snicket2100 ]; }; diff --git a/pkgs/development/python-modules/pymongo-inmemory/default.nix b/pkgs/development/python-modules/pymongo-inmemory/default.nix index b17502b730db..032f473cdf55 100644 --- a/pkgs/development/python-modules/pymongo-inmemory/default.nix +++ b/pkgs/development/python-modules/pymongo-inmemory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pymongo-inmemory"; - version = "0.4.2"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "kaizendorks"; repo = "pymongo_inmemory"; tag = "v${version}"; - hash = "sha256-FDHHf9x62EqNcHjDF2vH8w8WG/15efEe+fDqGiiOe4A="; + hash = "sha256-iYUU2XoTEfgUm+816wHveu6dPEo6nzhlZNXyuRw42T0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 1e1f16f531e8..426853bd6544 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.10.1"; + version = "4.11.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pymongo"; - hash = "sha256-qd4CvlO2u5jv4LntqE/6HsAn/LI6LeYsT5Qdmi8vMzA="; + hash = "sha256-0O4+AnX2e93Ng7ImOBi3xK568eyv6+frf9FjiUV+whA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index 3f28c0771596..629dbc39f29a 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.45"; + version = "1.0.46"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "semuconsulting"; repo = "pynmeagps"; tag = "v${version}"; - hash = "sha256-LAWve4Qrc7Kf4b/2+oNTZUnDQWMleuxeeBN/A3jR+rs="; + hash = "sha256-xTgUGr1ZFmQQBGTbD5rtIkg7uQZoAa+8+bUNHYDc3iA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 44a525bcb695..f70aef65ec33 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -6,6 +6,7 @@ openssl, setuptools, cryptography, + typing-extensions, pytestCheckHook, pretend, sphinxHook, @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "24.3.0"; + version = "25.0.0"; pyproject = true; src = fetchFromGitHub { owner = "pyca"; repo = "pyopenssl"; tag = version; - hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0="; + hash = "sha256-CQHLEtNb2jX7WNAYlmv5EIgepetMl81Xl3AJuRqOHow="; }; outputs = [ @@ -41,7 +42,10 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cryptography" ]; - dependencies = [ cryptography ]; + dependencies = [ + cryptography + typing-extensions + ]; nativeCheckInputs = [ pretend @@ -51,10 +55,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - preCheck = '' - export LANG="en_US.UTF-8" - ''; - disabledTests = [ # https://github.com/pyca/pyopenssl/issues/692 diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index e274f1ba5114..6e9f0cf7299c 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.16.3"; + version = "1.16.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; tag = "v${version}"; - hash = "sha256-tcwYtFfJHX4Z63P8syGbC30wW1hQEBlw10KIFKiv2Dc="; + hash = "sha256-J3AjTMLgKDUeCzRLRkUk3bvqBCHqBl+p3EyLmlojYhU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index f91ae224f442..4b4ac45bebae 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "5.1.0"; + version = "5.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { tag = version; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-ziJTYl7MQUCE8US0yeiq6BPDVbBsxWhti0NyiDnKtfE="; + hash = "sha256-4q4Se/8psa6hl+PA1vnh/3HpQsihDL8UCg0ScNLg61o="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyphotonfile/default.nix b/pkgs/development/python-modules/pyphotonfile/default.nix index 315d9c9496ed..9cac35c226d0 100644 --- a/pkgs/development/python-modules/pyphotonfile/default.nix +++ b/pkgs/development/python-modules/pyphotonfile/default.nix @@ -13,7 +13,6 @@ buildPythonPackage { format = "setuptools"; inherit version; - dontUseSetuptoolsCheck = true; propagatedBuildInputs = [ pillow numpy diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 77f863139ed5..9d7df731dfb1 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.7.0"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pyproj4"; repo = "pyproj"; tag = version; - hash = "sha256-uCoWmJ0xtbJ/DHts5+9KR6d6p8vmZqDrI4RFjXQn2fM="; + hash = "sha256-tVzifc+Y5u9Try5FHt67rj/+zaok0JNn3M8plMqX90g="; }; # force pyproj to use ${proj} diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 023a61e6137a..043db0acb7c8 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pyproject-api"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pyproject-api"; tag = version; - hash = "sha256-zFV44xqbwe1QsIVurvsjqY+zxC+X2hCljZ5u70kNTSU="; + hash = "sha256-4oX/h3EiLZIfHhU6zBD9ZQYnHGrid93LkJzaC6swBdI="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyquerylist/default.nix b/pkgs/development/python-modules/pyquerylist/default.nix new file mode 100644 index 000000000000..17560e05400f --- /dev/null +++ b/pkgs/development/python-modules/pyquerylist/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + tabulate, + coverage, + flake8, + pytest, + pytestCheckHook, + fetchpatch, +}: +buildPythonPackage rec { + pname = "pyquerylist"; + version = "0-unstable-2025-03-03"; + pyproject = true; + + src = fetchFromGitHub { + owner = "markmuetz"; + repo = "pyquerylist"; + # no recent releases including the pytest rewrite + rev = "1de783a7eddbe0726c6bf49c90153f1130c18ef8"; + hash = "sha256-ZhXFnzCKhcFPH8ayxwnDucD6v4E1y0jIk+3SeARAHlw="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + tabulate + ]; + + pythonImportsCheck = [ "pyquerylist" ]; + + nativeCheckInputs = [ + coverage + flake8 + pytestCheckHook + ]; + + meta = { + description = "Extension of base Python list that you can query"; + homepage = "https://github.com/markmuetz/pyquerylist"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ philipwilk ]; + }; +} diff --git a/pkgs/development/python-modules/pyrect/default.nix b/pkgs/development/python-modules/pyrect/default.nix index 3b673068adaa..757ad7ef886b 100644 --- a/pkgs/development/python-modules/pyrect/default.nix +++ b/pkgs/development/python-modules/pyrect/default.nix @@ -22,10 +22,6 @@ buildPythonPackage rec { pygame ]; - preCheck = '' - export LC_ALL="en_US.UTF-8" - ''; - pythonImportsCheck = [ "pyrect" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyside6-qtads/default.nix b/pkgs/development/python-modules/pyside6-qtads/default.nix new file mode 100644 index 000000000000..b9476e6dd10b --- /dev/null +++ b/pkgs/development/python-modules/pyside6-qtads/default.nix @@ -0,0 +1,80 @@ +{ + lib, + buildPythonPackage, + cmake-build-extension, + fetchFromGitHub, + pythonRelaxDepsHook, + pyside6, + qt6, + setuptools, + setuptools-scm, + shiboken6, +}: + +buildPythonPackage rec { + pname = "pyside6-qtads"; + version = "4.3.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mborgerson"; + repo = "pyside6_qtads"; + tag = "v${version}"; + hash = "sha256-02YUeD9PfcaYkvz9JX5FucsbG9Idk7OH24U+RXXEmvo="; + fetchSubmodules = true; + }; + + # bypass the broken parts of their bespoke python script cmake plugin + patches = [ ./find-nix-deps.patch ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail @shiboken6@ ${shiboken6} \ + --replace-fail @pyside6@ ${pyside6} + + # can't use pythonRelaxDepsHook because it runs postBuild but the dependency check + # happens during build. + # -Essentials is a smaller version of PySide6, but the name mismatch breaks build + # _generator is also a virtual package with the same issue + substituteInPlace pyproject.toml \ + --replace-warn 'PySide6-Essentials' "" \ + --replace-warn 'shiboken6_generator' "" \ + --replace-quiet '"",' "" \ + --replace-quiet '""' "" + ''; + + buildInputs = [ + qt6.qtbase + qt6.qtquick3d + ]; + + build-system = [ + cmake-build-extension + setuptools + setuptools-scm + ]; + + dependencies = [ + pyside6 + shiboken6 + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + # cmake-build-extension will configure + dontUseCmakeConfigure = true; + + dontWrapQtApps = true; + # runtime deps check fails on the pyside6-essentials virtual package + dontCheckRuntimeDeps = true; + + pythonImportsCheck = [ "PySide6QtAds" ]; + + meta = { + description = "Python bindings to Qt Advanced Docking System for PySide6"; + homepage = "https://github.com/mborgerson/pyside6_qtads"; + changelog = "https://github.com/mborgerson/pyside6_qtads/releases/tag/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ scoder12 ]; + }; +} diff --git a/pkgs/development/python-modules/pyside6-qtads/find-nix-deps.patch b/pkgs/development/python-modules/pyside6-qtads/find-nix-deps.patch new file mode 100644 index 000000000000..5ec2f5ab8259 --- /dev/null +++ b/pkgs/development/python-modules/pyside6-qtads/find-nix-deps.patch @@ -0,0 +1,43 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0c0568a..f12d50e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -105,15 +105,17 @@ macro(pyside_config option output_var) + endmacro() + + # Query for the shiboken generator path, Python path, include paths and linker flags. ++find_package(Shiboken6 REQUIRED) ++find_package(PySide6 REQUIRED) + pyside_config(--shiboken-module-path shiboken_module_path) +-pyside_config(--shiboken-generator-path shiboken_generator_path) +-pyside_config(--pyside-path pyside_path) +-pyside_config(--pyside-include-path pyside_include_dir 1) ++set(shiboken_generator_path "" CACHE PATH "Path where shiboken6 executable can be found") ++set(pyside_path "" CACHE PATH "pyside share path, where typesystems dir can be found") ++get_target_property(pyside_include_dir PySide6::pyside6 INTERFACE_INCLUDE_DIRECTORIES) + pyside_config(--python-include-path python_include_dir) +-pyside_config(--shiboken-generator-include-path shiboken_include_dir 1) +-pyside_config(--shiboken-module-shared-libraries-cmake shiboken_shared_libraries 0) ++get_target_property(shiboken_include_dir Shiboken6::libshiboken INTERFACE_INCLUDE_DIRECTORIES) ++get_target_property(shiboken_shared_libraries Shiboken6::libshiboken IMPORTED_LOCATION_RELEASE) + pyside_config(--python-link-flags-cmake python_linking_data 0) +-pyside_config(--pyside-shared-libraries-cmake pyside_shared_libraries 0) ++get_target_property(pyside_shared_libraries PySide6::pyside6 IMPORTED_LOCATION_RELEASE) + + set(shiboken_path "${shiboken_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}") + if(NOT EXISTS ${shiboken_path}) +diff --git a/setup.py b/setup.py +index 802821b..f522818 100644 +--- a/setup.py ++++ b/setup.py +@@ -88,7 +88,9 @@ setuptools.setup( + "-DBUILD_STATIC:BOOL=ON", + "-DADS_VERSION=4.3.0", + f"-DPython3_ROOT_DIR={Path(sys.prefix)}", +- f"-DPython_EXECUTABLE={Path(sys.executable)}" ++ f"-DPython_EXECUTABLE={Path(sys.executable)}", ++ "-Dshiboken_generator_path=@shiboken6@/bin", ++ "-Dpyside_path=@pyside6@/share/PySide6" + ], + py_limited_api=True + ), diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix index a900ab059c73..3306db65501b 100644 --- a/pkgs/development/python-modules/pysmartthings/default.nix +++ b/pkgs/development/python-modules/pysmartthings/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pysmartthings"; - version = "2.7.2"; + version = "2.7.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "andrewsayre"; repo = "pysmartthings"; rev = "v${version}"; - hash = "sha256-2MBm0I9dBr2N5iorN9BSKecHLnvmiTmcsIuGjDIWIKQ="; + hash = "sha256-WkUFAsZzdQI/LopJp5m1Nj4kLsRFmQWRe10eTcAUYGw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index 226d172a95e2..12f2d672673b 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pystache"; - version = "0.6.7"; + version = "0.6.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PennyDreadfulMTG"; repo = "pystache"; tag = "v${version}"; - hash = "sha256-kfR3ZXbrCDrIVOh4bcOTXqg9D56YQrIyV0NthStga5U="; + hash = "sha256-UVmDpg7wCPnY+1BZqujIYdgt/AT4gZ+RTYdD+ORQhzE="; }; build-system = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "Framework-agnostic, logic-free templating system inspired by ctemplate and et"; - homepage = "https://github.com/defunkt/pystache"; + homepage = "https://github.com/PennyDreadfulMTG/pystache"; license = lib.licenses.mit; maintainers = [ lib.maintainers.nickcao ]; }; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index ede2e6a0f238..905cfa9ba186 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.57.0"; + version = "0.57.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; tag = version; - hash = "sha256-9jA1V6Wri923pc2+MXLwF2hNgIPIYh3M8UBj0jc/548="; + hash = "sha256-bG0jRGhioNm0QNe7ymRKYO4hdgkiZypul79+gxN3Gsk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 335e53e31548..3ec93453f87a 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -2,30 +2,32 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, pycryptodome, + python-kasa, + pythonOlder, requests, rtp, - urllib3, setuptools, + urllib3, }: buildPythonPackage rec { pname = "pytapo"; - version = "3.3.38"; + version = "3.3.42"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-o3onR27lKg2QAa1Tgdidv6iOzqb/XlkJPq+vkkIhnAY="; + hash = "sha256-wToCKRmFyhsrRxDLcOtWagVVEPn4mYzfWxz3qwTnP2I="; }; build-system = [ setuptools ]; dependencies = [ pycryptodome + python-kasa requests rtp urllib3 diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 82b18bc8869c..7950aaf6e921 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.25.2"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "0.25.3"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = "pytest-asyncio"; tag = "v${version}"; - hash = "sha256-GLKcqf6NXCMNU/lVLQP8s/FDC1OcpPF1RxzKDItJSiU="; + hash = "sha256-/uG8/uhKYeWrXifAJ7iqvpgXe70YduiqH8FSq2rD7f0="; }; outputs = [ diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix index 2d042bff058f..dbf611fa5b1a 100644 --- a/pkgs/development/python-modules/pytest-codspeed/default.nix +++ b/pkgs/development/python-modules/pytest-codspeed/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pytest-codspeed"; - version = "3.1.2"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "pytest-codspeed"; tag = "v${version}"; - hash = "sha256-HtjfXA5Ifs2ytheHOb0HUM62foBYFEMwsV4h9lTNd38="; + hash = "sha256-SNVJtnanaSQTSeX3EFG+21GFC1WFCQTbaNyi7QjQROw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 63032480164a..c35057d20b6a 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytest-django"; - version = "4.9.0"; + version = "4.10.0"; pyproject = true; src = fetchPypi { pname = "pytest_django"; inherit version; - hash = "sha256-i/e8NYya5vb8UbbOuxkP4gISGW5oBxIfEb1qOwNCgxQ="; + hash = "sha256-EJGyDqFJH9BKMQ/Jqv9MAbToRQ47FXaHYl4WprXzo2Y="; }; build-system = [ diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index e8971271a397..99146020d6ca 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-httpbin"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "kevin1024"; repo = "pytest-httpbin"; tag = "v${version}"; - hash = "sha256-tq9nz2na94HkLACt7xB1MUanh9/JOoe2vyEm5sAq0/4="; + hash = "sha256-gESU1SDpqSQs8GRcGJclWM0WpS4DZicfdtwxk2sQubQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 8f64b14c6d71..6a136e9d3c05 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "csernazs"; repo = "pytest-httpserver"; tag = version; - hash = "sha256-BkdbCrpZKjHYikZk1mL4iSGe5gRjWUVN/w222QkmFLQ="; + hash = "sha256-41JrZ3ubaJHNzwGDWUSseJ3Z405k21SOpwW7jG5rNxg="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix index 66543ed586b5..8a37e716f31c 100644 --- a/pkgs/development/python-modules/pytest-notebook/default.nix +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -24,6 +24,7 @@ pytest-regressions, pytestCheckHook, writableTmpDirAsHomeHook, + pythonAtLeast, }: buildPythonPackage rec { @@ -69,18 +70,23 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - disabledTests = [ - # AssertionError: FILES DIFFER: - "test_diff_to_string" + disabledTests = + [ + # AssertionError: FILES DIFFER: + "test_diff_to_string" - # pytest_notebook.execution.CoverageError: An error occurred while executing coverage start-up - # TypeError: expected str, bytes or os.PathLike object, not NoneType - "test_execute_notebook_with_coverage" - "test_regression_coverage" + # pytest_notebook.execution.CoverageError: An error occurred while executing coverage start-up + # TypeError: expected str, bytes or os.PathLike object, not NoneType + "test_execute_notebook_with_coverage" + "test_regression_coverage" - # pytest_notebook.nb_regression.NBRegressionError - "test_regression_regex_replace_pass" - ]; + # pytest_notebook.nb_regression.NBRegressionError + "test_regression_regex_replace_pass" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # AssertionError: FILES DIFFER: + "test_documentation" + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pytest-unordered/default.nix b/pkgs/development/python-modules/pytest-unordered/default.nix index 4057319ff1e8..dc5aacf40ce2 100644 --- a/pkgs/development/python-modules/pytest-unordered/default.nix +++ b/pkgs/development/python-modules/pytest-unordered/default.nix @@ -2,27 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + mock, pytest, - pytest7CheckHook, + pytestCheckHook, }: buildPythonPackage rec { pname = "pytest-unordered"; - version = "0.5.2"; - format = "setuptools"; + version = "0.6.1"; + pyproject = true; src = fetchFromGitHub { owner = "utapyngo"; repo = "pytest-unordered"; tag = "v${version}"; - hash = "sha256-51UJjnGBO7qBvQlY8F0B29n8+EO2aa3DF3WOwcjZzSo="; + hash = "sha256-nANsX28+G8jcSe8X0dB6Tu3HYHd9ebGkh1AUx8Xq8HM="; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; nativeCheckInputs = [ - # https://github.com/utapyngo/pytest-unordered/issues/15 - pytest7CheckHook + mock + pytestCheckHook ]; pythonImportsCheck = [ "pytest_unordered" ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 44d6ba780ea2..97be4c03335e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "8.3.4"; + version = "8.3.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-llNw0GK84R5zho4DNausMbTT3g6C9AB0CNJCtPhhB2E="; + hash = "sha256-9O/nDMFOURVlrEdrV8J54SqFWxH0jyEq8QgO8iY9OEU="; }; outputs = [ diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix index 2a9dfd05a459..ae00c34c3354 100644 --- a/pkgs/development/python-modules/python-constraint/default.nix +++ b/pkgs/development/python-modules/python-constraint/default.nix @@ -19,7 +19,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; meta = with lib; { description = "Constraint Solving Problem resolver for Python"; diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index ecc7cbd02df8..f88377959251 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -10,26 +10,24 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.14.1"; + version = "0.15.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = "python-fsutil"; tag = version; - hash = "sha256-Cs78zpf3W5UZJkkUBEP6l6fi2J4OtJXGvqqQ8PWKx+8="; + hash = "sha256-hzPNj6hqNCnMx1iRK1c6Y70dUU/H4u6o+waEgOhyhuA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/test.py" ]; - disabledTests = [ # Tests require network access "test_download_file" diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index bd5e4f1c5cef..6c5cc05e4969 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "26.1.0"; + version = "26.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "python-gvm"; tag = "v${version}"; - hash = "sha256-0PCSocvykYWkVLXcYNnRo/pVlgKMBRbqtr0uB1y4onU="; + hash = "sha256-NslJHSNFVaUJhUXFUPeJ/S1zIpQmaKrXgQGjKOQJw2k="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index c84659014b71..ee9503865f70 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -44,6 +44,10 @@ buildPythonPackage rec { export LC_ALL=en_US.UTF-8 ''; + postCheck = '' + unset LC_ALL + ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index a891f0a0e48c..b7fd12f2d5c7 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { gevent pytestCheckHook process-tests - pkgs.redis + pkgs.valkey ] ++ optional-dependencies.django; # For Django tests diff --git a/pkgs/development/python-modules/python-snoo/default.nix b/pkgs/development/python-modules/python-snoo/default.nix index 688d3f031d14..f50582fe90ec 100644 --- a/pkgs/development/python-modules/python-snoo/default.nix +++ b/pkgs/development/python-modules/python-snoo/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-snoo"; - version = "0.6.3"; + version = "0.6.4"; pyproject = true; src = fetchFromGitHub { owner = "Lash-L"; repo = "python-snoo"; tag = "v${version}"; - hash = "sha256-kY8LetiY5wMJ6BMeoWK8al1PDC00ODU8B4CXesxBZSU="; + hash = "sha256-Lzyh9DbU9opKxx/2eb2yDEmwHCHsDkbcU6Xhqj0qOaU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix index 0181dfebb87e..0904441944de 100644 --- a/pkgs/development/python-modules/python3-eventlib/default.nix +++ b/pkgs/development/python-modules/python3-eventlib/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { greenlet ]; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "eventlib" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 0ba5f707f355..b9cde02359f8 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.5.0.post0"; + version = "2.5.1"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; tag = version; - hash = "sha256-TkwDncyfv1VoV/IErUgF4p0Or5PJbwKoABqo1xXGLVg="; + hash = "sha256-vGs+byt+/9tIMNYc2VmyN5vhj21ZFnaYsg4v2zeKzEM="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 2d69cfdb0cfb..bf3397672538 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytz"; - version = "2024.2"; + version = "2025.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KqNVCDxQoPk/pYFwnerAya1lzKip6b6sZgrcvUk8eYo="; + hash = "sha256-wttCviolGLKOZfkgfE0F5v9UfR76QIZGnvhV5KtwF44="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix deleted file mode 100644 index 8b66daba06af..000000000000 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - fetchPypi, - buildPythonPackage, -}: - -buildPythonPackage rec { - pname = "pytzdata"; - version = "2020.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "3efa13b335a00a8de1d345ae41ec78dd11c9f8807f522d39850f2dd828681540"; - }; - - # No tests - doCheck = false; - - meta = with lib; { - description = "Timezone database for Python"; - homepage = "https://github.com/sdispater/pytzdata"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index f5a4ad76af47..a2e0af522d83 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "3.15.0"; + version = "3.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-n6WlJc7Hh7SArJ8Z0fikxidtpXaPQvKTDGn6HukL2q8="; + hash = "sha256-bijW1uxoaVKLO0Psv3JeAG6rKeTwGa9ZW06VU1qFrrU="; }; propagatedBuildInputs = [ tokenize-rt ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 76d4550cd938..67364843a6f4 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.146"; + version = "9.2.147"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-JfKT7epFi9g/kfum7MrGOT2c2OaLkVj3b4hFZiQTDJE="; + hash = "sha256-TC7jmGibYJ/FfTb4Btmv10O4Dt741f3SrcTWmw6d7ho="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 3a925663da96..76841e31d2e3 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.5.14"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - hash = "sha256-IkuAYEg5nuUT6zxmuJe6afp4MVWf0+HAnEoAdOrdTvQ="; + hash = "sha256-4z1PmVoRs7mql/PhSG9Ek6NRkGXIXAYxaV8nNDoJjeY="; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/pyytlounge/default.nix b/pkgs/development/python-modules/pyytlounge/default.nix index fbefe276d19c..0527f9feb6a4 100644 --- a/pkgs/development/python-modules/pyytlounge/default.nix +++ b/pkgs/development/python-modules/pyytlounge/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyytlounge"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "FabioGNR"; repo = "pyytlounge"; tag = "v${version}"; - hash = "sha256-ZK52xh6IGhINQMakfjG759earUgvNoTNeBcUlFBSALo="; + hash = "sha256-VcGZV5AjRWtJeHT6+PUn23k6g1dRFzZM/JWGkVhF4ec="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 6f7ecf6b10b6..5cc7e7a9def5 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "26.2.0"; + version = "26.2.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-BwZywlhYHI5PZAtRWSl1gKmXSwJgQ71KsEcL6e0yTx8="; + hash = "sha256-F9cqdOXp/zgp3rcol6F1Mz0+9bVBOUjK489+vwsC7Mo="; }; build-system = [ diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index a51ad99805b9..940b5bd556f1 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -50,7 +50,6 @@ buildPythonPackage rec { # Tests pythonImportsCheck = [ "qiskit.ignis" ]; - dontUseSetuptoolsCheck = true; preCheck = '' export HOME=$TMPDIR ''; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index f5a356c2f4d6..d4ceeedd7872 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -13,6 +13,7 @@ daqp, ecos, gurobipy, + jaxopt, osqp, quadprog, scs, @@ -22,21 +23,21 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; tag = "v${version}"; - hash = "sha256-/yIFLxy2gjEFg/J9A5pcbrVmq4A3Tz2efEAntH0Twk8="; + hash = "sha256-6oqCUya0ObY51zPtJl8BFK7UeX5X2SUx6p3bGQSN/gQ="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; pythonImportsCheck = [ "qpsolvers" ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy ]; @@ -49,6 +50,7 @@ buildPythonPackage rec { ecos = [ ecos ]; gurobi = [ gurobipy ]; highs = [ highspy ]; + jaxopt = [ jaxopt ]; # mosek = [ cvxopt mosek ]; osqp = [ osqp ]; piqp = [ piqp ]; @@ -76,7 +78,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ] ++ optional-dependencies.open_source_solvers; meta = with lib; { - changelog = "https://github.com/qpsolvers/qpsolvers/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/qpsolvers/qpsolvers/blob/${src.tag}/CHANGELOG.md"; description = "Quadratic programming solvers in Python with a unified API"; homepage = "https://github.com/qpsolvers/qpsolvers"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index f0f83f8b3291..18c6cb6a2544 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "qtawesome"; - version = "1.3.1"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "spyder-ide"; repo = pname; tag = "v${version}"; - hash = "sha256-dF77vkrEl671fQvsHAX+JY9OmLA29kgAVswY2b3UyTg="; + hash = "sha256-VjUlP+5QU9ApD09UNvF48b0gepCUpVO6U6zYaKm0KoE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 71a7c6188da3..e3551b0373ad 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -8,7 +8,6 @@ cython, ninja, scikit-build-core, - setuptools, numpy, hypothesis, pandas, @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.12.1"; + version = "3.12.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,14 +27,9 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; tag = "v${version}"; - hash = "sha256-33NwGWulBJ7WAMAE0163OJM9kL04FuHa5P7m66PZL6s="; + hash = "sha256-keV+IBBHkdDpKuT1o6xNA5UAHlG1I9vkt13W8dafiDw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "Cython >=3.0.11, <3.1.0" "Cython" - ''; - build-system = [ cmake cython diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index f48b05273df0..c824c2747c92 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -66,7 +66,7 @@ let pname = "ray"; - version = "2.43.0"; + version = "2.44.0"; in buildPythonPackage rec { inherit pname version; @@ -83,32 +83,32 @@ buildPythonPackage rec { x86_64-darwin = "macosx_10_15_x86_64"; x86_64-linux = "manylinux2014_x86_64"; }; - # hashes retrieved via the following command - # curl https://pypi.org/pypi/ray/${version}/json | jq -r '.urls[] | "\(.digests.sha256) \(.filename)"' + # ./pkgs/development/python-modules/ray/prefetch.sh + # Results are in ./ray-hashes.nix hashes = { x86_64-linux = { - cp39 = "sha256-Xt89oYBB4LYXDGLghICrBQ8HZjYf8/bhElfMBKtG5ZI="; - cp310 = "sha256-GHKYOihahbd2vzEcgJ1Vn4SCkJotOerV8qxpz+OqhUQ="; - cp311 = "sha256-eMO9vxgrTQGfqaiqvVXDm/cFu2MK6gZPdo8wX8Ry0es="; - cp312 = "sha256-tF9HjSnOXfP8GYYd9k/vntXCXx6D+hACjTP63v3soJU="; + cp39 = "sha256-Ucy9W/gEXWnx+NL4WpL2aoKBjz2S1wx3xmJ1eYHDDZ8="; + cp310 = "sha256-tP29SytbReQT3Bahmkq/UADTbDxYVJCNykaXMj/11+E="; + cp311 = "sha256-hk8KabPNfKTrcEP3953JzotxosmC7ux/EX9I8oRrcTw="; + cp312 = "sha256-DWWsUjgB5Ao5e79VL0BoZ7uUad0mEEbKY83C7DEQ24c="; }; aarch64-linux = { - cp39 = "sha256-h+DKyFGJ3FGa8bbvKr1lSATEiMkyyq3WWLkMqqZfja4="; - cp310 = "sha256-VzgcVPIA5sAgPV9wrG+IKxPMGoD68zZRh4ejmm1vZdA="; - cp311 = "sha256-R27D4fokZN3V8EnA8nWP+d/swh+430Jm8d8BsngMZlM="; - cp312 = "sha256-c3cNTIqYlzCYX/K0KSEpJJ4oweKehFiUcMm6GukcqDI="; + cp39 = "sha256-Lxj0j8N95kAxXZNgECbfqiPwr0y6jwd9sT8dd+mR2a8="; + cp310 = "sha256-qZ+7mtLBryIYcNhrio49WcGKVROt3p1wiKSiddxZ2n8="; + cp311 = "sha256-wzcjfnqKHYcC3PZ+CpjqjNTsA1fSiL8IFviZDCWNi8M="; + cp312 = "sha256-KpEeaZ5IOsSHkRC2CLBrNeYCGRwOe5cybKSXxcqv5qg="; }; x86_64-darwin = { - cp39 = "sha256-0OJvnbkaWzND8IWOslYlWzXH6X/Gv5cGX1dErX6Mwpc="; - cp310 = "sha256-GGJv/zaEUaN6drM9UqcPBbIKIR6whn2GByHI6Gy2lVo="; - cp311 = "sha256-/eioEoDwevmDvDdpyZQdtdsnPOEOkquzNI5BvtAj1zU="; - cp312 = "sha256-USH99Ly8sP2jubcRZN1sj8x5ouJYAioqOVfkAQGJE/s="; + cp39 = "sha256-4373wSlDArrp2SFoCi2jR5iMHh4qmCo+coktEa4A4j4="; + cp310 = "sha256-YyeQwyfmkxp6jMrd6P06+utzrTgvh99N1HpSyov+BRw="; + cp311 = "sha256-++SDLLLvz8BJPqR0K0gosesNq8/t+H9kvmvh0M6HTGk="; + cp312 = "sha256-U9x16itP2GnqSmzKneXgKqJPLw0Y4KCLinZasr5l3Rw="; }; aarch64-darwin = { - cp39 = "sha256-2M/ewr9hxIaQ9stDJfFnPg0dAN6pJbWbYxGW5n9Cag4="; - cp310 = "sha256-t8T97FmhTWspOdkf7m78hLYUpnIsO+Cyf6Nx4/VjJV8="; - cp311 = "sha256-6TwyrQy2fx99p2+sQJ2H1c1eo+sDuDaDDp71zIELwsA="; - cp312 = "sha256-fyb3ty2gTDxEIiacMbBnq9Fcs4QktwEtgS3fssd0Yuo="; + cp39 = "sha256-Ef62eG+CAQRke2aiklRVNsA36Cl/FP4BI0t7JN2PJzk="; + cp310 = "sha256-XfvyazCuw35dRCXGYBReVSApmohVMkaG4vF/yGAb9Mg="; + cp311 = "sha256-Uzcifcn4CEKAwpRWmIokTKm0zg+8c4XXMHASD0fkaXk="; + cp312 = "sha256-OY6b4ZPJf3NK8Bnw76zh9FyUGVuW7MSmR61gdlDfVyw="; }; }; in diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 0569adc5b93e..a61f2804d71f 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { sphinx ]; - dontUseSetuptoolsCheck = true; - disabledTests = [ # https://github.com/readthedocs/recommonmark/issues/164 "test_lists" diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix index c5c9c5a238d6..fd767f45f767 100644 --- a/pkgs/development/python-modules/redis-om/default.nix +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { ]; preCheck = '' - ${pkgs.redis}/bin/redis-server & + ${pkgs.valkey}/bin/redis-server & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index 55a29aed8458..2283c7758de9 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -16,7 +16,7 @@ let self = buildPythonPackage rec { pname = "referencing"; - version = "0.36.1"; + version = "0.36.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ let repo = "referencing"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-kMYn41tlBMPb2hMMwHg+o6sNrwp3CHRQwmBzQHsgG1I="; + hash = "sha256-VwViFiquacwJlELNDp01DRbtYQHOY4qXS2CjD7YmS6g="; }; build-system = [ diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix index fc597ada7650..c1e8f44ddc78 100644 --- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix +++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "reflex-hosting-cli"; - version = "0.1.35"; + version = "0.1.36"; pyproject = true; # source is not published https://github.com/reflex-dev/reflex/issues/3762 src = fetchPypi { pname = "reflex_hosting_cli"; inherit version; - hash = "sha256-ml0Cl4uQAEVGShpVgfOtxiYNqqCeis+V/QUCTNqSauc="; + hash = "sha256-adLv5f9ikjTWvyC1UGfgocbSBFhhqTeo4JL8tLO1jyw="; }; pythonRelaxDeps = [ "pipdeptree" ]; diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index d07acb4b3df7..1dfea81f95cd 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.2.9"; + version = "0.2.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = "renault-api"; tag = "v${version}"; - hash = "sha256-Y+KFC/g0zJ1Ng3LnMsStN2jOsnjKLzYLyvM+fDmzdGQ="; + hash = "sha256-d+1H4hu8Mqj2oKrS5C1QnoIJePlQdBKLCHTfcNcZBWI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 0f7f49721228..1f2128181618 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-js7+x5Ft3gBsycaUKTz7qDaPOlgOZmnmxmfHSVGy1cw="; + hash = "sha256-9Jw5utU81u+HTr9bvnYsBRPYdV6OnvfXuc5s9EsNsDU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index dd638a7b6b9c..275bfbb32cb4 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -6,7 +6,6 @@ freetype, pillow, setuptools, - glibcLocales, python, isPyPy, }: @@ -49,12 +48,10 @@ buildPythonPackage rec { pillow ]; - nativeCheckInputs = [ glibcLocales ]; - checkPhase = '' runHook preCheck pushd tests - LC_ALL="en_US.UTF-8" ${python.interpreter} runAll.py + ${python.interpreter} runAll.py popd runHook postCheck ''; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 6ffe869c0a6a..cc80e5bb0de0 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - brotlicffi, buildPythonPackage, certifi, chardet, @@ -37,7 +36,6 @@ buildPythonPackage rec { ]; dependencies = [ - brotlicffi certifi charset-normalizer idna diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index 98e8e8d6487d..3bb181342c65 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "resolvelib"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; rev = version; - hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM="; + hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index e3087e105d95..c271a27557d1 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.8.5"; + version = "1.8.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ewels"; repo = "rich-click"; tag = "v${version}"; - hash = "sha256-S03cCQWs+tpX+5a9KmCOInXC9++gUXS1J7hTARz7VZQ="; + hash = "sha256-3spiDhSpVobhJMKfU7ZvQf9srD4goKowIl6LiBziiLA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/roman-numerals-py/default.nix b/pkgs/development/python-modules/roman-numerals-py/default.nix new file mode 100644 index 000000000000..5a2b5008b350 --- /dev/null +++ b/pkgs/development/python-modules/roman-numerals-py/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + pytestCheckHook, + sphinx, +}: + +buildPythonPackage rec { + pname = "roman-numerals-py"; + version = "3.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AA-Turner"; + repo = "roman-numerals"; + tag = "v${version}"; + hash = "sha256-YLF09jYwXq48iMvmqbj/cocYJPp7RsCXzbN0DV9gpis="; + }; + + postPatch = '' + ls -lah + cp LICENCE.rst python/ + + cd python + ''; + + build-system = [ flit-core ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "roman_numerals" ]; + + meta = { + description = "Manipulate roman numerals"; + homepage = "https://github.com/AA-Turner/roman-numerals/"; + changelog = "https://github.com/AA-Turner/roman-numerals/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.cc0; + maintainers = sphinx.meta.maintainers; + mainProgram = "roman-numerals-py"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/routeros-api/default.nix b/pkgs/development/python-modules/routeros-api/default.nix index 99bc0d1e4e0b..7d724a70bb2a 100644 --- a/pkgs/development/python-modules/routeros-api/default.nix +++ b/pkgs/development/python-modules/routeros-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "routeros-api"; - version = "0.18.1"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "socialwifi"; repo = "routeros-api"; tag = version; - hash = "sha256-6IpoByG3YhHh2dPS18ufaoI1vzTZBsZa9WNHS/fImrg="; + hash = "sha256-1g37fDB+/6bVwgtgE1YzGnUpDaLEfwDpQWoqjHgeeqk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index 8db7f97929bb..297f76820a11 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.22.3"; + version = "0.23.1"; pyproject = true; src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-4y/uirRdPC222hmlMjvDNiI3yLZTxwGUQUuJL9BqCA0="; + hash = "sha256-fzJA3PoU0ZjbokuLnLOxCMBraNRbe6vZ7vwQOP335wc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-2skrDC80g0EKvTEeBI4t4LD7ZXb6jp2Gw+owKFrkZzc="; + hash = "sha256-Iq8uthR4k+NN8hCwWLBW1kLNZ0Pvwz1xMDT6zHcIPb8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 45a173bfad46..1350c06b1265 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -14,7 +14,7 @@ # tests psutil, pytestCheckHook, - redis-server, + valkey, sentry-sdk, }: @@ -47,7 +47,7 @@ buildPythonPackage rec { preCheck = '' PATH=$out/bin:$PATH - ${redis-server}/bin/redis-server & + ${valkey}/bin/redis-server & ''; postCheck = '' diff --git a/pkgs/development/python-modules/rtslib-fb/default.nix b/pkgs/development/python-modules/rtslib-fb/default.nix new file mode 100644 index 000000000000..ab2f3b9d5553 --- /dev/null +++ b/pkgs/development/python-modules/rtslib-fb/default.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + + # build-system + hatchling, + hatch-vcs, + + # dependencies + pyudev, +}: + +buildPythonPackage rec { + pname = "rtslib-fb"; + version = "2.2.2"; + pyproject = true; + + # TypeError: 'method' object does not support the context manager protocol + postPatch = '' + substituteInPlace rtslib/root.py \ + --replace-fail "Path(restore_file).open" "Path(restore_file).open('r')" + ''; + + src = fetchFromGitHub { + owner = "open-iscsi"; + repo = "rtslib-fb"; + tag = "v${version}"; + hash = "sha256-FuXO/yGZBR+QRvB5s1tE77hjnisSfjjHSCPLvGJOYdM="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + pyudev + ]; + + postInstall = '' + install -Dm555 scripts/targetctl -t $out/bin + ''; + + # No tests + doCheck = false; + + meta = { + description = "Python object API for managing the Linux LIO kernel target"; + homepage = "https://github.com/open-iscsi/rtslib-fb"; + changelog = "https://github.com/open-iscsi/rtslib-fb/releases/tag/v${version}"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + mainProgram = "targetctl"; + }; +} diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix deleted file mode 100644 index 814e7515b543..000000000000 --- a/pkgs/development/python-modules/rtslib/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildPythonPackage, - hatchling, - hatch-vcs, - six, - pyudev, - pygobject3, -}: - -buildPythonPackage rec { - pname = "rtslib"; - version = "2.2.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "open-iscsi"; - repo = "${pname}-fb"; - tag = "v${version}"; - hash = "sha256-lBYckQlnvIQ6lSENctYsMhzULi1MJAVUyF06Ul56LzA="; - }; - - build-system = [ - hatchling - hatch-vcs - ]; - - dependencies = [ - six - pyudev - pygobject3 - ]; - - meta = with lib; { - description = "Python object API for managing the Linux LIO kernel target"; - mainProgram = "targetctl"; - homepage = "https://github.com/open-iscsi/rtslib-fb"; - license = licenses.asl20; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index ffbbe1092b13..69de04c60202 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -52,7 +52,9 @@ buildPythonPackage rec { build-system = [ hatchling ]; pythonRelaxDeps = [ + "filelock" "pydantic" + "psutil" ]; dependencies = [ diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 0a9d5f4ccc9c..e2373ad00b69 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -39,6 +39,9 @@ buildPythonPackage rec { hash = "sha256-17Nr0iNeZC1sHm0JETIufdMVqrhORts1WxCh8cukCKg="; }; + # https://github.com/sanic-org/sanic/issues/3031 + patches = [ ./websockets-14.2-compat.patch ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch b/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch new file mode 100644 index 000000000000..9acf47757335 --- /dev/null +++ b/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch @@ -0,0 +1,13 @@ +diff --git a/sanic/server/protocols/websocket_protocol.py b/sanic/server/protocols/websocket_protocol.py +index beee1d26..5a3e70f2 100644 +--- a/sanic/server/protocols/websocket_protocol.py ++++ b/sanic/server/protocols/websocket_protocol.py +@@ -147,7 +147,7 @@ class WebSocketProtocol(HttpProtocol): + "".join([f"{k}: {v}\r\n" for k, v in resp.headers.items()]) + ).encode() + rbody += b"\r\n" +- if resp.body is not None: ++ if resp.body: + rbody += resp.body + rbody += b"\r\n\r\n" + await super().send(rbody) diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index 0bf09e59751c..0b110511c70b 100644 --- a/pkgs/development/python-modules/schemdraw/default.nix +++ b/pkgs/development/python-modules/schemdraw/default.nix @@ -11,20 +11,21 @@ ziamath, pytestCheckHook, nbval, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "schemdraw"; - version = "0.19"; + version = "0.20"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "cdelker"; - repo = pname; - rev = version; - hash = "sha256-vqEHcazE5DNHr0FceOWLqq+RZmMK5ovHDVjy/2wbTJU="; + repo = "schemdraw"; + tag = version; + hash = "sha256-mt1XTrUH570zrJpCFo0jORAE/jo7H2T7sKpIskYw8bk="; }; build-system = [ setuptools ]; @@ -47,6 +48,7 @@ buildPythonPackage rec { latex2mathml ziafont ziamath + writableTmpDirAsHomeHook ]; # Strip out references to unfree fonts from the test suite diff --git a/pkgs/development/python-modules/sciform/default.nix b/pkgs/development/python-modules/sciform/default.nix new file mode 100644 index 000000000000..1c46270df1a1 --- /dev/null +++ b/pkgs/development/python-modules/sciform/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "sciform"; + version = "0.39.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jagerber48"; + repo = "sciform"; + tag = version; + hash = "sha256-5rgTnvckR9bGDgcVZEie+swpc5MEwKQuFHa7zvHiqr8="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sciform" + ]; + + meta = { + description = "A package for formatting numbers into scientific formatted strings"; + homepage = "https://sciform.readthedocs.io/en/stable/"; + downloadPage = "https://github.com/jagerber48/sciform"; + changelog = "https://github.com/jagerber48/sciform/blob/${src.tag}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 2cb10a86a1c1..9ff1f0125f06 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pythonOlder, # build-system @@ -31,25 +30,16 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.10.7"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-build"; repo = "scikit-build-core"; rev = "refs/tags/v${version}"; - hash = "sha256-R6/Y9brIYBA1P3YeG8zGaoPcxWFUDqZlqbZpWu3MIIw="; + hash = "sha256-t22/681GHA3tKBTNQ2b3A8cgMTsUiYUGptRtC2i9W6g="; }; - patches = [ - (fetchpatch2 { - name = "setuptools-75_8-compatibility.patch"; - url = "https://github.com/scikit-build/scikit-build-core/commit/e4e92bc28651001e91999e9759c44fb67cd3d211.patch"; - includes = [ "tests/test_setuptools_pep517.py" ]; - hash = "sha256-nqng1FAY90Qm/yVRkALTsKchqNvsxutbBr51/Q4IKPA="; - }) - ]; - postPatch = lib.optionalString (pythonOlder "3.11") '' substituteInPlace pyproject.toml \ --replace-fail '"error",' '"error", "ignore::UserWarning",' diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 5aca6b4dabc5..d5439693c4fc 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -35,7 +35,7 @@ let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; self = buildPythonPackage rec { pname = "scikit-image"; - version = "0.25.0"; + version = "0.25.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ let owner = "scikit-image"; repo = "scikit-image"; tag = "v${version}"; - hash = "sha256-v2bgazzx+7aoUgoOQvqhYJkSOzSJ5TWwEwBgHxRP318="; + hash = "sha256-viRX7Uh9coacueI6gJHBtOay/UIiUQkBfjpmDLJgyZ4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix index feffc4ddf6ed..bd110fd6ce04 100644 --- a/pkgs/development/python-modules/scikit-posthocs/default.nix +++ b/pkgs/development/python-modules/scikit-posthocs/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "scikit-posthocs"; - version = "0.11.2"; + version = "0.11.3"; pyproject = true; src = fetchFromGitHub { owner = "maximtrp"; repo = "scikit-posthocs"; tag = "v${version}"; - hash = "sha256-ChYBjT7xeAiKJFRI9ov4vOGucy0aK0j/0dndNs4ewBo="; + hash = "sha256-mK0O3cXBSXW/j/CqdYviYKJyj8SFSHoj6LK2CisIDmI="; }; build-system = [ setuptools ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multiple Pairwise Comparisons (Post Hoc) Tests in Python"; homepage = "https://github.com/maximtrp/scikit-posthocs"; - changelog = "https://github.com/maximtrp/scikit-posthocs/releases/tag/v${version}"; + changelog = "https://github.com/maximtrp/scikit-posthocs/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ mbalatsko ]; }; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 356d8f5598da..cc4cb5485140 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.28.0"; + version = "4.29.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "SeleniumHQ"; repo = "selenium"; tag = "selenium-${version}" + lib.optionalString (lib.versions.patch version != "0") "-python"; - hash = "sha256-b5xwuZ4lcwLbGhJuEmHYrFXoaTW/M0ABdK3dvbpj8oM="; + hash = "sha256-IyMXgYl/TPTpe/Y0pFyJVKj4Mp0xbkg1LSCNHzFL3bE="; }; patches = [ ./dont-build-the-selenium-manager.patch ]; diff --git a/pkgs/development/python-modules/semchunk/default.nix b/pkgs/development/python-modules/semchunk/default.nix index ff8002361d49..16dd15700b01 100644 --- a/pkgs/development/python-modules/semchunk/default.nix +++ b/pkgs/development/python-modules/semchunk/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "semchunk"; - version = "3.1.2"; + version = "3.1.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-JF/7/sj/IJ6gwtTIQ1BCb6jUYKJaRgzB7Y7rNrtjKVw="; + hash = "sha256-PKFv8EFHdRE2VEnd88h+LOhKrv8p9X5sH9kKawXqdsY="; }; build-system = [ diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 29f439d74b05..0886e5fedb2c 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "semver"; - version = "3.0.3"; + version = "3.0.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "python-semver"; repo = "python-semver"; tag = version; - hash = "sha256-/E2wJcAmEnmK9QSl7a4aLMHCIh0glq9VIlYls6GhfXM="; + hash = "sha256-ry6r2cY/DRTiPxT+ZiumgFbQyHNzL8i1QcQbLWjnDVE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index f88055d575da..05452c56951a 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "setproctitle"; - version = "1.3.4"; + version = "1.3.5"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-O0DTKj4fBOlCMe1t/uDankO0+ca1RQ1T5t13VMNODFA="; + hash = "sha256-Hm6ur4pzTUKKldjBBGQ7Oa99JH1gT0CnvrzzlgqFPF4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index 8b65a9f1eb4c..e7381b9dd7e0 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "setupmeta"; - version = "3.6.1"; + version = "3.7.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "codrsquad"; repo = "setupmeta"; tag = "v${version}"; - hash = "sha256-L8RDfcAa2Zhr6huFt0AmNt0Qzea2xNtCX1BIULsiQgA="; + hash = "sha256-qtnewUmTApPYq7/X82GsduW0VcioW4huRAyDMHUD74Q="; }; preBuild = '' diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index cc82356de85a..9ce94f6c964f 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "setuptools-scm"; - version = "8.1.0"; + version = "8.2.0"; pyproject = true; src = fetchPypi { pname = "setuptools_scm"; inherit version; - hash = "sha256-Qt6htldxy6k7elFdZaZdgkblYHaKZrkQalksjn8myKc="; + hash = "sha256-oYOWobwCGcl00adGErEfnc4NW9ix3FXGX2rH/WCejCg="; }; build-system = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index bc4bb700a9f9..c4ffa9e95b14 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "75.8.0"; + version = "75.8.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; tag = "v${version}"; - hash = "sha256-dSzsj0lnsc1Y+D/N0cnAPbS/ZYb+qC41b/KfPmL1zI4="; + hash = "sha256-nD6c2JOjBL/SfgNchBlNasuwnrRl6XIuppjOt6Hr7CE="; }; patches = [ diff --git a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix index e3f8bb0f17d7..29b10ba1e85a 100644 --- a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix +++ b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix @@ -5,11 +5,12 @@ fetchPypi, buildPythonPackage, betterproto, + pydantic, }: buildPythonPackage rec { pname = "sigstore-protobuf-specs"; - version = "0.3.5"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,12 +18,15 @@ buildPythonPackage rec { src = fetchPypi { pname = "sigstore_protobuf_specs"; inherit version; - hash = "sha256-yl0XAXrefexbuaABweDkXa5G+L2lk+j6sG6mjurBzpw="; + hash = "sha256-yuBBtAUCYAuKYz9DwldpXQIiqU76HlEQp+x62njDnZk="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ betterproto ]; + propagatedBuildInputs = [ + betterproto + pydantic + ]; # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 7eb59d7abf70..49b0c3061747 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.19.3"; + version = "3.20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = pname; tag = "v${version}"; - hash = "sha256-M6ohYhw7xvZiNVm9uhotvPHeVsBOwYjDpj2sfXAzf0U="; + hash = "sha256-wE/jqBMXVtmbc/78X4lgfvuj074CrzfLJL1CM6LCfas="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index 1c1325653ee5..75185cae8be2 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "skrl"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Toni-SM"; repo = pname; tag = version; - hash = "sha256-5Poc079E+6jpNsm/WUFBXqsIKWZpIIAW0fmoWLVEZDg="; + hash = "sha256-ONCRZ5Gpvg61dhi7GVxtvXIJiyZY9Fmk2qexMXVuj3A="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index 96751666f30f..0fd22c66f47b 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "slack-bolt"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; src = fetchFromGitHub { owner = "slackapi"; repo = "bolt-python"; tag = "v${version}"; - hash = "sha256-3+tp/R5ESdyvlvNS5W/Er7EgYalUjgVjsp3wO+Cwi/c="; + hash = "sha256-Aq7vLkrTeBVsY+xVwQhFmSqq8ik0yHEmPANtKyJZKTw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 27c265bef36e..f8855e4c760a 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -2,6 +2,7 @@ lib, aiodns, aiohttp, + aiosqlite, boto3, buildPythonPackage, fetchFromGitHub, @@ -14,30 +15,27 @@ sqlalchemy, websocket-client, websockets, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "slack-sdk"; - version = "3.34.0"; + version = "3.35.0"; pyproject = true; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; tag = "v${version}"; - hash = "sha256-aL8XOlvnAxT9cgPf8EvJT80FmlgL2Vhu7JxDRHkUoSM="; + hash = "sha256-yjYpALyHSTLQSuwd6xth7nqfi3m1C9tqnWrrVRmI220="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail ', "pytest-runner"' "" - ''; - build-system = [ setuptools ]; dependencies = [ aiodns aiohttp + aiosqlite boto3 sqlalchemy websocket-client @@ -54,10 +52,6 @@ buildPythonPackage rec { pytestCheckHook ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - disabledTests = [ # Requires internet access (to slack API) "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" @@ -65,6 +59,12 @@ buildPythonPackage rec { "test_send_message_while_disconnection" ]; + disabledTestPaths = [ + # Event loop issues + "tests/slack_sdk/oauth/installation_store/test_file.py" + "tests/slack_sdk/oauth/state_store/test_file.py" + ]; + __darwinAllowLocalNetworking = true; meta = { diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix index 678f2e9fb46a..56bc9f39d327 100644 --- a/pkgs/development/python-modules/smolagents/default.nix +++ b/pkgs/development/python-modules/smolagents/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, accelerate, buildPythonPackage, docker, @@ -12,9 +13,11 @@ litellm, markdownify, mcp, + mcpadapt, openai, pandas, pillow, + pytest-datadir, pytestCheckHook, python-dotenv, rank-bm25, @@ -30,14 +33,14 @@ buildPythonPackage rec { pname = "smolagents"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "smolagents"; tag = "v${version}"; - hash = "sha256-6+fI5Zp2UyDgcCUXYT34zumDBqkIeW+TXnRNA+SFoxI="; + hash = "sha256-OgivL7L6IOqIEDHO3JUrxluMZoq768DD3hhUpIh1fac="; }; build-system = [ setuptools ]; @@ -68,7 +71,7 @@ buildPythonPackage rec { litellm = [ litellm ]; mcp = [ mcp - # mcpadapt + mcpadapt ]; # mlx-lm = [ mlx-lm ]; openai = [ openai ]; @@ -98,27 +101,33 @@ buildPythonPackage rec { nativeCheckInputs = [ ipython + pytest-datadir pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "smolagents" ]; - disabledTests = [ - # Missing dependencies - "test_ddgs_with_kwargs" - "test_e2b_executor_instantiation" - "test_flatten_messages_as_text_for_all_models" - "test_from_mcp" - "test_import_smolagents_without_extras" - "test_vision_web_browser_main" - # Tests require network access - "test_agent_type_output" - "test_can_import_sklearn_if_explicitly_authorized" - "test_transformers_message_no_tool" - "test_transformers_message_vl_no_tool" - "test_transformers_toolcalling_agent" - "test_visit_webpage" - ]; + disabledTests = + [ + # Missing dependencies + "test_ddgs_with_kwargs" + "test_e2b_executor_instantiation" + "test_flatten_messages_as_text_for_all_models" + "test_from_mcp" + "test_import_smolagents_without_extras" + "test_vision_web_browser_main" + # Tests require network access + "test_agent_type_output" + "test_can_import_sklearn_if_explicitly_authorized" + "test_transformers_message_no_tool" + "test_transformers_message_vl_no_tool" + "test_transformers_toolcalling_agent" + "test_visit_webpage" + ] + ++ lib.optionals stdenv.isDarwin [ + # Missing dependencies + "test_get_mlx" + ]; meta = { description = "Barebones library for agents"; diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix index d0141a7ecc5f..7b78e60fec07 100644 --- a/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix +++ b/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "snakemake-storage-plugin-s3"; - version = "0.2.13"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; - repo = pname; + repo = "snakemake-storage-plugin-s3"; tag = "v${version}"; - hash = "sha256-tH4KLswRPberlaBlRCEJSPmUfkcwVkB9YbD/3LYJx0s="; + hash = "sha256-WbGlXu6/7e9U2GfVd4IF86bRfulNxjP1Tw5pVHpEj/g="; }; build-system = [ poetry-core ]; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Snakemake storage plugin for S3 API storage (AWS S3, MinIO, etc.)"; homepage = "https://github.com/snakemake/snakemake-storage-plugin-s3"; + changelog = "https://github.com/snakemake/snakemake-storage-plugin-s3/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index bebf413b2b58..46ec8597a9ef 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "spglib"; - version = "2.5.0"; + version = "2.6.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-+LtjiJe+kbnb1MCF2f3h9pBI9ZSeIPODLLlDjldBjUs="; + hash = "sha256-1m7aK6AKHhT9luycO02/irD7PxJGQ+NXhcce5FW0COs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index e8053eb31a8d..a600c758f336 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -21,16 +21,16 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "readthedocs"; repo = "sphinx-autoapi"; tag = "v${version}"; - hash = "sha256-GLIImHO6exBJBhvIMvyv8AyX+01QheIDwOj9Lhc83a8="; + hash = "sha256-pDfGNpDyrU4q48ZHKqfN8OrxKICfIhac2qMJDB1iE0I="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 827a9dc29813..a3cb24baa9c5 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -11,7 +11,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "3.0.1"; + version = "3.1.0"; in buildPythonPackage { @@ -23,7 +23,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-ubQN0V3uVPb4EMkk+GP5zxxU+fMmXElRQOoBvn9E+lU="; + hash = "sha256-prewtt8KOAeDzlspFQwtMDUnRvAno+KU03GDmV0/I+0="; }; pythonRelaxDeps = [ "sphinx" ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 2f951573b860..e578f401e936 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -19,6 +19,7 @@ packaging, pygments, requests, + roman-numerals-py, snowballstemmer, sphinxcontrib-applehelp, sphinxcontrib-devhelp, @@ -43,10 +44,10 @@ buildPythonPackage rec { pname = "sphinx"; - version = "8.1.3"; + version = "8.2.3"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "sphinx-doc"; @@ -59,14 +60,9 @@ buildPythonPackage rec { mv tests/roots/test-images/{testimäge,testimæge}.png sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; - hash = "sha256-AObNQz2gKoPHfvC5aoefynXfQMe3bnQpEx6KrLNQBoQ="; + hash = "sha256-FoyCpDGDKNN2GMhE7gDpJLmWRWhbMCYlcVEaBTfXSEw="; }; - patches = [ - # https://github.com/sphinx-doc/sphinx/commit/5ff3740063c1ac57f17ecd697bcd06cc1de4e75c - ./pygments-2.19-compat.patch - ]; - build-system = [ flit-core ]; dependencies = @@ -79,6 +75,7 @@ buildPythonPackage rec { packaging pygments requests + roman-numerals-py snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp @@ -132,8 +129,11 @@ buildPythonPackage rec { "test_cython" # Could not fetch remote image: http://localhost:7777/sphinx.png "test_copy_images" - # https://github.com/sphinx-doc/sphinx/issues/13223 - "test_html_multi_line_copyright" + # ModuleNotFoundError: No module named 'fish_licence.halibut' + "test_import_native_module_stubs" + # Racy tex file creation + "test_literalinclude_namedlink_latex" + "test_literalinclude_caption_latex" ] ++ lib.optionals (pythonAtLeast "3.12") [ # https://github.com/sphinx-doc/sphinx/issues/12430 diff --git a/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch b/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch deleted file mode 100644 index 37330e0f1f06..000000000000 --- a/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch +++ /dev/null @@ -1,213 +0,0 @@ -diff --git a/tests/test_builders/test_build_html_code.py b/tests/test_builders/test_build_html_code.py -index d32c0b3e2..02684b22e 100644 ---- a/tests/test_builders/test_build_html_code.py -+++ b/tests/test_builders/test_build_html_code.py -@@ -1,3 +1,6 @@ -+from __future__ import annotations -+ -+import pygments - import pytest - - -@@ -32,11 +35,16 @@ def test_html_codeblock_linenos_style_inline(app): - - @pytest.mark.sphinx('html', testroot='reST-code-role') - def test_html_code_role(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build() - content = (app.outdir / 'index.html').read_text(encoding='utf8') - - common_content = ( -- 'def foo' -+ f'def{sp}foo' - '(' - '1 ' - '+ ' -diff --git a/tests/test_builders/test_build_latex.py b/tests/test_builders/test_build_latex.py -index ea6dc7475..6ba2a375c 100644 ---- a/tests/test_builders/test_build_latex.py -+++ b/tests/test_builders/test_build_latex.py -@@ -8,6 +8,7 @@ from pathlib import Path - from shutil import copyfile - from subprocess import CalledProcessError - -+import pygments - import pytest - - from sphinx.builders.latex import default_latex_documents -@@ -2127,12 +2128,16 @@ def test_latex_container(app): - - @pytest.mark.sphinx('latex', testroot='reST-code-role') - def test_latex_code_role(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = r'\PYG{+w}{ }' -+ else: -+ sp = ' ' -+ - app.build() - content = (app.outdir / 'projectnamenotset.tex').read_text(encoding='utf8') - - common_content = ( -- r'\PYG{k}{def} ' -- r'\PYG{n+nf}{foo}' -+ r'\PYG{k}{def}' + sp + r'\PYG{n+nf}{foo}' - r'\PYG{p}{(}' - r'\PYG{l+m+mi}{1} ' - r'\PYG{o}{+} ' -diff --git a/tests/test_directives/test_directive_code.py b/tests/test_directives/test_directive_code.py -index 65e16b805..2876dbc05 100644 ---- a/tests/test_directives/test_directive_code.py -+++ b/tests/test_directives/test_directive_code.py -@@ -2,6 +2,7 @@ - - import os.path - -+import pygments - import pytest - from docutils import nodes - -@@ -393,6 +394,11 @@ def test_literal_include_block_start_with_comment_or_brank(app): - - @pytest.mark.sphinx('html', testroot='directive-code') - def test_literal_include_linenos(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build(filenames=[app.srcdir / 'linenos.rst']) - html = (app.outdir / 'linenos.html').read_text(encoding='utf8') - -@@ -410,7 +416,7 @@ def test_literal_include_linenos(app): - - # :lines: 5-9 - assert ( -- '5class ' -+ f'5class{sp}' - 'Foo:' - ) in html - -@@ -560,12 +566,17 @@ def test_code_block_highlighted(app): - - @pytest.mark.sphinx('html', testroot='directive-code') - def test_linenothreshold(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build(filenames=[app.srcdir / 'linenothreshold.rst']) - html = (app.outdir / 'linenothreshold.html').read_text(encoding='utf8') - - # code-block using linenothreshold - assert ( -- '1class ' -+ f'1class{sp}' - 'Foo:' - ) in html - -diff --git a/tests/test_extensions/test_ext_viewcode.py b/tests/test_extensions/test_ext_viewcode.py -index eeef391c1..996db00fd 100644 ---- a/tests/test_extensions/test_ext_viewcode.py -+++ b/tests/test_extensions/test_ext_viewcode.py -@@ -6,6 +6,7 @@ import re - import shutil - from typing import TYPE_CHECKING - -+import pygments - import pytest - - if TYPE_CHECKING: -@@ -13,6 +14,11 @@ if TYPE_CHECKING: - - - def check_viewcode_output(app: SphinxTestApp) -> str: -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - warnings = re.sub(r'\\+', '/', app.warning.getvalue()) - assert re.findall( - r"index.rst:\d+: WARNING: Object named 'func1' not found in include " -@@ -41,7 +47,7 @@ def check_viewcode_output(app: SphinxTestApp) -> str: - '[docs]\n' - ) in result - assert '@decorator\n' in result -- assert 'class Class1:\n' in result -+ assert f'class{sp}Class1:\n' in result - assert ' """\n' in result - assert ' this is Class1\n' in result - assert ' """\n' in result -diff --git a/tests/test_highlighting.py b/tests/test_highlighting.py -index 430d569c0..2d08162aa 100644 ---- a/tests/test_highlighting.py -+++ b/tests/test_highlighting.py -@@ -10,7 +10,8 @@ from pygments.token import Name, Text - - from sphinx.highlighting import PygmentsBridge - --if tuple(map(int, pygments.__version__.split('.')))[:2] < (2, 18): -+ -+if tuple(map(int, pygments.__version__.split('.')[:2])) < (2, 18): - from pygments.formatter import Formatter - - Formatter.__class_getitem__ = classmethod(lambda cls, name: cls) # type: ignore[attr-defined] -diff --git a/tests/test_intl/test_intl.py b/tests/test_intl/test_intl.py -index 6f343e03d..9125612af 100644 ---- a/tests/test_intl/test_intl.py -+++ b/tests/test_intl/test_intl.py -@@ -10,6 +10,7 @@ import shutil - import time - from io import StringIO - -+import pygments - import pytest - from babel.messages import mofile, pofile - from babel.messages.catalog import Catalog -@@ -1473,6 +1474,11 @@ def test_xml_strange_markup(app): - @pytest.mark.sphinx('html', testroot='intl') - @pytest.mark.test_params(shared_result='test_intl_basic') - def test_additional_targets_should_not_be_translated(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build() - # [literalblock.txt] - result = (app.outdir / 'literalblock.html').read_text(encoding='utf8') -@@ -1511,7 +1517,7 @@ def test_additional_targets_should_not_be_translated(app): - # doctest block should not be translated but be highlighted - expected_expr = ( - """>>> """ -- """import sys """ -+ f"""import{sp}sys """ - """# sys importing""" - ) - assert_count(expected_expr, result, 1) -@@ -1556,6 +1562,11 @@ def test_additional_targets_should_not_be_translated(app): - }, - ) - def test_additional_targets_should_be_translated(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build() - # [literalblock.txt] - result = (app.outdir / 'literalblock.html').read_text(encoding='utf8') -@@ -1605,7 +1616,7 @@ def test_additional_targets_should_be_translated(app): - # doctest block should not be translated but be highlighted - expected_expr = ( - """>>> """ -- """import sys """ -+ f"""import{sp}sys """ - """# SYS IMPORTING""" - ) - assert_count(expected_expr, result, 1) diff --git a/pkgs/development/python-modules/sphinxext-rediraffe/default.nix b/pkgs/development/python-modules/sphinxext-rediraffe/default.nix new file mode 100644 index 000000000000..9e80cea5e725 --- /dev/null +++ b/pkgs/development/python-modules/sphinxext-rediraffe/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + sphinx, + setuptools, +}: + +buildPythonPackage rec { + pname = "sphinxext-rediraffe"; + version = "0.2.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "wpilibsuite"; + repo = "sphinxext-rediraffe"; + tag = "v${version}"; + hash = "sha256-g+GD1ApD26g6PwPOH/ir7aaEgH+n1QQYSr9QizYrmug="; + }; + + postPatch = '' + # Fixes "packaging.version.InvalidVersion: Invalid version: 'main'" + substituteInPlace setup.py \ + --replace-fail 'version = "main"' 'version = "${version}"' + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + sphinx + ]; + + # tests require seleniumbase which is not currently in nixpkgs + doCheck = false; + + pythonImportsCheck = [ "sphinxext.rediraffe" ]; + + pythonNamespaces = [ "sphinxext" ]; + + meta = { + description = "Sphinx extension to redirect files"; + homepage = "https://github.com/wpilibsuite/sphinxext-rediraffe"; + changelog = "https://github.com/wpilibsuite/sphinxext-rediraffe/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.newam ]; + }; +} diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 668c45ad17a7..4f0a0c211bf4 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "3.0.3"; + version = "3.1.0a1"; pyproject = true; src = fetchFromGitHub { owner = "spyder-ide"; repo = "spyder-kernels"; tag = "v${version}"; - hash = "sha256-gsQVzDgEW+TQSitLiYAIEk4Ow1IyIKfp8BcHqNJ2Y+I="; + hash = "sha256-/Dd+yCLctOC7ao26EU6LrhBD1SKGd84XLepMdDJnFow="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index b6baba2405d1..df8fa28d2ca4 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -19,6 +19,7 @@ diff-match-patch, fzf, intervaltree, + ipython-pygments-lexers, jedi, jellyfish, keyring, @@ -55,23 +56,19 @@ buildPythonPackage rec { pname = "spyder"; - version = "6.0.4"; + version = "6.1.0a1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4AsaO75mAH0rRDnrHGiwwfuQS7A/0/nQ7YPot6y0y+Y="; + hash = "sha256-Yjii1YUmdWdrrSLe3trAoATJXt2bfjc0JX5CBMVIEq8="; }; patches = [ ./dont-clear-pythonpath.patch ]; - nativeBuildInputs = [ - pyqtwebengine.wrapQtAppsHook - ]; + nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -83,6 +80,7 @@ buildPythonPackage rec { diff-match-patch fzf intervaltree + ipython-pygments-lexers jedi jellyfish keyring diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index fff3fe067247..83823e97ce42 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.38"; + version = "2.0.39"; pyproject = true; disabled = pythonOlder "3.7"; @@ -52,7 +52,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-If4PEBD67pm0fs1TZkJTKNuFPRfc6SxIEm94ymyDvow="; + hash = "sha256-AuzaBrVR58kuyXF87GEQRrSb/b8yZqjOeWMz3JagoqA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 41d052471810..d7a5b5a18507 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, pythonOlder, - cython_0, + cython, catalogue, mock, numpy, @@ -26,12 +26,12 @@ buildPythonPackage rec { hash = "sha256-qxtL9s8+Kdoj2uBJPdFRf7eHB1IGUSNRQhuJtPwnx34="; }; - nativeBuildInputs = [ - cython_0 + build-system = [ + cython setuptools ]; - propagatedBuildInputs = [ catalogue ]; + dependencies = [ catalogue ]; nativeCheckInputs = [ mock diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 81e1bb316b14..fad89171e164 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.45.2"; + version = "0.46.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "encode"; repo = "starlette"; tag = version; - hash = "sha256-c4PAFrsp/KZMwUyvU6sgIyVKzoKM5zrt3is/SAQX3oM="; + hash = "sha256-4lybbJwisjNfqzJsZ5eNni+/KLYBwUU4CiTRshGD5Yo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/strip-ansi/default.nix b/pkgs/development/python-modules/strip-ansi/default.nix new file mode 100644 index 000000000000..07c9c547cf5d --- /dev/null +++ b/pkgs/development/python-modules/strip-ansi/default.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchpatch, + buildPythonPackage, + fetchPypi, + poetry-core, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "strip-ansi"; + version = "0.1.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-XWDyOcyKN/3VK0PD5m6JPUW6BCMRXbWeyg0u74Owdyk="; + }; + + patches = [ + # Replace `poetry` with `poetry-core`. Unreleased. + # See: https://github.com/NixOS/nixpkgs/issues/103325 + (fetchpatch { + url = "https://github.com/gwennlbh/python-strip-ansi/commit/0ea9b418d5b21bd3d3b1b3b91fad7e66f25acb97.diff"; + hash = "sha256-Pzlc7fx4kEmM8pezu+8K7z5oV44uq/rzeByqKxHVKx0="; + }) + ]; + + build-system = [ + poetry-core + ]; + + pythonImportsCheck = [ + "strip_ansi" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Strip ANSI escape sequences from a string"; + homepage = "https://pypi.org/project/strip-ansi"; + # License is in the repository but not in PyPI metadata. + # See: https://github.com/gwennlbh/python-strip-ansi/blob/master/LICENSE + license = lib.licenses.mit; + maintainers = [ lib.maintainers._9999years ]; + }; +} diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 373201e835a9..42b7fac621ec 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "11.5.0"; + version = "11.6.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vD4DWP/CPV7PqKr+wfpPBI7oEHwyN7ywAAPmjIyW+gI="; + hash = "sha256-DO18ziOmyxo5PIah9/lDXJ2Drny9VWNihoyvYstEqSw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/svg-py/default.nix b/pkgs/development/python-modules/svg-py/default.nix index a9589db0e9b6..add0da17c737 100644 --- a/pkgs/development/python-modules/svg-py/default.nix +++ b/pkgs/development/python-modules/svg-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "svg-py"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,10 +19,10 @@ buildPythonPackage rec { owner = "orsinium-labs"; repo = "svg.py"; tag = version; - hash = "sha256-Lxzk3IVCD4PG36Pozz2crccwxCAAAM2QfS4rgwbjs6g="; + hash = "sha256-XuSv4CVcbwWHuHiXxx4PfGJ8Pi+tfufbAdUiTFWNLcc="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Type-safe Python library to generate SVG files"; homepage = "https://github.com/orsinium-labs/svg.py"; - changelog = "https://github.com/orsinium-labs/svg.py/releases/tag/${version}"; + changelog = "https://github.com/orsinium-labs/svg.py/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index a05d13f466ee..a6c5d1fca425 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -27,10 +27,6 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "sympy" ]; - preCheck = '' - export LANG="en_US.UTF-8" - ''; - passthru.tests = { inherit sage; }; diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix index da1738716d4b..d2c43108acd3 100644 --- a/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -4,22 +4,25 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "teamcity-messages"; version = "1.33"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JetBrains"; - repo = pname; + repo = "teamcity-messages"; tag = "v${version}"; hash = "sha256-BAwAfe54J+gbbiz03Yiu3eC/9RnI7P0mfR3nfM1oKZw="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/unit-tests/" ]; @@ -29,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python unit test reporting to TeamCity"; homepage = "https://github.com/JetBrains/teamcity-messages"; + changelog = "https://github.com/JetBrains/teamcity-messages/releases/tag/v${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 444e0b7191d2..cac0455b82cb 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -33,12 +33,12 @@ buildPythonPackage rec { pname = "tempest"; - version = "42.0.0"; + version = "43.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-nW6cSOhC56YkyUQiXcJTqaojRseIf9q8YGSe4skhTA4="; + hash = "sha256-Py8SwyBYO35t+xv8oaxLv58owEUX/T9uhp3XM5wjsAI="; }; pythonRelaxDeps = [ "defusedxml" ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 1a35f306b52c..7b6bc1d6c60d 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1340"; + version = "3.0.1345"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-CbGYPoliqc3RuKC1vMaUwopqrGe/9T/E4i9a0w33UTE="; + hash = "sha256-sqWGrXuM8cUzVPKzpCeVRdE6uVg6hMG/tl4TEjT23So="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 685aba22686b..2a7be3be31b1 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -2,37 +2,35 @@ lib, fetchPypi, buildPythonPackage, - pythonOlder, - numpy, - wheel, - werkzeug, - protobuf, + + # dependencies + absl-py, grpcio, markdown, - absl-py, - google-auth-oauthlib, + numpy, + packaging, + protobuf, setuptools, - standard-imghdr, + six, tensorboard-data-server, - tensorboard-plugin-wit, - tensorboard-plugin-profile, -}: + werkzeug, + standard-imghdr, -# tensorflow/tensorboard is built from a downloaded wheel, because -# https://github.com/tensorflow/tensorboard/issues/719 blocks -# buildBazelPackage. + versionCheckHook, +}: buildPythonPackage rec { pname = "tensorboard"; - version = "2.18.0"; + version = "2.19.0"; format = "wheel"; - disabled = pythonOlder "3.9"; + # tensorflow/tensorboard is built from a downloaded wheel, because + # https://github.com/tensorflow/tensorboard/issues/719 blocks buildBazelPackage. src = fetchPypi { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-EHykghdF9z4q76AsUP9wqbaU8595CxHm9oL30yZ0Xqs="; + hash = "sha256-XnG5hmOmQafOim5wsL6OGkwMRdSHYLB2ODrEdVw1uaA="; }; pythonRelaxDeps = [ @@ -40,28 +38,23 @@ buildPythonPackage rec { "protobuf" ]; - propagatedBuildInputs = [ + dependencies = [ absl-py grpcio - google-auth-oauthlib markdown numpy + packaging protobuf setuptools - standard-imghdr + six tensorboard-data-server - tensorboard-plugin-profile - tensorboard-plugin-wit werkzeug - # not declared in install_requires, but used at runtime - # https://github.com/NixOS/nixpkgs/issues/73840 - wheel - ]; - # in the absence of a real test suite, run cli and imports - checkPhase = '' - $out/bin/tensorboard --help > /dev/null - ''; + # Requires 'imghdr' which has been removed from python in 3.13 + # ModuleNotFoundError: No module named 'imghdr' + # https://github.com/tensorflow/tensorboard/issues/6964 + standard-imghdr + ]; pythonImportsCheck = [ "tensorboard" @@ -73,12 +66,17 @@ buildPythonPackage rec { "tensorboard.util" ]; - meta = with lib; { + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + meta = { changelog = "https://github.com/tensorflow/tensorboard/blob/${version}/RELEASE.md"; description = "TensorFlow's Visualization Toolkit"; homepage = "https://www.tensorflow.org/"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "tensorboard"; - maintainers = with maintainers; [ abbradar ]; + maintainers = with lib.maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 79495d4e9ac2..f8476a2f1821 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -1,40 +1,44 @@ { - stdenv, lib, - fetchurl, + stdenv, buildPythonPackage, - isPy3k, - astor, + fetchurl, + + # buildInputs + llvmPackages, + + # build-system + distutils, + + # dependencies + ml-dtypes, + absl-py, + astunparse, + flatbuffers, gast, google-pasta, - wrapt, + grpcio, + h5py, + libclang, numpy, - six, - termcolor, + opt-einsum, packaging, protobuf, - absl-py, - grpcio, - mock, - scipy, - distutils, - wheel, - jax, - ml-dtypes, - opt-einsum, - tensorflow-estimator-bin, + requests, + six, tensorboard, + termcolor, + typing-extensions, + wrapt, + isPy3k, + mock, + config, cudaSupport ? config.cudaSupport, cudaPackages, zlib, python, addDriverRunpath, - astunparse, - flatbuffers, - h5py, - llvmPackages, - typing-extensions, }: # We keep this binary build for three reasons: @@ -50,7 +54,6 @@ let inherit (cudaPackages) cudatoolkit cudnn; isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild; - isCudaX64 = cudaSupport && stdenv.hostPlatform.isx86_64; in buildPythonPackage rec { pname = "tensorflow" + lib.optionalString cudaSupport "-gpu"; @@ -68,38 +71,36 @@ buildPythonPackage rec { buildInputs = [ llvmPackages.openmp ]; + build-system = [ + distutils + ]; + + nativeBuildInputs = + lib.optionals cudaSupport [ addDriverRunpath ] + ++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ]; + dependencies = [ + absl-py astunparse flatbuffers - typing-extensions - distutils + gast + google-pasta + grpcio + h5py + libclang + ml-dtypes + numpy + opt-einsum packaging protobuf - numpy - scipy - (if isCudaX64 then jax else ml-dtypes) - termcolor - grpcio + requests six - astor - absl-py - gast - opt-einsum - google-pasta - wrapt - tensorflow-estimator-bin tensorboard - h5py + termcolor + typing-extensions + wrapt ] ++ lib.optional (!isPy3k) mock; - build-system = - [ - distutils - wheel - ] - ++ lib.optionals cudaSupport [ addDriverRunpath ] - ++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ]; - preConfigure = '' unset SOURCE_DATE_EPOCH @@ -113,28 +114,6 @@ buildPythonPackage rec { mv "$f" "$(sed -E 's/(nv[0-9]+)\.0*([0-9]+)/\1.\2/' <<< "$f")" done - wheel unpack --dest unpacked ./*.whl - rm ./*.whl - ( - cd unpacked/tensorflow* - # Adjust dependency requirements: - # - Relax flatbuffers, gast, protobuf, tensorboard, and tensorflow-estimator version requirements that don't match what we have packaged - # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet - # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. - # - numpy was pinned to fix some internal tests: https://github.com/tensorflow/tensorflow/issues/60216 - sed -i *.dist-info/METADATA \ - -e "/Requires-Dist: flatbuffers/d" \ - -e "/Requires-Dist: gast/d" \ - -e "/Requires-Dist: keras/d" \ - -e "/Requires-Dist: libclang/d" \ - -e "/Requires-Dist: protobuf/d" \ - -e "/Requires-Dist: tensorboard/d" \ - -e "/Requires-Dist: tensorflow-estimator/d" \ - -e "/Requires-Dist: tensorflow-io-gcs-filesystem/d" \ - -e "s/Requires-Dist: numpy (.*)/Requires-Dist: numpy/" - ) - wheel pack ./unpacked/tensorflow* - popd ''; diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix index b69986fdc7e7..2dcdb54035a3 100644 --- a/pkgs/development/python-modules/tensorrt/default.nix +++ b/pkgs/development/python-modules/tensorrt/default.nix @@ -10,10 +10,22 @@ let pyVersion = "${lib.versions.major python.version}${lib.versions.minor python.version}"; + buildVersion = lib.optionalString (cudaPackages ? tensorrt) cudaPackages.tensorrt.version; + wheelVersion = lib.optionalString (cudaPackages ? tensorrt) ( + if + (builtins.elem buildVersion [ + "8.6.1.6" + "10.3.0.26" + ]) + then + builtins.concatStringsSep "." (lib.take 3 (builtins.splitVersion buildVersion)) + else + buildVersion + ); in buildPythonPackage rec { pname = "tensorrt"; - version = lib.optionalString (cudaPackages ? tensorrt) cudaPackages.tensorrt.version; + version = wheelVersion; src = cudaPackages.tensorrt.src; @@ -30,7 +42,7 @@ buildPythonPackage rec { preUnpack = '' mkdir -p dist tar --strip-components=2 -xf "$src" --directory=dist \ - "TensorRT-${version}/python/tensorrt-${version}-cp${pyVersion}-none-linux_x86_64.whl" + "TensorRT-${buildVersion}/python/tensorrt-${wheelVersion}-cp${pyVersion}-none-linux_x86_64.whl" ''; sourceRoot = "."; diff --git a/pkgs/development/python-modules/thefuzz/default.nix b/pkgs/development/python-modules/thefuzz/default.nix index d307d5912b03..2f4613da9e00 100644 --- a/pkgs/development/python-modules/thefuzz/default.nix +++ b/pkgs/development/python-modules/thefuzz/default.nix @@ -6,12 +6,13 @@ pytestCheckHook, hypothesis, levenshtein, + setuptools, }: buildPythonPackage rec { pname = "thefuzz"; version = "0.22.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,20 +21,27 @@ buildPythonPackage rec { hash = "sha256-cTgDmn7PVA2jI3kthZLvmQKx1563jBR9TyBmTeefNoA="; }; - propagatedBuildInputs = [ levenshtein ]; - # Skip linting postPatch = '' - substituteInPlace test_thefuzz.py --replace "import pycodestyle" "" + substituteInPlace test_thefuzz.py \ + --replace-fail "import pycodestyle" "" ''; - pythonImportsCheck = [ "thefuzz" ]; + build-system = [ setuptools ]; + + dependencies = [ levenshtein ]; nativeCheckInputs = [ hypothesis pytestCheckHook ]; + optional-dependencies = { + speedup = [ ]; + }; + + pythonImportsCheck = [ "thefuzz" ]; + disabledTests = [ # Skip linting "test_pep8_conformance" diff --git a/pkgs/development/python-modules/three-merge/default.nix b/pkgs/development/python-modules/three-merge/default.nix index e20e1aea09ac..62d2892a48a4 100644 --- a/pkgs/development/python-modules/three-merge/default.nix +++ b/pkgs/development/python-modules/three-merge/default.nix @@ -17,8 +17,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ diff-match-patch ]; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "three_merge" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 6794870e32d1..b7d5585e8617 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.15.0"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = "time-machine"; tag = version; - hash = "sha256-0WYmkrMMeCkBYxy2qGovdxftzrYW9x/3tdeBcYC47Z0="; + hash = "sha256-xNoLtgON1dfKAgK0XhSMLHLsUr/nST3lepy15YWDEcE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 1634f7681363..b3e994e26020 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tokenize-rt"; - version = "5.2.0"; + version = "6.1.0"; pyproject = true; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-G4Dn6iZLVOovzfEt9eMzp93mTX+bo0tHI5cCbaJLxBQ="; + hash = "sha256-7ykczY73KkqR99tYLL/5bgr9bqU444qHs2ONz+ldVyg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 20ae66d60fcd..ea17a226873e 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tomli"; - version = "2.0.1"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "hukkin"; repo = pname; rev = version; - hash = "sha256-v0ZMrHIIaGeORwD4JiBeLthmnKZODK5odZVL0SY4etA="; + hash = "sha256-4MWp9pPiUZZkjvGXzw8/gDele743NBj8uG4jvK2ohUM="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index c355e6e99e2a..2a3e54cab71b 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -44,15 +44,18 @@ # dependencies astunparse, - fsspec, + expecttest, filelock, + fsspec, + hypothesis, jinja2, networkx, - sympy, - numpy, + packaging, + psutil, pyyaml, - cffi, - click, + requests, + sympy, + types-dataclasses, typing-extensions, # ROCm build and `torch.compile` requires `triton` tritonSupport ? (!stdenv.hostPlatform.isDarwin), @@ -69,10 +72,6 @@ _tritonEffective ? if cudaSupport then triton-cuda else triton, triton-cuda, - # Unit tests - hypothesis, - psutil, - # Disable MKLDNN on aarch64-darwin, it negatively impacts performance, # this is also what official pytorch build does mklDnnSupport ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64), @@ -510,18 +509,20 @@ buildPythonPackage rec { dependencies = [ astunparse - cffi - click - numpy - pyyaml - - # From install_requires: - fsspec + expecttest filelock - typing-extensions - sympy - networkx + fsspec + hypothesis jinja2 + networkx + ninja + packaging + psutil + pyyaml + requests + sympy + types-dataclasses + typing-extensions # the following are required for tensorboard support pillow diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index d3595bd90b7f..132bd67caea3 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "torchmetrics"; - version = "1.6.3"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "torchmetrics"; tag = "v${version}"; - hash = "sha256-zBsqotwL6KUpcNV7SyEGnuW9Vl3oxaVy5wMHgGD7U/M="; + hash = "sha256-OrNYkvaTU1Zm1634eaLQqESkmLmPGgIBN2mAd1xmMP0="; }; dependencies = [ diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 3fcb2b6a4923..f317c50a0e62 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.49.0"; + version = "4.50.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; tag = "v${version}"; - hash = "sha256-drq7RWoRaRejiQjCUHIYuzaKa9rA4eQZI2do74scp1c="; + hash = "sha256-/scrMPUY43n+XAMbwWCtmiJKXscXGLrklyDg9XZTaqw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index 64bece61cff2..91d65d77ee00 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "translate-toolkit"; - version = "3.15.0"; + version = "3.15.1"; pyproject = true; build-system = [ setuptools-scm ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "translate_toolkit"; inherit version; - hash = "sha256-16evXSr6Znwber/UNSMVd86toWZGswPSQO7Y5ySCYIY="; + hash = "sha256-Omapbrcv6+A5fGb34xLdlmoh3QAXN1+5VxoCRdyX9mM="; }; dependencies = [ @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Useful localization tools for building localization & translation systems"; homepage = "https://toolkit.translatehouse.org/"; + changelog = "https://docs.translatehouse.org/projects/translate-toolkit/en/latest/releases/${version}.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ erictapen ]; }; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 097e3d985916..2593645aaf4e 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.6.4"; + version = "4.6.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mikedh"; repo = "trimesh"; tag = version; - hash = "sha256-kkIGAeWFrgOIbvBnZFRQue7Fh7REKF/CHgJLBEZliLM="; + hash = "sha256-zPtfJMBblXaapYE8jBf8755T+0LP3W9M7e5JnM2adHU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix index 2804bcaa76e5..afcc26350ee9 100644 --- a/pkgs/development/python-modules/trio-websocket/default.nix +++ b/pkgs/development/python-modules/trio-websocket/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "trio-websocket"; - version = "0.11.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "HyperionGray"; repo = "trio-websocket"; rev = version; - hash = "sha256-ddLbYkb1m9zRjv3Lb7YwUzj26gYbK4nYN6jN+FAuiOs="; + hash = "sha256-TGFf4WUeZDrjp/UiQ9O/GoaK5BRC2aaGZVPfqZ4Ip9I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 7c24edb26354..bc5b4ee8b440 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -35,7 +35,7 @@ let in buildPythonPackage rec { pname = "trio"; - version = "0.28.0"; + version = "0.29.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "trio"; tag = "v${version}"; - hash = "sha256-ru5Q7YHpnA/hLwh2Og5Hp3z6XJCv/BHHW0S26N1oTJ0="; + hash = "sha256-f77HXhXkPu2GMKCFqahfiP0EgpjyRqWaxzduqM2oXtA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index c39c058b8aca..c6c33f37ac57 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -11,7 +11,7 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2025.1.15.22"; + version = "2025.3.3.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ let src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-kK90NY06AbNTK8ezyI2MaglML9UKVj0T2VdheTJtftk="; + hash = "sha256-P/z6kKQorf3hpdkOOqG4f+R0xdvb9cy8p07Wm6g8XKc="; }; build-system = [ diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 432747ab7ca5..4104379858c6 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.4.4"; + version = "7.4.8"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rmwen1XmH7NkUJpgobVPkIGuDbwjzuWKNvOAj8Mwiq8="; + hash = "sha256-o/VMPW5nh8zci82I80sFnythW7Z7A6DV6Nfl4Cnp2OE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 7b9d0b4a2e0e..fd83e5e252ba 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.5.0"; + version = "9.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; tag = version; - hash = "sha256-Md9TjsUem+npAG2PWezmSpGcxtQlhdyvNaDs4AkX/Vo="; + hash = "sha256-qmXvs9CjHjkd/DsbqMPA90wCDiS+pMwaHXCRBUNnv30="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 751f5b715a04..148fb1566f01 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -61,6 +61,11 @@ buildPythonPackage rec { # fails due to change in file (libmagic) 5.45 "test_doc_postscript_eps" "test_package_debian" + + # fails due to change in file (libmagic) 5.46 + "test_media_image_img" + "test_compiled_elf_so" + "test_compiled_elf_so_2" ]; pythonImportsCheck = [ "typecode" ]; diff --git a/pkgs/development/python-modules/typecode/libmagic.nix b/pkgs/development/python-modules/typecode/libmagic.nix index 7d1add320b4c..a666aa65eff1 100644 --- a/pkgs/development/python-modules/typecode/libmagic.nix +++ b/pkgs/development/python-modules/typecode/libmagic.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { pname = "typecode-libmagic"; - version = "21.4.4"; + version = "21.5.31"; src = fetchFromGitHub { - owner = "nexB"; + owner = "aboutcode-org"; repo = "scancode-plugins"; - rev = "v${version}"; - sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A="; + tag = "v${version}"; + hash = "sha256-nGgFjp1N1IM/Sm4xLJw5WiZncc369/LqNcwFJBS1EQs="; }; sourceRoot = "${src.name}/builtins/typecode_libmagic-linux"; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations"; - homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/typecode_libmagic-linux"; + homepage = "https://github.com/aboutcode-org/scancode-plugins/tree/main/builtins/typecode_libmagic-linux"; license = licenses.asl20; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 69493dca3e5b..15d06f3946cc 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "typeguard"; - version = "4.4.1"; + version = "4.4.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DSKonQC0U7R8SYdfQrZgG5YXV1QaLh4O9Re24kITwhs="; + hash = "sha256-pvEGWBPjLvNlvDs/UDr4qW+d1OADOgLCjEpJg96MbEk="; }; outputs = [ diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index f9384b1fee22..f97ce9b36a65 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "typer"; - version = "0.15.1"; + version = "0.15.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-oFiMCn+mihl4oGmBhld3j4ar5v9epqv0cvlAoIv+Two="; + hash = "sha256-qy+rR1M6gTxJ/h8WsaNw/VgZCZwAsRngYz32XyIUS6U="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index d7af8cd38be7..f664f3142bd2 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.24.1"; + version = "0.24.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-/G6uVvjcWj+MyTzCx8My+oKQn4KE++JeAUxXV1evOX0="; + hash = "sha256-WCa69prV0px2vkn8ffACIigfoxsU+Z6ftEktceyY/qU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index 88874e3be565..6f3cdd6c4a13 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.8.20240310"; + version = "5.2.0.20250224"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-UuMWsDeDiGqKKr3CKPcHFoC6ZYlFRc0ghevjz4hoSg4="; + pname = "types_decorator"; + inherit version; + hash = "sha256-1oqi9Vz1BFEN19AbSeaN0yw6IA0LwMu4RZXboaEZVP8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Modules doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/types-deprecated/default.nix b/pkgs/development/python-modules/types-deprecated/default.nix index 3d26a47ee404..e6cde7039037 100644 --- a/pkgs/development/python-modules/types-deprecated/default.nix +++ b/pkgs/development/python-modules/types-deprecated/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "types-deprecated"; - version = "1.2.15.20241117"; + version = "1.2.15.20250304"; pyproject = true; src = fetchPypi { - pname = "types-Deprecated"; + pname = "types_deprecated"; inherit version; - hash = "sha256-kkACyLf93sUbpJSXiKcCQRouNjbNmyozq9juEZcB134="; + hash = "sha256-wykDBVMCneXMbLMPJpwR9OAOWYxCQSkBefY82n0z9xk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Modules has no tests doCheck = false; @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Typing stubs for Deprecated"; homepage = "https://pypi.org/project/types-Deprecated/"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix index df4ed0262b68..df8cc5976f63 100644 --- a/pkgs/development/python-modules/types-lxml/default.nix +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -5,29 +5,30 @@ cssselect, fetchFromGitHub, html5lib, + hypothesis, lxml, + mypy, pdm-backend, + pook, pyright, pytestCheckHook, - pythonOlder, typeguard, types-beautifulsoup4, + types-html5lib, typing-extensions, - hypothesis, + urllib3, }: buildPythonPackage rec { pname = "types-lxml"; - version = "2024.12.13"; + version = "2025.03.04"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "abelcheung"; repo = "types-lxml"; tag = version; - hash = "sha256-iqIOwQIg6EB/m8FIoUzkvh1W0w4bKmS9zi4Z+5qlC+0="; + hash = "sha256-dA9sspqEChHarwk2LrK2F7Ehri2ffjOlGk3nj4KFsfU="; }; build-system = [ pdm-backend ]; @@ -35,18 +36,25 @@ buildPythonPackage rec { dependencies = [ cssselect types-beautifulsoup4 + types-html5lib typing-extensions ]; + optional-dependencies = { + mypy = [ mypy ]; + pyright = [ pyright ]; + }; + nativeCheckInputs = [ beautifulsoup4 html5lib hypothesis lxml - pyright + pook pytestCheckHook typeguard - ]; + urllib3 + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "lxml-stubs" ]; diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix index fb3cea743ad9..5d74a287e80d 100644 --- a/pkgs/development/python-modules/types-markdown/default.nix +++ b/pkgs/development/python-modules/types-markdown/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-markdown"; - version = "3.7.0.20241204"; + version = "3.7.0.20250322"; pyproject = true; src = fetchPypi { pname = "types_markdown"; inherit version; - hash = "sha256-7MorJc0jFj/SjtW6NNGD1zHaA+il7Togtg2t7TBMVBA="; + hash = "sha256-pI7YLfy2lUWSoQ8QRonS1E35ElzlGzzuIOAZilIW1Vw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix index 37b313bc59e9..0f9dac90ddd8 100644 --- a/pkgs/development/python-modules/types-mock/default.nix +++ b/pkgs/development/python-modules/types-mock/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-mock"; - version = "5.1.0.20240425"; + version = "5.2.0.20250306"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-UoGmRdcugn1wBD48wUT+M7HAA9sIT3idwgOqkOgSpaQ="; + pname = "types_mock"; + inherit version; + hash = "sha256-FYgstc+ZgFh6dgfjGJCAEiOAHXmX9VloaAXOCbZTYIc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 2284290e8f69..7d9e9eb9de4d 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "6.1.0.20241221"; + version = "7.0.0.20250218"; format = "setuptools"; src = fetchPypi { pname = "types_psutil"; inherit version; - hash = "sha256-YA9aNr1eDriIfw4/P/LPFU2QaQrYEjyKcHu6SrlNMYU="; + hash = "sha256-HmQs2v6DeyQClbI7HL1GkdgLCKB9KZMhQ8u64w6w25w="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index 19234ab8ae0c..31c8d6091516 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20241019"; + version = "2.9.21.20250121"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-vKibmI0uvRm80IsXfSKod+qLhB3ssQ7RMK/POUBGEvo="; + pname = "types_psycopg2"; + inherit version; + hash = "sha256-Kw4s0PN0evGuJacCeJhxbYAglgR3DvPL81D+BVucNJs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "psycopg2-stubs" ]; diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index af2ffa67e5f3..eba78ae955fa 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2025.1.0.20250204"; + version = "2025.1.0.20250318"; pyproject = true; src = fetchPypi { pname = "types_pytz"; inherit version; - hash = "sha256-APdQEydp8cZaT3JAvITxOYW02ndL0X375dnNRCdGvUk="; + hash = "sha256-l+DjUYTG/hTjpQFFEgV/LFe7DGWC1jwc/MSAn4IYBEk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 124bcfe8874f..dfc2d80fdefd 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,12 +9,13 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.0.20241016"; + version = "2.32.0.20250306"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-DZytLydRXQ4+PacTShtvKPuXEp2GuGfyTZxyZFJjTZU="; + pname = "types_requests"; + inherit version; + hash = "sha256-CWI1JpTsWy+V/ah37mChWavfhKD8b9rOWZ8grLQaA9E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-retry/default.nix b/pkgs/development/python-modules/types-retry/default.nix index 04eed20ab8e5..419fc5f43a60 100644 --- a/pkgs/development/python-modules/types-retry/default.nix +++ b/pkgs/development/python-modules/types-retry/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-retry"; - version = "0.9.9.20241221"; + version = "0.9.9.20250322"; format = "setuptools"; src = fetchPypi { pname = "types_retry"; inherit version; - hash = "sha256-661tSVpaBKsNBtQVamZVKMO4SoRhqgGd1uXT4zwqoeA="; + hash = "sha256-LqpvS4MsGHEhBWmIu+bS0Lb06wNjH9yXUuKsKAL3tyY="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index cfea4f817fd9..88001456803a 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "75.8.0.20250110"; + version = "75.8.2.20250305"; pyproject = true; src = fetchPypi { pname = "types_setuptools"; inherit version; - hash = "sha256-lvfsi71uClTqGA1mrWiteh15VOcoGnEOot5141VUUnE="; + hash = "sha256-qYcmm0lIjyGWGh2Zqo0oG2EWJYg972OSqThVsxVE5AU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-tqdm/default.nix b/pkgs/development/python-modules/types-tqdm/default.nix index 162025c961e1..935929519d1b 100644 --- a/pkgs/development/python-modules/types-tqdm/default.nix +++ b/pkgs/development/python-modules/types-tqdm/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "types-tqdm"; - version = "4.67.0.20250301"; + version = "4.67.0.20250319"; pyproject = true; src = fetchPypi { pname = "types_tqdm"; inherit version; - hash = "sha256-XomjitibhngjNo65fZ+Q0vxpgGuwVd3mJxagXaYrXg0="; + hash = "sha256-rpR6ZL2Nfte30rc2nfBfkYH4R+woKP3Iot6wu4cBrao="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/typing-validation/default.nix b/pkgs/development/python-modules/typing-validation/default.nix index 172a23f459ba..2feb759bd877 100644 --- a/pkgs/development/python-modules/typing-validation/default.nix +++ b/pkgs/development/python-modules/typing-validation/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "typing-validation"; - version = "1.2.11"; + version = "1.2.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "hashberg-io"; repo = "typing-validation"; tag = "v${version}"; - hash = "sha256-0scXoAPkx/VBIbNRMtFoRRbmGpC2RzNRmQG4mRXSxrs="; + hash = "sha256-N0VAxlxB96NA01c/y4xtoLKoiqAxfhJJV0y/3w6H9ek="; }; build-system = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple library for runtime type-checking"; homepage = "https://github.com/hashberg-io/typing-validation"; - changelog = "https://github.com/hashberg-io/typing-validation/releases/tag/v${version}"; + changelog = "https://github.com/hashberg-io/typing-validation/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ vizid ]; }; diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index 2f160104a741..ea86870247f0 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "typst"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,13 +22,13 @@ buildPythonPackage rec { owner = "messense"; repo = "typst-py"; tag = "v${version}"; - hash = "sha256-/nWEs+qeAvejGyjBVSATnUWMVb6AdiCGOE7VjuYl0PU="; + hash = "sha256-Cqi8GupcC7n/OfiFLrNXw0ydXpOqOpWTgIGJXdib5L8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-aeAEqO6vtcLdCRClqhJ3ooJY9jf70iUJDL/GDZw/UXs="; + hash = "sha256-bcO+irLT4Sy8IZ/YQZFD2jVjZAUCO0j+TitigHo4xbM="; }; build-system = [ diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 7ef57e00a0e8..640592a71fc2 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2024.2"; + version = "2025.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-fYXMQW6TguaQlbe99K/Z44gEGKJBP+7HBp1TPWtOMcw="; + hash = "sha256-JIlJCeiM2yi9FjbGiHgB32TLSFvVk/L9g+8pB1qB1pQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index a4e6ba12061c..6f100cfb5a7a 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "5.2"; # version needs to be compatible with APScheduler + version = "5.3.1"; # version needs to be compatible with APScheduler disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-jTmSBVePGpNCgWQJzB5GqT69V1XjnqLYUzS+qRG/Dm4="; + hash = "sha256-zO/8ft7O/qH1lVQdvW6ZDLHqPRm/AbKAnzYqA915If0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix index a776a9e1b27b..1f412bdefd1f 100644 --- a/pkgs/development/python-modules/ulid-transform/default.nix +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "ulid-transform"; tag = "v${version}"; - hash = "sha256-+P5sd3FSk9SYmeHkatB88EE+/1vktyiJJeaecbBkBhI="; + hash = "sha256-Rg9es24nsHy+y7uV0da120n1FDGJ9buSRi94L23H59c="; }; build-system = [ diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index 6d6cc711c2cc..690fd305564e 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -8,6 +8,7 @@ setuptools, # dependencies + lap, matplotlib, opencv-python, pandas, @@ -31,14 +32,14 @@ buildPythonPackage rec { pname = "ultralytics"; - version = "8.3.92"; + version = "8.3.94"; pyproject = true; src = fetchFromGitHub { owner = "ultralytics"; repo = "ultralytics"; tag = "v${version}"; - hash = "sha256-+SwhQVEl7tLrhwuCruVLAtVS3U/RJb0ysIKG3bmuZk4="; + hash = "sha256-pDUF/uqtMA9xMK7G9Ka2XSr55jEka7DhWX9d2S3n6KA="; }; build-system = [ setuptools ]; @@ -48,6 +49,7 @@ buildPythonPackage rec { ]; dependencies = [ + lap matplotlib opencv-python pandas @@ -116,7 +118,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/ultralytics/ultralytics"; - changelog = "https://github.com/ultralytics/ultralytics/releases/tag/v${version}"; + changelog = "https://github.com/ultralytics/ultralytics/releases/tag/${src.tag}"; description = "Train YOLO models for computer vision tasks"; mainProgram = "yolo"; license = lib.licenses.agpl3Only; diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index 871023795233..6572eebdbb97 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.17.2"; + version = "0.17.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-C4oq/TR28athVfxXlQGsR//+Q1R9iKcOWlt2p/5sqiw="; + hash = "sha256-MulsnfY8VjoRjUEd+0+cZy8YGkEJd/Z2XA7UMLDTJ4Q="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 51670c928404..1b428a61e764 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.29.1"; + version = "20.29.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uLiXATjTL7YGGSy5f2zUu2RPpIa+kwj7m2P4EJG13DU="; + hash = "sha256-/aq+v20DtbqDrgoCz+lvSKcW9PrlVkYdGAglhm91tyg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wadler-lindig/default.nix b/pkgs/development/python-modules/wadler-lindig/default.nix index 7011c0a9ef16..8946220eed50 100644 --- a/pkgs/development/python-modules/wadler-lindig/default.nix +++ b/pkgs/development/python-modules/wadler-lindig/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "wadler-lindig"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "wadler_lindig"; - rev = "v${version}"; - hash = "sha256-akb1x9UYbfEwnVS6ahpb42XnEl3y7kk3WkhwD8p7AA4="; + tag = "v${version}"; + hash = "sha256-ykRyJ5kCxYb3jBb8/8ogGjpgXMcb/mvvvHaSy9fecxA="; }; build-system = [ diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix index 92b58509c7d6..eba324854748 100644 --- a/pkgs/development/python-modules/walrus/default.nix +++ b/pkgs/development/python-modules/walrus/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ]; preCheck = '' - ${pkgs.redis}/bin/redis-server & + ${pkgs.valkey}/bin/redis-server & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 89e705b4fcad..50b2c11c4b53 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -7,11 +7,12 @@ pythonAtLeast, pythonOlder, setuptools, + werkzeug, }: buildPythonPackage rec { pname = "websockets"; - version = "14.1"; + version = "15.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "aaugustin"; repo = "websockets"; tag = version; - hash = "sha256-lH4BPP8AjR13rnl4m7IP52iSGHjKE4q1AmHv4t+PRXw="; + hash = "sha256-DC1nK+TvCoCqchyWJOyT4Ul4gkTYXixu7XmTqvytqEo="; }; build-system = [ setuptools ]; @@ -46,7 +47,10 @@ buildPythonPackage rec { "test_reject_invalid_server_certificate" ]; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + werkzeug + ]; preCheck = '' # https://github.com/python-websockets/websockets/issues/1509 diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 706cf030e930..1759284570c1 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "webtest"; - version = "3.0.3"; + version = "3.0.4"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tjX2/mWEvJc3SWtocVXpNz89AbyxtGFpAH2g97piOPk="; + hash = "sha256-lHeNGaN+Wr1ziNrU2Th0QQ7M7VOhc5qOX/Lby6HPwMQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 1ed00fb2e30a..48ec0bca95f1 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.7.2"; + version = "0.7.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; tag = version; - hash = "sha256-L0U02hJ6UBG/HtwWQE7xuy+yR8+RErykJNXqo0huyzk="; + hash = "sha256-J5FpY/vmaZ5TGQEPi+pQFz295tb02BZcCOvlX6zqM6o="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/development/python-modules/wolf-comm/default.nix b/pkgs/development/python-modules/wolf-comm/default.nix index 32bc2005f636..f7171efca681 100644 --- a/pkgs/development/python-modules/wolf-comm/default.nix +++ b/pkgs/development/python-modules/wolf-comm/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "wolf-comm"; - version = "0.0.21"; + version = "0.0.23"; pyproject = true; src = fetchFromGitHub { owner = "janrothkegel"; repo = "wolf-comm"; tag = version; - hash = "sha256-IZJxtMWZNGzzcGpXAzHEOrc2DngZop4yKmfnuXp9urc="; + hash = "sha256-LpehooW3vmohiyMwOQTFNLiNCsaLKelWQxQk8bl+y1k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index e355d96aa9bd..46cdbd4f9071 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.17.1"; + version = "1.17.2"; pyproject = true; src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = "wrapt"; tag = version; - hash = "sha256-k1OuGzUFF2gRsx3xrJ5/YwpXB6ksK0TsaZq6x3+ckf0="; + hash = "sha256-QduT5bncXi4LeI034h5Pqtwybru0QcQIYI7cMchLy7c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix index b4bb6534a58d..d60a9aa186e2 100644 --- a/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, pytestCheckHook, - setuptools, sqlalchemy, wtforms, }: @@ -21,7 +21,7 @@ buildPythonPackage rec { }; build-system = [ - setuptools + hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index b8c537ce0d71..26c40ea937b3 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -29,7 +29,6 @@ libglvnd, libgbm, pango, - SDL, webkitgtk_4_0, wxGTK, xorgproto, @@ -71,7 +70,6 @@ buildPythonPackage rec { attrdict pkg-config setuptools - SDL sip which wxGTK @@ -80,7 +78,6 @@ buildPythonPackage rec { buildInputs = [ wxGTK - SDL ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gst_all_1.gst-plugins-base @@ -108,7 +105,6 @@ buildPythonPackage rec { export DOXYGEN=${doxygen}/bin/doxygen export PATH="${wxGTK}/bin:$PATH" - export SDL_CONFIG="${lib.getExe' (lib.getDev SDL) "sdl-config"}" export WAF=$PWD/bin/waf ${python.pythonOnBuildForHost.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 2aa91ec953f7..b14920e347ca 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "xarray"; - version = "2025.01.1"; + version = "2025.01.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; tag = "v${version}"; - hash = "sha256-BUpMNdYu72/R36r6XXHQqwIWL/ip+O+yE4WxcQQ3ZLY="; + hash = "sha256-Ub3XHMhMnJ9i746o701PYSai8ulTdjLx4OWal2KUTLM="; }; build-system = [ diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index f1d80867a9b2..203ad3fe7228 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -12,21 +12,21 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.35.1"; + version = "1.37.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "adrienverge"; repo = "yamllint"; tag = "v${version}"; - hash = "sha256-+7Q2cPl4XElI2IfLAkteifFVTrGkj2IjZk7nPuc6eYM="; + hash = "sha256-874VqcJyHMVIvrR3qzL2H7/Hz7qRb7GDWI56SAdCz00="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml pathspec ]; @@ -37,6 +37,8 @@ buildPythonPackage rec { [ # test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373 "test_find_files_recursively" + # Issue wih fixture + "test_codec_built_in_equivalent" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # locale tests are broken on BSDs; see https://github.com/adrienverge/yamllint/issues/307 @@ -49,12 +51,10 @@ buildPythonPackage rec { meta = with lib; { description = "Linter for YAML files"; - mainProgram = "yamllint"; homepage = "https://github.com/adrienverge/yamllint"; changelog = "https://github.com/adrienverge/yamllint/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ - mikefaille - ]; + maintainers = with maintainers; [ mikefaille ]; + mainProgram = "yamllint"; }; } diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index a9fa51c1a1d0..1d32f8f6d1d8 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.52"; + version = "0.0.53"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-tGVRlYUoXS3uEAis9NE3gYBjbY5KzMvx8+J67BgU3kI="; + hash = "sha256-EszxMIdZKmw1q9WNyeTSMaGU9or/6oBe7VGOzXMkUzg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 98a46812f7ee..17990e64a151 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -6,26 +6,28 @@ setuptools, pytestCheckHook, nbval, + writableTmpDirAsHomeHook, fetchurl, }: buildPythonPackage rec { pname = "ziafont"; - version = "0.9"; + version = "0.10"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "cdelker"; repo = "ziafont"; tag = version; - hash = "sha256-S7IDL3ItP14/GrCUtSTT+JWuqRAY/Po0Kerq8mggDdg="; + hash = "sha256-tDwl+2EChzBDCFcZW71r4eSKyazlJSv7tRX6soPNSuY="; }; build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook + writableTmpDirAsHomeHook nbval ]; diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index a74411d8afd5..97d6d45ce06a 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -8,20 +8,21 @@ pytestCheckHook, nbval, latex2mathml, + writableTmpDirAsHomeHook, fetchurl, }: buildPythonPackage rec { pname = "ziamath"; - version = "0.11"; + version = "0.12"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "cdelker"; repo = "ziamath"; tag = version; - hash = "sha256-DLpbidQEeQVKxGCbS2jeeCvmVK9ElDIDQMj5bh/x7/Q="; + hash = "sha256-ShR9O170Q26l6XHSe2CO4bEuQm4JNOxiPZ2kbKDLNEU="; }; build-system = [ setuptools ]; @@ -32,6 +33,7 @@ buildPythonPackage rec { pytestCheckHook nbval latex2mathml + writableTmpDirAsHomeHook ]; preCheck = diff --git a/pkgs/development/rocm-modules/6/rocfft/default.nix b/pkgs/development/rocm-modules/6/rocfft/default.nix index 92f51a161a48..c8af11ad4d51 100644 --- a/pkgs/development/rocm-modules/6/rocfft/default.nix +++ b/pkgs/development/rocm-modules/6/rocfft/default.nix @@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { description = "FFT implementation for ROCm"; homepage = "https://github.com/ROCm/rocFFT"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ kira-bruneau ] ++ teams.rocm.members; + maintainers = teams.rocm.members; platforms = platforms.linux; broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index aceb522e6d8a..bf51057d1786 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.32.1"; + version = "0.32.3"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-uzmwxruhJozMJ48f+Xm+CkTCKVwkAcCrjdKGddxLRwQ="; + hash = "sha256-sKb+e2aROl1IBUUR0LB8aHxQfEOkbqz9WYqUWVNj8W8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0iv+SpowtMHkODhnnyc/0dzr+XWZjhLS7sv2rSQExxo="; + cargoHash = "sha256-dPWdBNrY57tLV/YTcnM7SAQs6mfRynZZelNao1tNj2c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/analysis/rr/zen_workaround.nix b/pkgs/development/tools/analysis/rr/zen_workaround.nix index 79898dcfcf64..4ca50b7eb1f7 100644 --- a/pkgs/development/tools/analysis/rr/zen_workaround.nix +++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { pname = "rr-zen_workaround"; inherit (rr) src version; - sourceRoot = "source/third-party/zen-pmu-workaround"; + sourceRoot = "${rr.src.name}/third-party/zen-pmu-workaround"; hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix index 07792ae475cb..71f0cc211e0c 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tflint-ruleset-google"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-eE1KSfbMbNuHlzEi7+zTRdxq548+pB8p01iIWoE2NAQ="; + hash = "sha256-DMFIJ0ywR2goHad3SvUSbj5w2057HJ4k0pNbiR/Y0pI="; }; - vendorHash = "sha256-nuucBbqS+D12JEPoS/QHHTcPKaTjsD4oxnVLDMmLwNA="; + vendorHash = "sha256-plXiB1MTesjg54s0JZGdyf1hR159LlaewJhhyK7raZY="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index c2ceec732117..642d4d25ae37 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -49,8 +49,7 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.hostPlatform.isLinux; preConfigure = lib.optionalString stdenv.hostPlatform.isFreeBSD '' - substituteInPlace configure --replace '`uname -r`' \ - ${toString stdenv.hostPlatform.parsed.kernel.version}.0- + substituteInPlace configure --replace-fail '`uname -r`' ${stdenv.cc.libc.version}- '' + lib.optionalString stdenv.hostPlatform.isDarwin ( let OSRELEASE = '' $(awk -F '"' '/#define OSRELEASE/{ print $2 }' \ diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index e251cf4e48ae..bbc2fe5989e4 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "apko"; - version = "0.25.2"; + version = "0.25.5"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; tag = "v${version}"; - hash = "sha256-lvxdpc8rXGgebxjFEeQOlpDfLwwe8a0QAfqApCgWAHw="; + hash = "sha256-t5ktcl52KOinqqFNNQISqAUBZ08qfR3VBXFTF9k3bsQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-EE59/VyP/dK9qZuTSQqqxAhcJUh/hfSopR7x6k5Eunc="; + vendorHash = "sha256-pFraDvKiQdj7zx20gZbE76mtfkUnnJnUDsdQus+SDes="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index b6eff15e7bc7..f5338093eb70 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.32.7"; + version = "1.33.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-F4b9pTyXOfH+MjRrjHw6OlWmPL1ASfYpJ/LSyBCXpdc="; + hash = "sha256-i9G4mcHZy/nOiLv0eMrjsjiuneL2qRe0QTroeiP3LrY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JK5szUAIAnOhp4kwSNu7Dzt2u8+8woMgoOHi1gA9avU="; + cargoHash = "sha256-1cKD+HL6u8A+7LAZ4Df5wLpbKnodrj7KCE8wbJkwRkA="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 59fdbc570dc2..8c5ee0d17400 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.39.2"; + version = "1.39.3"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-OmDchq0ngdDbgDUyrz/jRwrCI1FJNKeq7ZLMOK4B+z0="; + hash = "sha256-iMM9bLIfWkbxSMNhoDmH7qSxgtlTVJwoNed0OY0Mmds="; }; outputs = [ diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index b0e2a3aa3381..4c9e51e1c8cf 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -14,21 +14,21 @@ let channels = { stable = { - version = "2.18.5"; + version = "2.19.1"; hash = { - x86_64-linux = "sha256-thoe1TYT4b2tm1t9ZTGGMl9AzW/zP74LavIYweUs8Yw="; - x86_64-darwin = "sha256-HOHNzUKSt1ZO2onmydeHDeYdekwxfyy19Ps4q8xdurI="; - aarch64-linux = "sha256-dU6XdW/uOHMgSTnokvw9bDGULQM4urm8Szc7RRUEEcs="; - aarch64-darwin = "sha256-u1/yWTZv0NgviED6+VywONPv4CJsgWBpXjstyL1dBg4="; + x86_64-linux = "sha256-w8yET4jpuNn/DswFlJ8QpKS5YjI9gs0OTmQ0D1f5JZE="; + x86_64-darwin = "sha256-2ttVjvemACsRLoRE7wMmgsUUDM2AFNo5lXG1kCL8Ae8="; + aarch64-linux = "sha256-8BJrMj0s2MzgCueWlWsGKntEkBwW7rBYZF+5O3lVLN0="; + aarch64-darwin = "sha256-9v0OzQMGq92lNKsOevpE1jjwto+ETgfmVmK5p+JdVBI="; }; }; mainline = { - version = "2.18.5"; + version = "2.20.0"; hash = { - x86_64-linux = "sha256-thoe1TYT4b2tm1t9ZTGGMl9AzW/zP74LavIYweUs8Yw="; - x86_64-darwin = "sha256-HOHNzUKSt1ZO2onmydeHDeYdekwxfyy19Ps4q8xdurI="; - aarch64-linux = "sha256-dU6XdW/uOHMgSTnokvw9bDGULQM4urm8Szc7RRUEEcs="; - aarch64-darwin = "sha256-u1/yWTZv0NgviED6+VywONPv4CJsgWBpXjstyL1dBg4="; + x86_64-linux = "sha256-Vk2Qhk4eNf9Akwza0QNuAc/lh2BtU0sd6QSS2IIyZo4="; + x86_64-darwin = "sha256-TVQYQOqJj9gnTt5HaVVjyr7sBPD3mAPpy5vNw9RJ7dc="; + aarch64-linux = "sha256-hBp7lVaJk30KD8eQ4ehoI1/DW28SWQisGtY4lJNVETw="; + aarch64-darwin = "sha256-pvFZELrXk1bf5nfbDskY3bpSCv22Ls0Leo11Dgu/dfI="; }; }; }; diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index aa75150a1b3f..d1a77f0ab25a 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -41,7 +41,6 @@ importlib-resources, packaging, unidiff, - glibcLocales, nixosTests, }: @@ -136,7 +135,6 @@ buildPythonApplication rec { parameterized git openssh - glibcLocales ]; patches = [ @@ -155,7 +153,6 @@ buildPythonApplication rec { doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' - export LC_ALL="en_US.UTF-8" export PATH="$out/bin:$PATH" ''; diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/development/tools/gemstash/Gemfile.lock index e091a27c0f86..92112368f9a2 100644 --- a/pkgs/development/tools/gemstash/Gemfile.lock +++ b/pkgs/development/tools/gemstash/Gemfile.lock @@ -1,8 +1,9 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.2.1.2) + activesupport (7.2.2.1) base64 + benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) @@ -13,10 +14,12 @@ GEM securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) base64 (0.2.0) - bigdecimal (3.1.8) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) + benchmark (0.4.0) + bigdecimal (3.1.9) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) dalli (3.2.8) + date (3.4.1) drb (2.2.1) faraday (1.10.4) faraday-em_http (~> 1.0) @@ -34,8 +37,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -57,26 +60,28 @@ GEM sqlite3 (~> 1.3) terminal-table (~> 3.0) thor (~> 1.0) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) - logger (1.6.1) + logger (1.6.6) lru_redux (1.1.0) - minitest (5.25.1) + mini_portile2 (2.8.8) + minitest (5.25.5) multipart-post (2.4.1) mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - nio4r (2.7.3) - psych (5.1.2) + nio4r (2.7.4) + psych (5.2.3) + date stringio - puma (6.4.3) + puma (6.6.0) nio4r (~> 2.0) - rack (2.2.10) + rack (2.2.13) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) ruby2_keywords (0.0.5) - securerandom (0.3.1) - sequel (5.85.0) + securerandom (0.4.1) + sequel (5.90.0) bigdecimal server_health_check (1.0.2) server_health_check-rack (0.1.0) @@ -86,31 +91,22 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.2.0) tilt (~> 2.0) - sqlite3 (1.7.3-aarch64-linux) - sqlite3 (1.7.3-arm-linux) - sqlite3 (1.7.3-arm64-darwin) - sqlite3 (1.7.3-x86-linux) - sqlite3 (1.7.3-x86_64-darwin) - sqlite3 (1.7.3-x86_64-linux) - stringio (3.1.1) + sqlite3 (1.7.3) + mini_portile2 (~> 2.8.0) + stringio (3.1.5) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.3.2) - tilt (2.4.0) + tilt (2.6.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.6.0) PLATFORMS - aarch64-linux - arm-linux - arm64-darwin - x86-linux - x86_64-darwin - x86_64-linux + ruby DEPENDENCIES gemstash BUNDLED WITH - 2.5.17 + 2.6.2 diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/development/tools/gemstash/gemset.nix index 40f7f09fe9e2..afa40fa2c182 100644 --- a/pkgs/development/tools/gemstash/gemset.nix +++ b/pkgs/development/tools/gemstash/gemset.nix @@ -2,6 +2,7 @@ activesupport = { dependencies = [ "base64" + "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" @@ -16,10 +17,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc"; + sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4"; type = "gem"; }; - version = "7.2.1.2"; + version = "7.2.2.1"; }; base64 = { groups = [ "default" ]; @@ -31,35 +32,45 @@ }; version = "0.2.0"; }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; type = "gem"; }; - version = "3.1.8"; + version = "3.1.9"; }; concurrent-ruby = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; connection_pool = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; dalli = { groups = [ "default" ]; @@ -71,6 +82,16 @@ }; version = "3.2.8"; }; + date = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; + type = "gem"; + }; + version = "3.4.1"; + }; drb = { groups = [ "default" ]; platforms = [ ]; @@ -150,10 +171,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; + sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; type = "gem"; }; - version = "1.0.4"; + version = "1.1.0"; }; faraday-net_http = { groups = [ "default" ]; @@ -247,20 +268,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; + sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; type = "gem"; }; - version = "1.14.6"; + version = "1.14.7"; }; logger = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.6"; }; lru_redux = { groups = [ "default" ]; @@ -272,15 +293,25 @@ }; version = "1.1.0"; }; + mini_portile2 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; + type = "gem"; + }; + version = "2.8.8"; + }; minitest = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; type = "gem"; }; - version = "5.25.1"; + version = "5.25.5"; }; multipart-post = { groups = [ "default" ]; @@ -308,21 +339,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; + sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr"; type = "gem"; }; - version = "2.7.3"; + version = "2.7.4"; }; psych = { - dependencies = [ "stringio" ]; + dependencies = [ + "date" + "stringio" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; + sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4"; type = "gem"; }; - version = "5.1.2"; + version = "5.2.3"; }; puma = { dependencies = [ "nio4r" ]; @@ -330,20 +364,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; + sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j"; type = "gem"; }; - version = "6.4.3"; + version = "6.6.0"; }; rack = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4"; + sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc"; type = "gem"; }; - version = "2.2.10"; + version = "2.2.13"; }; rack-protection = { dependencies = [ @@ -374,10 +408,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; type = "gem"; }; - version = "0.3.1"; + version = "0.4.1"; }; sequel = { dependencies = [ "bigdecimal" ]; @@ -385,10 +419,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04jjv63wvvi9qfkpfsrv6w74liiqk4cd1qnlk7ja7i2waci9hlzx"; + sha256 = "1s5qhylirrmfbjhdjdfqaiksjlaqmgixl25sxd8znq8dqwqlrydz"; type = "gem"; }; - version = "5.85.0"; + version = "5.90.0"; }; server_health_check = { groups = [ "default" ]; @@ -428,11 +462,12 @@ version = "3.2.0"; }; sqlite3 = { + dependencies = [ "mini_portile2" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "sha256-+nf2PHCVSPRtTptrtFzaUqo4gaoSzIWZETJ1jolocBw="; + sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs"; type = "gem"; }; version = "1.7.3"; @@ -442,10 +477,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; + sha256 = "1j1mgvrgkxhadi6nb6pz1kcff7gsb5aivj1vfhsia4ssa5hj9adw"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.5"; }; terminal-table = { dependencies = [ "unicode-display_width" ]; @@ -473,10 +508,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.4.0"; + version = "2.6.0"; }; tzinfo = { dependencies = [ "concurrent-ruby" ]; diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index eafee2eca4b2..f0a20d3ee546 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -21,7 +21,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.36.17"; + version = "0.36.19"; # the platform-specific, statically linked binary src = diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index c1d02052eabc..f94473f9bd4c 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-+qGdxKMStfbLiZJ52axyZI0QXmjX5aoTMCYDlMzlgwY=" -, "x86_64-darwin": "sha256-Twpzd4TmFCvZWwUMHrQhNUWeDz3euKIVbnKYwM1wKtg=" -, "aarch64-linux": "sha256-ZLc41Dl2F4+X1P1KAxUc7bGTiHMM9tQX06GrXSJw5RU=" -, "aarch64-darwin": "sha256-NtGldaVkw40WMJB91iZxdTr6w8vbMyyEQimBk9ldSMI=" +, "x86_64-linux": "sha256-vR7XBHplTNrUkX+cJT93wsWieLWm36Q8QYd3PXTONmU=" +, "x86_64-darwin": "sha256-+RbKuywsLwWIDVvkXQOaxOUNwI7pYt/sbFM/OHTJ3G0=" +, "aarch64-linux": "sha256-KlRcuX4V2BiGVYxZocCXS9X6TVnlfcAQcXzVcwf5zKg=" +, "aarch64-darwin": "sha256-lTb9JiMYW1EjSLilF9TtmAoz54wnDHxqcnO7UeAsbpE=" } diff --git a/pkgs/development/tools/language-servers/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix index 7f43ffe95f5d..e0b970181b57 100644 --- a/pkgs/development/tools/language-servers/fortls/default.nix +++ b/pkgs/development/tools/language-servers/fortls/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "fortls"; - version = "3.1.2"; + version = "3.2.2"; src = fetchFromGitHub { owner = "fortran-lang"; repo = pname; tag = "v${version}"; - hash = "sha256-mOYPtysPj+JczRPTeM1DUckAH0XC9cO1ssP8pviYa0E="; + hash = "sha256-cUZBr+dtTFbd68z6ts4quIPp9XYMikUBrCq+icrZ1KU="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 2a84c902fe82..a56c47b59b31 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -21,13 +21,13 @@ let common = rec { - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; tag = version; - hash = "sha256-HbHqog4Ct8qWJegAHcEcIVNbSyzrmrFspdOk+SVUaHI="; + hash = "sha256-kxCUBgdIulW68H0ATOXsWp5977HFIF7wTw3qYYfgCAQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 8967827c1168..1b0c6ca36506 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -117,11 +117,14 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; - configurePlatforms = [ - "build" - "host" - "target" - ]; + # Workaround for Apple Silicon, configurePlatforms must be disabled + configurePlatforms = + lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) + [ + "build" + "host" + "target" + ]; preConfigure = '' # remove precompiled docs, required for man gdbinit to mention /etc/gdb/gdbinit @@ -170,7 +173,11 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls" ++ lib.optional stdenv.hostPlatform.isStatic "--disable-inprocess-agent" ++ lib.optional enableDebuginfod "--with-debuginfod=yes" - ++ lib.optional (!enableSim) "--disable-sim"; + ++ lib.optional (!enableSim) "--disable-sim" + # Workaround for Apple Silicon, "--target" must be "faked", see eg: https://github.com/Homebrew/homebrew-core/pull/209753 + ++ lib.optional ( + stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 + ) "--target=x86_64-apple-darwin"; postInstall = '' # Remove Info files already provided by Binutils and other packages. @@ -210,9 +217,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ cygwin ++ freebsd ++ darwin; - # upstream does not support targeting aarch64-darwin; - # see https://inbox.sourceware.org/gdb/3185c3b8-8a91-4beb-a5d5-9db6afb93713@Spark/ - badPlatforms = lib.optionals (stdenv.targetPlatform.system == "aarch64-darwin") meta.platforms; maintainers = with lib.maintainers; [ pierron globin diff --git a/pkgs/development/tools/ocaml/crunch/default.nix b/pkgs/development/tools/ocaml/crunch/default.nix index 0af8cb6a9133..959a5c0b02f2 100644 --- a/pkgs/development/tools/ocaml/crunch/default.nix +++ b/pkgs/development/tools/ocaml/crunch/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "crunch"; - version = "3.3.1"; + version = "4.0.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-${version}.tbz"; - sha256 = "sha256-LFug1BELy7dzHLpOr7bESnSHw/iMGtR0AScbaf+o7Wo="; + sha256 = "sha256-k5uNESntbGNMsPnMxvbUSqFwPNBc5gkfLuKgFilEuJs="; }; buildInputs = [ cmdliner ]; diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 5a8d6e5769c3..0900ec9f01b1 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc="; }; "10" = { - version = "10.6.3"; - hash = "sha256-vB7+ku5NQLGnpkTlyp4YVcXF6vxrFRL5AXsxuSRUGds="; + version = "10.6.5"; + hash = "sha256-R8i8pCtLSFNLWxso1XPFBnc5N7AvaOUpkvvYJpExxcg="; }; }; diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 0eb8467a4274..d1048a25da42 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -1,6 +1,7 @@ { lib, stdenvNoCC, + writeScript, callPackages, fetchurl, installShellFiles, @@ -10,7 +11,9 @@ version, hash, }: - +let + majorVersion = lib.versions.major version; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "pnpm"; inherit version; @@ -71,10 +74,32 @@ stdenvNoCC.mkDerivation (finalAttrs: { in { inherit (fetchDepsAttrs) fetchDeps configHook; + inherit majorVersion; tests.version = lib.optionalAttrs withNode ( testers.testVersion { package = finalAttrs.finalPackage; } ); + updateScript = writeScript "pnpm-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + set -eou pipefail + + curl_github() { + curl -L ''${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@" + } + + latestTag=$(curl_github https://api.github.com/repos/pnpm/pnpm/releases?per_page=100 | jq -r --arg major "v${majorVersion}" '[.[].tag_name | select(startswith($major))][0]') + + # Exit if there is no tag with this major version + if [ "$latestTag" = "null" ]; then + echo "No releases starting with v${majorVersion}" + exit 0 + fi + + latestVersion="''${latestTag#v}" + + update-source-version pnpm_${majorVersion} "$latestVersion" --file=./pkgs/development/tools/pnpm/default.nix + ''; }; meta = { diff --git a/pkgs/development/tools/rufo/Gemfile.lock b/pkgs/development/tools/rufo/Gemfile.lock index 57951b5236e8..cac8a74d828c 100644 --- a/pkgs/development/tools/rufo/Gemfile.lock +++ b/pkgs/development/tools/rufo/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - rufo (0.17.0) + rufo (0.18.1) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES rufo BUNDLED WITH - 2.5.3 + 2.6.2 diff --git a/pkgs/development/tools/rufo/gemset.nix b/pkgs/development/tools/rufo/gemset.nix index 18b3414d4be9..ec79e581f6c7 100644 --- a/pkgs/development/tools/rufo/gemset.nix +++ b/pkgs/development/tools/rufo/gemset.nix @@ -4,9 +4,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rqq6mf7fvwvc9m3d5w5ysch3h7z4ml1vvdvy26064fb6lrnn5ai"; + sha256 = "0jcdkl9kpk96kby9qw46klgdy0nxswsbicxdq0dbdhhg7v00cc3r"; type = "gem"; }; - version = "0.17.0"; + version = "0.18.1"; }; } diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 07220d39ecde..be42ec00b39f 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-codspeed"; - version = "2.4.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; rev = "v${version}"; - hash = "sha256-pi02Bn5m4JoTtCIZvxkiUVKkjmtCShKqZw+AyhaVdyY="; + hash = "sha256-q5xsZ8KHuC/Qm+o4xcWbW9Y9VrxHZ+/AxUO8TYEbE74="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xHA6fe1/0p/PHGV6JcyVir5uGAqJ7qkHObjVqDPGwSY="; + cargoHash = "sha256-Ance7Hfl0EOmMfZf3ZqvawrK7scot7WpefLtemHKb+U="; nativeBuildInputs = [ curl @@ -43,6 +43,10 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p=cargo-codspeed" ]; cargoTestFlags = cargoBuildFlags; + checkFlags = [ + # requires an extra dependency, blit + "--skip=test_package_in_deps_build" + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index c6a6672b0c74..48a0933ee61c 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.42.2"; + version = "2.42.3"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - hash = "sha256-2ef94xCBSk/WM/wNCZbKMn6Cx6owxKhHoE5cAlrHLB4="; + hash = "sha256-frqKGDkDFTG53B5AdJMz2UYnIe6fRQFcFejvFPO0LTg="; }; doCheck = false; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; useFetchCargoVendor = true; - cargoHash = "sha256-IvQEQ1TN1NEZ6KLMyxujP5AYMV0xJ1sGmZiY9p2HJus="; + cargoHash = "sha256-E7tvg5bm3XwbrTi3BCOZGJajHE6xuy/+uv21AvG6kgs="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ diff --git a/pkgs/development/tools/xcode-install/Gemfile b/pkgs/development/tools/xcode-install/Gemfile index b9d313ce14fc..791e2b76172c 100644 --- a/pkgs/development/tools/xcode-install/Gemfile +++ b/pkgs/development/tools/xcode-install/Gemfile @@ -1,2 +1,4 @@ source 'https://rubygems.org' gem 'xcode-install' + +gem "abbrev", "~> 0.1.2" diff --git a/pkgs/development/tools/xcode-install/Gemfile.lock b/pkgs/development/tools/xcode-install/Gemfile.lock index 589543fe47d6..d9bbc5cc8cb3 100644 --- a/pkgs/development/tools/xcode-install/Gemfile.lock +++ b/pkgs/development/tools/xcode-install/Gemfile.lock @@ -1,62 +1,84 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.3) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - artifactory (3.0.15) + CFPropertyList (3.0.7) + base64 + nkf + rexml + abbrev (0.1.2) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.1.0) - aws-partitions (1.419.0) - aws-sdk-core (3.111.2) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.41.0) - aws-sdk-core (~> 3, >= 3.109.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-eventstream (1.3.2) + aws-partitions (1.1068.0) + aws-sdk-core (3.220.1) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.99.0) + aws-sdk-core (~> 3, >= 3.216.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.1) - aws-sigv4 (1.2.2) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - claide (1.0.3) + base64 (0.2.0) + claide (1.1.0) colored (1.2) colored2 (3.1.2) - commander-fastlane (4.4.6) - highline (~> 1.7.2) + commander (4.6.0) + highline (~> 2.0.0) declarative (0.0.20) - declarative-option (0.1.0) - digest-crc (0.6.3) + digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - emoji_regex (3.2.1) - excon (0.78.1) - faraday (1.3.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.112.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday-net_http (1.0.1) - faraday_middleware (1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) faraday (~> 1.0) - fastimage (2.2.1) - fastlane (2.172.0) + fastimage (2.4.0) + fastlane (2.227.0) CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) + addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) - colored - commander-fastlane (>= 4.4.6, < 5.0.0) + colored (~> 1.2) + commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) @@ -64,133 +86,135 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.37.0, < 0.39.0) - google-cloud-storage (>= 1.15.0, < 2.0.0) - highline (>= 1.7.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) + security (= 0.1.5) simctl (~> 1.6.3) - slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) + terminal-table (~> 3) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) + xcpretty (~> 0.4.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) gh_inspector (1.1.3) - google-api-client (0.38.0) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.12) - google-apis-core (0.2.1) - addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.14) - httpclient (>= 2.8.1, < 3.0) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.0) + retriable (>= 2.0, < 4.a) rexml - signet (~> 0.14) - webrick - google-apis-iamcredentials_v1 (0.1.0) - google-apis-core (~> 0.1) - google-apis-storage_v1 (0.1.0) - google-apis-core (~> 0.1) - google-cloud-core (1.5.0) - google-cloud-env (~> 1.0) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.8.0) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.4.0) - faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.0.1) - google-cloud-storage (1.30.0) - addressable (~> 2.5) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.5.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.15.0) - faraday (>= 0.17.3, < 2.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) - highline (1.7.10) - http-cookie (1.0.3) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.8) domain_name (~> 0.5) - httpclient (2.8.3) - jmespath (1.4.0) - json (2.5.1) - jwt (2.2.2) - memoist (0.16.2) - mini_magick (4.11.0) - mini_mime (1.0.2) + httpclient (2.9.0) + mutex_m + jmespath (1.6.2) + json (2.10.2) + jwt (2.10.1) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.0.0) - nanaimo (0.3.0) + multipart-post (2.4.1) + mutex_m (0.3.0) + nanaimo (0.4.0) naturally (2.2.1) - os (1.1.1) - plist (3.6.0) - public_suffix (4.0.6) - rake (13.0.3) - representable (3.0.4) + nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.2) + public_suffix (6.0.1) + rake (13.2.1) + representable (3.2.0) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.4) - rouge (2.0.7) - ruby2_keywords (0.0.4) - rubyzip (2.3.0) - security (0.1.3) - signet (0.14.0) - addressable (~> 2.3) - faraday (>= 0.17.3, < 2.0) + rexml (3.4.1) + rouge (3.28.0) + ruby2_keywords (0.0.5) + rubyzip (2.4.1) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.8) + simctl (1.6.10) CFPropertyList naturally - slack-notifier (2.3.2) + sysrandom (1.0.5) terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) tty-cursor (0.7.1) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - webrick (1.7.0) + unicode-display_width (2.6.0) word_wrap (1.0.0) - xcode-install (2.6.8) - claide (>= 0.9.1, < 1.1.0) + xcode-install (2.8.1) + claide (>= 0.9.1) fastlane (>= 2.1.0, < 3.0.0) - xcodeproj (1.19.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.0) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) @@ -198,7 +222,8 @@ PLATFORMS ruby DEPENDENCIES + abbrev (~> 0.1.2) xcode-install BUNDLED WITH - 1.17.2 + 2.6.2 diff --git a/pkgs/development/tools/xcode-install/default.nix b/pkgs/development/tools/xcode-install/default.nix index 4b753b74d9f8..a00ee5f3bf42 100644 --- a/pkgs/development/tools/xcode-install/default.nix +++ b/pkgs/development/tools/xcode-install/default.nix @@ -1,6 +1,7 @@ { lib, bundlerApp, + bundlerUpdateScript, }: bundlerApp { @@ -8,6 +9,8 @@ bundlerApp { gemdir = ./.; exes = [ "xcversion" ]; + passthru.updateScript = bundlerUpdateScript "xcode-install"; + meta = with lib; { description = "Install and update your Xcodes automatically"; homepage = "https://github.com/xcpretty/xcode-install"; diff --git a/pkgs/development/tools/xcode-install/gemset.nix b/pkgs/development/tools/xcode-install/gemset.nix index 351c162ca498..115647dd9c29 100644 --- a/pkgs/development/tools/xcode-install/gemset.nix +++ b/pkgs/development/tools/xcode-install/gemset.nix @@ -1,24 +1,34 @@ { + abbrev = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hj2qyx7rzpc7awhvqlm597x7qdxwi4kkml4aqnp5jylmsm4w6xd"; + type = "gem"; + }; + version = "0.1.2"; + }; addressable = { dependencies = [ "public_suffix" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.7"; }; artifactory = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls"; + sha256 = "0qzj389l2a3zig040h882mf6cxfa71pm2nk51l4p85n3ck4xa8rh"; type = "gem"; }; - version = "3.0.15"; + version = "3.0.17"; }; atomos = { groups = [ "default" ]; @@ -35,36 +45,37 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; + sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.2"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vz0djj8w3ns0sz5gvkla5jml8xzx6skbcfj255m81fyww1x6ws8"; + sha256 = "0lmnx4sa9wm9ffqsjbybxzlgz6h4clf96s694sdn2lz1qcx0fq2i"; type = "gem"; }; - version = "1.419.0"; + version = "1.1068.0"; }; aws-sdk-core = { dependencies = [ "aws-eventstream" "aws-partitions" "aws-sigv4" + "base64" "jmespath" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4"; + sha256 = "0cjdqmy5hjbgzc0iac1i143va76qgp7jc7hg1aviy1n8cgywq44y"; type = "gem"; }; - version = "3.111.2"; + version = "3.220.1"; }; aws-sdk-kms = { dependencies = [ @@ -75,10 +86,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm"; + sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; type = "gem"; }; - version = "1.41.0"; + version = "1.99.0"; }; aws-sdk-s3 = { dependencies = [ @@ -90,10 +101,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; + sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; type = "gem"; }; - version = "1.87.0"; + version = "1.182.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -101,10 +112,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; + sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; type = "gem"; }; - version = "1.2.2"; + version = "1.11.0"; }; babosa = { groups = [ "default" ]; @@ -116,25 +127,40 @@ }; version = "1.0.4"; }; - CFPropertyList = { + base64 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; type = "gem"; }; - version = "3.0.3"; + version = "0.2.0"; + }; + CFPropertyList = { + dependencies = [ + "base64" + "nkf" + "rexml" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4"; + type = "gem"; + }; + version = "3.0.7"; }; claide = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; colored = { groups = [ "default" ]; @@ -156,16 +182,16 @@ }; version = "3.1.2"; }; - commander-fastlane = { + commander = { dependencies = [ "highline" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65"; + sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx"; type = "gem"; }; - version = "4.4.6"; + version = "4.6.0"; }; declarative = { groups = [ "default" ]; @@ -177,82 +203,79 @@ }; version = "0.0.20"; }; - declarative-option = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; - type = "gem"; - }; - version = "0.1.0"; - }; digest-crc = { dependencies = [ "rake" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a"; + sha256 = "01wcsyhaadss4zzvqh12kvbq3hmkl5y4fck7pr608hd24qxc5bb4"; type = "gem"; }; - version = "0.6.3"; + version = "0.7.0"; }; domain_name = { - dependencies = [ "unf" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20240107"; }; dotenv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; type = "gem"; }; - version = "2.7.6"; + version = "2.8.1"; }; emoji_regex = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qbzlracxw4xwyvrgr0qcl1alk4ijk6pv53ni6f43csi649y3n3s"; + sha256 = "0jsnrkfy345v66jlm2xrz8znivfnamg3mfzkddn414bndf2vxn7c"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.3"; }; excon = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r"; + sha256 = "1w7098hnyby5sn2315qy26as6kxlxivxlcrs714amj9g9hxaryfs"; type = "gem"; }; - version = "0.78.1"; + version = "0.112.0"; }; faraday = { dependencies = [ + "faraday-em_http" + "faraday-em_synchrony" + "faraday-excon" + "faraday-httpclient" + "faraday-multipart" "faraday-net_http" - "multipart-post" + "faraday-net_http_persistent" + "faraday-patron" + "faraday-rack" + "faraday-retry" "ruby2_keywords" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153"; type = "gem"; }; - version = "1.3.0"; + version = "1.10.4"; }; faraday-cookie_jar = { dependencies = [ @@ -268,15 +291,106 @@ }; version = "0.0.7"; }; + faraday-em_http = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-httpclient = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-multipart = { + dependencies = [ "multipart-post" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; + type = "gem"; + }; + version = "1.1.0"; + }; faraday-net_http = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; + }; + faraday-net_http_persistent = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday-patron = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-rack = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-retry = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; }; faraday_middleware = { dependencies = [ "faraday" ]; @@ -284,20 +398,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; + sha256 = "1s990pnapb3vci9c00bklqc7jjix4i2zhxn2zf1lfk46xv47hnyl"; type = "gem"; }; - version = "1.0.0"; + version = "1.2.1"; }; fastimage = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vqp53s9vgd28f4l17q0vs7xv32y64af0ny3wb1fgg4i534rzg6j"; + sha256 = "1s67b9n7ki3iaycypq8sh02377gjkaxadg4dq53bpgfk4xg3gkjz"; type = "gem"; }; - version = "2.2.1"; + version = "2.4.0"; }; fastlane = { dependencies = [ @@ -307,7 +421,7 @@ "aws-sdk-s3" "babosa" "colored" - "commander-fastlane" + "commander" "dotenv" "emoji_regex" "excon" @@ -315,19 +429,24 @@ "faraday-cookie_jar" "faraday_middleware" "fastimage" + "fastlane-sirp" "gh_inspector" - "google-api-client" + "google-apis-androidpublisher_v3" + "google-apis-playcustomapp_v1" + "google-cloud-env" "google-cloud-storage" "highline" + "http-cookie" "json" "jwt" "mini_magick" "multipart-post" + "naturally" + "optparse" "plist" "rubyzip" "security" "simctl" - "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" @@ -341,10 +460,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0crr42qdgy9l409pffpfs7nq8ha18lp1nxngny2dc9hiq1xx4r5d"; + sha256 = "12lqn70c3v5h2z2svn1gickyhkhny6rwnm2xfrs3gmjc6pvfrqhb"; type = "gem"; }; - version = "2.172.0"; + version = "2.227.0"; + }; + fastlane-sirp = { + dependencies = [ "sysrandom" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hg6ql3g25f96fsmwr9xlxpn8afa7wvjampnrh1fqffhphjqyiv6"; + type = "gem"; + }; + version = "1.0.0"; }; gh_inspector = { groups = [ "default" ]; @@ -356,24 +486,16 @@ }; version = "1.1.3"; }; - google-api-client = { - dependencies = [ - "addressable" - "googleauth" - "httpclient" - "mini_mime" - "representable" - "retriable" - "signet" - ]; + google-apis-androidpublisher_v3 = { + dependencies = [ "google-apis-core" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1"; + sha256 = "046j100lrh5dhb8p3gr38fyqrw8vcif97pqb55ysipy874lafw49"; type = "gem"; }; - version = "0.38.0"; + version = "0.54.0"; }; google-apis-core = { dependencies = [ @@ -384,17 +506,15 @@ "representable" "retriable" "rexml" - "signet" - "webrick" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "184pqw7z7s8mc1r5gj8f76xvp8z650xq50vdfj5gjwsbmzd99z2f"; + sha256 = "15ycm7al9dizabbqmri5xmiz8mbcci343ygb64ndbmr9n49p08a3"; type = "gem"; }; - version = "0.2.1"; + version = "0.11.3"; }; google-apis-iamcredentials_v1 = { dependencies = [ "google-apis-core" ]; @@ -402,10 +522,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xjlzq2fxpwvp9b6ajs8cpyjv8vs2d2npg9v23yj181hj2fnn82c"; + sha256 = "0ysil0bkh755kmf9xvw5szhk1yyh3gqzwfsrbwsrl77gsv7jarcs"; type = "gem"; }; - version = "0.1.0"; + version = "0.17.0"; + }; + google-apis-playcustomapp_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1mlgwiid5lgg41y7qk8ca9lzhwx5njs25hz5fbf1mdal0kwm37lm"; + type = "gem"; + }; + version = "0.13.0"; }; google-apis-storage_v1 = { dependencies = [ "google-apis-core" ]; @@ -413,10 +544,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0axycds5q20fqm6vqxa5r922021p0f8jhwvlgw8r1vq600ljribi"; + sha256 = "13yvc9r8bhs16vq3fjc93qlffmq9p6zx97c9g1c3wh0jbrvwrs03"; type = "gem"; }; - version = "0.1.0"; + version = "0.31.0"; }; google-cloud-core = { dependencies = [ @@ -427,10 +558,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qjn7vs8f85vxi1nkikbjfja6bv9snrj26vzscjii0cm8n4dy0i1"; + sha256 = "1kw10897ardky1chwwsb8milygzcdi8qlqlhcnqwmkw9y75yswp5"; type = "gem"; }; - version = "1.5.0"; + version = "1.8.0"; }; google-cloud-env = { dependencies = [ "faraday" ]; @@ -438,20 +569,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i"; + sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; google-cloud-errors = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hvs1x39g77hbdqjxmzcl6gq8160pv3kskvzbbch0ww1np6qwm67"; + sha256 = "0jvv9w8s4dqc4ncfa6c6qpdypz2wj8dmgpjd44jq2qhhij5y4sxm"; type = "gem"; }; - version = "1.0.1"; + version = "1.5.0"; }; google-cloud-storage = { dependencies = [ @@ -467,16 +598,15 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17axi5gmy0g04801v11lww5mvqzffqdc3w6k1j7f95v90hy4yn6m"; + sha256 = "0xpb3s7zr7g647xg66y2mavdargk5ixsfbfdmi4m2jc3khdd0hxm"; type = "gem"; }; - version = "1.30.0"; + version = "1.47.0"; }; googleauth = { dependencies = [ "faraday" "jwt" - "memoist" "multi_json" "os" "signet" @@ -485,20 +615,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pwm0mzb5zffhk6yw4v3n1yj8qr6jla6f78vsv4g0bxh9z0ikc2z"; + sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1"; type = "gem"; }; - version = "0.15.0"; + version = "1.8.1"; }; highline = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; - version = "1.7.10"; + version = "2.0.3"; }; http-cookie = { dependencies = [ "domain_name" ]; @@ -506,80 +636,72 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.8"; }; httpclient = { + dependencies = [ "mutex_m" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b"; type = "gem"; }; - version = "2.8.3"; + version = "2.9.0"; }; jmespath = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.2"; }; json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; type = "gem"; }; - version = "2.5.1"; + version = "2.10.2"; }; jwt = { + dependencies = [ "base64" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; + sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6"; type = "gem"; }; - version = "2.2.2"; - }; - memoist = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; - type = "gem"; - }; - version = "0.16.2"; + version = "2.10.1"; }; mini_magick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + sha256 = "1nfxjpmka12ihbwd87d5k2hh7d2pv3aq95x0l2lh8gca1s72bmki"; type = "gem"; }; - version = "4.11.0"; + version = "4.13.2"; }; mini_mime = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.5"; }; multi_json = { groups = [ "default" ]; @@ -596,20 +718,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; type = "gem"; }; - version = "2.0.0"; + version = "2.4.1"; + }; + mutex_m = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; + type = "gem"; + }; + version = "0.3.0"; }; nanaimo = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; + sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; naturally = { groups = [ "default" ]; @@ -621,60 +753,80 @@ }; version = "2.2.1"; }; + nkf = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv"; + type = "gem"; + }; + version = "0.2.0"; + }; + optparse = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1306kdvq0xr333xma4452zvvvw6mx7fw20fwi6508i6dq5lh9s95"; + type = "gem"; + }; + version = "0.6.0"; + }; os = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; + sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.4"; }; plist = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; + sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.2"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "4.0.6"; + version = "6.0.1"; }; rake = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.0.3"; + version = "13.2.1"; }; representable = { dependencies = [ "declarative" - "declarative-option" + "trailblazer-option" "uber" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; + sha256 = "1kms3r6w6pnryysnaqqa9fsn0v73zx1ilds9d1c565n3xdzbyafc"; type = "gem"; }; - version = "3.0.4"; + version = "3.2.0"; }; retriable = { groups = [ "default" ]; @@ -691,50 +843,50 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.2.4"; + version = "3.4.1"; }; rouge = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; type = "gem"; }; - version = "2.0.7"; + version = "3.28.0"; }; ruby2_keywords = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; rubyzip = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; security = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa"; + sha256 = "1drkm2wgjazwzj09db1szrllkag036bdvc3dr42fh1kpr877m5rs"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.5"; }; signet = { dependencies = [ @@ -747,10 +899,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp"; + sha256 = "0cfxa11wy1nv9slmnzjczkdgld0gqizajsb03rliy53zylwkjzsk"; type = "gem"; }; - version = "0.14.0"; + version = "0.19.0"; }; simctl = { dependencies = [ @@ -761,20 +913,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v9rsdmg5c5kkf8ps47xnrfbvjnq11sbaifr186jwkh4npawz00x"; + sha256 = "0sr3z4kmp6ym7synicyilj9vic7i9nxgaszqx6n1xn1ss7s7g45r"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.10"; }; - slack-notifier = { + sysrandom = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv"; + sha256 = "0x8yryf6migjnkfwr8dxgx1qyzhvajgha60hr5mgfkn65qyarhas"; type = "gem"; }; - version = "2.3.2"; + version = "1.0.5"; }; terminal-notifier = { groups = [ "default" ]; @@ -792,10 +944,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "1.8.0"; + version = "3.0.2"; + }; + trailblazer-option = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10"; + type = "gem"; + }; + version = "0.1.2"; }; tty-cursor = { groups = [ "default" ]; @@ -812,10 +974,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + sha256 = "0l4vh6g333jxm9lakilkva2gn17j6gb052626r1pdbmy2lhnb460"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; }; tty-spinner = { dependencies = [ "tty-cursor" ]; @@ -838,46 +1000,15 @@ }; version = "0.1.0"; }; - unf = { - dependencies = [ "unf_ext" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; - type = "gem"; - }; - version = "0.0.7.7"; - }; unicode-display_width = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "1.7.0"; - }; - webrick = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; - type = "gem"; - }; - version = "1.7.0"; + version = "2.6.0"; }; word_wrap = { groups = [ "default" ]; @@ -898,10 +1029,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yhslanqw8r0mhls2hira05c8xjzzr7mnz1ab9p5qwg4z45ddjj8"; + sha256 = "11mkjyz5icxyskmchwh1vld9vdlhc794356nbla88dgjaqhjddvl"; type = "gem"; }; - version = "2.6.8"; + version = "2.8.1"; }; xcodeproj = { dependencies = [ @@ -910,15 +1041,16 @@ "claide" "colored2" "nanaimo" + "rexml" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc"; type = "gem"; }; - version = "1.19.0"; + version = "1.27.0"; }; xcpretty = { dependencies = [ "rouge" ]; @@ -926,10 +1058,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; + sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; xcpretty-travis-formatter = { dependencies = [ "xcpretty" ]; diff --git a/pkgs/development/tools/xcpretty/Gemfile.lock b/pkgs/development/tools/xcpretty/Gemfile.lock index c0b9676d27bd..d56a9587d70d 100644 --- a/pkgs/development/tools/xcpretty/Gemfile.lock +++ b/pkgs/development/tools/xcpretty/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - rouge (2.0.7) - xcpretty (0.3.0) - rouge (~> 2.0.7) + rouge (3.28.0) + xcpretty (0.4.0) + rouge (~> 3.28.0) PLATFORMS ruby @@ -12,4 +12,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 2.1.4 + 2.6.2 diff --git a/pkgs/development/tools/xcpretty/gemset.nix b/pkgs/development/tools/xcpretty/gemset.nix index 97dffa3040fd..b9dd45abfbbb 100644 --- a/pkgs/development/tools/xcpretty/gemset.nix +++ b/pkgs/development/tools/xcpretty/gemset.nix @@ -1,19 +1,23 @@ { rouge = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; type = "gem"; }; - version = "2.0.7"; + version = "3.28.0"; }; xcpretty = { dependencies = [ "rouge" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; + sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; } diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/development/web/mailcatcher/Gemfile.lock index 9f931928053d..8df2c9589ec2 100644 --- a/pkgs/development/web/mailcatcher/Gemfile.lock +++ b/pkgs/development/web/mailcatcher/Gemfile.lock @@ -1,143 +1,62 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.4) - public_suffix (>= 2.0.2, < 6.0) - capybara (3.39.2) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - capybara-screenshot (1.0.26) - capybara (>= 1.0, < 4) - launchy - chunky_png (1.4.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) - concurrent-ruby (1.2.2) + base64 (0.2.0) daemons (1.4.1) - date (3.3.3) - diff-lcs (1.5.0) + date (3.4.1) eventmachine (1.2.7) - execjs (2.8.1) faye-websocket (0.11.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.15.5) - launchy (2.5.2) - addressable (~> 2.8) mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - mailcatcher (0.9.0) - eventmachine (= 1.2.7) + mailcatcher (0.10.0) + eventmachine (~> 1.0) faye-websocket (~> 0.11.1) mail (~> 2.3) net-smtp - rack (~> 1.5) - sinatra (~> 1.2) + rack (~> 2.2) + sinatra (~> 3.2) sqlite3 (~> 1.3) thin (~> 1.8) - matrix (0.4.2) - mini_mime (1.1.2) - mini_portile2 (2.8.4) - multi_json (1.15.0) - net-imap (0.3.7) + mini_mime (1.1.5) + mini_portile2 (2.8.8) + mustermann (3.0.3) + ruby2_keywords (~> 0.0.1) + net-imap (0.5.6) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.5.1) net-protocol - nokogiri (1.16.0) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - psych (5.1.0) - stringio - public_suffix (5.0.3) - racc (1.7.1) - rack (1.6.13) - rack-protection (1.5.5) - rack - rack-test (2.1.0) - rack (>= 1.3) - rake (13.0.6) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rdoc (6.5.0) - psych (>= 4.0.0) - regexp_parser (2.8.1) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rubyzip (2.3.2) - sass (3.4.25) - selenium-webdriver (4.9.0) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2, < 3.0) - websocket (~> 1.0) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-helpers (1.4.0) - sprockets (>= 2.2) - sprockets-sass (2.0.0.beta2) - sprockets (>= 2.0, < 4.0) - sqlite3 (1.6.3) + rack (2.2.13) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.2.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.2.0) + tilt (~> 2.0) + sqlite3 (1.7.3) mini_portile2 (~> 2.8.0) - stringio (3.0.7) thin (1.8.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - tilt (2.2.0) - timeout (0.4.0) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) - websocket (1.2.9) - websocket-driver (0.7.6) + tilt (2.6.0) + timeout (0.4.3) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - xpath (3.2.0) - nokogiri (~> 1.8) PLATFORMS ruby @@ -146,4 +65,4 @@ DEPENDENCIES mailcatcher BUNDLED WITH - 2.1.4 + 2.6.2 diff --git a/pkgs/development/web/mailcatcher/gemset.nix b/pkgs/development/web/mailcatcher/gemset.nix index 34021359d865..d9f6eb17e4a6 100644 --- a/pkgs/development/web/mailcatcher/gemset.nix +++ b/pkgs/development/web/mailcatcher/gemset.nix @@ -1,153 +1,13 @@ { - addressable = { - dependencies = [ "public_suffix" ]; - groups = [ - "default" - "development" - ]; + base64 = { + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; type = "gem"; }; - version = "2.8.4"; - }; - capybara = { - dependencies = [ - "addressable" - "matrix" - "mini_mime" - "nokogiri" - "rack" - "rack-test" - "regexp_parser" - "xpath" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; - type = "gem"; - }; - version = "3.39.2"; - }; - capybara-screenshot = { - dependencies = [ - "capybara" - "launchy" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xqc7hdiw1ql42mklpfvqd2pyfsxmy55cpx0h9y0jlkpl1q96sw1"; - type = "gem"; - }; - version = "1.0.26"; - }; - chunky_png = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; - type = "gem"; - }; - version = "1.4.0"; - }; - coffee-script = { - dependencies = [ - "coffee-script-source" - "execjs" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; - type = "gem"; - }; - version = "2.4.1"; - }; - coffee-script-source = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1907v9q1zcqmmyqzhzych5l7qifgls2rlbnbhy5vzyr7i7yicaz1"; - type = "gem"; - }; - version = "1.12.2"; - }; - compass = { - dependencies = [ - "chunky_png" - "compass-core" - "compass-import-once" - "rb-fsevent" - "rb-inotify" - "sass" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lfi83w8z75czr0pf0rmj9hda22082h3cmvczl8r1ma9agf88y2c"; - type = "gem"; - }; - version = "1.0.3"; - }; - compass-core = { - dependencies = [ - "multi_json" - "sass" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yaspqwdmzwdcqviclbs3blq7an16pysrfzylz8q1gxmmd6bpj3a"; - type = "gem"; - }; - version = "1.0.3"; - }; - compass-import-once = { - dependencies = [ "sass" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq"; - type = "gem"; - }; - version = "1.0.5"; - }; - concurrent-ruby = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; - type = "gem"; - }; - version = "1.2.2"; + version = "0.2.0"; }; daemons = { groups = [ "default" ]; @@ -164,23 +24,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; type = "gem"; }; - version = "3.3.3"; - }; - diff-lcs = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; - type = "gem"; - }; - version = "1.5.0"; + version = "3.4.1"; }; eventmachine = { groups = [ "default" ]; @@ -192,19 +39,6 @@ }; version = "1.2.7"; }; - execjs = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; - type = "gem"; - }; - version = "2.8.1"; - }; faye-websocket = { dependencies = [ "eventmachine" @@ -219,33 +53,6 @@ }; version = "0.11.3"; }; - ffi = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; - type = "gem"; - }; - version = "1.15.5"; - }; - launchy = { - dependencies = [ "addressable" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; - type = "gem"; - }; - version = "2.5.2"; - }; mail = { dependencies = [ "mini_mime" @@ -277,62 +84,41 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "003d2a6i97syw67jxrjq0p4xm19p9cfqnbmsg4b1c3mdb5c78rfz"; + sha256 = "0383smildpjh0zrcq38x1y1ka6rkpdwjnlx4ng9dlyv8hkhnz6zm"; type = "gem"; }; - version = "0.9.0"; - }; - matrix = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; - type = "gem"; - }; - version = "0.4.2"; + version = "0.10.0"; }; mini_mime = { - groups = [ - "default" - "development" - ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; mini_portile2 = { - groups = [ - "default" - "development" - ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.8"; }; - multi_json = { - groups = [ - "default" - "development" - ]; + mustermann = { + dependencies = [ "ruby2_keywords" ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i"; type = "gem"; }; - version = "1.15.0"; + version = "3.0.3"; }; net-imap = { dependencies = [ @@ -343,10 +129,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; + sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy"; type = "gem"; }; - version = "0.3.7"; + version = "0.5.6"; }; net-pop = { dependencies = [ "net-protocol" ]; @@ -365,10 +151,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.2"; }; net-smtp = { dependencies = [ "net-protocol" ]; @@ -376,296 +162,48 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd"; type = "gem"; }; - version = "0.3.3"; - }; - nokogiri = { - dependencies = [ - "mini_portile2" - "racc" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; - type = "gem"; - }; - version = "1.16.0"; - }; - psych = { - dependencies = [ "stringio" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1msambb54r3d1sg6smyj4k2pj9h9lz8jq4jamip7ivcyv32a85vz"; - type = "gem"; - }; - version = "5.1.0"; - }; - public_suffix = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; - type = "gem"; - }; - version = "5.0.3"; - }; - racc = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; - type = "gem"; - }; - version = "1.7.1"; + version = "0.5.1"; }; rack = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0"; - type = "gem"; - }; - version = "1.6.13"; - }; - rack-protection = { - dependencies = [ "rack" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; + sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc"; type = "gem"; }; - version = "1.5.5"; + version = "2.2.13"; }; - rack-test = { - dependencies = [ "rack" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; - type = "gem"; - }; - version = "2.1.0"; - }; - rake = { - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; - type = "gem"; - }; - version = "13.0.6"; - }; - rb-fsevent = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; - type = "gem"; - }; - version = "0.11.2"; - }; - rb-inotify = { - dependencies = [ "ffi" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; - type = "gem"; - }; - version = "0.10.1"; - }; - rdoc = { - dependencies = [ "psych" ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05r2cxscapr9saqjw8dlp89as7jvc2mlz1h5kssrmkbz105qmfcm"; - type = "gem"; - }; - version = "6.5.0"; - }; - regexp_parser = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; - type = "gem"; - }; - version = "2.8.1"; - }; - rexml = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; - type = "gem"; - }; - version = "3.2.6"; - }; - rspec = { + rack-protection = { dependencies = [ - "rspec-core" - "rspec-expectations" - "rspec-mocks" + "base64" + "rack" ]; - groups = [ "development" ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; + sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w"; type = "gem"; }; - version = "3.12.0"; + version = "3.2.0"; }; - rspec-core = { - dependencies = [ "rspec-support" ]; - groups = [ - "default" - "development" - ]; + ruby2_keywords = { + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "3.12.2"; - }; - rspec-expectations = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; - type = "gem"; - }; - version = "3.12.3"; - }; - rspec-mocks = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; - type = "gem"; - }; - version = "3.12.6"; - }; - rspec-support = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; - type = "gem"; - }; - version = "3.12.1"; - }; - rubyzip = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; - type = "gem"; - }; - version = "2.3.2"; - }; - sass = { - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kfpcwh8dgw4lc81qglkvjl73689jy3g7196zkxm4fpskg1p5lkw"; - type = "gem"; - }; - version = "3.4.25"; - }; - selenium-webdriver = { - dependencies = [ - "rexml" - "rubyzip" - "websocket" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kxnv3ywssagv2q453hasrrrvsv68d5f3ccm33pyacdji88w8pqg"; - type = "gem"; - }; - version = "4.9.0"; + version = "0.0.5"; }; sinatra = { dependencies = [ + "mustermann" "rack" "rack-protection" "tilt" @@ -674,46 +212,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + sha256 = "01wq20aqk5kfggq3wagx5xr1cz0x08lg6dxbk9yhd1sf0d6pywkf"; type = "gem"; }; - version = "1.4.8"; - }; - sprockets = { - dependencies = [ - "concurrent-ruby" - "rack" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; - type = "gem"; - }; - version = "3.7.2"; - }; - sprockets-helpers = { - dependencies = [ "sprockets" ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0513ma356g05lsskhsb363263177h6ccmp475il0p69y18his2ij"; - type = "gem"; - }; - version = "1.4.0"; - }; - sprockets-sass = { - dependencies = [ "sprockets" ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02g153dhzmrlik5dd9kyq0rvr2xjm3fwx8rm7apqfrykc47aizqr"; - type = "gem"; - }; - version = "2.0.0.beta2"; + version = "3.2.0"; }; sqlite3 = { dependencies = [ "mini_portile2" ]; @@ -721,23 +223,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; + sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs"; type = "gem"; }; - version = "1.6.3"; - }; - stringio = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0557v4z7996cgqw7i9197848mymv02krads93dn9lyqa5d7xd0dn"; - type = "gem"; - }; - version = "3.0.7"; + version = "1.7.3"; }; thin = { dependencies = [ @@ -759,55 +248,34 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.2.0"; + version = "2.6.0"; }; timeout = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; type = "gem"; }; - version = "0.4.0"; - }; - uglifier = { - dependencies = [ "execjs" ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f"; - type = "gem"; - }; - version = "4.2.0"; - }; - websocket = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; - type = "gem"; - }; - version = "1.2.9"; + version = "0.4.3"; }; websocket-driver = { - dependencies = [ "websocket-extensions" ]; + dependencies = [ + "base64" + "websocket-extensions" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; + sha256 = "1d26l4qn55ivzahbc7fwc4k4z3j7wzym05i9n77i4mslrpr9jv85"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; }; websocket-extensions = { groups = [ "default" ]; @@ -819,18 +287,4 @@ }; version = "0.1.5"; }; - xpath = { - dependencies = [ "nokogiri" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; - type = "gem"; - }; - version = "3.2.0"; - }; } diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix deleted file mode 100644 index 963b3c471217..000000000000 --- a/pkgs/games/0ad/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - fmt, - wxGTK, - stdenv, - newScope, -}: -let - callPackage = newScope self; - - self = { - zeroad-unwrapped = callPackage ./game.nix { inherit fmt wxGTK stdenv; }; - - zeroad-data = callPackage ./data.nix { inherit stdenv; }; - - zeroad = callPackage ./wrapper.nix { }; - }; - -in -self diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 5bab46e5b7c3..51cf2829be7f 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -19,7 +19,10 @@ SDL2, SDL2_image, SDL2_mixer, + libGL, + libGLU, libpng, + libX11, libxml2, protobuf, xvfb-run, @@ -54,6 +57,9 @@ let inherit version; src = fetchArmagetron rev hash; extraBuildInputs = lib.optionals (!dedicatedServer) [ + libGL + libGLU + libX11 libpng SDL SDL_image @@ -79,6 +85,9 @@ let glew ftgl freetype + libGL + libGLU + libX11 SDL2 SDL2_image SDL2_mixer @@ -96,6 +105,9 @@ let version = "${latestVersionMajor}-sty+ct+ap-${builtins.substring 0 8 rev}"; src = fetchArmagetron rev hash; extraBuildInputs = lib.optionals (!dedicatedServer) [ + libGL + libGLU + libX11 libpng SDL SDL_image diff --git a/pkgs/games/crossfire/crossfire-client.nix b/pkgs/games/crossfire/crossfire-client.nix index 2f96c2bf4cc4..2d3401914109 100644 --- a/pkgs/games/crossfire/crossfire-client.nix +++ b/pkgs/games/crossfire/crossfire-client.nix @@ -9,6 +9,8 @@ gtk2, pcre, zlib, + libGL, + libGLU, libpng, fribidi, harfbuzzFull, @@ -45,6 +47,8 @@ stdenv.mkDerivation { gtk2 pcre zlib + libGL + libGLU libpng fribidi harfbuzzFull diff --git a/pkgs/games/ldmud/default.nix b/pkgs/games/ldmud/default.nix index 8287b3274c7d..5dcd6dfbc80e 100644 --- a/pkgs/games/ldmud/default.nix +++ b/pkgs/games/ldmud/default.nix @@ -7,7 +7,7 @@ , libiconv , pcre , libgcrypt -, libxcrypt +, libxcrypt-legacy , json_c , libxml2 , ipv6Support ? false @@ -37,11 +37,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA="; }; + patches = [ ./libxml2-2.12.0-compat.patch ./mysql-compat.patch ]; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ autoreconfHook pkg-config bison ]; - buildInputs = [ libgcrypt libxcrypt pcre json_c libxml2 ] + buildInputs = [ libgcrypt libxcrypt-legacy pcre json_c libxml2 ] ++ lib.optional mccpSupport zlib ++ lib.optional mysqlSupport libmysqlclient ++ lib.optional postgresSupport libpq ++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl diff --git a/pkgs/games/ldmud/libxml2-2.12.0-compat.patch b/pkgs/games/ldmud/libxml2-2.12.0-compat.patch new file mode 100644 index 000000000000..372bdc8cafbd --- /dev/null +++ b/pkgs/games/ldmud/libxml2-2.12.0-compat.patch @@ -0,0 +1,18 @@ +diff --git src/pkg-xml2.c src/pkg-xml2.c +index 048ca38c..9ea4de35 100644 +--- src/pkg-xml2.c ++++ src/pkg-xml2.c +@@ -507,8 +507,13 @@ f_xml_generate (svalue_t *sp) + return sp; + } + ++#if LIBXML_VERSION >= 21200 ++static void ++xml_pkg_error_handler(void * userData, const xmlError *error) ++#else + static void + xml_pkg_error_handler(void * userData, xmlErrorPtr error) ++#endif + { + if (error) + { diff --git a/pkgs/games/ldmud/mysql-compat.patch b/pkgs/games/ldmud/mysql-compat.patch new file mode 100644 index 000000000000..36aabfc08cef --- /dev/null +++ b/pkgs/games/ldmud/mysql-compat.patch @@ -0,0 +1,13 @@ +diff --git src/autoconf/configure.ac src/autoconf/configure.ac +index 156e97f4..6d70bf33 100644 +--- src/autoconf/configure.ac ++++ src/autoconf/configure.ac +@@ -1410,7 +1410,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + +-struct MYSQL * foo(void) ++struct st_mysql * foo(void) + { + static MYSQL var; + diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index c947356d226d..86de99a68a86 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -5,6 +5,8 @@ SDL2, fetchurl, gzip, + libGL, + libGLU, libvorbis, libmad, flac, @@ -52,6 +54,8 @@ stdenv.mkDerivation rec { buildInputs = [ gzip + libGL + libGLU libvorbis libmad flac diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 96e4b0d8a73b..b87907a3a7f3 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sha256 = "1qwl95av5an2zl01m7saj6fyy49xpixga7gbn4lwbpgpqs1rbwxj"; }; + patches = [ ./bloodspilot-sdl-window-fix.patch ]; + buildInputs = [ libX11 SDL diff --git a/pkgs/games/xpilot/bloodspilot-sdl-window-fix.patch b/pkgs/games/xpilot/bloodspilot-sdl-window-fix.patch new file mode 100644 index 000000000000..8ce71780a0f6 --- /dev/null +++ b/pkgs/games/xpilot/bloodspilot-sdl-window-fix.patch @@ -0,0 +1,95 @@ +--- a/src/client/sdl/scrap.c 2012-09-02 11:25:23.000000000 +0200 ++++ b/src/client/sdl/scrap.c 2025-03-23 12:01:51.968751308 +0100 +@@ -71,13 +71,13 @@ + #if defined(X11_SCRAP) + /* * */ + static Display *SDL_Display; +-static Window SDL_Window; ++static Window BloodsPilot_SDL_Window; + static void (*Lock_Display) (void); + static void (*Unlock_Display) (void); + + #elif defined(WIN_SCRAP) + /* * */ +-static HWND SDL_Window; ++static HWND BloodsPilot_SDL_Window; + + #elif defined(QNX_SCRAP) + /* * */ +@@ -274,7 +274,7 @@ + /* * */ + if (info.subsystem == SDL_SYSWM_X11) { + SDL_Display = info.info.x11.display; +- SDL_Window = info.info.x11.window; ++ BloodsPilot_SDL_Window = info.info.x11.window; + Lock_Display = info.info.x11.lock_func; + Unlock_Display = info.info.x11.unlock_func; + +@@ -290,7 +290,7 @@ + + #elif defined(WIN_SCRAP) + /* * */ +- SDL_Window = info.window; ++ BloodsPilot_SDL_Window = info.window; + retval = 0; + + #elif defined(QNX_SCRAP) +@@ -310,12 +310,12 @@ + #if defined(X11_SCRAP) + /* * */ + Lock_Display(); +- retval = (XGetSelectionOwner(SDL_Display, XA_PRIMARY) != SDL_Window); ++ retval = (XGetSelectionOwner(SDL_Display, XA_PRIMARY) != BloodsPilot_SDL_Window); + Unlock_Display(); + + #elif defined(WIN_SCRAP) + /* * */ +- retval = (GetClipboardOwner() != SDL_Window); ++ retval = (GetClipboardOwner() != BloodsPilot_SDL_Window); + + #elif defined(QNX_SCRAP) + /* * */ +@@ -346,14 +346,14 @@ + (unsigned char *) dst, dstlen); + free(dst); + if (lost_scrap()) +- XSetSelectionOwner(SDL_Display, XA_PRIMARY, SDL_Window, ++ XSetSelectionOwner(SDL_Display, XA_PRIMARY, BloodsPilot_SDL_Window, + CurrentTime); + Unlock_Display(); + } + + #elif defined(WIN_SCRAP) + /* * */ +- if (OpenClipboard(SDL_Window)) { ++ if (OpenClipboard(BloodsPilot_SDL_Window)) { + HANDLE hMem; + + hMem = GlobalAlloc((GMEM_MOVEABLE | GMEM_DDESHARE), dstlen); +@@ -441,7 +441,7 @@ + Lock_Display(); + owner = XGetSelectionOwner(SDL_Display, XA_PRIMARY); + Unlock_Display(); +- if ((owner == None) || (owner == SDL_Window)) { ++ if ((owner == None) || (owner == BloodsPilot_SDL_Window)) { + owner = DefaultRootWindow(SDL_Display); + selection1 = XA_CUT_BUFFER0; + } +@@ -449,7 +449,7 @@ + int selection_response = 0; + SDL_Event event; + +- owner = SDL_Window; ++ owner = BloodsPilot_SDL_Window; + Lock_Display(); + selection1 = XInternAtom(SDL_Display, "SDL_SELECTION", False); + XConvertSelection(SDL_Display, XA_PRIMARY, format, +@@ -485,7 +485,7 @@ + + #elif defined(WIN_SCRAP) + /* * */ +- if (IsClipboardFormatAvailable(format) && OpenClipboard(SDL_Window)) { ++ if (IsClipboardFormatAvailable(format) && OpenClipboard(BloodsPilot_SDL_Window)) { + HANDLE hMem; + char *src; + diff --git a/pkgs/games/xpilot/bloodspilot-server-strcpy-fix.patch b/pkgs/games/xpilot/bloodspilot-server-strcpy-fix.patch new file mode 100644 index 000000000000..58b060808159 --- /dev/null +++ b/pkgs/games/xpilot/bloodspilot-server-strcpy-fix.patch @@ -0,0 +1,40 @@ +Fortify catches a possible strcpy overcopy, throw more space at it + +--- a/src/server/contact.c 2010-05-24 14:51:41.000000000 +0200 ++++ b/src/server/contact.c 2025-03-23 12:15:36.426805646 +0100 +@@ -58,11 +58,11 @@ + + struct queued_player { + struct queued_player *next; +- char real_name[MAX_CHARS]; +- char nick_name[MAX_CHARS]; +- char disp_name[MAX_CHARS]; +- char host_name[MAX_CHARS]; +- char host_addr[24]; ++ char real_name[MAX_CHARS + 32]; ++ char nick_name[MAX_CHARS + 32]; ++ char disp_name[MAX_CHARS + 32]; ++ char host_name[MAX_CHARS + 32]; ++ char host_addr[1056]; + int32_t port; + team_t *team; + uint32_t version; +@@ -271,12 +271,12 @@ + uint32_t my_magic; + uint16_t port; + char ch; +- char real_name[MAX_CHARS]; +- char disp_name[MAX_CHARS]; +- char nick_name[MAX_CHARS]; +- char host_name[MAX_CHARS]; +- char host_addr[24]; +- char str[MSG_LEN]; ++ char real_name[MAX_CHARS + 32 ]; ++ char disp_name[MAX_CHARS + 32 ]; ++ char nick_name[MAX_CHARS + 32 ]; ++ char host_name[MAX_CHARS + 32 ]; ++ char host_addr[1056]; ++ char str[MSG_LEN + 32]; + + /* + * Someone connected to us, now try and decipher the message :) diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix index 2e3ac840ea67..a54b111a8117 100644 --- a/pkgs/games/xpilot/bloodspilot-server.nix +++ b/pkgs/games/xpilot/bloodspilot-server.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./server-gcc5.patch + ./bloodspilot-server-strcpy-fix.patch ]; meta = with lib; { diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 8e011af62f29..11ccbc8d5a74 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -4,6 +4,7 @@ fetchurl, libX11, libSM, + libXext, SDL, libGLU, libGL, @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libSM + libXext SDL SDL_ttf SDL_image @@ -33,7 +35,10 @@ stdenv.mkDerivation rec { libXxf86misc ]; - patches = [ ./xpilot-ng-gcc-14-fix.patch ]; + patches = [ + ./xpilot-ng-gcc-14-fix.patch + ./xpilot-ng-sdl-window-fix.patch + ]; meta = with lib; { description = "Multiplayer X11 space combat game"; diff --git a/pkgs/games/xpilot/xpilot-ng-sdl-window-fix.patch b/pkgs/games/xpilot/xpilot-ng-sdl-window-fix.patch new file mode 100644 index 000000000000..d1dfa7b16c2a --- /dev/null +++ b/pkgs/games/xpilot/xpilot-ng-sdl-window-fix.patch @@ -0,0 +1,96 @@ +XPilot-NG uses SDL_Window (now an SDL type name) as a variable name + +--- a/src/client/sdl/scrap.c 2025-03-23 11:48:45.045699445 +0100 ++++ b.src/client/sdl/scrap.c 2025-03-23 11:48:48.773699690 +0100 +@@ -57,13 +57,13 @@ + #if defined(X11_SCRAP) + /* * */ + static Display *SDL_Display; +-static Window SDL_Window; ++static Window XPilot_SDL_Window; + static void (*Lock_Display)(void); + static void (*Unlock_Display)(void); + + #elif defined(WIN_SCRAP) + /* * */ +-static HWND SDL_Window; ++static HWND XPilot_SDL_Window; + + #elif defined(QNX_SCRAP) + /* * */ +@@ -285,7 +285,7 @@ + if ( info.subsystem == SDL_SYSWM_X11 ) + { + SDL_Display = info.info.x11.display; +- SDL_Window = info.info.x11.window; ++ XPilot_SDL_Window = info.info.x11.window; + Lock_Display = info.info.x11.lock_func; + Unlock_Display = info.info.x11.unlock_func; + +@@ -302,7 +302,7 @@ + + #elif defined(WIN_SCRAP) + /* * */ +- SDL_Window = info.window; ++ XPilot_SDL_Window = info.window; + retval = 0; + + #elif defined(QNX_SCRAP) +@@ -323,12 +323,12 @@ + #if defined(X11_SCRAP) + /* * */ + Lock_Display(); +- retval = ( XGetSelectionOwner(SDL_Display, XA_PRIMARY) != SDL_Window ); ++ retval = ( XGetSelectionOwner(SDL_Display, XA_PRIMARY) != XPilot_SDL_Window ); + Unlock_Display(); + + #elif defined(WIN_SCRAP) + /* * */ +- retval = ( GetClipboardOwner() != SDL_Window ); ++ retval = ( GetClipboardOwner() != XPilot_SDL_Window ); + + #elif defined(QNX_SCRAP) + /* * */ +@@ -360,13 +360,13 @@ + XA_CUT_BUFFER0, format, 8, PropModeReplace, (unsigned char *)dst, dstlen); + free(dst); + if ( lost_scrap() ) +- XSetSelectionOwner(SDL_Display, XA_PRIMARY, SDL_Window, CurrentTime); ++ XSetSelectionOwner(SDL_Display, XA_PRIMARY, XPilot_SDL_Window, CurrentTime); + Unlock_Display(); + } + + #elif defined(WIN_SCRAP) + /* * */ +- if ( OpenClipboard(SDL_Window) ) ++ if ( OpenClipboard(XPilot_SDL_Window) ) + { + HANDLE hMem; + +@@ -461,7 +461,7 @@ + Lock_Display(); + owner = XGetSelectionOwner(SDL_Display, XA_PRIMARY); + Unlock_Display(); +- if ( (owner == None) || (owner == SDL_Window) ) ++ if ( (owner == None) || (owner == XPilot_SDL_Window) ) + { + owner = DefaultRootWindow(SDL_Display); + selection1 = XA_CUT_BUFFER0; +@@ -471,7 +471,7 @@ + int selection_response = 0; + SDL_Event event; + +- owner = SDL_Window; ++ owner = XPilot_SDL_Window; + Lock_Display(); + selection1 = XInternAtom(SDL_Display, "SDL_SELECTION", False); + XConvertSelection(SDL_Display, XA_PRIMARY, format, +@@ -511,7 +511,7 @@ + + #elif defined(WIN_SCRAP) + /* * */ +- if ( IsClipboardFormatAvailable(format) && OpenClipboard(SDL_Window) ) ++ if ( IsClipboardFormatAvailable(format) && OpenClipboard(XPilot_SDL_Window) ) + { + HANDLE hMem; + char *src; diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 76a9d19e28aa..14acfe0f2f7f 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -40,10 +40,7 @@ let ) allUrls; in ( - # This removes reference to deprecated `qt6Packages.stdenv` - # so when a KDE package asks for a stdenv, it won't trigger - # an eval warning - (lib.removeAttrs qt6Packages [ "stdenv" ]) + qt6Packages // frameworks // gear // plasma diff --git a/pkgs/kde/gear/blinken/default.nix b/pkgs/kde/gear/blinken/default.nix index 92cb126b089d..5027eeada8ca 100644 --- a/pkgs/kde/gear/blinken/default.nix +++ b/pkgs/kde/gear/blinken/default.nix @@ -1,10 +1,14 @@ { mkKdeDerivation, qtsvg, + phonon, }: mkKdeDerivation { pname = "blinken"; - extraBuildInputs = [ qtsvg ]; + extraBuildInputs = [ + qtsvg + phonon + ]; meta.mainProgram = "blinken"; } diff --git a/pkgs/kde/gear/klettres/default.nix b/pkgs/kde/gear/klettres/default.nix index b01e22878385..9cced73f2fb9 100644 --- a/pkgs/kde/gear/klettres/default.nix +++ b/pkgs/kde/gear/klettres/default.nix @@ -1,10 +1,14 @@ { mkKdeDerivation, qtsvg, + phonon, }: mkKdeDerivation { pname = "klettres"; - extraBuildInputs = [ qtsvg ]; + extraBuildInputs = [ + qtsvg + phonon + ]; meta.mainProgram = "klettres"; } diff --git a/pkgs/kde/gear/kmailtransport/default.nix b/pkgs/kde/gear/kmailtransport/default.nix index b021413b9328..7953ec021b64 100644 --- a/pkgs/kde/gear/kmailtransport/default.nix +++ b/pkgs/kde/gear/kmailtransport/default.nix @@ -1,9 +1,4 @@ -{ - mkKdeDerivation, - kconfigwidgets, -}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmailtransport"; - - extraBuildInputs = [ kconfigwidgets ]; } diff --git a/pkgs/kde/gear/libgravatar/default.nix b/pkgs/kde/gear/libgravatar/default.nix index fe2fddb9f018..5666dea42041 100644 --- a/pkgs/kde/gear/libgravatar/default.nix +++ b/pkgs/kde/gear/libgravatar/default.nix @@ -1,4 +1,6 @@ -{ mkKdeDerivation }: +{ mkKdeDerivation, pimcommon }: mkKdeDerivation { pname = "libgravatar"; + + extraBuildInputs = [ pimcommon ]; } diff --git a/pkgs/kde/gear/mailcommon/default.nix b/pkgs/kde/gear/mailcommon/default.nix index 51a702ac9d9b..ecfef67b544e 100644 --- a/pkgs/kde/gear/mailcommon/default.nix +++ b/pkgs/kde/gear/mailcommon/default.nix @@ -3,6 +3,7 @@ qtwebengine, qttools, libxslt, + phonon, }: mkKdeDerivation { pname = "mailcommon"; @@ -11,5 +12,6 @@ mkKdeDerivation { extraBuildInputs = [ qtwebengine qttools + phonon ]; } diff --git a/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix index 47411b5e37c2..467ebc2837e6 100644 --- a/pkgs/kde/gear/tokodon/default.nix +++ b/pkgs/kde/gear/tokodon/default.nix @@ -5,7 +5,6 @@ qtsvg, qtwebsockets, qtwebview, - mpv-unwrapped, sonnet, }: mkKdeDerivation { @@ -17,8 +16,10 @@ mkKdeDerivation { qtsvg qtwebsockets qtwebview - mpv-unwrapped sonnet ]; + + extraCmakeFlags = [ "-DUSE_QTMULTIMEDIA=1" ]; + meta.mainProgram = "tokodon"; } diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json index 52e01405accd..5fa3cd9a6b26 100644 --- a/pkgs/kde/generated/dependencies.json +++ b/pkgs/kde/generated/dependencies.json @@ -73,11 +73,6 @@ "kio", "kmime" ], - "akonadi-notes": [ - "akonadi", - "extra-cmake-modules", - "kmime" - ], "akonadi-search": [ "akonadi", "akonadi-mime", @@ -215,6 +210,7 @@ "extra-cmake-modules", "kconfig", "kcoreaddons", + "kcrash", "kdbusaddons", "kfilemetadata", "ki18n", @@ -322,6 +318,18 @@ "plasma-workspace", "solid" ], + "aurorae": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcoreaddons", + "kdecoration", + "ki18n", + "knewstuff", + "kpackage", + "ksvg", + "kwindowsystem" + ], "baloo": [ "extra-cmake-modules", "kconfig", @@ -375,8 +383,7 @@ "kdoctools", "kguiaddons", "ki18n", - "kxmlgui", - "phonon" + "kxmlgui" ], "bluedevil": [ "bluez-qt", @@ -413,6 +420,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -424,6 +432,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -737,6 +746,7 @@ ], "elisa": [ "extra-cmake-modules", + "kcodecs", "kcolorscheme", "kconfig", "kconfigwidgets", @@ -871,6 +881,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -1020,7 +1031,6 @@ "kunitconversion", "kwindowsystem", "libquotient", - "networkmanager-qt", "plasma-integration", "prison", "qqc2-breeze-style", @@ -1132,10 +1142,12 @@ "kaidan": [ "extra-cmake-modules", "kcoreaddons", + "kcrash", "kio", "kirigami", "kirigami-addons", - "kquickimageeditor" + "kquickimageeditor", + "prison" ], "kajongg": [ "extra-cmake-modules", @@ -1280,6 +1292,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -1287,25 +1300,41 @@ "kapptemplate": [ "extra-cmake-modules", "karchive", + "kconfig", + "kconfigwidgets", "kcoreaddons", "kdoctools", "ki18n", - "kio", + "kiconthemes", "kirigami", "kirigami-addons" ], "karchive": [ "extra-cmake-modules" ], + "karp": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kcrash", + "ki18n", + "kiconthemes", + "kirigami", + "kirigami-addons" + ], "kasts": [ "extra-cmake-modules", "kcolorscheme", "kconfig", "kcoreaddons", "kcrash", + "kdbusaddons", "ki18n", + "kiconthemes", "kirigami", "kirigami-addons", + "kwindowsystem", "qqc2-desktop-style", "qtkeychain", "syndication", @@ -1323,8 +1352,7 @@ "knewstuff", "ktexteditor", "kuserfeedback", - "qtkeychain", - "selenium-webdriver-at-spi" + "qtkeychain" ], "katomic": [ "extra-cmake-modules", @@ -1334,6 +1362,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "knewstuff", "kwidgetsaddons", "kxmlgui", @@ -1383,6 +1412,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "ktextwidgets", "kwidgetsaddons", "kxmlgui", @@ -1397,6 +1427,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -1418,6 +1449,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kwidgetsaddons", "kxmlgui", @@ -1432,6 +1464,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -1576,10 +1609,8 @@ "kcmutils", "kconfigwidgets", "kcoreaddons", - "kdeclarative", "kdoctools", "ki18n", - "kio", "kirigami-addons" ], "kdav": [ @@ -1599,24 +1630,18 @@ ], "kde-cli-tools": [ "extra-cmake-modules", - "kauth", "kcmutils", - "kcodecs", "kcompletion", "kconfig", - "kconfigwidgets", "kcoreaddons", "kdesu", "ki18n", "kiconthemes", "kio", - "kjobwidgets", "kparts", - "kpty", "kservice", "kwidgetsaddons", - "kwindowsystem", - "solid" + "kwindowsystem" ], "kde-dev-scripts": [ "extra-cmake-modules", @@ -1676,8 +1701,7 @@ "kiconthemes", "kitemviews", "kwidgetsaddons", - "kxmlgui", - "selenium-webdriver-at-spi" + "kxmlgui" ], "kdeclarative": [ "extra-cmake-modules", @@ -1789,6 +1813,7 @@ "kaddressbook", "kcalendarcore", "kcalutils", + "kcmutils", "kcolorscheme", "kconfig", "kconfigwidgets", @@ -2073,6 +2098,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "knotifications", "knotifyconfig", "kwidgetsaddons", @@ -2151,8 +2177,7 @@ "ktexteditor", "ktextwidgets", "kwidgetsaddons", - "kxmlgui", - "marble" + "kxmlgui" ], "keysmith": [ "extra-cmake-modules", @@ -2164,6 +2189,7 @@ "kirigami", "kwidgetsaddons", "kwindowsystem", + "prison", "qqc2-desktop-style" ], "kfilemetadata": [ @@ -2207,6 +2233,7 @@ "kdnssd", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -2290,6 +2317,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kwidgetsaddons", "kxmlgui", @@ -2335,7 +2363,6 @@ "extra-cmake-modules", "kcompletion", "kconfig", - "kconfigwidgets", "kcoreaddons", "kcrash", "kdoctools", @@ -2437,6 +2464,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "knewstuff", "ktextwidgets", @@ -2471,6 +2499,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -2628,7 +2657,6 @@ "kirigami-gallery": [ "extra-cmake-modules", "kirigami", - "kirigami-addons", "kitemmodels" ], "kiriki": [ @@ -2699,6 +2727,7 @@ "kjournald": [ "extra-cmake-modules", "kcoreaddons", + "kcrash", "ki18n" ], "kjumpingcube": [ @@ -2710,6 +2739,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kjobwidgets", "kwidgetsaddons", @@ -2755,8 +2785,7 @@ "ki18n", "knewstuff", "kwidgetsaddons", - "kxmlgui", - "phonon" + "kxmlgui" ], "klevernotes": [ "extra-cmake-modules", @@ -2778,6 +2807,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kwidgetsaddons", "kxmlgui", @@ -2799,12 +2829,14 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" ], "kmag": [ "extra-cmake-modules", + "kcrash", "kdoctools", "ki18n", "kio", @@ -2887,6 +2919,7 @@ ], "kmailtransport": [ "extra-cmake-modules", + "kconfigwidgets", "ksmtp", "libkgapi", "qtkeychain" @@ -2922,6 +2955,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "ktextwidgets", "kwidgetsaddons", "kxmlgui", @@ -2944,13 +2978,6 @@ "kxmlgui", "solid" ], - "kmoretools": [ - "extra-cmake-modules", - "ki18n", - "kio", - "kjobwidgets", - "kwidgetsaddons" - ], "kmousetool": [ "extra-cmake-modules", "kconfig", @@ -3048,6 +3075,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "ktextwidgets", "kwidgetsaddons", "kxmlgui", @@ -3099,14 +3127,17 @@ "extra-cmake-modules", "kconfigwidgets", "kcoreaddons", + "kcrash", "ki18n", "kio", "kwidgetsaddons", + "kxmlgui", "purpose" ], "koko": [ "extra-cmake-modules", "kconfig", + "kconfigwidgets", "kcoreaddons", "kdbusaddons", "kdeclarative", @@ -3130,6 +3161,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "ktextwidgets", "kwidgetsaddons", @@ -3144,6 +3176,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -3310,6 +3343,13 @@ "kwidgetsaddons", "kwindowsystem" ], + "konvex": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kirigami", + "kwindowsystem" + ], "kooka": [ "extra-cmake-modules", "kconfig", @@ -3404,13 +3444,6 @@ "kitemviews", "kwidgetsaddons" ], - "kpeoplevcard": [ - "extra-cmake-modules", - "kcontacts", - "kcoreaddons", - "ki18n", - "kpeople" - ], "kphotoalbum": [ "karchive", "kcompletion", @@ -3424,6 +3457,7 @@ "kwidgetsaddons", "kxmlgui", "libkdcraw", + "marble", "phonon", "purpose" ], @@ -3474,6 +3508,18 @@ "kcoreaddons", "ki18n" ], + "kpublicalerts": [ + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kguiaddons", + "ki18n", + "kirigami", + "knotifications", + "kunifiedpush", + "kweathercore" + ], "kpublictransport": [ "extra-cmake-modules", "ki18n", @@ -3514,7 +3560,8 @@ "kcrash", "kdbusaddons", "kpipewire", - "kstatusnotifieritem" + "kstatusnotifieritem", + "qtkeychain" ], "krecorder": [ "extra-cmake-modules", @@ -3568,6 +3615,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kjobwidgets", "kwidgetsaddons", @@ -3712,6 +3760,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kxmlgui", "libkdegames", "libkmahjongg" @@ -3750,6 +3799,7 @@ "kdoctools", "kguiaddons", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -3970,7 +4020,6 @@ "kxmlgui", "libktorrent", "phonon", - "solid", "syndication" ], "ktouch": [ @@ -4197,6 +4246,42 @@ "wayland", "wayland-protocols" ], + "kwin-x11": [ + "breeze", + "breeze-icons", + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdeclarative", + "kdecoration", + "kdoctools", + "kglobalaccel", + "kglobalacceld", + "ki18n", + "kidletime", + "kirigami", + "knewstuff", + "knotifications", + "kpackage", + "kpipewire", + "kscreenlocker", + "kservice", + "ksvg", + "kwayland", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libplasma", + "libqaccessibilityclient", + "plasma-activities", + "plasma-wayland-protocols", + "plasma-workspace", + "wayland", + "wayland-protocols" + ], "kwindowsystem": [ "extra-cmake-modules", "plasma-wayland-protocols", @@ -4291,10 +4376,17 @@ "wayland", "wayland-protocols" ], + "libdebconf-kde": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kiconthemes", + "ktextwidgets", + "kwidgetsaddons" + ], "libgravatar": [ "extra-cmake-modules", - "kconfigwidgets", - "pimcommon" + "kconfigwidgets" ], "libkcddb": [ "extra-cmake-modules", @@ -4425,8 +4517,8 @@ "extra-cmake-modules", "karchive", "kcmutils", + "kcolorscheme", "kconfig", - "kconfigwidgets", "kcoreaddons", "kdbusaddons", "kglobalaccel", @@ -4481,6 +4573,7 @@ "kdoctools", "kguiaddons", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -4496,7 +4589,6 @@ "libkdepim", "mailimporter", "messagelib", - "phonon", "pimcommon", "plasma-activities" ], @@ -4633,6 +4725,7 @@ "kcontacts", "kcrash", "kdepim-runtime", + "kholidays", "kirigami", "kirigami-addons", "kmime", @@ -4702,6 +4795,7 @@ "kcrash", "kdbusaddons", "ki18n", + "kiconthemes", "kio", "kirigami", "kirigami-addons", @@ -4818,6 +4912,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kitemviews", "knotifications", @@ -4889,6 +4984,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "knewstuff", "kwidgetsaddons", "kxmlgui", @@ -4916,6 +5012,7 @@ "kimap", "kmailtransport", "kuserfeedback", + "kwindowsystem", "kxmlgui", "libksieve", "pimcommon", @@ -5038,6 +5135,7 @@ "baloo", "breeze", "extra-cmake-modules", + "kaccounts-integration", "kactivitymanagerd", "kauth", "kcmutils", @@ -5147,6 +5245,11 @@ "kxmlgui", "wayland" ], + "plasma-keyboard": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n" + ], "plasma-mobile": [ "bluedevil", "bluez-qt", @@ -5274,7 +5377,6 @@ "kcodecs", "kcompletion", "kconfig", - "kconfigwidgets", "kcoreaddons", "kdbusaddons", "ki18n", @@ -5303,12 +5405,8 @@ "kcrash", "kdbusaddons", "ki18n", - "kirigami-addons" - ], - "plasma-simplemenu": [ - "extra-cmake-modules", - "ki18n", - "libplasma" + "kirigami-addons", + "kitemmodels" ], "plasma-systemmonitor": [ "attica", @@ -5388,6 +5486,7 @@ "attica", "baloo", "extra-cmake-modules", + "kactivitymanagerd", "kauth", "kbookmarks", "kcmutils", @@ -5419,7 +5518,6 @@ "knotifyconfig", "kpackage", "kparts", - "kpipewire", "kquickcharts", "krunner", "kscreenlocker", @@ -5441,7 +5539,6 @@ "libksysguard", "libplasma", "milou", - "networkmanager-qt", "packagekit-qt", "phonon", "plasma-activities", @@ -5465,9 +5562,12 @@ "kcoreaddons", "kguiaddons", "ki18n", + "kidletime", "kio", "knotifications", "libksysguard", + "networkmanager-qt", + "plasma-activities", "solid" ], "plasmatube": [ @@ -5538,9 +5638,13 @@ "futuresql", "kconfig", "kcoreaddons", + "kcrash", "ki18n", "kirigami", "kirigami-addons", + "kitemmodels", + "kquickcharts", + "kweathercore", "qqc2-desktop-style" ], "poxml": [ @@ -5626,8 +5730,14 @@ "knotifications", "kservice", "networkmanager-qt", - "prison", - "purpose" + "prison" + ], + "rattlesnake": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami" ], "raven": [ "akonadi", @@ -5681,10 +5791,14 @@ "rolisteam": [ "extra-cmake-modules" ], + "rolisteam-diceparser": [ + "extra-cmake-modules" + ], "rsibreak": [ "extra-cmake-modules", "kconfig", "kconfigwidgets", + "kcoreaddons", "kcrash", "kdbusaddons", "kdoctools", @@ -5692,6 +5806,7 @@ "kidletime", "knotifications", "knotifyconfig", + "kstatusnotifieritem", "ktextwidgets", "kwindowsystem", "kxmlgui" @@ -5700,6 +5815,7 @@ "breeze-icons", "extra-cmake-modules", "karchive", + "kcolorscheme", "kconfig", "kcoreaddons", "kdbusaddons", @@ -5720,6 +5836,7 @@ "kwidgetsaddons", "kwindowsystem", "kxmlgui", + "plasma-activities", "prison", "purpose", "qtkeychain", @@ -5773,6 +5890,7 @@ "kcoreaddons", "kcrash", "ki18n", + "kio", "kirigami", "kquickimageeditor", "ksanecore", @@ -5810,6 +5928,8 @@ "knotifyconfig", "kparts", "krunner", + "kstatusnotifieritem", + "ktexttemplate", "kwallet", "kwidgetsaddons", "kwindowsystem", @@ -5843,6 +5963,13 @@ "qtkeychain", "solid" ], + "snap-kcm": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcoreaddons", + "ki18n" + ], "solid": [ "extra-cmake-modules" ], @@ -5962,6 +6089,7 @@ "kauth", "kcrash", "ki18n", + "ktexteditor", "kxmlgui" ], "systemsettings": [ @@ -6025,7 +6153,8 @@ "kirigami", "kirigami-addons", "kitemmodels", - "kwindowsystem" + "kwindowsystem", + "qqc2-desktop-style" ], "tokodon": [ "extra-cmake-modules", @@ -6036,6 +6165,7 @@ "kdbusaddons", "kdeclarative", "ki18n", + "kiconthemes", "kio", "kirigami", "kirigami-addons", @@ -6043,7 +6173,7 @@ "knotifications", "kunifiedpush", "kwindowsystem", - "mpvqt", + "prison", "purpose", "qqc2-desktop-style", "qtkeychain", @@ -6073,6 +6203,9 @@ "kwindowsystem", "kxmlgui" ], + "union": [ + "extra-cmake-modules" + ], "upnp-lib-qt": [ "extra-cmake-modules", "kdsoap" @@ -6128,7 +6261,11 @@ "plasma5support" ], "washipad": [ - "extra-cmake-modules" + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "ki18n", + "kirigami" ], "xdg-desktop-portal-kde": [ "extra-cmake-modules", @@ -6163,16 +6300,6 @@ "knotifications", "kwayland" ], - "xwaylandvideobridge": [ - "extra-cmake-modules", - "kcoreaddons", - "kcrash", - "ki18n", - "knotifications", - "kpipewire", - "kstatusnotifieritem", - "kwindowsystem" - ], "yakuake": [ "extra-cmake-modules", "karchive", @@ -6205,5 +6332,5 @@ "kwindowsystem" ] }, - "version": "c8684032" + "version": "7e4e118f" } \ No newline at end of file diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json index 3307433dd64a..c206e5b0705c 100644 --- a/pkgs/kde/generated/projects.json +++ b/pkgs/kde/generated/projects.json @@ -401,6 +401,12 @@ "project_path": "kde/workspace/aura-browser", "repo_path": "plasma/aura-browser" }, + "aurorae": { + "description": "Aurorae is a themeable window decoration for KWin", + "name": "aurorae", + "project_path": "playground/base/aurorae", + "repo_path": "plasma/aurorae" + }, "automoc": { "description": "Automoc", "name": "automoc", @@ -840,7 +846,7 @@ "repo_path": "graphics/digikam-test-data" }, "discover": { - "description": "KDE and Plasma resources management GUI", + "description": "Helps you find and install applications, games, and tools", "name": "discover", "project_path": "kde/workspace/discover", "repo_path": "plasma/discover" @@ -1112,7 +1118,7 @@ "glaxnimate": { "description": "Simple vector animation program.", "name": "glaxnimate", - "project_path": "kdereview/glaxnimate", + "project_path": "graphics/glaxnimate", "repo_path": "graphics/glaxnimate" }, "gluon": { @@ -1302,7 +1308,7 @@ "repo_path": "multimedia/kaffeine" }, "kaidan": { - "description": "Simple and user-friendly Jabber/XMPP client for every device and platform", + "description": "Modern chat app for every device", "name": "kaidan", "project_path": "kdereview/kaidan", "repo_path": "network/kaidan" @@ -1751,6 +1757,12 @@ "project_path": "kde/workspace/kde-gtk-config", "repo_path": "plasma/kde-gtk-config" }, + "kde-gui-test": { + "description": "Tool for emulating user behaviour for energy consumption measurements", + "name": "kde-gui-test", + "project_path": "playground/sdk/kde-gui-test", + "repo_path": "sdk/kde-gui-test" + }, "kde-inotify-survey": { "description": "Tooling for monitoring inotify limits and informing the user when they have been or about to be reached.", "name": "kde-inotify-survey", @@ -3275,6 +3287,12 @@ "project_path": "kde/kdenetwork/konversation", "repo_path": "network/konversation" }, + "konvex": { + "description": "3D Model Viewer", + "name": "konvex", + "project_path": "playground/base/konvex", + "repo_path": "graphics/konvex" + }, "kooka": { "description": "Scanning application and libkscan library", "name": "kooka", @@ -3479,6 +3497,12 @@ "project_path": "frameworks/kpty", "repo_path": "frameworks/kpty" }, + "kpublicalerts": { + "description": "Public emergency and weather alert notification.", + "name": "kpublicalerts", + "project_path": "playground/utils/kpublicalerts", + "repo_path": "utilities/kpublicalerts" + }, "kpublictransport": { "description": "Library to assist with accessing public transport timetables and other data", "name": "kpublictransport", @@ -3593,6 +3617,12 @@ "project_path": "extragear/graphics/krita-extensions/krita-analogies", "repo_path": "unmaintained/krita-analogies" }, + "krita-ci-utilities": { + "description": "CI/CD utilities for Krita builds", + "name": "krita-ci-utilities", + "project_path": "playground/packaging/krita-ci-utilities", + "repo_path": "packaging/krita-ci-utilities" + }, "krita-cimg": { "description": "Extension based on the cimg library. http://cimg.sourceforge.net/", "name": "krita-cimg", @@ -3605,6 +3635,12 @@ "project_path": "extragear/graphics/krita-extensions/krita-ctlbrush", "repo_path": "unmaintained/krita-ctlbrush" }, + "krita-deps-management": { + "description": "Dependencies management for Krita builds across the various platforms it supports", + "name": "krita-deps-management", + "project_path": "playground/packaging/krita-deps-management", + "repo_path": "packaging/krita-deps-management" + }, "krita-deskew": { "description": "Deskew rotates an image such that text is straight, which is useful when dealing with scanned images.", "name": "krita-deskew", @@ -4248,11 +4284,17 @@ "repo_path": "frameworks/kwidgetsaddons" }, "kwin": { - "description": "Easy to use, but flexible, X Window Manager and Wayland Compositor", + "description": "Easy to use, but flexible, Wayland Compositor", "name": "kwin", "project_path": "kde/workspace/kwin", "repo_path": "plasma/kwin" }, + "kwin-x11": { + "description": "Easy to use, but flexible, X Window Manager", + "name": "kwin-x11", + "project_path": "kde/workspace/kwin-x11", + "repo_path": "plasma/kwin-x11" + }, "kwindowsaddons": { "description": "Runtime components for KDE software on Windows", "name": "kwindowsaddons", @@ -5483,6 +5525,12 @@ "project_path": "kde/workspace/plasma-integration", "repo_path": "plasma/plasma-integration" }, + "plasma-keyboard": { + "description": "Virtual Keyboard for Qt based desktops", + "name": "plasma-keyboard", + "project_path": "playground/workspace/plasma-keyboard", + "repo_path": "plasma/plasma-keyboard" + }, "plasma-lionmail": { "description": "A Plasma widget displaying new and important email", "name": "plasma-lionmail", @@ -5657,6 +5705,12 @@ "project_path": "kde/workspace/plasma-vault", "repo_path": "plasma/plasma-vault" }, + "plasma-wallpaper-updater": { + "description": "Tooling to assist with updating wallpapers across Plasma repositories", + "name": "plasma-wallpaper-updater", + "project_path": "plasma/plasma-wallpaper-updater", + "repo_path": "plasma/plasma-wallpaper-updater" + }, "plasma-wayland-protocols": { "description": "Plasma-specific protocols for Wayland", "name": "plasma-wayland-protocols", @@ -5760,7 +5814,7 @@ "repo_path": "plasma/powerdevil" }, "powerplant": { - "description": "A verry WIP app to keep track of your plant's needs", + "description": "An app to keep track of your plants' needs", "name": "powerplant", "project_path": "playground/utils/powerplant", "repo_path": "utilities/powerplant" @@ -6839,6 +6893,12 @@ "project_path": "kde/kdesdk/umbrello", "repo_path": "sdk/umbrello" }, + "union": { + "description": "A Qt style supporting both QtQuick and QtWidgets.", + "name": "union", + "project_path": "playground/workspace/union", + "repo_path": "plasma/union" + }, "upnp-lib-qt": { "description": "UPnP wrapper for Qt", "name": "upnp-lib-qt", @@ -7211,6 +7271,12 @@ "project_path": "websites/elisa-kde-org", "repo_path": "websites/elisa-kde-org" }, + "websites-endof10-org": { + "description": "Website for the EndOf10 initative", + "name": "websites-endof10-org", + "project_path": "websites/endof10-org", + "repo_path": "websites/endof10-org" + }, "websites-ev-kde-org": { "description": "Website for KDE e.V. - ev.kde.org", "name": "websites-ev-kde-org", diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index f7d897c97d65..6d69bb11ca55 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/attica-6.11.0.tar.xz", - "hash": "sha256-57fAPXZWpZcOAtYcP40nYLLD2kbT9kZL/CVKczsmP7M=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/attica-6.12.0.tar.xz", + "hash": "sha256-UnV/+x6gHjvrdCUy9n0cy96aVi46/9YhRDvxPZN864I=" }, "baloo": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/baloo-6.11.0.tar.xz", - "hash": "sha256-u4fUBTSgDMNj0p49fQ83qdzdDYMdsaV7v4uOOVUHVgo=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/baloo-6.12.0.tar.xz", + "hash": "sha256-iYRPq5x5LfWioZ6DJC5Pxx/8X9UeGOKz2QY3cdUJa14=" }, "bluez-qt": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/bluez-qt-6.11.0.tar.xz", - "hash": "sha256-k4ELpwp8rAQ7InsjrGqQfFL6L4qpDOtKz+jW1Gt+ros=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/bluez-qt-6.12.0.tar.xz", + "hash": "sha256-2KhM0zoTRTAUhzkcbcYl4ne1olRNc2Dl9u2gKjTMdVg=" }, "breeze-icons": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/breeze-icons-6.11.0.tar.xz", - "hash": "sha256-+c2ewbakERRny6Mafu1Q7l8DhG+x9cMrOr2/aId/ik4=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/breeze-icons-6.12.0.tar.xz", + "hash": "sha256-Gvl5pnwFOfJ6j8v/lzyRJFWEv7Jg3WTCBrxpFXXLtmg=" }, "extra-cmake-modules": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/extra-cmake-modules-6.11.0.tar.xz", - "hash": "sha256-af2rXw/t+3PRrM/1AS1RC0huHddccR6SWmkSo+cYFLA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/extra-cmake-modules-6.12.0.tar.xz", + "hash": "sha256-5U6HNl4ZPIBpZulpgyC96BmBIZV0ch/xlwqYFjyO1aA=" }, "frameworkintegration": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/frameworkintegration-6.11.0.tar.xz", - "hash": "sha256-p0R6WHBAKERjhGpHngG32CHIm187hoPLs2f1aM6oH7I=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/frameworkintegration-6.12.0.tar.xz", + "hash": "sha256-mw1qoaUUkzMd4S5I4JHbHVTu9BEgx88+qLpn3/jtPEE=" }, "kapidox": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kapidox-6.11.0.tar.xz", - "hash": "sha256-o/kGK+5XNMjkUG2AoVkbnRKJpwFx0Q9N6dqIdRbetLw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kapidox-6.12.0.tar.xz", + "hash": "sha256-N+BjcFYUHNw6c353PSyq4yN9ExQGvrAJYMEI6OYWBpg=" }, "karchive": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/karchive-6.11.0.tar.xz", - "hash": "sha256-EvxKxTWR+x3YHWxSQ7kAptSAZlWSY/xm6y9Jlc6544A=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/karchive-6.12.0.tar.xz", + "hash": "sha256-kKU5fV3zqQSGtNfvrqspgptjqHeyXiPln18S9DH4KQQ=" }, "kauth": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kauth-6.11.0.tar.xz", - "hash": "sha256-R5Zg6r6XGYwx8iihgnG8c5sjSUPGjpU4PDYag1ExF5s=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kauth-6.12.0.tar.xz", + "hash": "sha256-BM9PHC0ezet4z9mG4h1Iq1May+aUIPNDIH3Wbaj/nZM=" }, "kbookmarks": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kbookmarks-6.11.0.tar.xz", - "hash": "sha256-tcZ3RTxwMUue7MABGnMQPwReq8lLxfLyI7WXl4DIAcc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kbookmarks-6.12.0.tar.xz", + "hash": "sha256-G27cIKenl/4qGQ1aeKO20PRtHnsbLIFkbeMXa/dPjjo=" }, "kcalendarcore": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcalendarcore-6.11.0.tar.xz", - "hash": "sha256-6iYTJNG4DvR4a4bPhr+jLDMqoDV7BbopmxP1S+aac4A=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcalendarcore-6.12.0.tar.xz", + "hash": "sha256-+HD6Tjn5HgT55o8qPrD0lHmEYAW7DNQYA8khD16V4lE=" }, "kcmutils": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcmutils-6.11.0.tar.xz", - "hash": "sha256-ZNLFzYFlGJwtdBu1Q6q3K1vI21xUDKTojC+ND5PneZA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcmutils-6.12.0.tar.xz", + "hash": "sha256-eqzS8G8POTYx/AWBiLkq1Vkphx6Tqi6j3iqdCzWjasc=" }, "kcodecs": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcodecs-6.11.0.tar.xz", - "hash": "sha256-+93EN7qZadiWNbdfDvfkHJJcYcZNrB//AIwukTgTn+Q=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcodecs-6.12.0.tar.xz", + "hash": "sha256-blhSlUqeg3UONG+GA+gUYBDNyNfVRKXl1etG2TyUqRE=" }, "kcolorscheme": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcolorscheme-6.11.0.tar.xz", - "hash": "sha256-iye924MPAXP0SumqwFITV5kJuF+mlqKHGy7hHLI5vMg=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcolorscheme-6.12.0.tar.xz", + "hash": "sha256-9CJpmce5ydqN6e2eMXT8pJ94ZNoNodC8lmjERI9mdRI=" }, "kcompletion": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcompletion-6.11.0.tar.xz", - "hash": "sha256-yBK2DeRTDeMAORbkX7qxIcX59XbiQwqyzfDj5MkEGFI=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcompletion-6.12.0.tar.xz", + "hash": "sha256-jNMReVtdFcB7IbNsESTOTxqgoYo6A//ylgjkyt0JGpw=" }, "kconfig": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kconfig-6.11.0.tar.xz", - "hash": "sha256-xxByqvJ3EpW1kfxi1PtlfO+zjfKfJA75xxIIVLQtD38=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kconfig-6.12.0.tar.xz", + "hash": "sha256-A9HQkFTWRsZ/yqnx+lMVeBGtB+9Ao4ufTgtSrjFzsb8=" }, "kconfigwidgets": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kconfigwidgets-6.11.0.tar.xz", - "hash": "sha256-KKG7ElFh/pqw2/qJlDNRLpKGab4xzhSfolGRokpQJCo=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kconfigwidgets-6.12.0.tar.xz", + "hash": "sha256-ZtpiyQtrBuW+xo5pH3DJwwL+TcX9TeUANZV9p/Ro0mY=" }, "kcontacts": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcontacts-6.11.0.tar.xz", - "hash": "sha256-LwzSazK9utFLbl8+/5niOu3yQl6ssNTW9Eck3ObiZWI=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcontacts-6.12.0.tar.xz", + "hash": "sha256-TI4LdCAcSDiM7c/7djen9Gt1r+ao8IggappEGNQ/KoA=" }, "kcoreaddons": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcoreaddons-6.11.0.tar.xz", - "hash": "sha256-/2kcbgkzST6j6MSgukH6Rs7XuTlObzXvne40nM/MOjk=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcoreaddons-6.12.0.tar.xz", + "hash": "sha256-ezfo1OGFvN2L/RZsc59628sHMM3xQNZKMI97lrGEVzY=" }, "kcrash": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcrash-6.11.0.tar.xz", - "hash": "sha256-uhPp9d0rQBJdXWHSm2EttjgzFdwPUQzB8OM7tsmwrok=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcrash-6.12.0.tar.xz", + "hash": "sha256-wLlhENJfqjVYesSvMM0eOoASEz/KwSJ26LJZd82bhKQ=" }, "kdav": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdav-6.11.0.tar.xz", - "hash": "sha256-nKVYbmcvVkOYjc1gS2oDD1mz1eePHPNyXy5PJXhSNA4=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdav-6.12.0.tar.xz", + "hash": "sha256-sHPWBCvxRIAcFrPBnhuKKoGDuJOTl6w86qQ9IGhDML4=" }, "kdbusaddons": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdbusaddons-6.11.0.tar.xz", - "hash": "sha256-YuDzsEh+8atyn8hby1SYyUSeC3T+gEl3lDQVi7ixKoc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdbusaddons-6.12.0.tar.xz", + "hash": "sha256-wjbHCSK5ZAp9/jrIELDXQ1Vd9K65RTZ15WpEnuwexSE=" }, "kdeclarative": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdeclarative-6.11.0.tar.xz", - "hash": "sha256-augRNnvLyBkPil0u85qObHKHHEHsJuKksMODJKPoWWs=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdeclarative-6.12.0.tar.xz", + "hash": "sha256-thIfcgM7Nh9AjecSX2H0DPFOnGxU6rlcRtquAoEuc7A=" }, "kded": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kded-6.11.0.tar.xz", - "hash": "sha256-VcmSERQpmr2b3F5gHMxqdQ/y0zH8CDbXlnDMvFCOBqQ=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kded-6.12.0.tar.xz", + "hash": "sha256-YBrJZL2EFFbRyu/pWwSj3wVcqFg9dTNTpVtHpt+2g+g=" }, "kdesu": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdesu-6.11.0.tar.xz", - "hash": "sha256-qstJ0xPnnxBnlcTat96Zkeb+TnJMK0wZ3u/NFx9qO6c=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdesu-6.12.0.tar.xz", + "hash": "sha256-wZ2Nz0x0rXTilAOj79FmIIZF7c7xQpdf+t87Icwi508=" }, "kdnssd": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdnssd-6.11.0.tar.xz", - "hash": "sha256-ads1S7Km+qwW7B63fm9xMI+OvZIFlnx121usk355m9k=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdnssd-6.12.0.tar.xz", + "hash": "sha256-q7RTjqVsff6e2gYzii3TuA9HMmODpsWiPyoJrV+svpg=" }, "kdoctools": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdoctools-6.11.0.tar.xz", - "hash": "sha256-383GoCWPXMLlXSSPYWzHxiJOGwYUDetofkAbU3lZ/Ag=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdoctools-6.12.0.tar.xz", + "hash": "sha256-DHLfRaYkeMKvELglXswYunnkEI/0spChNoHjU89cfhc=" }, "kfilemetadata": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kfilemetadata-6.11.0.tar.xz", - "hash": "sha256-+RkJaer2b50naQzDuFo9GTle42V1gsmubJTEmhEzEsc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kfilemetadata-6.12.0.tar.xz", + "hash": "sha256-X7OaNwUVQxfu/3i366d2tRpEY0oSFrYOvn9i7METGPc=" }, "kglobalaccel": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kglobalaccel-6.11.0.tar.xz", - "hash": "sha256-BVLk5cWKJEczr0nP3QyPwEpjgotsI0azaCAiLV47zvU=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kglobalaccel-6.12.0.tar.xz", + "hash": "sha256-HF5+TZtoYus2ofbCP9n/9LS88LT610C65cpY4VyEB/Q=" }, "kguiaddons": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kguiaddons-6.11.0.tar.xz", - "hash": "sha256-7wkl9gmuW2LtaJRR3+mTdxnOTsJnFJUrVJbj4SjVzFw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kguiaddons-6.12.0.tar.xz", + "hash": "sha256-45SCbK3hxdlJEWbzo/TQw9YlvycQY1JnigbS7FNkxTI=" }, "kholidays": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kholidays-6.11.0.tar.xz", - "hash": "sha256-zNv6ter8BDV0kA1m4AIjJvYEjn3NsJvFON7eqZiJxq8=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kholidays-6.12.0.tar.xz", + "hash": "sha256-aYx3RO0ExdOVlgtPTIwHz196KBy5zsaL8w/beEFVA8M=" }, "ki18n": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/ki18n-6.11.0.tar.xz", - "hash": "sha256-ZYoFzsoYS6Mc5YpunFHudvKClFnFbbzTutOqFX6vEf4=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/ki18n-6.12.0.tar.xz", + "hash": "sha256-zRrbzeG637esiUXDwKmvwCsu1kLHaddOG8twoC0HDcU=" }, "kiconthemes": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kiconthemes-6.11.0.tar.xz", - "hash": "sha256-FnGrP9mx4HU6cGK6uA9UifOsdQ7LMLkduZpmiZiK+4c=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kiconthemes-6.12.0.tar.xz", + "hash": "sha256-VLG18oORYtmAhzMocWswzwj5D9B5rYVMwJh4rZs3bs8=" }, "kidletime": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kidletime-6.11.0.tar.xz", - "hash": "sha256-lu+wtTOjfdsuGIjf99RyLBnEfWYPdNGwpCLrlXGPSII=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kidletime-6.12.0.tar.xz", + "hash": "sha256-2KiIqMgDMU66l63yDkj51ZYExIC7A0KLfugycBAPpsM=" }, "kimageformats": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kimageformats-6.11.0.tar.xz", - "hash": "sha256-DEV4f5fQD8Alf33jJQ2E6VDeKjMsRedSgTj3z4QxVMw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kimageformats-6.12.0.tar.xz", + "hash": "sha256-ye/zCJlTC2GT7nhVtFLwc7C2tvkyVRYZXAhDlc3O2jY=" }, "kio": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kio-6.11.0.tar.xz", - "hash": "sha256-/lEeQ6U4b5Y8mv75OiHA30Siwk/MQXd35NBWkQJHf/g=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kio-6.12.0.tar.xz", + "hash": "sha256-FYHk+IV1DwijE0+tR7gelTVW4/yUAok5tH/64KtDLu4=" }, "kirigami": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kirigami-6.11.0.tar.xz", - "hash": "sha256-IjkslbuDXxFiYlDwcoznNZDbY4gU5xgRSPz2ah9ELqY=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kirigami-6.12.0.tar.xz", + "hash": "sha256-0Xfq4YqtNub0HTBxBORaj8xo2xR9uzM/bdsXiihGTnw=" }, "kitemmodels": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kitemmodels-6.11.0.tar.xz", - "hash": "sha256-OY3E48XERGE1CiCsI0BVuvwrGEKE3eqRVjE072L11qY=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kitemmodels-6.12.0.tar.xz", + "hash": "sha256-YmiDEQgrasoiYReBC8OZGwy5UVjexNTIANcKmb3P38g=" }, "kitemviews": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kitemviews-6.11.0.tar.xz", - "hash": "sha256-42JTaOP4z2EnIYzD6Ef78BdqWXjIYiixGjIK2W/qLLw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kitemviews-6.12.0.tar.xz", + "hash": "sha256-+NX/Lk5SNLzo7VaInYs9fpRVTsi0Djl9LprC/8EX49M=" }, "kjobwidgets": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kjobwidgets-6.11.0.tar.xz", - "hash": "sha256-K7NC5VT47PhNchimVnYo3Mc8G5FNDFqtHIv3dTmG3dc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kjobwidgets-6.12.0.tar.xz", + "hash": "sha256-7D4xSYwUCylvXkQuJSCCNDfybLYtcYbxFhN9GbvLnxI=" }, "knewstuff": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/knewstuff-6.11.0.tar.xz", - "hash": "sha256-izgCtrZDCatnCa81DySNxi4+bVCw207LDJaKz7+yNSA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/knewstuff-6.12.0.tar.xz", + "hash": "sha256-8LzKZsJn26M1499esImuQMVmgKfThRdrxE2VHe+j0Ck=" }, "knotifications": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/knotifications-6.11.0.tar.xz", - "hash": "sha256-ouCBXqblwpT902MWypeSpAb1wSPsAaHHOn5Uywvi6jE=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/knotifications-6.12.0.tar.xz", + "hash": "sha256-0oJUc7zE93QjtSZqW5LoGKmpix1nKxwp2PI33RHpkCY=" }, "knotifyconfig": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/knotifyconfig-6.11.0.tar.xz", - "hash": "sha256-YSURFhdYFEqdPZnU8KnrdZMcP4r1lm4EWgiAI8odDG8=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/knotifyconfig-6.12.0.tar.xz", + "hash": "sha256-U0SPmB0WVuQjNSoBcj3iq5k+W7o5pz9t5CLrTestqqs=" }, "kpackage": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kpackage-6.11.0.tar.xz", - "hash": "sha256-v8cE6hcI83FQqdFO3Lue7Y6/jVR1OTDaY0Ms2pVKHqc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kpackage-6.12.0.tar.xz", + "hash": "sha256-qNZQX6alO/3MMfqPKtCpIm7J+vq8DAEgSQ++trAX+0o=" }, "kparts": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kparts-6.11.0.tar.xz", - "hash": "sha256-OZXzVWq6Q03nsT2uCZtRoKhq6t5guh4GWSg21AZpu2o=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kparts-6.12.0.tar.xz", + "hash": "sha256-uJeqMkED75dM5ROVVHP+Zf6uq6Td+Z+0zIZ3IRT6kww=" }, "kpeople": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kpeople-6.11.0.tar.xz", - "hash": "sha256-P2evQ0QjWOe02aCoHYYTNwf/quD14FxIqh85DsR/+Ws=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kpeople-6.12.0.tar.xz", + "hash": "sha256-pD3d54MlDX+1nT3814DPJ6t+QCj2snwDVR/Rei0xV+Y=" }, "kplotting": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kplotting-6.11.0.tar.xz", - "hash": "sha256-zrkVzAJs0g/xDo/bPkkU6mH3Noai2f5qiDml6tFKmJI=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kplotting-6.12.0.tar.xz", + "hash": "sha256-RidBrgpxcNRT1KqT2BP/nQ7XDL42OIhVY3rpWxsRy/4=" }, "kpty": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kpty-6.11.0.tar.xz", - "hash": "sha256-8dmFvwoUBhp2THwBvLbPKEpZrYLeE+cs/RvSaIGe68I=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kpty-6.12.0.tar.xz", + "hash": "sha256-hOcTzPYwyRo1HMrj2Vw7hXtn5Eb8SRpioBPcEBlPgDo=" }, "kquickcharts": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kquickcharts-6.11.0.tar.xz", - "hash": "sha256-/8Naew3eUqza5QiSWlVbdgBsydS3jrAD6aMc1DnymT8=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kquickcharts-6.12.0.tar.xz", + "hash": "sha256-4zE7TcXiYBQloQPW9wzmHeoDQP6qBdH9mb9EU70d43o=" }, "krunner": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/krunner-6.11.0.tar.xz", - "hash": "sha256-IXnaZWN12IOep8LFAgh7UnxnFeEBhYKsj2NhLKUnqpA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/krunner-6.12.0.tar.xz", + "hash": "sha256-zgzjKC/J0fgRp7TEz7AV57n82NbKytlF6KOHV3E71Rs=" }, "kservice": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kservice-6.11.0.tar.xz", - "hash": "sha256-FhzSlld/+YArCIsGhm7Fq0wcGm/hn3a7UTTN+KarQAU=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kservice-6.12.0.tar.xz", + "hash": "sha256-lTO5OpUE3fLx6OaWvPraDDeRAZ7o6M++4E2dHRS2uWQ=" }, "kstatusnotifieritem": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kstatusnotifieritem-6.11.0.tar.xz", - "hash": "sha256-JsksJbH3Apa96ecfuh9xl3jIXLVyJ/YEX2Bq+ZxIqL0=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kstatusnotifieritem-6.12.0.tar.xz", + "hash": "sha256-Ww57IEktvZ1XQruv1vhXfcaCSAphXhll88U3QeaE/D0=" }, "ksvg": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/ksvg-6.11.0.tar.xz", - "hash": "sha256-BTCS42t23u/+GWKa4So3KxcvlHvuPMIDTGjnuk4dps8=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/ksvg-6.12.0.tar.xz", + "hash": "sha256-dAfNrJ8f43cK2oig4UuKx9+sbfE3FFAeHXGz0PBFanc=" }, "ktexteditor": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/ktexteditor-6.11.0.tar.xz", - "hash": "sha256-gtM9zK2Y4vUU3k0XxOZlGX/dhYilWXk1j4iu6sb8RBk=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/ktexteditor-6.12.0.tar.xz", + "hash": "sha256-1dIepl+chKm9o/utPY33DHaSTZ1WGCIGnuuc6GKSSj8=" }, "ktexttemplate": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/ktexttemplate-6.11.0.tar.xz", - "hash": "sha256-sPMMbkmhMs31hyKOC6Hh2XTMFV0jO1f/YX9dVef3uQU=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/ktexttemplate-6.12.0.tar.xz", + "hash": "sha256-n//X9skwmy/KOXz+29tV3tM+So5UOODc6/M7b5UAaZw=" }, "ktextwidgets": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/ktextwidgets-6.11.0.tar.xz", - "hash": "sha256-DwQ7imBpjM24jj1pV7X1yXz+eT6i7qQh/EZ//98gBpc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/ktextwidgets-6.12.0.tar.xz", + "hash": "sha256-aY4r5/xv0ntKpMGSoasLCrwIEhY5d1xP9PS0yB2PBB0=" }, "kunitconversion": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kunitconversion-6.11.0.tar.xz", - "hash": "sha256-jSaoPRNxvXDEgoFwhoDGnmH6ykSWPeq1LQfJcjwn7kk=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kunitconversion-6.12.0.tar.xz", + "hash": "sha256-4pikWf+YHcgFKSBmBPpZkcJrzxnSiRdxaMOdubvA4II=" }, "kuserfeedback": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kuserfeedback-6.11.0.tar.xz", - "hash": "sha256-rFFre4+c0IkWZPi1gNClpcSUz2tdv93Ye29iVlSLeRA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kuserfeedback-6.12.0.tar.xz", + "hash": "sha256-b0VTezJ02Zw9Ubtc407++bVqZqhgkApjigbmZIsTMCw=" }, "kwallet": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kwallet-6.11.0.tar.xz", - "hash": "sha256-zpSwMkRu0eE4PmcxhbWkNy3uq3Hfi3pJCDobbq2CLgk=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kwallet-6.12.0.tar.xz", + "hash": "sha256-0j5/29pmZJBGK7v9UIeSTtRRtw3P9vpMmtNU257VrQA=" }, "kwidgetsaddons": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kwidgetsaddons-6.11.0.tar.xz", - "hash": "sha256-HGTnNUgEhF2wzYOuZx37XSywgwhVGgtse4ozmqbctDY=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kwidgetsaddons-6.12.0.tar.xz", + "hash": "sha256-As5grIui5xcYBxX3+3CwJNMMQ2+C+rbOGlRGlqnwwc0=" }, "kwindowsystem": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kwindowsystem-6.11.0.tar.xz", - "hash": "sha256-2HLoXQkV3Vzx4rr4n772LphV/zMX7MWTmIK8FyRijVo=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kwindowsystem-6.12.0.tar.xz", + "hash": "sha256-bn8Oob1bGw+B94X/D93rlDIiOC8cEbUgH2m2xidjtvY=" }, "kxmlgui": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kxmlgui-6.11.0.tar.xz", - "hash": "sha256-acOmpjY72+PMus524jxszsFz6w+cGVTvcxfZmNbttvw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kxmlgui-6.12.0.tar.xz", + "hash": "sha256-PDCkTj1Rdt42r1a2wp2GQT/VjGOGZ5xiIqpNC0bQ2Iw=" }, "modemmanager-qt": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/modemmanager-qt-6.11.0.tar.xz", - "hash": "sha256-pjYyOQLFepq/GZFo6cM7NDLFOOJ2JR5rt851P//vX+4=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/modemmanager-qt-6.12.0.tar.xz", + "hash": "sha256-HuUSPviznfy9zwTTEvAjS4Z2vNwO+sI8RiPAqJYvTto=" }, "networkmanager-qt": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/networkmanager-qt-6.11.0.tar.xz", - "hash": "sha256-5uFyMk5Ml4WRKZ4pga1q445dHj1422rIN1FgSvICtgw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/networkmanager-qt-6.12.0.tar.xz", + "hash": "sha256-s7Asg2PqptULmHgOiSLDWgck0lT1sVYYe9oyD/gHqc0=" }, "prison": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/prison-6.11.0.tar.xz", - "hash": "sha256-fMjf8+8XKyTRDuUMCHbXnIdzC2+yO9Z4cI93cLnaTyA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/prison-6.12.0.tar.xz", + "hash": "sha256-AABM15tQ2zxDl/apKKvrnB3MNI3NQ3sVjFfa2uhshoE=" }, "purpose": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/purpose-6.11.0.tar.xz", - "hash": "sha256-SOFy8Fhp4aLMGeDrYjCuEs/iPSNLQNbTuy9BHH9phOA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/purpose-6.12.0.tar.xz", + "hash": "sha256-r46HaFgvNXwI86F3Z0f0xKLFqMx9pVoK9WfOX1OtBg0=" }, "qqc2-desktop-style": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/qqc2-desktop-style-6.11.0.tar.xz", - "hash": "sha256-mWVCcWGWv6yKIoo2tGGMmS4ZN4J3nc9BONY444MGZSw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/qqc2-desktop-style-6.12.0.tar.xz", + "hash": "sha256-j7jay+aPaPly3bHM7vFbnXDX5R7yBKbyX4MpgQyoliQ=" }, "solid": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/solid-6.11.0.tar.xz", - "hash": "sha256-zezHZluAGlCLmtCSmwJayT/ih75QNYnI2MOKUgwlCNc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/solid-6.12.0.tar.xz", + "hash": "sha256-S9lrOUcjvlM6MEBIBL5Avkld+uBaRDDAESI9YD19hmY=" }, "sonnet": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/sonnet-6.11.0.tar.xz", - "hash": "sha256-GUQd5i2dl/YeSNJuADVD51YHsrqPbk/rGflWKJryHWA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/sonnet-6.12.0.tar.xz", + "hash": "sha256-vuzKUsuVoEp6BDeAKWWVBesXoL1N/wkV1+XhyKO3XNI=" }, "syndication": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/syndication-6.11.0.tar.xz", - "hash": "sha256-2InFU6UYkzkhfo0GtihZWro8hCt0aT56gXlgaxNinh0=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/syndication-6.12.0.tar.xz", + "hash": "sha256-vH0CgitnBfkxLsoR8vHE3aTuE3+JgYV1TpoXHkKORyA=" }, "syntax-highlighting": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/syntax-highlighting-6.11.0.tar.xz", - "hash": "sha256-sj274ZUDCiknyq/F/fTKejcsRMqVAT1hFQN/5i4fy1E=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/syntax-highlighting-6.12.0.tar.xz", + "hash": "sha256-VkSvkAvqQNTaWo+eH7VzACMGrp4oSkOuU0LRphgQ5Is=" }, "threadweaver": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/threadweaver-6.11.0.tar.xz", - "hash": "sha256-xAjZ7zwT6ZBubvGhYt71v3RZ8JkZexeI6z2W30UF3Y8=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/threadweaver-6.12.0.tar.xz", + "hash": "sha256-7Hf7r7vZpr7wSOV+C9ZJmbHBezG0PVmjxamBqxjy4b4=" } } \ No newline at end of file diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix index 3ab9fb6291f7..fb4e03ce1986 100644 --- a/pkgs/kde/misc/klevernotes/default.nix +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -8,11 +8,11 @@ }: mkKdeDerivation rec { pname = "klevernotes"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz"; - hash = "sha256-YkIBYlTvweSg4CMqj+sHoNyZJXuwpCAMNZUZUyH2dYE="; + hash = "sha256-TorqKMx0bvxHfvYlTxRKtgbNOWBPohfXuUmBpKZkugc="; }; extraBuildInputs = [ diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix index dc8d7afcb1c0..0ba2cd1c2df6 100644 --- a/pkgs/kde/plasma/krdp/default.nix +++ b/pkgs/kde/plasma/krdp/default.nix @@ -4,7 +4,6 @@ replaceVars, openssl, pkg-config, - qtkeychain, qtwayland, freerdp, wayland, @@ -21,7 +20,6 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ - qtkeychain qtwayland freerdp wayland diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 7933541b4501..4401a99d7a48 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -11,7 +11,6 @@ qtsvg, qtwayland, breeze, - kaccounts-integration, SDL2, xkeyboard_config, xorg, @@ -50,8 +49,6 @@ mkKdeDerivation { qtsvg qtwayland - kaccounts-integration - SDL2 libcanberra libwacom diff --git a/pkgs/kde/plasma/plasma5support/default.nix b/pkgs/kde/plasma/plasma5support/default.nix index b5226ca56c4a..5a23a46b1278 100644 --- a/pkgs/kde/plasma/plasma5support/default.nix +++ b/pkgs/kde/plasma/plasma5support/default.nix @@ -1,9 +1,6 @@ { mkKdeDerivation, pkg-config, - kidletime, - networkmanager-qt, - plasma-activities, gpsd, }: mkKdeDerivation { @@ -11,11 +8,5 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; - extraBuildInputs = [ - kidletime - networkmanager-qt - plasma-activities - - gpsd - ]; + extraBuildInputs = [ gpsd ]; } diff --git a/pkgs/kde/third-party/koi/default.nix b/pkgs/kde/third-party/koi/default.nix index a735b799ee23..3a7e8ceda25d 100644 --- a/pkgs/kde/third-party/koi/default.nix +++ b/pkgs/kde/third-party/koi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; # See https://github.com/baduhai/Koi/blob/master/development/Nix%20OS/dev.nix - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ cmake wrapQtAppsHook diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 58641f46a11f..d509cb443db6 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -21,10 +21,10 @@ let owner = "elastic"; repo = "beats"; rev = "v${version}"; - hash = "sha256-0qwWHRIDLlnaPOCRmiiFGg+/jdanWuQtggM2QSaMR1o="; + hash = "sha256-TzcKB1hIHe1LNZ59GcvR527yvYqPKNXPIhpWH2vyMTY="; }; - vendorHash = "sha256-rwCCpptppkpvwQWUtqTjBUumP8GSpPHBTCaj0nYVQv8="; + vendorHash = "sha256-JOCcceYYutC5MI+/lXBqcqiET+mcrG1e3kWySo3+NIk="; subPackages = [ package ]; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 1559328665fa..bfee67b6fff7 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -339,6 +339,25 @@ in { }; }; + kanagawa = mkTmuxPlugin rec { + pluginName = "kanagawa"; + version = "0-unstable-2025-02-10"; + src = fetchFromGitHub { + owner = "Nybkox"; + repo = "tmux-kanagawa"; + rev = "5440b9476627bf5f7f3526156a17ae0e3fd232dd"; + hash = "sha256-sFL9/PMdPJxN7tgpc4YbUHW4PkCXlKmY7a7gi7PLcn8="; + }; + meta = { + homepage = "https://github.com/Nybkox/tmux-kanagawa"; + downloadPage = "https://github.com/Nybkox/tmux-kanagawa"; + description = "Feature packed kanagawa theme for tmux!"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ FKouhai ]; + }; + }; + logging = mkTmuxPlugin { pluginName = "logging"; version = "unstable-2019-04-19"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix new file mode 100644 index 000000000000..90341417d67f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix @@ -0,0 +1,16 @@ +{ + lib, + libsbuf, + mkDerivation, +}: +mkDerivation { + path = "lib/libcam"; + extraPaths = [ + "sys/cam" + ]; + buildInputs = [ + libsbuf + ]; + MK_TESTS = "no"; + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix index a4a5cb497524..98dc93a20d27 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix @@ -21,7 +21,7 @@ let baseAttrs = finalAttrs: { releaseName = "ICU"; - sourceRoot = "source/icu/icu4c/source"; + sourceRoot = "${finalAttrs.src.name}/icu/icu4c/source"; patches = [ # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does. diff --git a/pkgs/os-specific/darwin/apple-source-releases/locale/package.nix b/pkgs/os-specific/darwin/apple-source-releases/locale/package.nix index e9b58462f2c8..77955a309e8a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/locale/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/locale/package.nix @@ -6,7 +6,7 @@ stdenvNoCC, }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "locale"; version = "118"; @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-KzaAlqXqfJW2s31qmA0D7qteaZY57Va2o86aZrwyR74="; }; - sourceRoot = "source/usr-share-locale.tproj"; + sourceRoot = "${finalAttrs.src.name}/usr-share-locale.tproj"; postPatch = '' # bmake expects `Makefile` not `BSDmakefile`. @@ -60,4 +60,4 @@ stdenvNoCC.mkDerivation { ]; maintainers = lib.teams.darwin.members; }; -} +}) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 4ce47eedba2a..90f92a51ef47 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -190,6 +190,7 @@ stdenv.mkDerivation rec { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = "https://busybox.net/"; license = licenses.gpl2Only; + mainProgram = "busybox"; maintainers = with maintainers; [ TethysSvensson qyliss ]; platforms = platforms.linux; priority = 15; # below systemd (halt, init, poweroff, reboot) and coreutils diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0f7606c79b53..b66a2f6abaaa 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -43,16 +43,25 @@ let ); forceRust = features.rust or false; - kernelSupportsRust = lib.versionAtLeast version "6.7"; + # Architecture support collected from HAVE_RUST Kconfig definitions and the following table: + # https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/rust/arch-support.rst + rustByDefault = ( + lib.versionAtLeast version "6.12" + && ( + stdenv.hostPlatform.isx86_64 + || stdenv.hostPlatform.isLoongArch64 + || stdenv.hostPlatform.isAarch64 + || (stdenv.hostPlatform.isRiscV64 && !stdenv.cc.isGNU) + ) + ); - # Currently only enabling Rust by default on kernel 6.12+, - # which actually has features that use Rust that we want. - defaultRust = lib.versionAtLeast version "6.12" && rustAvailable; withRust = - assert lib.assertMsg (!(forceRust && !kernelSupportsRust)) '' - Kernels below 6.7 (the kernel being built is ${version}) don't support Rust. - ''; - (forceRust || defaultRust) && kernelSupportsRust; + lib.warnIfNot (forceRust -> rustAvailable) + "force-enabling Rust for Linux without an available rustc" + lib.warnIfNot + (forceRust -> rustByDefault) + "force-enabling Rust for Linux on an unsupported kernel version, host platform or compiler" + (forceRust || (rustAvailable && rustByDefault)); options = { @@ -1054,7 +1063,7 @@ let HIDRAW = yes; # Enable loading HID fixups as eBPF from userspace - HID_BPF = whenAtLeast "6.3" yes; + HID_BPF = whenAtLeast "6.3" (whenPlatformHasEBPFJit yes); HID_ACRUX_FF = yes; DRAGONRISE_FF = yes; @@ -1281,7 +1290,7 @@ let LIRC = yes; SCHED_CORE = whenAtLeast "5.14" yes; - SCHED_CLASS_EXT = whenAtLeast "6.12" yes; + SCHED_CLASS_EXT = whenAtLeast "6.12" (whenPlatformHasEBPFJit yes); LRU_GEN = whenAtLeast "6.1" yes; LRU_GEN_ENABLED = whenAtLeast "6.1" yes; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index fe6b1b8f0f98..334e76efb60a 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -109,11 +109,7 @@ let commonStructuredConfig = import ./common-config.nix { inherit lib stdenv version; - rustAvailable = - lib.any (lib.meta.platformMatch stdenv.hostPlatform) rustc.targetPlatforms - && lib.all (p: !lib.meta.platformMatch stdenv.hostPlatform p) rustc.badTargetPlatforms - # Known to be broken: https://lore.kernel.org/lkml/31885EDD-EF6D-4EF1-94CA-276BA7A340B7@kernel.org/T/ - && !(stdenv.hostPlatform.isRiscV && stdenv.cc.isGNU); + rustAvailable = lib.meta.availableOn stdenv.hostPlatform rustc; features = kernelFeatures; # Ensure we know of all extra patches, etc. }; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d7bc239e65a9..10b2356c63f3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,42 +2,42 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.10.234-hardened1.patch", - "sha256": "0155pikfzyrmrf9xc2bid6s7jz6qw6pb1x1pbzgphsvsi83jm886", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.234-hardened1/linux-hardened-v5.10.234-hardened1.patch" + "name": "linux-hardened-v5.10.235-hardened1.patch", + "sha256": "1xhpwy62jbwbc71s2cglxhrn7radpp256v05d587gf7jwhbi2zmc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.235-hardened1/linux-hardened-v5.10.235-hardened1.patch" }, - "sha256": "1rgb4v6dvqlw1mgzsli0hxaj2d5d4m1nylgcrwm4bkpiwbzc95wm", - "version": "5.10.234" + "sha256": "1k7iq4np3pflkq3d71ya8xs5czhslhy2iha4ls9lma81269y6fwm", + "version": "5.10.235" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.15.178-hardened1.patch", - "sha256": "01gbhdfnbxsb20qvgchk1qar7mf9phrzfidx825jags1v565jbpf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.178-hardened1/linux-hardened-v5.15.178-hardened1.patch" + "name": "linux-hardened-v5.15.179-hardened1.patch", + "sha256": "18255w5x7fjx37zdzbmigp641izc5h8fp2h8z7lj33z2mf7gfs9y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.179-hardened1/linux-hardened-v5.15.179-hardened1.patch" }, - "sha256": "0hkw2l4gr5m6jw2adxcgm2sb6kl0w51r6s4hcbn6rlm4bvmzgsgg", - "version": "5.15.178" + "sha256": "0vqk4wd0cacigz42gigdzbj415hcdn2k2m01yr7k8pcv3rxs86ck", + "version": "5.15.179" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.4.290-hardened1.patch", - "sha256": "0bd1g3zx5x5hxljw0qfis6h5y13pjlw1sizj7cx261iqb35vsv3x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.290-hardened1/linux-hardened-v5.4.290-hardened1.patch" + "name": "linux-hardened-v5.4.291-hardened1.patch", + "sha256": "1i7x7pdmqbrj306jbqv75ij1lq4hvdmw1qnfa4975zyzdd8d0khq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.291-hardened1/linux-hardened-v5.4.291-hardened1.patch" }, - "sha256": "0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc", - "version": "5.4.290" + "sha256": "0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk", + "version": "5.4.291" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.1.129-hardened1.patch", - "sha256": "0lacg5p2pw56cwijiiby6isa5r4nwmi5lh1p1lr1n1yy8nzzs3kx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.129-hardened1/linux-hardened-v6.1.129-hardened1.patch" + "name": "linux-hardened-v6.1.131-hardened1.patch", + "sha256": "005qvy3r69cy007fvj7m4b49m3vplndb280p2q72wnk9mpw8axrp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.131-hardened1/linux-hardened-v6.1.131-hardened1.patch" }, - "sha256": "0axm373w49cjga541nxk9rxpkh75wl1b04l8w6clm93mvszy6qwx", - "version": "6.1.129" + "sha256": "05jvvv3khadvfgdrv43fcrnm606jk4064a7qivkvnk1vc08gbjj4", + "version": "6.1.131" }, "6.11": { "patch": { @@ -52,31 +52,31 @@ "6.12": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.12.17-hardened1.patch", - "sha256": "15glq35gdh4mn69qqlv2hr79clwk1xphf6cfhh5n67xjkxri8jxw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.17-hardened1/linux-hardened-v6.12.17-hardened1.patch" + "name": "linux-hardened-v6.12.19-hardened1.patch", + "sha256": "1f78k1bns49gfb8ari5jg5wkfai206nfpsnwj0y5h5yrjg0x8sx8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.19-hardened1/linux-hardened-v6.12.19-hardened1.patch" }, - "sha256": "1cv3vrvwsj4ldbq7f9ccmal9as2ziw0cn8g3fd4lx5w09z9mq82w", - "version": "6.12.17" + "sha256": "0cb5ri6xsd9fyf0s48xrrsbhqzbgjd0iddnid6qk8i60prbz0fyp", + "version": "6.12.19" }, "6.13": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.13.5-hardened1.patch", - "sha256": "04adsib4g7rfgmq1sc7przp3fpw6djb4vvf8ypn94a7dihg7f8ip", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.13.5-hardened1/linux-hardened-v6.13.5-hardened1.patch" + "name": "linux-hardened-v6.13.7-hardened1.patch", + "sha256": "0s0h6z9qxqcfdz14zbaalapl2py7z40hf4p6405f2hy5hajdcxq3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.13.7-hardened1/linux-hardened-v6.13.7-hardened1.patch" }, - "sha256": "1qp6aprkkf2iwlhg2czd2msyqc728ab1vyr2v1nw3yzkhh3wngi8", - "version": "6.13.5" + "sha256": "07c08x68fgcsgriss5z8w427h69y52s887vas91jzb5p70hbcf9s", + "version": "6.13.7" }, "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.6.80-hardened1.patch", - "sha256": "09hhswaslihs5w58jka5xfw2kz70mg7awsvhbca9il5wn7wppp0j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.80-hardened1/linux-hardened-v6.6.80-hardened1.patch" + "name": "linux-hardened-v6.6.83-hardened1.patch", + "sha256": "0wzgkj4ypa3clbzq40jkm3qjhbnj8wj48wc9vxx8v15gl4rppgga", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.83-hardened1/linux-hardened-v6.6.83-hardened1.patch" }, - "sha256": "09qkadl9fm0c589qyjdwhgryr85xampz0k7lsafmrx142g813ybc", - "version": "6.6.80" + "sha256": "0262q81mwhy8plql8hnnfvagp460vfl127kaayya113l7gkbnjw9", + "version": "6.6.83" } } diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index d45fb41336ba..3e9e4fc5539b 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.30"; - hash = "sha256-rXar7LjciHcz4GxEnLmt0Eo1BvnweAwSiBem4aF87AU="; + version = "2.03.31"; + hash = "sha256-XbKVagD7+H2SJ0zMySQ2OH7Aw/qt7OdBPs4bocEMmP8="; } diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index 279c0003c83c..3e9936d30129 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -231,7 +231,7 @@ partition. .It Cm build-image Build a disk-image variant, pre-configured for the given platform/provider. Select a variant with the -.Fl --image-variant +.Fl -image-variant option or run without any options to get a list of available variants. .Bd -literal -offset indent diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index baecce29f371..769a95549ec4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -64,12 +64,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production; production = generic { - version = "570.124.04"; - sha256_64bit = "sha256-G3hqS3Ei18QhbFiuQAdoik93jBlsFI2RkWOBXuENU8Q="; - sha256_aarch64 = "sha256-HN58N00SNEwMQKSKuOMAXVW6J2VI/2YyDulQNJHuVeM="; - openSha256 = "sha256-KCGUyu/XtmgcBqJ8NLw/iXlaqB9/exg51KFx0Ta5ip0="; - settingsSha256 = "sha256-LNL0J/sYHD8vagkV1w8tb52gMtzj/F0QmJTV1cMaso8="; - persistencedSha256 = "sha256-SHSdnGyAiRH6e0gYMYKvlpRSH5KYlJSA1AJXPm7MDRk="; + version = "570.133.07"; + sha256_64bit = "sha256-LUPmTFgb5e9VTemIixqpADfvbUX1QoTT2dztwI3E3CY="; + sha256_aarch64 = "sha256-yTovUno/1TkakemRlNpNB91U+V04ACTMwPEhDok7jI0="; + openSha256 = "sha256-9l8N83Spj0MccA8+8R1uqiXBS0Ag4JrLPjrU3TaXHnM="; + settingsSha256 = "sha256-XMk+FvTlGpMquM8aE8kgYK2PIEszUZD2+Zmj2OpYrzU="; + persistencedSha256 = "sha256-G1V7JtHQbfnSRfVjz/LE2fYTlh9okpCbE4dfX9oYSg8="; }; latest = selectHighestVersion production (generic { diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 488771ac3229..d1a420d22422 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -76,27 +76,31 @@ stdenv.mkDerivation { installShellFiles pkg-config ]; - buildInputs = [ - luajit - ncurses - openssl - curl - jq - gcc - elfutils - tbb - re2 - protobuf - grpc - yaml-cpp - jsoncpp - nlohmann_json - zstd - uthash - clang - libbpf - bpftools - ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies; + buildInputs = + [ + luajit + ncurses + openssl + curl + jq + tbb + re2 + protobuf + grpc + yaml-cpp + jsoncpp + nlohmann_json + zstd + uthash + ] + ++ lib.optionals stdenv.isLinux [ + bpftools + elfutils + libbpf + clang + gcc + ] + ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" @@ -158,7 +162,7 @@ stdenv.mkDerivation { ''; postInstall = - '' + lib.optionalString stdenv.isLinux '' # Fix the bash completion location installShellCompletion --bash $out/etc/bash_completion.d/sysdig rm $out/etc/bash_completion.d/sysdig diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index db21f9fb7d54..c67384b3d938 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -108,8 +108,7 @@ withDocumentation ? true, withEfi ? stdenv.hostPlatform.isEfi, withFido2 ? true, - # conflicts with the NixOS /etc management - withFirstboot ? false, + withFirstboot ? true, withGcrypt ? true, withHomed ? !stdenv.hostPlatform.isMusl, withHostnamed ? true, @@ -883,6 +882,7 @@ stdenv.mkDerivation (finalAttrs: { withKmod withLocaled withMachined + withNetworkd withPortabled withTimedated withTpm2Tss @@ -892,6 +892,10 @@ stdenv.mkDerivation (finalAttrs: { kbd ; + # Many TPM2-related units are only installed if this trio of features are + # enabled. See https://github.com/systemd/systemd/blob/876ee10e0eb4bbb0920bdab7817a9f06cc34910f/units/meson.build#L521 + withTpm2Units = withTpm2Tss && withBootloader && withOpenSSL; + tests = let # Some entries in the `nixosTests.systemd-*` set of attributes are collections of tests, diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 31742d4f7cb9..3360b2cc7319 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -20,7 +20,6 @@ let openssl, libtirpc, nfs-utils, - samba, gawk, gnugrep, gnused, @@ -112,7 +111,7 @@ let enablePython = old.enablePython or true && enablePython; }) }/bin/exportfs" - substituteInPlace ./lib/libshare/smb.h --replace-fail "/usr/bin/net" "${samba}/bin/net" + substituteInPlace ./lib/libshare/smb.h --replace-fail "/usr/bin/net" "/run/current-system/sw/bin/net" # Disable dynamic loading of libcurl substituteInPlace ./config/user-libfetch.m4 --replace-fail "curl-config --built-shared" "true" substituteInPlace ./config/user-systemd.m4 --replace-fail "/usr/lib/modules-load.d" "$out/etc/modules-load.d" diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index b77903a7580b..ee0b62a52e2c 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -47,7 +47,7 @@ rec { inherit (lib) mkOptionType; inherit (lib.types) nullOr oneOf coercedTo listOf nonEmptyListOf attrsOf either; - inherit (lib.types) bool int float str path; + inherit (lib.types) bool int float str path luaInline; json = {}: { @@ -541,6 +541,66 @@ rec { ''; }; + lua = + { + asBindings ? false, + multiline ? true, + columnWidth ? 100, + indentWidth ? 2, + indentUsingTabs ? false, + }: + { + type = + let + valueType = + nullOr (oneOf [ + bool + float + int + path + str + luaInline + (attrsOf valueType) + (listOf valueType) + ]) + // { + description = "lua value"; + descriptionClass = "noun"; + }; + in + if asBindings then attrsOf valueType else valueType; + generate = + name: value: + pkgs.callPackage ( + { runCommand, stylua }: + runCommand name + { + nativeBuildInputs = [ stylua ]; + inherit columnWidth; + inherit indentWidth; + indentType = if indentUsingTabs then "Tabs" else "Spaces"; + value = lib.generators.toLua { inherit asBindings multiline; } value; + passAsFile = [ "value" ]; + preferLocalBuild = true; + } + '' + ${lib.optionalString (!asBindings) '' + echo -n 'return ' >> $out + ''} + cat $valuePath >> $out + stylua \ + --no-editorconfig \ + --line-endings Unix \ + --column-width $columnWidth \ + --indent-width $indentWidth \ + --indent-type $indentType \ + $out + '' + ) { }; + # Alias for mkLuaInline + lib.mkRaw = lib.mkLuaInline; + }; + # Outputs a succession of Python variable assignments # Useful for many Django-based services pythonVars = {}: { diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 2a2138bdbd10..77c002886bde 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -601,6 +601,82 @@ in runBuildTests { ''; }; + luaTable = shouldPass { + format = formats.lua { }; + input = { + null = null; + false = false; + true = true; + int = 10; + float = 3.141; + str = "foo"; + attrs.foo = null; + list = [ + null + null + ]; + path = ./testfile; + inline = lib.mkLuaInline "hello('world')"; + }; + expected = '' + return { + ["attrs"] = { + ["foo"] = nil, + }, + ["false"] = false, + ["float"] = 3.141, + ["inline"] = (hello("world")), + ["int"] = 10, + ["list"] = { + nil, + nil, + }, + ["null"] = nil, + ["path"] = "${./testfile}", + ["str"] = "foo", + ["true"] = true, + } + ''; + }; + + luaBindings = shouldPass { + format = formats.lua { + asBindings = true; + }; + input = { + null = null; + _false = false; + _true = true; + int = 10; + float = 3.141; + str = "foo"; + attrs.foo = null; + list = [ + null + null + ]; + path = ./testfile; + inline = lib.mkLuaInline "hello('world')"; + }; + expected = '' + _false = false + _true = true + attrs = { + ["foo"] = nil, + } + float = 3.141 + inline = (hello("world")) + int = 10 + list = { + nil, + nil, + } + null = nil + path = "${./testfile}" + str = "foo" + ''; + }; + phpAtoms = shouldPass rec { format = formats.php { finalVariable = "config"; }; input = { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index fc49fd60d8db..d65575ee75a8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.3.3"; + version = "2025.3.4"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix new file mode 100644 index 000000000000..33b57159f978 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + bluetooth-sensor-state-data, + bleak-retry-connector, + bleak, + nix-update-script, +}: +let + version = "0.0.14.2"; +in +buildHomeAssistantComponent { + owner = "8none1"; + domain = "lednetwf_ble"; + inherit version; + + src = fetchFromGitHub { + owner = "8none1"; + repo = "lednetwf_ble"; + tag = "v.${version}"; + hash = "sha256-FgLUBCIYsmvrU8auraFVJ+hnl/p6KHpEeIWMT4KGJBM="; + }; + + dependencies = [ + bluetooth-sensor-state-data + bleak-retry-connector + bleak + ]; + + # Currently there are no tests run, so we skip + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Home Assistant custom integration for LEDnetWF devices"; + homepage = "https://github.com/8none1/lednetwf_ble"; + changelog = "https://github.com/8none1/lednetwf_ble/releases/tag/v.${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ blenderfreaky ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix index c05dc8db9192..8588b6045e72 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "mill1000"; domain = "midea_ac"; - version = "2025.2.3"; + version = "2025.3.0"; src = fetchFromGitHub { owner = "mill1000"; repo = "midea-ac-py"; tag = version; - hash = "sha256-GfIdt5HRjtTKrndsICrLL3mttVzlMbOd9GP7+2HUPTA="; + hash = "sha256-UJS9z+t+Tb/w7yRHKXJ6HoQ4uS1guM8PYl0OcLz4EJM="; }; dependencies = [ msmart-ng ]; diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index 759512211c73..eb3b321722a3 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "jmcollin78"; domain = "versatile_thermostat"; - version = "7.2.4"; + version = "7.2.5"; src = fetchFromGitHub { inherit owner; repo = domain; rev = "refs/tags/${version}"; - hash = "sha256-djrhF4BMjQNYHAQNUobqcN5M+ptA/oEjDRR8ZRbBmH8="; + hash = "sha256-my2jy9pab0b8ZPBu9ZD1WWhJQp0pJUXlC9G0Ow969Sc="; }; passthru.updateScript = gitUpdater { ignoredVersions = "(Alpha|Beta|alpha|beta).*"; }; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index f12d302f12cd..2e2656ceb947 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.3.5"; + version = "7.3.6"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-DpQHSHZ+jmaUjepbUYiGJJ3d7xu2mj15Tts6DAXY4Ng="; + hash = "sha256-+sDIs1r3668FrpnJ3qcQlrfDvtapODj5LVOb6yStSA8="; }; # TODO: build from source once yarn berry support lands in nixpkgs diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 42c6db165bc8..78eff4e2231f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -393,7 +393,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.3.3"; + hassVersion = "2025.3.4"; in python.pkgs.buildPythonApplication rec { @@ -414,13 +414,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-uWNK7izeaK5XZMNfDgq/npJ1PrmC/HYHvHc5NU7Rff8="; + hash = "sha256-g1t9xAjrSSePyAloTQ2qwxAGEXJUTWX2zIZmAvlGGa8="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-axmqJRiOt5T8gr/eh7qXOQBMLrcR9ZSqLS8SlmTgkE8="; + hash = "sha256-MIh8FMTKZVEZ/zC+Av8fykTpz9kkXgZZfnsuOZbgP0M="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 21ad2e622052..74f1f1f6a987 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.3.3"; + version = "2025.3.4"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KapJI"; repo = "homeassistant-stubs"; - rev = "refs/tags/${version}"; - hash = "sha256-SI43zL0DfXGfk/A8VhoUTq+3Q4N2730vBxEXRj8fgUI="; + tag = version; + hash = "sha256-HO1A1uLGNnFdigmoZVL+T28f1Oh+6t1pDUa+nh84MLA="; }; build-system = [ @@ -41,11 +41,11 @@ buildPythonPackage rec { doCheck = false; - meta = with lib; { + meta = { description = "Typing stubs for Home Assistant Core"; homepage = "https://github.com/KapJI/homeassistant-stubs"; - changelog = "https://github.com/KapJI/homeassistant-stubs/releases/tag/${version}"; - license = licenses.mit; - maintainers = teams.home-assistant.members; + changelog = "https://github.com/KapJI/homeassistant-stubs/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = lib.teams.home-assistant.members; }; } diff --git a/pkgs/servers/homepage-dashboard/prerender_cache_path.patch b/pkgs/servers/homepage-dashboard/prerender_cache_path.patch deleted file mode 100644 index 1d8c3b34384a..000000000000 --- a/pkgs/servers/homepage-dashboard/prerender_cache_path.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/share/homepage/node_modules/next/dist/server/lib/incremental-cache/file-system-cache.js b/share/homepage/node_modules/next/dist/server/lib/incremental-cache/file-system-cache.js -index b1b74d8..a46c80b 100644 ---- a/share/homepage/node_modules/next/dist/server/lib/incremental-cache/file-system-cache.js -+++ b/share/homepage/node_modules/next/dist/server/lib/incremental-cache/file-system-cache.js -@@ -5,11 +5,12 @@ Object.defineProperty(exports, "__esModule", { - exports.default = void 0; - var _lruCache = _interopRequireDefault(require("next/dist/compiled/lru-cache")); - var _path = _interopRequireDefault(require("../../../shared/lib/isomorphic/path")); -+var path = require('node:path'); - class FileSystemCache { - constructor(ctx){ - this.fs = ctx.fs; - this.flushToDisk = ctx.flushToDisk; -- this.serverDistDir = ctx.serverDistDir; -+ this.serverDistDir = path.join(process.env.NIXPKGS_HOMEPAGE_CACHE_DIR, "homepage"); - this.appDir = !!ctx._appDir; - if (ctx.maxMemoryCacheSize) { - this.memoryCache = new _lruCache.default({ diff --git a/pkgs/servers/http/showoff/Gemfile b/pkgs/servers/http/showoff/Gemfile index cfd295096bc1..f25b166e154d 100644 --- a/pkgs/servers/http/showoff/Gemfile +++ b/pkgs/servers/http/showoff/Gemfile @@ -1,2 +1,6 @@ source 'https://rubygems.org' gem 'showoff' + +gem "rexml", "~> 3.4" + +gem "pdfkit", "~> 0.8.7" diff --git a/pkgs/servers/http/showoff/Gemfile.lock b/pkgs/servers/http/showoff/Gemfile.lock index 69111fa16637..d38babcc650a 100644 --- a/pkgs/servers/http/showoff/Gemfile.lock +++ b/pkgs/servers/http/showoff/Gemfile.lock @@ -20,31 +20,16 @@ GEM concurrent-ruby (~> 1.0) iso-639 (0.3.8) csv - json (2.10.1) + json (2.10.2) mini_portile2 (2.8.8) mustermann (2.0.2) ruby2_keywords (~> 0.0.1) - nokogiri (1.18.3) + nokogiri (1.18.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.3-aarch64-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-aarch64-linux-musl) - racc (~> 1.4) - nokogiri (1.18.3-arm-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-arm-linux-musl) - racc (~> 1.4) - nokogiri (1.18.3-arm64-darwin) - racc (~> 1.4) - nokogiri (1.18.3-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.18.3-x86_64-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-x86_64-linux-musl) - racc (~> 1.4) ostruct (0.6.1) parslet (2.0.0) + pdfkit (0.8.7.3) public_suffix (6.0.1) racc (1.8.1) rack (2.2.13) @@ -53,6 +38,7 @@ GEM rack-protection (2.2.4) rack redcarpet (3.6.1) + rexml (3.4.1) ruby-dbus (0.14.1) ruby2_keywords (0.0.5) showoff (0.20.4) @@ -86,17 +72,11 @@ GEM tilt (2.6.0) PLATFORMS - aarch64-linux-gnu - aarch64-linux-musl - arm-linux-gnu - arm-linux-musl - arm64-darwin ruby - x86_64-darwin - x86_64-linux-gnu - x86_64-linux-musl DEPENDENCIES + pdfkit (~> 0.8.7) + rexml (~> 3.4) showoff BUNDLED WITH diff --git a/pkgs/servers/http/showoff/gemset.nix b/pkgs/servers/http/showoff/gemset.nix index ded3537faf33..c3836a6716a1 100644 --- a/pkgs/servers/http/showoff/gemset.nix +++ b/pkgs/servers/http/showoff/gemset.nix @@ -55,6 +55,8 @@ "addressable" "eventmachine" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "0xkb1rc6dd3y5s7qsp4wqrri3n9gwsbvnwwv6xwgp241jxdpp4iq"; @@ -63,6 +65,8 @@ version = "0.3.8"; }; eventmachine = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; @@ -72,6 +76,8 @@ }; fidget = { dependencies = [ "ruby-dbus" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "04g2846wjlb8ms5041lv37aqs4jzsziwv58bxg7yzc61pdvi4ksb"; @@ -91,6 +97,8 @@ version = "2.22.2"; }; htmlentities = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; @@ -125,10 +133,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x"; + sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; type = "gem"; }; - version = "2.10.1"; + version = "2.10.2"; }; mini_portile2 = { groups = [ "default" ]; @@ -160,10 +168,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb"; + sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8"; type = "gem"; }; - version = "1.18.3"; + version = "1.18.5"; }; ostruct = { groups = [ "default" ]; @@ -185,6 +193,16 @@ }; version = "2.0.0"; }; + pdfkit = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nmp0csvkh99x1ii6pq29j8424g40lfb7k9ajfkkpzgwygpfk6fd"; + type = "gem"; + }; + version = "0.8.7.3"; + }; public_suffix = { groups = [ "default" ]; platforms = [ ]; @@ -247,7 +265,19 @@ }; version = "3.6.1"; }; + rexml = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + type = "gem"; + }; + version = "3.4.1"; + }; ruby-dbus = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "16lsqdwas6ngyyvq51l7lynj5ayis17zm5hpsg5x3m3n6r5k2gv4"; @@ -313,6 +343,8 @@ "eventmachine" "thin" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "0as52mfw34z3ba6qjab009h2rdn0za0iwrc42kw948hbb8qzcm5m"; diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/servers/mail/mailpit/source.nix index 540272746512..ae61813cc2b9 100644 --- a/pkgs/servers/mail/mailpit/source.nix +++ b/pkgs/servers/mail/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.22.1"; - hash = "sha256-1A3gQZ4kdVmKYe8LP0IYJJnYksXSH0OAIlGWAU2gPhA="; - npmDepsHash = "sha256-5Y3qLwK8v7pkDyW3PXfedhmduaplNh0G4jNJo+aaWZY="; - vendorHash = "sha256-YKl3Wvm0WYvyL7Sm5OZ1XiWhF/xf5ZHGg+F0LnaEY/U="; + version = "1.23.2"; + hash = "sha256-Yz+m6fmfv6OU6daEZjqEWxVnWruHONfdssU8cpJMt18="; + npmDepsHash = "sha256-hZSNTALU/DVT8U0RePcDDcBStTPbyKQ3bTBU0FMHh1k="; + vendorHash = "sha256-oyfIiy0o/nEm1nQCLKfaHeRKndZFh9aFI/g9227Pzo8="; } diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 2b3af84648a6..a23e0e669559 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -5,8 +5,8 @@ let in { mir = common { - version = "2.20.0"; - hash = "sha256-Dmo/aEATbbVoZd3fWIO0uHkwnAiATih33XS2MF/azoY="; + version = "2.20.1"; + hash = "sha256-c+0xMW6GspTpRsPX7D/9mdqHRBRsrcChl6TkFkHT6hg="; }; mir_2_15 = common { diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index a27d0d50c8e9..403420cb9962 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -8,6 +8,7 @@ bison, systemd, boost186, + libedit, openssl, patchelf, mariadb-connector-c, @@ -81,6 +82,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost186 + libedit openssl systemd ] ++ lib.optional withPostgresql libpq; diff --git a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix index dd3ca8b91eb8..d7d08aee3fff 100644 --- a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.87.1"; + version = "2.88.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; tag = "v${version}"; - hash = "sha256-pEMCYqPtk+18uNVUxRQ4awrRMuCqrQ6G8Ds6m3lhL9w="; + hash = "sha256-0iWGtruO4/SD6GT0sRVgj5wDi8PPB5Ui9HQGRcAf2ao="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 0edaee9ed545..8fa0995e38cc 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.68.0"; + version = "1.69.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-rdJPrGRXNZq00U3ZX0AqaDPUtLBcPRZhqHPVuUV/Tm4="; + sha256 = "sha256-KIbrJJ2QNghj/dehcDXJqWJU2pD6mt8Gw9RPLK3RTk0="; }; vendorHash = "sha256-8N/gY6YvhrGGwziLUPC12vhoxZ8QnCxgv9jxFnG6/XQ="; diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix index eb8305e13c99..d0759e991f7a 100644 --- a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "systemd_exporter"; - version = "0.6.0"; + version = "0.7.0"; - vendorHash = "sha256-D5ASUP6XHNeHZqH/ui5GvxWis/NQrRpN/+wkO4fKkA8="; + vendorHash = "sha256-4hsQ1417jLNOAqGkfCkzrmEtYR4YLLW2j0CiJtPg6GI="; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zLg4cOZUh50OFPp4mKR/FY0JfzVmXmDFcKkhB6DalGc="; + sha256 = "sha256-wWXtAyQ48fsh/9BBo2tHXf4QS3Pbsmj6rha28TdBRWI="; }; ldflags = [ diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index d3edb9d1b733..c68e1bb44a0e 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -91,6 +91,10 @@ import ./versions.nix ( ++ optional postgresqlSupport "--with-postgresql" ++ optional ipmiSupport "--with-openipmi=${openipmi.dev}"; + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + lib.versions.major version <= "5" + ) "-Wno-error=incompatible-pointer-types"; + prePatch = '' find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} + ''; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 3c7622bf6587..36c8ff67ad31 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -16,8 +16,8 @@ generic: { }; v50 = generic { - version = "5.0.41"; - hash = "sha256-pPvw0lPoK1IpsXc5c8Qu9zFhx2oHJz2bwiX80vrYa58="; - vendorHash = "sha256-qLDoNnEFiSrWXbLtYlmQaqY8Rv6JaG8WbMYBlry5Evc="; + version = "5.0.46"; + hash = "sha256-p6OZALpOQG6v70Y20cC2bdlzTINz3JBd9qGWZACfcl4="; + vendorHash = "sha256-NgSi6usIbss3WEZCYht46WjxcrdOO3qv8KwwUZwtkk0="; }; } diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index bbe4069105ca..72bdd6ba0800 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -60,20 +60,20 @@ let in { nextcloud29 = generic { - version = "29.0.13"; - hash = "sha256-B3hipF/CzO/mSJA3MIYh8H3Gw2bK20/Wo1JbiRGaXb8="; + version = "29.0.14"; + hash = "sha256-mjMuAywSnD6Sp6EBkktfJnsJNvaJdJxF0DE0PIikavs="; packages = nextcloud29Packages; }; nextcloud30 = generic { - version = "30.0.7"; - hash = "sha256-3HIxyDKEBoPLcsPYognaFETVXBNVSoTrn656dfDBJQY="; + version = "30.0.8"; + hash = "sha256-uwhqES+zUW50SSHXrhSCzBvVN+39HxQFHBNI1LatWKI="; packages = nextcloud30Packages; }; nextcloud31 = generic { - version = "31.0.1"; - hash = "sha256-ufoEWK7JS+e7KHhp+WC7yHBZLZP7w1JxYGwx5Hfk57I="; + version = "31.0.2"; + hash = "sha256-ALVyERt8K5iELZXARt5570Y8z63IoEtUAGx4bh+UwxA="; packages = nextcloud31Packages; }; diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 8617f1e8beb8..222cd4e4fbb3 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -143,7 +143,7 @@ "hash": "sha256-yfTZjAsmv2wdMNNP1Tm0fmzSIlUwRfMraNPgFEHW238=", "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.10/groupfolders-v17.0.10.tar.gz", "version": "17.0.10", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -190,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-nx9trnOjtl/jd081DB8/5BjtDe6WVwcss0ynxyT/dEU=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.23/mail-v3.7.23.tar.gz", - "version": "3.7.23", + "hash": "sha256-4XLoP07M614QM2n86QvNlol3NVmrfQLBDLZCZ013Lsc=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.24/mail-stable3.7.tar.gz", + "version": "3.7.24", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -249,6 +249,16 @@ "agpl" ] }, + "oidc_login": { + "hash": "sha256-RLYquOE83xquzv+s38bahOixQ+y4UI6OxP9HfO26faI=", + "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.2.2/oidc_login.tar.gz", + "version": "3.2.2", + "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication", + "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect", + "licenses": [ + "agpl" + ] + }, "onlyoffice": { "hash": "sha256-Bh0CGw0qdJI+NzJ/dmzoqSZdVYzcFbqSJa70gvZhDGs=", "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.7.0/onlyoffice.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index 4f1bdf116b96..13ede76e727d 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-MpWmWSyC6ZxzE8Xu+rjCxl9OhdmSydGMR+zcJyoH7uE=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.1.3/calendar-v5.1.3.tar.gz", - "version": "5.1.3", + "hash": "sha256-mAH/A5oiPwIh6K6bb9wd55CmqMoEAaKQVVr8zFNbXE8=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.0/calendar-v5.2.0.tar.gz", + "version": "5.2.0", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -140,10 +140,10 @@ ] }, "groupfolders": { - "hash": "sha256-zWRg9oqEhD0SGL82LB1HxbkLt3CbcQsgrBXlCLy94h8=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.1/groupfolders-v18.1.1.tar.gz", - "version": "18.1.1", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-xlxc4m0xxjrI3Pi+1L63Sm4wQCjJdkHD9JPorsrI5e0=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.2/groupfolders-v18.1.2.tar.gz", + "version": "18.1.2", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -190,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-c/inKInFwLG7MdNcJPV7NzF1QNRgKNWyC+rjnza2/K8=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.2.6/mail-stable4.2.tar.gz", - "version": "4.2.6", + "hash": "sha256-EFhjy0LcJCsNHJy//rGwM1f3UkAGLNXzC6lz6k5JstY=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.3.1/mail-v4.3.1.tar.gz", + "version": "4.3.1", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -249,6 +249,16 @@ "agpl" ] }, + "oidc_login": { + "hash": "sha256-RLYquOE83xquzv+s38bahOixQ+y4UI6OxP9HfO26faI=", + "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.2.2/oidc_login.tar.gz", + "version": "3.2.2", + "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication", + "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect", + "licenses": [ + "agpl" + ] + }, "onlyoffice": { "hash": "sha256-Bh0CGw0qdJI+NzJ/dmzoqSZdVYzcFbqSJa70gvZhDGs=", "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.7.0/onlyoffice.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json index 2fe69cf9d338..269eb424ad6d 100644 --- a/pkgs/servers/nextcloud/packages/31.json +++ b/pkgs/servers/nextcloud/packages/31.json @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-MpWmWSyC6ZxzE8Xu+rjCxl9OhdmSydGMR+zcJyoH7uE=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.1.3/calendar-v5.1.3.tar.gz", - "version": "5.1.3", + "hash": "sha256-mAH/A5oiPwIh6K6bb9wd55CmqMoEAaKQVVr8zFNbXE8=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.0/calendar-v5.2.0.tar.gz", + "version": "5.2.0", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -140,10 +140,10 @@ ] }, "groupfolders": { - "hash": "sha256-xotf3sAiP1sQNHfL+2kuE04YsbV4rGfDYDyZUkteGHY=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.0.3/groupfolders-v19.0.3.tar.gz", - "version": "19.0.3", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-lFIXNbBqdRHEvNFu2P68IF4v0+E4rFWLdRJYWm3RM/k=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.0.4/groupfolders-v19.0.4.tar.gz", + "version": "19.0.4", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -190,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-c/inKInFwLG7MdNcJPV7NzF1QNRgKNWyC+rjnza2/K8=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.2.6/mail-stable4.2.tar.gz", - "version": "4.2.6", + "hash": "sha256-EFhjy0LcJCsNHJy//rGwM1f3UkAGLNXzC6lz6k5JstY=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.3.1/mail-v4.3.1.tar.gz", + "version": "4.3.1", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -239,6 +239,16 @@ "agpl" ] }, + "oidc_login": { + "hash": "sha256-RLYquOE83xquzv+s38bahOixQ+y4UI6OxP9HfO26faI=", + "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.2.2/oidc_login.tar.gz", + "version": "3.2.2", + "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication", + "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect", + "licenses": [ + "agpl" + ] + }, "onlyoffice": { "hash": "sha256-Bh0CGw0qdJI+NzJ/dmzoqSZdVYzcFbqSJa70gvZhDGs=", "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.7.0/onlyoffice.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/README.md b/pkgs/servers/nextcloud/packages/README.md index 0b325848f2ed..93d1436b25b2 100644 --- a/pkgs/servers/nextcloud/packages/README.md +++ b/pkgs/servers/nextcloud/packages/README.md @@ -1,4 +1,16 @@ -= Adding apps = +## Updating apps + +To regenerate the nixpkgs nextcloudPackages set, run: + +``` +./generate.sh +``` + +After that you can commit and submit the changes in a pull request. + +## Adding apps + +**Before adding an app and making a pull request to nixpkgs, please first update as described above in a separate commit.** To extend the nextcloudPackages set, add a new line to the corresponding json file with the id of the app: @@ -11,27 +23,29 @@ https://apps.nextcloud.com. The id corresponds to the last part in the app url, for example `breezedark` for the app with the url `https://apps.nextcloud.com/apps/breezedark`. -To regenerate the nixpkgs nextcloudPackages set, run: +Then regenerate the nixpkgs nextcloudPackages set by running: ``` ./generate.sh ``` -After that you can commit and submit the changes. +**Make sure that in this update, only the app added to `nextcloud-apps.json` gets updated.** -= Usage with the Nextcloud module = +After that you can commit and submit the changes in a pull request. -The apps will be available in the namespace `nextcloud25Packages.apps`. +## Usage with the Nextcloud module + +The apps will be available in the namespace `nextcloud31Packages.apps` (and for older versions of Nextcloud similarly). Using it together with the Nextcloud module could look like this: -```nix +``` { services.nextcloud = { enable = true; - package = pkgs.nextcloud25; + package = pkgs.nextcloud31; hostName = "localhost"; config.adminpassFile = "${pkgs.writeText "adminpass" "hunter2"}"; - extraApps = with pkgs.nextcloud25Packages.apps; { + extraApps = with pkgs.nextcloud31Packages.apps; { inherit mail calendar contact; }; extraAppsEnable = true; diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 0d25f9429a3a..7e22c1c47943 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -26,6 +26,7 @@ , "music": "agpl3Plus" , "news": "agpl3Plus" , "notes": "agpl3Plus" +, "oidc_login": "agpl3Only" , "onlyoffice": "asl20" , "phonetrack": "agpl3Plus" , "polls": "agpl3Plus" diff --git a/pkgs/servers/nosql/cassandra/3.0.json b/pkgs/servers/nosql/cassandra/3.0.json index 968edce704b3..298270273093 100644 --- a/pkgs/servers/nosql/cassandra/3.0.json +++ b/pkgs/servers/nosql/cassandra/3.0.json @@ -1,4 +1,4 @@ { - "version": "3.0.28", - "sha256": "1x06sxzppipi0jg0qvk26iicqwf28y0aik7c732r0yd1vz4vdwq6" + "version": "3.0.31", + "sha256": "sha256-NKElcojNVjAXusDXGlPeFYOzSrS01hZnk0U+1va4EuQ=" } diff --git a/pkgs/servers/nosql/cassandra/3.11.json b/pkgs/servers/nosql/cassandra/3.11.json index e47f78b7baf8..33fc2c310c43 100644 --- a/pkgs/servers/nosql/cassandra/3.11.json +++ b/pkgs/servers/nosql/cassandra/3.11.json @@ -1,4 +1,4 @@ { - "version": "3.11.12", - "sha256": "16j58l7r47qrfh8q7fm92y935ykgvnbj3qn984c42qda15x92hkw" + "version": "3.11.18", + "sha256": "sha256-eb9+d1nVQ1mMKY9+O0f1gIIlpxQ8FYQeAU4/Msad5Ro=" } diff --git a/pkgs/servers/nosql/cassandra/4.json b/pkgs/servers/nosql/cassandra/4.json index 00321c9df8e1..adff55e01ad1 100644 --- a/pkgs/servers/nosql/cassandra/4.json +++ b/pkgs/servers/nosql/cassandra/4.json @@ -1,4 +1,4 @@ { - "version": "4.1.7", - "sha256": "0qnsz1zvjs1ax9p58g5b8bf3xyjg47sskkcb9nfafp6nzfdy0a2w" + "version": "4.1.8", + "sha256": "sha256-jsMCNuHxTzPki3lYQ5QiRw+Y8JtVJ+8FyAfeQpf4lyE=" } diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 1dd885e7d07c..a06b8e29af45 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -17,10 +17,10 @@ let arch = lib.elemAt info 0; plat = lib.elemAt info 1; hashes = { - x86_64-linux = "sha512-OiWGRxaCdRxXuxE/W04v87ytzOeUEcHRjF5nyRkdqSbZSnLXUyKOYQ4fKmk4til0VBOaKZYId20XyPiu/XTXNw=="; - x86_64-darwin = "sha512-V/vKYL96+M1lp7ZJlvuneRBePWZmucUANfUrFPMuq+fnUP4nN69RStLWcgwgt65EspFMBwKVyQbak4swV8rWxw=="; - aarch64-linux = "sha512-fNgVRaIIGx01reNHOnGKhMOG1aYU7gC8HLpIESSbM3+9xO1q9IHIaL/ObI/w2RYj/lD22d7PAdX5N6Hd1pVSAA=="; - aarch64-darwin = "sha512-DgexeyoxZ1YTPw9HjSUAM6eC8XtzIw7MY1WUVsIa8zl5j3RpCp25s3oI12BWefjYYCTjdtFDMsnoFSqZBabLig=="; + x86_64-linux = "sha512-xlbdx/fFQxilECdDiN80U+s+huBowo9Qf5tDIYwZ1z9gUCriNL0rMNDkvzUDL73BEI3WMFMqHdbi3cn7b5l9gA=="; + x86_64-darwin = "sha512-hiTSp7lO/x6tBYiUgKglce39k/oxT4hUlTAoC50pYFiqANALAN+2E0HtZdvsMmrOn4aGLxh+SKVglMHfrGxr+g=="; + aarch64-linux = "sha512-MPrDfBMcwNCgWW8dpOeAtlz9Odfk/0z8i+Rn08hTp35kU849KdPQLTmexlvnf/jVwqfwzN2xWJtNF0sQO26pUA=="; + aarch64-darwin = "sha512-uq5VVwvbOX4Rv32iLFw+RalFPBxQqA+1hBjFw3svzOaD1caOOrGHD4lJVHFxsFw0xl//AZuSG7S3r7Eh9AmWvQ=="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index aedb10f9e210..7fba9a2fc89e 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -38,7 +38,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then "sha256-wgm6N5fofs5wTM25ZT3dJkg7iDesXsc3Up419IAY9gk=" + if version == "7.17.27" then "sha256-HGHhcWj+6IWZ9kQCGJD7HmmvwqYV1zjN0tCsEpN4IAA=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -54,7 +54,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then "sha256-SShdBcWfm21XoVhghSSiWIhsoXzG7wz6162iOmuf5EU=" + if version == "7.17.27" then "sha256-j0WXuGmE3bRNBnDx/uWxfWrIUrdatDt52ASj8m3mrVg=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -87,7 +87,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then "sha256-S/Cp9opeLitFh2/3Qw7/MFt6GcYKufxXKD6cJSi3SaQ=" + if version == "7.17.27" then "sha256-X8b8z9LznJQ24aF9GugRuDz1c9buqT7QGS3jhuDbYBM=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -103,8 +103,8 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then - "sha256-Ym2h7Qe+L4PFhcFjsSBSfXbYoG3PgfaVKXfkaPwvuFM=" + if version == "7.17.27" then + "sha256-0hHHkywdpjKqzZ9vFqQ9B2aLCky17AYzFcSiaz/zGSw=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -121,7 +121,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then "sha256-hMErTLd5fXg420Olz+j6Zv7WByA1aNq9FlEgCtkYIxY=" + if version == "7.17.27" then "sha256-44p0Pn0mYKR5hWtC8jdaUbh9mbUGiHN9PK98ZT1jQFY=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -137,7 +137,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.16" then "sha256-z0gfdx98urCzdQNlVn99CmteG6jweOmUDmGJW89twtU=" + if version == "7.17.27" then "sha256-i+fGO7Ic2Wm/COfPGeRhiJ99Os+rLRYgs/pSepQr68g=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -153,7 +153,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; hash = - if version == "7.17.16" then "sha256-TWMN8jzFjzBVTUB+zn4tJr47VMXHC8U+014BvnArK8M=" + if version == "7.17.27" then "sha256-o2T0Dd2RqVh99wDPJMEvpnEpFFjz0lQrN9yAVJfiSGY=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -169,7 +169,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; hash = - if version == "7.17.16" then "sha256-hG5wy1Xw4T1NzI7pja3CejwJg002/n6YqM1/QaVSWbg=" + if version == "7.17.27" then "sha256-CWyQuzf2fP9BSIUWL/jxkxrXwdvHyujEINDNhY3FKNI=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = { @@ -185,13 +185,13 @@ in pluginName = "search-guard"; version = # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.17.16" then "${esVersion}-53.8.0" + if esVersion == "7.17.27" then "${esVersion}-53.10.0" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = - if esVersion == "7.17.16" then + if esVersion == "7.17.27" then fetchurl { url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"; - hash = "sha256-j8dz7rUKWqMvT6EksoFIuGJzYcgdMipKeg2d8UtzlDI="; + hash = "sha256-M1yJ8OD+mDq2uEiK6pvsMxUQMrg6o5A4xEPX8nDt1Rs="; } else throw "unsupported version ${version} for plugin ${pluginName}"; meta = { diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index c20accfbbacd..dbae69e02e58 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -11,13 +11,13 @@ postgresqlBuildExtension rec { pname = "citus"; - version = "13.0.2"; + version = "13.0.3"; src = fetchFromGitHub { owner = "citusdata"; repo = "citus"; tag = "v${version}"; - hash = "sha256-SuJs6OCHKO7efQagsATgn/V9rgMyuXQIHGCEP9ME7tQ="; + hash = "sha256-tQ2YkMUeziz+dhfXtfuK0x8PWH3vfoJiVbE+YvQ/Gzc="; }; patches = [ diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 3ebcf0c57086..8b2c2173d48b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -8,13 +8,13 @@ postgresqlBuildExtension rec { pname = "pg_ivm"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "sraoss"; repo = "pg_ivm"; tag = "v${version}"; - hash = "sha256-Qcie7sbXcMbQkMoFIYBfttmvlYooESdSk2DyebHKPlk="; + hash = "sha256-4/ftJkm2ZInm9lkjJG7y4ZULwlyVC19lP0wGXu56SGw="; }; meta = { diff --git a/pkgs/servers/sql/postgresql/ext/pg_tle.nix b/pkgs/servers/sql/postgresql/ext/pg_tle.nix index e8c45d2a026a..55c83a82f7ea 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_tle.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_tle.nix @@ -7,13 +7,13 @@ postgresqlBuildExtension rec { pname = "pg_tle"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "aws"; repo = "pg_tle"; tag = "v${version}"; - hash = "sha256-crxj5R9jblIv0h8lpqddAoYe2UqgUlnvbOajKTzVces="; + hash = "sha256-GuHlmFQjMr9Kv4NqIm9mcVfLc36EQVj5Iy7Kh26k0l4="; }; buildInputs = postgresql.buildInputs; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index a9dcd5cbe07c..1c1117b2d831 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -14,13 +14,13 @@ postgresqlBuildExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.18.2"; + version = "2.19.0"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; tag = version; - hash = "sha256-/PKk8/cS6jqL+mhSqFU6gybqDx3ld77RLF/uB+1XJCQ="; + hash = "sha256-8E5oEEsyu247WtmR20xRO/SAI6KXYSVCrU0qta6iUB8="; }; nativeBuildInputs = [ cmake ]; @@ -29,14 +29,12 @@ postgresqlBuildExtension rec { libkrb5 ]; - cmakeFlags = - [ - "-DSEND_TELEMETRY_DEFAULT=OFF" - "-DREGRESS_CHECKS=OFF" - "-DTAP_CHECKS=OFF" - ] - ++ lib.optionals (!enableUnfree) [ "-DAPACHE_ONLY=ON" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLINTER=OFF" ]; + cmakeFlags = [ + (lib.cmakeBool "SEND_TELEMETRY_DEFAULT" false) + (lib.cmakeBool "REGRESS_CHECKS" false) + (lib.cmakeBool "TAP_CHECKS" false) + (lib.cmakeBool "APACHE_ONLY" (!enableUnfree)) + ]; # Fix the install phase which tries to install into the pgsql extension dir, # and cannot be manually overridden. This is rather fragile but works OK. diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 9c487a14ea93..52c6e9a7d7e7 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -398,9 +398,10 @@ let # Tests just get stuck on macOS 14.x for v13 and v14 !(stdenv'.hostPlatform.isDarwin && olderThan "15") && - # Likely due to rosetta emulation: + # x86: Likely due to rosetta emulation: # FATAL: could not create shared memory segment: Cannot allocate memory - !(stdenv'.hostPlatform.isDarwin && stdenv'.hostPlatform.isx86_64); + # aarch64: not sure why, e.g. https://hydra.nixos.org/build/292573408/nixlog/7 + !(stdenv'.hostPlatform.isDarwin); installCheckTarget = "check-world"; passthru = diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 7196fb61a211..105812d93537 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "tt-rss"; - version = "0-unstable-2025-02-26"; + version = "0-unstable-2025-03-14"; src = fetchgit { url = "https://git.tt-rss.org/fox/tt-rss.git"; - rev = "532570ca17f1120a4bfc07195080e5e6a3c469fd"; - hash = "sha256-eu0YfIwghuTETsYA3Lrs4LmK95gxxhFUZV/tEZHPo1U="; + rev = "28cb97ddc5834ce8cfe24602a293b90348851495"; + hash = "sha256-l4aGTxL9d+go9R7cn14XOoOr8JTrJSScgDIIHGvaB9Q="; }; installPhase = '' diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 24863ebaf41a..7603a39a1bfc 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1123,11 +1123,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libX11"; - version = "1.8.11"; + version = "1.8.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.11.tar.xz"; - sha256 = "120f716wl7ay33yshicl1l0w62b9jx16ik3qnyh4ajwj8clyhx1v"; + url = "mirror://xorg/individual/lib/libX11-1.8.12.tar.xz"; + sha256 = "16lspc3bw2pg3jal7zyq6mxmxmmaax0fz6lgh1n4skqjn2dny0ps"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2143,11 +2143,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xauth"; - version = "1.1.3"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xauth-1.1.3.tar.xz"; - sha256 = "0cwxzq7lv932rcfad3baanr541qcjjdhyrhxy0bzjcp3pac581z7"; + url = "mirror://xorg/individual/app/xauth-1.1.4.tar.xz"; + sha256 = "1466a5hj0rm7sm0cr253hmy9f3yjy20aar451zfb9msa8r0q2cg9"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -4363,11 +4363,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xtrans = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xtrans"; - version = "1.5.2"; + version = "1.6.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/xtrans-1.5.2.tar.xz"; - sha256 = "0v7qvys42md6nvm16xynhb3b8zz534fc60wg0hfi7ab48zivyp2w"; + url = "mirror://xorg/individual/lib/xtrans-1.6.0.tar.xz"; + sha256 = "14ly6m6ww8rl45fdmlf58m0l1ihfji936ncx7lbiligjdcbfmbzs"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index a995b1a7d2aa..819c9ac4e934 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -21,7 +21,7 @@ mirror://xorg/individual/app/transset-1.0.3.tar.xz mirror://xorg/individual/app/twm-1.0.12.tar.xz mirror://xorg/individual/app/viewres-1.0.7.tar.xz mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2 -mirror://xorg/individual/app/xauth-1.1.3.tar.xz +mirror://xorg/individual/app/xauth-1.1.4.tar.xz mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2 mirror://xorg/individual/app/xcalc-1.1.2.tar.xz mirror://xorg/individual/app/xclock-1.1.1.tar.xz @@ -172,7 +172,7 @@ mirror://xorg/individual/lib/libICE-1.1.2.tar.xz mirror://xorg/individual/lib/libpciaccess-0.18.1.tar.xz mirror://xorg/individual/lib/libSM-1.2.5.tar.xz mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.8.11.tar.xz +mirror://xorg/individual/lib/libX11-1.8.12.tar.xz mirror://xorg/individual/lib/libXau-1.0.12.tar.xz mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz @@ -207,7 +207,7 @@ mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz -mirror://xorg/individual/lib/xtrans-1.5.2.tar.xz +mirror://xorg/individual/lib/xtrans-1.6.0.tar.xz mirror://xorg/individual/proto/xcb-proto-1.17.0.tar.xz mirror://xorg/individual/proto/xorgproto-2024.1.tar.xz mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index f0f6a57d640b..b4a39b23c1ff 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.102.0"; + version = "0.103.0"; in rustPlatform.buildRustPackage { @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; tag = version; - hash = "sha256-ISiixFQ2m++WKX66SnvF1VZpgYJjgchRWSlo/Cp/Ybs="; + hash = "sha256-PqhZFzFkvOtznJV3h25X02ZgLLvlheMm9R0tibcBrbQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3cmNlCTawMUpr6kSyT/YZzC717FoXkF0uTeE/D8BSFM="; + cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY="; nativeBuildInputs = [ pkg-config ] diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index f42180d27437..7581ed0cf2f0 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; useFetchCargoVendor = true; - cargoHash = "sha256-3cmNlCTawMUpr6kSyT/YZzC717FoXkF0uTeE/D8BSFM="; + cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index b7b08e512c9a..458f57e1beb8 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; useFetchCargoVendor = true; - cargoHash = "sha256-3cmNlCTawMUpr6kSyT/YZzC717FoXkF0uTeE/D8BSFM="; + cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix index 90d5dac530a5..d78b8007bd82 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/shells/nushell/plugins/highlight.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_highlight"; - version = "1.4.3+0.102.0"; + version = "1.4.4+0.103.0"; src = fetchFromGitHub { repo = "nu-plugin-highlight"; owner = "cptpiepmatz"; rev = "refs/tags/v${version}"; - hash = "sha256-0gKwk5YGysKWAFZdUAWzw3wiCvzF43N9f5Bj5NnDTJ4="; + hash = "sha256-XxYsxoHeRhZ4A52ctyJZVqJ40J3M3R42NUetZZIbk0w="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-Z7fTKMZacNTRrcwJNb8kiH5G8irITQMNpt+pcskDbKQ="; + cargoHash = "sha256-y0SCpDU1GM5JrixOffP1DRGtaXZsBjr7fYgYxhn4NDg="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index cbe03c0e66ba..31e8ec22b9b1 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { inherit (nushell) version src; useFetchCargoVendor = true; - cargoHash = "sha256-3cmNlCTawMUpr6kSyT/YZzC717FoXkF0uTeE/D8BSFM="; + cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 68e3ca819412..880bbca3a64b 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_query"; inherit (nushell) version src; useFetchCargoVendor = true; - cargoHash = "sha256-3cmNlCTawMUpr6kSyT/YZzC717FoXkF0uTeE/D8BSFM="; + cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 2d8d784982a8..991cb4379511 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -19,5 +19,5 @@ mkdir $out # in stdenv. mkdir $out/nix-support if [ "$propagatedUserEnvPkgs" ]; then - printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages + printf '%s ' "${propagatedUserEnvPkgs[@]}" > $out/nix-support/propagated-user-env-packages fi diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 57a58eb2ebe4..4bb5be6021f7 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -69,6 +69,7 @@ let defaultNativeBuildInputs = extraNativeBuildInputs ++ [ + ../../build-support/setup-hooks/no-broken-symlinks.sh ../../build-support/setup-hooks/audit-tmpdir.sh ../../build-support/setup-hooks/compress-man-pages.sh ../../build-support/setup-hooks/make-symlinks-relative.sh @@ -77,7 +78,6 @@ let ../../build-support/setup-hooks/move-sbin.sh ../../build-support/setup-hooks/move-systemd-user-units.sh ../../build-support/setup-hooks/multiple-outputs.sh - ../../build-support/setup-hooks/no-broken-symlinks.sh ../../build-support/setup-hooks/patch-shebangs.sh ../../build-support/setup-hooks/prune-libtool-files.sh ../../build-support/setup-hooks/reproducible-builds.sh diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 958fc54f277f..e37134e98ced 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1644,8 +1644,7 @@ fixupPhase() { if [ -n "${propagatedUserEnvPkgs:-}" ]; then mkdir -p "${!outputBin}/nix-support" - # shellcheck disable=SC2086 - printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages" + printWords "${propagatedUserEnvPkgs[@]}" > "${!outputBin}/nix-support/propagated-user-env-packages" fi runHook postFixup diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index 83e82b77b24b..aa138040d50f 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -7,6 +7,9 @@ # ordering should match defaultNativeBuildInputs { + no-broken-symlinks = lib.recurseIntoAttrs ( + import ./no-broken-symlinks.nix { inherit stdenv lib pkgs; } + ); # TODO: add audit-tmpdir compress-man-pages = let @@ -97,7 +100,6 @@ [[ -e $out/bin/foo ]] ''; }; - no-broken-symlinks = import ./no-broken-symlinks.nix { inherit stdenv lib pkgs; }; # TODO: add multiple-outputs patch-shebangs = import ./patch-shebangs.nix { inherit stdenv lib pkgs; }; prune-libtool-files = diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix index 9c8ea72a2c7d..af23373c5630 100644 --- a/pkgs/test/stdenv/no-broken-symlinks.nix +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -17,6 +17,18 @@ let ln -s${optionalString (!absolute) "r"} "$out/reflexive-symlink" "$out/reflexive-symlink" ''; + # Some platforms implement permissions for symlinks, while others - including Linux - ignore them. + # As a result, testing this hook's handling of unreadable symlinks requires careful attention to + # which kind of platform we're on. See the comments by `lib.optionalAttrs` below for details. + hasSymlinkPermissions = with stdenv.hostPlatform; isDarwin || isBSD; + mkUnreadableSymlink = absolute: '' + touch "$out/unreadable-symlink-target" + ( + umask 777 + ln -s${optionalString (!absolute) "r"} "$out/unreadable-symlink-target" "$out/unreadable-symlink" + ) + ''; + mkValidSymlink = absolute: '' touch "$out/valid" ln -s${optionalString (!absolute) "r"} "$out/valid" "$out/valid-symlink" @@ -61,7 +73,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 0 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 0 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -81,7 +93,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 0 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 0 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -101,7 +113,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 0 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 0 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -121,7 +133,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 0 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 0 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -131,6 +143,7 @@ in derivationArgs.dontCheckForBrokenSymlinks = true; }; + # Leave the unreadable symlink out of the combined 'broken' test since it doesn't work on all platforms. fail-broken-symlinks-relative = runCommand "fail-broken-symlinks-relative" { @@ -144,7 +157,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -170,7 +183,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -183,6 +196,10 @@ in derivationArgs.dontCheckForBrokenSymlinks = true; }; + # The `all-broken` tests include unreadable symlinks along with the other kinds of broken links. + # They should be run/skipped on the same sets platforms as the corresponding `unreadable` tests. + # See below. + pass-valid-symlink-relative = testBuilder { name = "pass-valid-symlink-relative"; commands = [ (mkValidSymlink false) ]; @@ -203,3 +220,111 @@ in commands = [ (mkValidSymlinkOutsideNixStore true) ]; }; } +# Skip these tests if symlink permissions are not supported, since the hook won't have anything to report. +// lib.optionalAttrs hasSymlinkPermissions { + fail-unreadable-symlink-relative = + runCommand "fail-unreadable-symlink-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-unreadable-symlink-relative-inner"; + commands = [ (mkUnreadableSymlink false) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + fail-unreadable-symlink-absolute = + runCommand "fail-unreadable-symlink-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-unreadable-symlink-absolute-inner"; + commands = [ (mkUnreadableSymlink true) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + fail-all-broken-symlinks-relative = + runCommand "fail-all-broken-symlinks-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-all-broken-symlinks-relative-inner"; + commands = [ + (mkDanglingSymlink false) + (mkReflexiveSymlink false) + (mkUnreadableSymlink false) + ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then + grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" + fi + touch $out + ''; + + fail-all-broken-symlinks-absolute = + runCommand "fail-all-broken-symlinks-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-all-broken-symlinks-absolute-inner"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + (mkUnreadableSymlink true) + ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then + grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" + fi + touch $out + ''; + +} +# These tests will break on platforms that do use symlink permissions, because even though this hook will be okay, later ones will error out. +# They should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. +// lib.optionalAttrs (!hasSymlinkPermissions) { + pass-unreadable-symlink-relative-allowed = testBuilder { + name = "pass-unreadable-symlink-relative-allowed"; + commands = [ (mkUnreadableSymlink false) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-unreadable-symlink-absolute-allowed = testBuilder { + name = "pass-unreadable-symlink-absolute-allowed"; + commands = [ (mkUnreadableSymlink true) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-all-broken-symlinks-relative-allowed = testBuilder { + name = "pass-all-broken-symlinks-relative-allowed"; + commands = [ + (mkDanglingSymlink false) + (mkReflexiveSymlink false) + (mkUnreadableSymlink false) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-all-broken-symlinks-absolute-allowed = testBuilder { + name = "pass-all-broken-symlinks-absolute-allowed"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + (mkUnreadableSymlink true) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; +} diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index ced751e17623..4154249ad1a6 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -438,6 +438,9 @@ rec { let # TODO known broken binaries broken = [ + # do not know how to test without a valid build.lua + "ppmcheckpdf" + # *.inc files in source container rather than run "texaccents" @@ -660,6 +663,8 @@ rec { "allcm" "allec" "chkweb" + "explcheck" + "extractbb" "fontinst" "ht*" "installfont-tl" diff --git a/pkgs/tools/X11/xdragon/default.nix b/pkgs/tools/X11/xdragon/default.nix index babdb75224cb..9fa790b2048b 100644 --- a/pkgs/tools/X11/xdragon/default.nix +++ b/pkgs/tools/X11/xdragon/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "Simple drag-and-drop source/sink for X (called dragon in upstream)"; + description = "Simple drag-and-drop source/sink for X or Wayland (called dragon in upstream)"; homepage = "https://github.com/mwh/dragon"; license = licenses.gpl3; maintainers = with maintainers; [ das_j ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index bd43082ba12b..fc0c33deaa32 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -35,6 +35,10 @@ which, x264, x265, + libavif, + libspng, + openh264, + libyuv, xauth, xdg-utils, xorg, @@ -82,7 +86,7 @@ let in buildPythonApplication rec { pname = "xpra"; - version = "6.2.3"; + version = "6.2.5"; stdenv = if withNvenc then cudaPackages.backendStdenv else args.stdenv; @@ -90,7 +94,7 @@ buildPythonApplication rec { owner = "Xpra-org"; repo = "xpra"; rev = "v${version}"; - hash = "sha256-5f6yHz3uc5qsU1F6D8r0KPo8tbrFP4pfxXTvIJYqKuI="; + hash = "sha256-XY8NZhWCRLjpgq0dOClzftvMR7g/X64b+OYyjOGC/lM="; }; patches = [ @@ -132,6 +136,8 @@ buildPythonApplication rec { ] ++ (with gst_all_1; [ gst-libav + gst-vaapi + gst-plugins-ugly gst-plugins-bad gst-plugins-base gst-plugins-good @@ -154,6 +160,10 @@ buildPythonApplication rec { pango x264 x265 + libavif + libspng + openh264 + libyuv xxHash ] ++ lib.optional withNvenc [ @@ -182,10 +192,14 @@ buildPythonApplication rec { pygobject3 pyinotify pyopengl + pyopengl-accelerate python-uinput pyxdg rencode invoke + aioquic + uvloop + pyopenssl ] ++ lib.optionals withNvenc [ pycuda diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/tools/admin/ansible/later.nix index 2c626708b9b9..08012dacdccd 100644 --- a/pkgs/tools/admin/ansible/later.nix +++ b/pkgs/tools/admin/ansible/later.nix @@ -17,7 +17,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-4ZHCnLeG5gr0UtKQLU+6xnTxUbxnLcmDd51Psnaa42I="; }; - pythonRelaxDeps = [ "python-json-logger" ]; + pythonRelaxDeps = [ + "python-json-logger" + "yamllint" + ]; build-system = with python3Packages; [ poetry-core diff --git a/pkgs/tools/admin/fastlane/Gemfile b/pkgs/tools/admin/fastlane/Gemfile index 1fa8dbca63b1..ed9098c1e9d4 100644 --- a/pkgs/tools/admin/fastlane/Gemfile +++ b/pkgs/tools/admin/fastlane/Gemfile @@ -1,2 +1,4 @@ source 'https://rubygems.org' gem 'fastlane' + +gem "abbrev", "~> 0.1.2" diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index d9ca6d0777e2..50f4212ec318 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -5,25 +5,26 @@ GEM base64 nkf rexml - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.0) - aws-partitions (1.909.0) - aws-sdk-core (3.191.6) + aws-eventstream (1.3.2) + aws-partitions (1.1068.0) + aws-sdk-core (3.220.1) 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.78.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.146.1) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (1.99.0) + aws-sdk-core (~> 3, >= 3.216.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-sigv4 (1.8.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) @@ -33,13 +34,13 @@ GEM commander (4.6.0) highline (~> 2.0.0) declarative (0.0.20) - digest-crc (0.6.5) + digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.110.0) - faraday (1.10.3) + excon (0.112.0) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -58,17 +59,17 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) - fastimage (2.3.1) - fastlane (2.220.0) + fastimage (2.4.0) + fastlane (2.227.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -84,6 +85,7 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) @@ -107,8 +109,10 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) + xcpretty (~> 0.4.0) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) @@ -126,12 +130,12 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.7.0) + google-cloud-core (1.8.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.4.0) + google-cloud-errors (1.5.0) google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -147,34 +151,36 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.5) + http-cookie (1.0.8) domain_name (~> 0.5) - httpclient (2.8.3) + httpclient (2.9.0) + mutex_m jmespath (1.6.2) - json (2.7.2) - jwt (2.8.1) + json (2.10.2) + jwt (2.10.1) base64 - mini_magick (4.12.0) + mini_magick (4.13.2) mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.4.0) - nanaimo (0.3.0) + multipart-post (2.4.1) + mutex_m (0.3.0) + nanaimo (0.4.0) naturally (2.2.1) nkf (0.2.0) - optparse (0.4.0) + optparse (0.6.0) os (1.1.4) - plist (3.7.1) - public_suffix (5.0.5) + plist (3.7.2) + public_suffix (6.0.1) rake (13.2.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.6) - rouge (2.0.7) + rexml (3.4.1) + rouge (3.28.0) ruby2_keywords (0.0.5) - rubyzip (2.3.2) + rubyzip (2.4.1) security (0.1.5) signet (0.19.0) addressable (~> 2.8) @@ -184,6 +190,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + sysrandom (1.0.5) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -193,17 +200,17 @@ GEM tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) word_wrap (1.0.0) - xcodeproj (1.24.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) - xcpretty (0.3.0) - rouge (~> 2.0.7) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.0) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) @@ -214,4 +221,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.5.6 + 2.6.2 diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index eb46a8fe55c5..7565ccee0a62 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -5,10 +5,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; artifactory = { groups = [ "default" ]; @@ -35,36 +35,37 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; + sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.2"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00iknq94smbskgmxqmlxlcgpq5famd968l12nvv8bxi7gk1hagsk"; + sha256 = "0lmnx4sa9wm9ffqsjbybxzlgz6h4clf96s694sdn2lz1qcx0fq2i"; type = "gem"; }; - version = "1.909.0"; + version = "1.1068.0"; }; aws-sdk-core = { dependencies = [ "aws-eventstream" "aws-partitions" "aws-sigv4" + "base64" "jmespath" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk"; + sha256 = "0cjdqmy5hjbgzc0iac1i143va76qgp7jc7hg1aviy1n8cgywq44y"; type = "gem"; }; - version = "3.191.6"; + version = "3.220.1"; }; aws-sdk-kms = { dependencies = [ @@ -75,10 +76,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fbp2vw5qnyiya63hlmwiqkbh30lipyqplancmhm84ad7i98ambb"; + sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; type = "gem"; }; - version = "1.78.0"; + version = "1.99.0"; }; aws-sdk-s3 = { dependencies = [ @@ -90,10 +91,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq"; + sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; type = "gem"; }; - version = "1.146.1"; + version = "1.182.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -101,10 +102,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; + sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; type = "gem"; }; - version = "1.8.0"; + version = "1.11.0"; }; babosa = { groups = [ "default" ]; @@ -198,10 +199,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w"; + sha256 = "01wcsyhaadss4zzvqh12kvbq3hmkl5y4fck7pr608hd24qxc5bb4"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.0"; }; domain_name = { groups = [ "default" ]; @@ -238,10 +239,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1m3gzvp1wqki0yh4b7761qhdy4pyr4phy429b7s9w25nrkhp4lsz"; + sha256 = "1w7098hnyby5sn2315qy26as6kxlxivxlcrs714amj9g9hxaryfs"; type = "gem"; }; - version = "0.110.0"; + version = "0.112.0"; }; faraday = { dependencies = [ @@ -261,10 +262,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; + sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; faraday-cookie_jar = { dependencies = [ @@ -326,20 +327,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; + sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; type = "gem"; }; - version = "1.0.4"; + version = "1.1.0"; }; faraday-net_http = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; faraday-net_http_persistent = { groups = [ "default" ]; @@ -387,20 +388,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; + sha256 = "1s990pnapb3vci9c00bklqc7jjix4i2zhxn2zf1lfk46xv47hnyl"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; fastimage = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sfc7svf7h1ja6zmsq9f3ps6pg0q4hymphh6rk7ipmp7ygqjkii3"; + sha256 = "1s67b9n7ki3iaycypq8sh02377gjkaxadg4dq53bpgfk4xg3gkjz"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; fastlane = { dependencies = [ @@ -418,6 +419,7 @@ "faraday-cookie_jar" "faraday_middleware" "fastimage" + "fastlane-sirp" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" @@ -448,10 +450,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14ywmlipmryzdxzn4235ah67hy06wh5hf32jbs3a9j7byc2x1kx3"; + sha256 = "12lqn70c3v5h2z2svn1gickyhkhny6rwnm2xfrs3gmjc6pvfrqhb"; type = "gem"; }; - version = "2.220.0"; + version = "2.227.0"; + }; + fastlane-sirp = { + dependencies = [ "sysrandom" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hg6ql3g25f96fsmwr9xlxpn8afa7wvjampnrh1fqffhphjqyiv6"; + type = "gem"; + }; + version = "1.0.0"; }; gh_inspector = { groups = [ "default" ]; @@ -535,10 +548,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l"; + sha256 = "1kw10897ardky1chwwsb8milygzcdi8qlqlhcnqwmkw9y75yswp5"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; google-cloud-env = { dependencies = [ "faraday" ]; @@ -556,10 +569,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "056yw9cg771c1xqvw15wpdfdw9lz3m13fh5b6a3p1c9xaq7jwkhb"; + sha256 = "0jvv9w8s4dqc4ncfa6c6qpdypz2wj8dmgpjd44jq2qhhij5y4sxm"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; google-cloud-storage = { dependencies = [ @@ -613,20 +626,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; + sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.8"; }; httpclient = { + dependencies = [ "mutex_m" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b"; type = "gem"; }; - version = "2.8.3"; + version = "2.9.0"; }; jmespath = { groups = [ "default" ]; @@ -643,10 +657,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; + sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; type = "gem"; }; - version = "2.7.2"; + version = "2.10.2"; }; jwt = { dependencies = [ "base64" ]; @@ -654,20 +668,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02m3vza49pb9dirwpn8vmzbcypi3fc6l3a9dh253jwm1121g7ajb"; + sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6"; type = "gem"; }; - version = "2.8.1"; + version = "2.10.1"; }; mini_magick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; + sha256 = "1nfxjpmka12ihbwd87d5k2hh7d2pv3aq95x0l2lh8gca1s72bmki"; type = "gem"; }; - version = "4.12.0"; + version = "4.13.2"; }; mini_mime = { groups = [ "default" ]; @@ -694,20 +708,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67"; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; + }; + mutex_m = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; + type = "gem"; + }; + version = "0.3.0"; }; nanaimo = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; + sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; naturally = { groups = [ "default" ]; @@ -734,10 +758,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pmsn1g1q5fpkjrc4h1wlw6lxlqp165sdcd951xyl47n6k0az17m"; + sha256 = "1306kdvq0xr333xma4452zvvvw6mx7fw20fwi6508i6dq5lh9s95"; type = "gem"; }; - version = "0.4.0"; + version = "0.6.0"; }; os = { groups = [ "default" ]; @@ -754,20 +778,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b643i5b7b7galvlb2fc414ifmb78b5lsq47gnvhzl8m27dl559z"; + sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk"; type = "gem"; }; - version = "3.7.1"; + version = "3.7.2"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.5"; + version = "6.0.1"; }; rake = { groups = [ "default" ]; @@ -809,20 +833,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.2.6"; + version = "3.4.1"; }; rouge = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; type = "gem"; }; - version = "2.0.7"; + version = "3.28.0"; }; ruby2_keywords = { groups = [ "default" ]; @@ -839,10 +863,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; security = { groups = [ "default" ]; @@ -884,6 +908,16 @@ }; version = "1.6.10"; }; + sysrandom = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0x8yryf6migjnkfwr8dxgx1qyzhvajgha60hr5mgfkn65qyarhas"; + type = "gem"; + }; + version = "1.0.5"; + }; terminal-notifier = { groups = [ "default" ]; platforms = [ ]; @@ -961,10 +995,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; word_wrap = { groups = [ "default" ]; @@ -989,10 +1023,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56"; + sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc"; type = "gem"; }; - version = "1.24.0"; + version = "1.27.0"; }; xcpretty = { dependencies = [ "rouge" ]; @@ -1000,10 +1034,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; + sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; xcpretty-travis-formatter = { dependencies = [ "xcpretty" ]; diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix index f6f5ab016efd..eb6094277569 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix @@ -9,7 +9,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/go/pulumi-language-go"; - vendorHash = "sha256-mhwmHxZ+I/IdNGpEzXYJWPDKt7Gnun3HuXsjmFme6GI="; + vendorHash = "sha256-MqqkDuCAHsxyzcofufMSzf1TpntnMy+sNHhBY5vr+TE="; ldflags = [ "-s" diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix index 8819fb107afd..835e46e43c9d 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix @@ -12,7 +12,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs"; - vendorHash = "sha256-vmFoMxWK5sj3vsBVFAji0Pz2wtf1H3MJhbrkHshDOno="; + vendorHash = "sha256-Blhbjc9nNj2ZDKs6uO/IZ5RuFJJTkS2wJF/7Egc7VvA="; ldflags = [ "-s" diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix index 687d9df8bf64..45a346cd0bf3 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix @@ -11,7 +11,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python"; - vendorHash = "sha256-2K3EIG0xRcRRJES9h72Sk9V442T6dHZbYxz1uxxEKWI="; + vendorHash = "sha256-x3dWYM8/2cWWhTmfGEDdrGHntqIDObYwQicSHIXr1rw="; ldflags = [ "-s" diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index bcb22caab20c..ece354ab29e7 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -7,6 +7,8 @@ mp3gain, mp3val, python3Packages, + version, + lib, ... }: { @@ -170,3 +172,9 @@ ]; zero = { }; } +# NOTE: There will be no need for this conditional once beets is updated. +// lib.optionalAttrs (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") { + _typing = { + testPaths = [ ]; + }; +} diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index ed070d8fb4d5..d06e10494b59 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -82,17 +82,6 @@ python3Packages.buildPythonApplication { pyproject = true; patches = [ - (fetchpatch { - # Already on master. TODO: remove when updating to the next release - # Issue: https://github.com/beetbox/beets/issues/5527 - # PR: https://github.com/beetbox/beets/pull/5650 - name = "fix-im-backend"; - url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch"; - hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ="; - excludes = [ - "docs/changelog.rst" - ]; - }) ] ++ extraPatches; build-system = [ @@ -113,6 +102,9 @@ python3Packages.buildPythonApplication { unidecode typing-extensions ] + ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [ + lap + ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins)); nativeBuildInputs = [ @@ -160,6 +152,9 @@ python3Packages.buildPythonApplication { rarfile responses ] + ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [ + requests-mock + ] ++ [ writableTmpDirAsHomeHook ] diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 2a4540681f6f..70d3b644d692 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -20,6 +20,17 @@ */ let extraPatches = [ + (fetchpatch { + # Already on master. TODO: remove when updating to the next release + # Issue: https://github.com/beetbox/beets/issues/5527 + # PR: https://github.com/beetbox/beets/pull/5650 + name = "fix-im-backend"; + url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch"; + hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ="; + excludes = [ + "docs/changelog.rst" + ]; + }) # Bash completion fix for Nix ./patches/bash-completion-always-print.patch # Remove after next release. @@ -46,13 +57,13 @@ lib.makeExtensible (self: { beets-minimal = self.beets.override { disableAllPlugins = true; }; beets-unstable = callPackage ./common.nix { - inherit python3Packages extraPatches; - version = "2.2.0-unstable-2024-12-02"; + inherit python3Packages; + version = "2.2.0-unstable-2025-03-12"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "f92c0ec8b14fbd59e58374fd123563123aef197b"; - hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM="; + rev = "670a3bcd17a46883c71cf07dd313fcd0dff4be9d"; + hash = "sha256-hSY7FhpPL4poOY1/gqk7oLNgQ7KA/MJqx50xOLIP0QA="; }; }; diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix index f49f590a6e73..b43f46683510 100644 --- a/pkgs/tools/backup/awsbck/default.nix +++ b/pkgs/tools/backup/awsbck/default.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "awsbck"; - version = "0.3.10"; + version = "0.3.12"; src = fetchFromGitHub { owner = "beeb"; repo = "awsbck"; rev = "v${version}"; - hash = "sha256-6AJTNJ/vuRAMnkuOoBVmEAlJy18OZDWVr4OzFv9/oag="; + hash = "sha256-C5QaOxZ9DQuda+slf8uqPQYVgDtS5Lhm3AFn8K2G/T4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sr9E6AbgGibOhlg+LOuYL5ysd6gHDyKOAYJTwjrzl2E="; + cargoHash = "sha256-Pb4tnP8BiVTfUR1qM1dUXj9aCmdK23YYxQ4KQQc4z54="; # tests run in CI on the source repo doCheck = false; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 103690caf3aa..9454c6698b36 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.9.2"; + version = "11.9.3"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4998"; - sha256 = "sha256-lpPTvsRNsATmcg3eCGs9rqxeWw5CaNZP2DUU4yCOmyc="; + rev = "5027"; + sha256 = "sha256-fz4SvJwQAYV6agXC7oMwo8rUIHMRav25MuWiwoEONkE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 381bc7b4a0a4..02be20fad163 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ibus-libpinyin"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; tag = version; - hash = "sha256-aeyoBfl5x9Jo35vESMmLBbl72Qx5F3JwZHZaBr3c0Jk="; + hash = "sha256-lDwQjQepMTmsnGh/wreUfweT1xih/z3tiBPHaY+mBTI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 23954dc67596..490d1a7049d9 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,17 +2,20 @@ lib, stdenv, fetchFromGitHub, + installShellFiles, autoconf, automake, libtool, pkg-config, which, + libavif, + libjxl, + librsvg, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, - imagemagick, Foundation, }: @@ -27,6 +30,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-9RkN0yZnHf5cx6tsp3P6jsi0/xtplWxMm3hYCPjWj0M="; }; + outputs = [ + "bin" + "dev" + "man" + "out" + ]; + nativeBuildInputs = [ autoconf automake @@ -37,12 +47,15 @@ stdenv.mkDerivation rec { libxml2 docbook_xml_dtd_412 docbook_xsl + installShellFiles ]; buildInputs = [ glib - imagemagick - ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; + libavif + libjxl + librsvg + ]; patches = [ ./xmlcatalog_patch.patch ]; @@ -56,8 +69,9 @@ stdenv.mkDerivation rec { "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" ]; - # https://github.com/NixOS/nixpkgs/pull/240893#issuecomment-1635347507 - NIX_LDFLAGS = [ "-lwebp" ]; + postInstall = '' + installShellCompletion --cmd chafa tools/completions/zsh-completion.zsh + ''; meta = with lib; { description = "Terminal graphics for the 21st century"; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 4556bfdb2728..921e1094997e 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -21,14 +21,14 @@ }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; rev = "v${version}"; - hash = "sha256-xOt+yvdrN6wBkvz1OfkdAPSz5F4qWg5kIgCw8JlXd10="; + hash = "sha256-lA1FpUee2SpUQwJotbYhG0QX7LT5l2PP9lJ9F3uNtdU="; }; buildInputs = [ diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index dcf905f7b219..5c5420b7a169 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -22,14 +22,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.2.2"; + version = "2025.3.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; tag = version; - hash = "sha256-UD+vpJ2hIWDNba2mEFLfhifujNCpjA33LCo4nyO+qBU="; + hash = "sha256-+KmWQPZok73DEs11C5wm5pQ6osy9SS9QNyaqBWsyulI="; }; build-systems = with python.pkgs; [ diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 3a09752bf638..df84399d2b16 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -17,15 +17,15 @@ let hashes = if enableUnfree then { - x86_64-linux = "sha512-ze0hJxUHCN52bOxUs5upDj64tIE58P2BTow2kaCo6HreRiF9rfTTzNkNr/hCmEgE+/oFbgSEuOQLz+6G373RDQ=="; - x86_64-darwin = "sha512-FOFd8d+4UddSGorjuUWW/JbQ5fQH4LU1f1HJLmdbfnb8Q5L4GEveb2LmWNILU8/a85V4HGmD6lL8mCJqH9CULQ=="; - aarch64-linux = "sha512-giYqW88/6iT3haXzJVn/+b7uxjYhHq4GERmiq3tMIvjxDyu7B6g+X7JneaTYxhpNdn6gOD/hfXgNv+hFRq6lgg=="; + x86_64-linux = "sha512-9JzopnY43Osoy4/0G9gxJYlbCl1a9Qy2pL4GL1uyjJ3uSNoOskEBhhsqLp9BhtJXOaquuRDgbJnXhbBrlE0rKg=="; + x86_64-darwin = "sha512-ZcdKWFrIQUmGtxoWbLc2F7g85quXfRqy62DyVPR/9zBtMTgFH0eG4Cj40ELpW7nYXZqglmAUTF/0mZZYUg2Ciw=="; + aarch64-linux = "sha512-V2Nt/lup4ofgoMqpAH3OHF8Fp0PvC1M8nl6sCKmTf+ZXQYHNjAJkJwGJwHeQQ0L/348JHyCkeWL43dS7Jr6ZJQ=="; } else { - x86_64-linux = "sha512-OC9gx76k+RMdjqcDkrJCNbPYSQameyddaYMxUIB0foVxCmo6UvbdcwZGXRLPPn95in8rYOCjvPoBkmupiQw9xQ=="; - x86_64-darwin = "sha512-1OEfEED/jjlT3Fd095Y5VYiWKnovytI3UYCCy1Rs3tEvkZPHYwqIQHfMQYeAvGgUci37ADwEDu8xrSQULHToLw=="; - aarch64-linux = "sha512-QWW0AXOMNIXThxpUiRomvINm+917MvGrSDndrEw11IYYuvi0d0dckJiRytfnBbBNoOKpVhB68uOmfjIcZBNpWQ=="; + x86_64-linux = "sha512-L11ZUdXC8VDiSEVDBMous2OaMlAFgvkQ+eDbmbA9r/sDIXY8W7dx3jgPNXoorDtatTemwy8aXw1XJGaVmj4T3Q=="; + x86_64-darwin = "sha512-az5ujFtwcuNNGuITDeGRu1FB2bb8/hIUmGMvm0Xcfvs0GZPnCZVY6ScsiHZYjT8X+qBYkn/httT3MYozrPOy4Q=="; + aarch64-linux = "sha512-iVft0kZYhvFJ1NKCfdePhRxDljPTwV+3G7wV94iykYISgLTVoehzDTMdxUyfK/mmQhu3hmmHbVpw1jXjTrS7ng=="; }; this = stdenv.mkDerivation rec { version = elk7Version; diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 9012e9b59279..5dc4d4718e2b 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -23,6 +23,8 @@ mkDerivation rec { hash = "sha256-6bKeR3UX2DhXGcKJ1bxvT1aLTgCfc+aNo6ckE89NV+I="; }; + patches = [ ./remove-upload-import.diff ]; + nativeBuildInputs = [ python3.pkgs.wrapPython qmake @@ -85,6 +87,9 @@ mkDerivation rec { meta = with lib; { description = "Cross-platform application for configuring any YubiKey over all USB interfaces"; homepage = "https://developers.yubico.com/yubikey-manager-qt/"; + knownVulnerabilities = [ + "Yubico has announced the End of Life of YubiKey Manager QT. Upstream recommends yubioath-flutter to configure a YubiKey. yubikey-manager-qt will be dropped after NixOS 25.05." + ]; license = licenses.bsd2; maintainers = [ maintainers.cbley ]; mainProgram = "ykman-gui"; diff --git a/pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff b/pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff new file mode 100644 index 000000000000..3e22803a3b56 --- /dev/null +++ b/pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff @@ -0,0 +1,16 @@ +--- a/ykman-gui/py/yubikey.py 2025-01-08 19:42:20.058393985 +0100 ++++ b/ykman-gui/py/yubikey.py 2025-01-08 19:44:12.520364702 +0100 +@@ -50,12 +50,10 @@ + if int(ykman_v.split(".")[0] ) > 4: + from yubikit.support import get_name + from ykman.device import list_all_devices, scan_devices +- from ykman.otp import ( +- _PrepareUploadFailed as PrepareUploadFailed +- , _prepare_upload_key as prepare_upload_key, generate_static_pw) ++ from ykman.otp import generate_static_pw + else: + from ykman import connect_to_device, scan_devices, get_name + from ykman.otp import PrepareUploadFailed, prepare_upload_key, generate_static_pw + + from fido2.ctap2 import Ctap2, ClientPin + diff --git a/pkgs/tools/networking/curl-impersonate/chrome/default.nix b/pkgs/tools/networking/curl-impersonate/chrome/default.nix index ac85af4de081..dce29e548661 100644 --- a/pkgs/tools/networking/curl-impersonate/chrome/default.nix +++ b/pkgs/tools/networking/curl-impersonate/chrome/default.nix @@ -95,13 +95,13 @@ stdenv.mkDerivation rec { postUnpack = lib.concatStringsSep "\n" ( - lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} source/${name}") ( + lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} ${src.name}/${name}") ( lib.filterAttrs (n: v: v ? outPath) passthru.deps ) ) + '' - curltar=$(realpath -s source/curl-*.tar.gz) + curltar=$(realpath -s ${src.name}/curl-*.tar.gz) pushd "$(mktemp -d)" diff --git a/pkgs/tools/networking/curl-impersonate/firefox/default.nix b/pkgs/tools/networking/curl-impersonate/firefox/default.nix index 73b4458ec8db..e0d178466ea2 100644 --- a/pkgs/tools/networking/curl-impersonate/firefox/default.nix +++ b/pkgs/tools/networking/curl-impersonate/firefox/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { dontUseNinjaCheck = true; postUnpack = lib.concatStringsSep "\n" ( - lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} source/${name}") ( + lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} ${src.name}/${name}") ( lib.filterAttrs (n: v: v ? outPath) passthru.deps ) ); diff --git a/pkgs/tools/networking/maubot/default.nix b/pkgs/tools/networking/maubot/default.nix index f5e5ab4ec45e..21db3534cb74 100644 --- a/pkgs/tools/networking/maubot/default.nix +++ b/pkgs/tools/networking/maubot/default.nix @@ -93,9 +93,6 @@ let rm $out/example-config.yaml ''; - # Setuptools is trying to do python -m maubot test - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "maubot" ]; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 767fc3011fd8..96dae1f4c682 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -22,8 +22,6 @@ buildPythonApplication rec { python-dateutil ]; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://s3tools.org/s3cmd"; description = "Command line tool for managing Amazon S3 and CloudFront services"; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index c497786b4738..54d0a106a533 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "shadowsocks-rust"; tag = "v${version}"; - hash = "sha256-rufOrNwUp8h0LoBKPyDV63WAYTLJbctWrq5Ghj6ODB4="; + hash = "sha256-JcYf6Meq8iG7zcjQu240EKwlAPBriestKlz0RLpIAHg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hdHCpER4qs8W6rMmwys2KhaGDiTWcnntAL3ZeTBgt84="; + cargoHash = "sha256-RadM8sN7ePGNkTanClqgpsDg8fHIrYMHcjbHxDmzKdc="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/tools/package-management/nix/vendor/2_26/packaging/everything.nix b/pkgs/tools/package-management/nix/vendor/2_26/packaging/everything.nix index aab58cc82509..1835eefb643b 100644 --- a/pkgs/tools/package-management/nix/vendor/2_26/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/vendor/2_26/packaging/everything.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: { devPaths = lib.mapAttrsToList (_k: lib.getDev) finalAttrs.finalPackage.libs; in '' - mkdir -p $out $dev/nix-support $doc $man + mkdir -p $out $dev/nix-support # Custom files echo $libs >> $dev/nix-support/propagated-build-inputs @@ -168,8 +168,8 @@ stdenv.mkDerivation (finalAttrs: { done # Forwarded outputs - ln -s ${nix-manual} $doc - ln -s ${nix-manual.man} $man + ln -sT ${nix-manual} $doc + ln -sT ${nix-manual.man} $man ''; passthru = { diff --git a/pkgs/tools/security/bundler-audit/Gemfile.lock b/pkgs/tools/security/bundler-audit/Gemfile.lock index 5d51735440d6..65b5974ba283 100644 --- a/pkgs/tools/security/bundler-audit/Gemfile.lock +++ b/pkgs/tools/security/bundler-audit/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - bundler-audit (0.9.1) + bundler-audit (0.9.2) bundler (>= 1.2.0, < 3) thor (~> 1.0) - thor (1.2.1) + thor (1.3.2) PLATFORMS ruby @@ -13,4 +13,4 @@ DEPENDENCIES bundler-audit BUNDLED WITH - 2.3.9 + 2.6.2 diff --git a/pkgs/tools/security/bundler-audit/gemset.nix b/pkgs/tools/security/bundler-audit/gemset.nix index 2dc2c5141f34..9901d5bbb413 100644 --- a/pkgs/tools/security/bundler-audit/gemset.nix +++ b/pkgs/tools/security/bundler-audit/gemset.nix @@ -5,19 +5,19 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gdx0019vj04n1512shhdx7hwphzqmdpw4vva2k551nd47y1dixx"; + sha256 = "0j0h5cgnzk0ms17ssjkzfzwz65ggrs3lsp53a1j46p4616m1s1bk"; type = "gem"; }; - version = "0.9.1"; + version = "0.9.2"; }; thor = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.2"; }; } diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 303c5231b498..9b8d385d1d38 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.45.1"; + version = "11.46.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-vLo4ehr2QNErfJ+PQJ4CDSrUqtxMlHsYaAzsSgxoInI="; + hash = "sha256-Bf3+W2F44mTCEyMnKUSoeft4HKY4C3kYmLtuKG4SWls="; }; proxyVendor = true; - vendorHash = "sha256-gPZ8oLuHuwOqQK1RJHMYvWXnyZPenMiNEFaZzDwHsCo="; + vendorHash = "sha256-Q+CHJRroYAhgYLVemC/dcHfS03GHuUoaz/s+hrntdGQ="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 4849d1f81e36..2d94a4a27ba3 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done ''; - configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ]; + configureFlags = [ " --disable-openssl" ] ++ lib.optionals (!enablePython) [ "--disable-pywrap" ]; nativeBuildInputs = [ diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 3515430b965c..945020445950 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -41,7 +41,13 @@ stdenv.mkDerivation rec { # Fortify causes build failures: 'str*' defined both normally and as 'alias' attribute hardeningDisable = [ "fortify" ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + # hfuzz-cc can only find 'includes' folder (instead of 'include') + # Defined here: https://github.com/google/honggfuzz/blob/defed1013fdacd7090617ecc1ced8bdcc3c617d6/hfuzz_cc/hfuzz-cc.c#L273 + "INC_PATH=$(PREFIX)/includes" + "HFUZZ_INC=$(out)" + ]; postInstall = '' mkdir -p $out/lib diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4e73e39a34e5..edb38fa4e1b5 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,6 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.43" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.53" + +gem "syslog", "~> 0.3.0" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 0360b87c4db2..c04ba2f51c90 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 726e819f87e3022dc90232087bf30edb0d149ba5 - ref: refs/tags/6.4.43 + revision: ce6990ff84c944186dfa104b3aa1edd98962b468 + ref: refs/tags/6.4.53 specs: - metasploit-framework (6.4.43) + metasploit-framework (6.4.53) aarch64 abbrev actionpack (~> 7.0.0) @@ -17,10 +17,12 @@ GIT base64 bcrypt bcrypt_pbkdf + benchmark bigdecimal bootsnap bson chunky_png + concurrent-ruby (= 1.3.4) csv dnsruby drb @@ -33,6 +35,7 @@ GIT faraday-retry faye-websocket ffi (< 1.17.0) + fiddle filesize getoptlong hrr_rb_ssh-ed25519 @@ -62,6 +65,7 @@ GIT octokit (~> 4.0) openssl-ccm openvas-omp + ostruct packetfu patch_finder pcaprub @@ -69,7 +73,7 @@ GIT pg puma railties - rasn1 (= 0.13.0) + rasn1 (= 0.14.0) rb-readline recog redcarpet @@ -179,6 +183,7 @@ GEM base64 (0.2.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.1) + benchmark (0.4.0) bigdecimal (3.1.8) bindata (2.4.15) bootsnap (1.18.4) @@ -223,6 +228,7 @@ GEM eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.16.3) + fiddle (1.1.6) filesize (0.2.0) getoptlong (0.2.1) gssapi (1.3.1) @@ -249,6 +255,7 @@ GEM rkelly-remix json (2.7.5) little-plugger (1.1.4) + logger (1.6.6) logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) @@ -322,6 +329,7 @@ GEM openssl-ccm (1.2.3) openssl-cmac (2.0.2) openvas-omp (0.0.4) + ostruct (0.6.1) packetfu (2.0.0) pcaprub (~> 0.13.1) patch_finder (1.0.2) @@ -358,7 +366,7 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rake (13.2.1) - rasn1 (0.13.0) + rasn1 (0.14.0) strptime (~> 0.2.5) rb-readline (0.5.5) recog (3.1.11) @@ -443,6 +451,8 @@ GEM sshkey (3.0.0) strptime (0.2.5) swagger-blocks (3.0.0) + syslog (0.3.0) + logger thin (1.8.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) @@ -487,6 +497,7 @@ PLATFORMS DEPENDENCIES metasploit-framework! + syslog (~> 0.3.0) BUNDLED WITH 2.5.22 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 1406fb4aeff0..3f61d6185e32 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "metasploit-framework"; - version = "6.4.43"; + version = "6.4.53"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; tag = finalAttrs.version; - hash = "sha256-1zUt6nInDUIY97fBJa0dQ/hD4WZ1v5LXYdPQhnYKlYw="; + hash = "sha256-yHat9U8EZbUWo4j9ut6K9IPtPFm130pfSmIuhtQhFoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index ff54d3f154f1..0d7c23000d41 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -239,6 +239,16 @@ }; version = "1.1.1"; }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; @@ -509,6 +519,16 @@ }; version = "1.16.3"; }; + fiddle = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1as92bp6pgkab73kj3mh5d1idjr9wykczz7r9i1pkn82wq4xks3r"; + type = "gem"; + }; + version = "1.1.6"; + }; filesize = { groups = [ "default" ]; platforms = [ ]; @@ -679,6 +699,16 @@ }; version = "1.1.4"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + type = "gem"; + }; + version = "1.6.6"; + }; logging = { groups = [ "default" ]; platforms = [ ]; @@ -734,12 +764,12 @@ platforms = [ ]; source = { fetchSubmodules = false; - rev = "726e819f87e3022dc90232087bf30edb0d149ba5"; - sha256 = "134m19v8dl6kc7br5gvmcvhl7y233nnjbhdpywc44397fbm2sdfp"; + rev = "ce6990ff84c944186dfa104b3aa1edd98962b468"; + sha256 = "110n47a8cbk299glmpxmb4yfv0zlibgbmzc8lcbbar849zsssxn8"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.43"; + version = "6.4.53"; }; metasploit-model = { groups = [ "default" ]; @@ -1025,6 +1055,16 @@ }; version = "0.0.4"; }; + ostruct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; packetfu = { groups = [ "default" ]; platforms = [ ]; @@ -1180,10 +1220,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07dvrv2s9hs2vcbr6lai8vj4vk2i3m4jf468hyvkp9k8xzjvc0fi"; + sha256 = "1rz96j4jzm02rdxrs70hj5an3kmxrfd77d4hy97b80fasj049992"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; rb-readline = { groups = [ "default" ]; @@ -1565,6 +1605,16 @@ }; version = "3.0.0"; }; + syslog = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "023lbh48fcn72gwyh1x52ycs1wx1bnhdajmv0qvkidmdsmxnxzjd"; + type = "gem"; + }; + version = "0.3.0"; + }; thin = { groups = [ "default" ]; platforms = [ ]; diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix index 407620581539..f5169e2bb02d 100644 --- a/pkgs/tools/security/metasploit/shell.nix +++ b/pkgs/tools/security/metasploit/shell.nix @@ -1,10 +1,11 @@ -# Env to update Gemfile.lock / gemset.nix { pkgs ? import ../../../.. { }, }: -pkgs.stdenv.mkDerivation { - name = "env"; - nativeBuildInputs = [ pkgs.pkg-config ]; +pkgs.mkShell { + nativeBuildInputs = [ + pkgs.pkg-config + pkgs.libffi # libffi as native input + ]; buildInputs = with pkgs; [ bundix git @@ -16,4 +17,9 @@ pkgs.stdenv.mkDerivation { ruby.devEnv sqlite ]; + # Ensure that pkg-config finds libffi + shellHook = '' + export PKG_CONFIG_PATH="${pkgs.libffi.out}/lib/pkgconfig:$PKG_CONFIG_PATH" + echo "PKG_CONFIG_PATH set to: $PKG_CONFIG_PATH" + ''; } diff --git a/pkgs/tools/security/sbomnix/default.nix b/pkgs/tools/security/sbomnix/default.nix index d55375519195..d9a71e4f631d 100644 --- a/pkgs/tools/security/sbomnix/default.nix +++ b/pkgs/tools/security/sbomnix/default.nix @@ -28,14 +28,14 @@ python.pkgs.buildPythonApplication rec { pname = "sbomnix"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; src = fetchFromGitHub { owner = "tiiuae"; repo = "sbomnix"; tag = "v${version}"; - hash = "sha256-LMrsJnJXmn+rneIslAaoIpwOyPVIVjOyu49O+7J/nIs="; + hash = "sha256-Vtrxpb6nTTR5a9sFi1NrhEflhPOwv1gt6i7DnggJwMs="; # Remove documentation as it contains references to nix store postFetch = '' diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 5a44c7b401c3..38c5a3ac1d11 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.17"; + version = "3.88.18"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-Fx2p0ClkSd0PJycYQbwg0LjO6MN8fiFmVZGUPiaTtik="; + hash = "sha256-0STZXG7abx5viXhU2Zks1uiabNtL1ckoSH7foSn6WNw="; }; vendorHash = "sha256-mxmPvuOznYN3sjuCzuircQNtot9ntApS9ygKywLIVv4="; diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index bf7f2e802fe1..bdc8070d0c3f 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -105,6 +105,7 @@ stdenvNoCC.mkDerivation rec { znewman01 lewo squalus + lesuisse ]; }; } diff --git a/pkgs/tools/system/osquery/info.json b/pkgs/tools/system/osquery/info.json index ebab01e514e3..fa2e3291ad18 100644 --- a/pkgs/tools/system/osquery/info.json +++ b/pkgs/tools/system/osquery/info.json @@ -5,9 +5,9 @@ }, "osquery": { "fetchSubmodules": true, - "hash": "sha256-ZEFdsdXf7a+lj79QtfjpfOKPt01C40lcdK5TAocjVmE=", + "hash": "sha256-Q5KiPqkyciuC5vlgBuY9ObRnDhM7Xhq6Oe5GbtatH/s=", "owner": "osquery", "repo": "osquery", - "rev": "5.15.0" + "rev": "5.16.0" } } diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index ec515dc611d0..40eec27c5126 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -251,6 +251,16 @@ rec { inherit (common) binToOutput src prePatch; + patches = [ + (fetchpatch { + # do not create extractbb -> xdvipdfmx link + name = "extractbb-separate-package.patch"; + url = "https://github.com/TeX-Live/texlive-source/commit/e48aafd2889281e5e9082cf2e4815a906b9a68ec.patch"; + hash = "sha256-Rh0PJeUgKUfmgZ+WXnTteM5A0vXPEajKzZBU7AoE7Vs"; + excludes = [ "texk/dvipdfm-x/ChangeLog" ]; + }) + ]; + outputs = [ "out" "dev" @@ -694,11 +704,14 @@ rec { # so that top level updates do not break texlive src = fetchurl { url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz"; - hash = "sha256-nZtcb6fg+848HlT+sl4tUdKMT+d5jyTHbNyugpGo6mY="; + hash = "sha256-egUACsP2vwYx2uvSCZ8H/jLU9f17Siz8gFWwCNSXsIQ="; }; texContainer = texlive.pkgs.asymptote.tex; texdocContainer = texlive.pkgs.asymptote.texdoc; + + # build issue with asymptote 2.95 has been fixed + postConfigure = ""; } ); diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 1da527cd692a..9fc1b43724ee 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,7 +5,7 @@ { lib #, stdenv , gcc12Stdenv -, fetchurl, runCommand, writeShellScript, writeText, buildEnv +, fetchpatch, fetchurl, runCommand, writeShellScript, writeText, buildEnv , callPackage, ghostscript_headless, harfbuzz , makeWrapper, installShellFiles , python3, ruby, perl, tk, jdk, bash, snobol4 @@ -34,7 +34,7 @@ let overriddenTlpdb = let overrides = import ./tlpdb-overrides.nix { inherit - stdenv lib bin tlpdb tlpdbxz tl + stdenv lib fetchpatch bin tlpdb tlpdbxz tl installShellFiles coreutils findutils gawk getopt ghostscript_headless gnugrep gnumake gnupg gnused gzip html-tidy ncurses perl python3 ruby zip; @@ -44,12 +44,12 @@ let version = { # day of the snapshot being taken year = "2024"; - month = "10"; - day = "27"; + month = "03"; + day = "09"; # TeX Live version texliveYear = 2024; # final (historic) release or snapshot - final = false; + final = true; }; # The tarballs on CTAN mirrors for the current release are constantly @@ -80,7 +80,7 @@ let # use last mirror for daily snapshots as texlive.tlpdb.xz changes every day # TODO make this less hacky (if version.final then mirrors else [ (lib.last mirrors) ]); - hash = "sha256-jB9FXLpmqYluxdxGl67C50cx9dfN2S8LQwOow4OezcQ="; + hash = "sha256-YLn4+Ik9WR0iDS9Pjdo/aGyqFl7+eKoMzI3sgNSHmao="; }; tlpdbNix = runCommand "tlpdb.nix" { @@ -159,15 +159,15 @@ let # these license lists should be the sorted union of the licenses of the packages the schemes contain. # The correctness of this collation is tested by tests.texlive.licenses licenses = with lib.licenses; { - scheme-basic = [ free gfl gpl1Only gpl2Only gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; - scheme-bookpub = [ artistic2 asl20 bsd3 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus knuth lgpl21 lppl1 lppl12 lppl13c mit ofl publicDomain ]; + scheme-basic = [ cc-by-sa-40 free gfl gpl1Only gpl2Only gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; + scheme-bookpub = [ artistic2 asl20 bsd3 cc-by-sa-40 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus knuth lgpl21 lppl1 lppl12 lppl13c mit ofl publicDomain ]; scheme-context = [ bsd2 bsd3 cc-by-sa-40 eupl12 free gfl gfsl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl13c mit ofl publicDomain x11 ]; scheme-full = [ artistic1-cl8 artistic2 asl20 bsd2 bsd3 bsdOriginal cc-by-10 cc-by-20 cc-by-30 cc-by-40 cc-by-sa-10 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gfsl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; - scheme-gust = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gfsl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-gust = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gfsl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13c mit ofl publicDomain x11 ]; scheme-infraonly = [ gpl2Plus lgpl21 ]; scheme-medium = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; - scheme-minimal = [ free gpl1Only gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; - scheme-small = [ asl20 cc-by-40 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-minimal = [ cc-by-sa-40 free gpl1Only gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; + scheme-small = [ asl20 cc-by-40 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13c mit ofl publicDomain x11 ]; scheme-tetex = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-30 cc-by-40 cc-by-sa-10 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; }; diff --git a/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix b/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix index f0a0f39e20a2..535a2f96f8bd 100644 --- a/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix +++ b/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix @@ -12,7 +12,7 @@ abbr-15878={run="1irhcs2zkam6sdl92wk07v5ckg56r6n10hgcjn5im2jpsinsad5k";doc="1z45 abc-41157={run="0fxnxavk76gayahflpa8f61j63x9y6aym7gqnmn6xfgggyab4qmd";doc="0ipxihm9jkb5dvlrk217275p7r6amnkbh352k07s7k7i7rjg9pmd";source="0461ci1zg2wq3f9qypwkxmyi0rciv8p2zk9rcajs0591fwz3drj5";}; abnt-55471={run="0zw8vdmqcb5qddc0rf8qd67fwprwjagzy8s9ildgisb7arqmbj5w";doc="00m174q9gxsm23j3fla7m7lj5fbr7iqfw02dz9s6481nfsjh1wgy";}; abntex2-49248={run="1q7r2j7c5p1f0gbrc3sjd5gjq2mhljf1nj5n5760snhwj3qblr66";doc="1id5yj5kh0qgjywbiajaf5hf9ix9jq8178fv2kvp1yslra7r20s2";}; -abntexto-70885={run="16222rln9m0r3awvr78sdr8jwhx9rpcjm8aggw3qlsa0g4glwlhj";doc="1vym52zk1d4w62c749z9a64ifxsvp13v11aipi0c1g0dlmhqixa6";}; +abntexto-73233={run="10gxnacw9bimhlqhq7rbi15g0w09cp0r6hrx8mha39cm5bhfj06j";doc="10ribwsk5628sr45js8g6bbgcchbr9nw2anz5vbc8jxmp8aqfis5";}; aboensis-62977={run="171586kjnfg1qb4wi50mrc9jd8h2ybg6r68kwyhgc5y0gyhyg08c";doc="0qc74wvq6ibxgil36wp0b5s66d7m7axbn0y1qpzy9hyrh8v8jpav";}; abraces-71955={run="0afy64vj5rj27s9nfdf4cl17sf4946mli0khmxr5lfnkjihkws57";doc="01c6d2wgbiz6wxqjlmqrndjvk2fp44izg3wwj3lsm1iyb1hd9g0q";}; abspos-64465={run="0qzx59dz7x8pn9jr8g15jsmf4hs27v8qc30phi1g5h39i9c6pmg6";doc="1a3li91yvvw2r62dvp87zzzxni3xllrzp38zg6qxfsn6xbwry9zf";source="10dx92msh53z7sn603vsg740wvbhz8hr6bcn1sjs60snl47f4yf5";}; @@ -24,11 +24,11 @@ accents-51497={run="1xl7fkm5gc36mm0bhx7rm9v4g2d9j22gr5fjxjbzmr6byjfgw71k";doc="0 accessibility-55777={run="0d7xrsdanx7wnnmc983rfy00r4290rigwx5ils6pfm0br2g5kfsr";doc="17gxz1lm39wh2a235wk0s03jc7jxd4bl0iqj04v02m994gz43y3x";source="14av24zcjqxq8v92yni6aj66cblnfzb1f07hbcd3ljbycw14ii44";}; accfonts-18835={run="10z7c7cgwm62dyzxfnj0jiy328zj3wccqjick37lz641vqifrd4v";doc="17mbr2ydbkc4md6zd34km3d4s2vjmqzfwb2l01n4y30vjz2lzsn1";}; accsupp-53052={run="156yax2q84naj394xzr8m7hfyl1j7pziw8d6rzkrjjgxs9p9az1j";doc="1ak7xv0hhghgbwmcviirhh1x5y9pb4is8h0a32kdd4hdxjdm7c92";source="0spz8640bdzmirlnc3rwynzvgy5fi58vfs802jzbqxb0ypdg14s7";}; -achemso-69638={run="16si3krcn64nz383y2cpv77fka9xlc5bb568inr3xi0sckwnvd6f";doc="1n7kznrriac60pn7wnlnpm82fxj07gbnrxf7zfv4f8b9vj2x706v";source="1h07bjmbnkk0sr60qd5ml6j78g5hbzvw0pwin2npsd2fxx8q8hfa";}; -acmart-72113={run="04jzzm5lp7x20dbbbzkpjla1npwsnglr5w8wx2sxb74jln7lk06c";doc="0kvyfmjzddinr81rfxkrdm0s0fww1lx051xsx0a8hwp7wk9gjxm7";source="1k3yd4z3j4b3fgvy3v46y3fw33caj1bq82mi60z295sxxqkdckza";}; +achemso-73648={run="17l8nqaaizc62dwdjd6hackwgj9n34098nrr0vb8qzjbn9k3dx50";doc="0zscc6dh8ccbxgs3igzzszdzlxwbcikjq4d2m7bnzayjf33dxkvk";source="0ris62y36zykmshrkgn8vzf3j0y2wy1zvd65q4zkyljcwjbpqmgn";}; +acmart-73261={run="1f1hhnx8s6d1gvi1pimkkrk4ysajr6jxy8mnf5kxw7s89m67c52k";doc="0zqpr043vqihk0glp6bd9j0ghba53fpsi7415bvrljhlliiss74z";source="01v0mmcahq4j02rp3zkn16dfnf9c5fb1j3964f4jvm3957nyb3j8";}; acmconf-15878={run="17l1kcwv6wk5p752lmanlx0bmh2py4hfxranapgbdrhjpis4jm9i";doc="1vyhkwqg0v3pxjnlwzwnmiffh6b3d9nrwnpaqjm24j9d2sc6cxcx";source="1n8cf6n2fdb88xmnj2m5r3cjz3jlp9n7bn1yr717fsp2ks81pr3f";}; acro-62925={run="1hzavaicandq6sqz3sy8hj5n3kvkbic34p8id2mslizcw3rmlhhz";doc="05iwf21y45l61fsask04pphxzzjn7h1al8n2wv59jkxyh8vy8dbv";}; -acronym-72324={run="0da9rs8xgpik35k1s86sna9aqlcldxqvgsyh7q5idjxngflfal3m";doc="0w0zyfgjqdn0r2afxbpf07hhgvkdd961r82d97a9n7fzk21sf7m2";source="1hsmgf93m1hzqpc2mlxjwgyxq3c6sv7y9bm9r37gw56375kxfry6";}; +acronym-73491={run="1zz4hhrpmrr0yqrc0j7w3ihadk2am63nsl3nl80qhl918b7d5xh3";doc="07r7h17zalw3gcsyfzsp90l8aps9w45p4vag5pyc4lsiv1h374cf";source="0q6h09wk9qdhwyyg2np9x3va34km6x02a77cyy5p8csh831k6hdz";}; acroterm-61719={run="0snnpamdf0qqqf3nabl2f4pnabpjxjn949s44lb8wb4lifndyj8d";doc="1ybgfy3x0a3dz5p2gac2w4ai2yc84i28vi6x0bq61ff3v74iqdhc";source="1gja9j0a0v22qqdqy5f3ivrwablrz550gp7nf20054cirjzgr6f2";}; active-conf-15878={run="1chi30gbr7xjcs7y3p2y8vfg6hany4wbacdm4drha9pa9m5sxqgw";doc="1css89hbdg8zgl7zf2x7vfgbl90x7bjvf0c0m0akjk8fzx936g7k";source="0anxqifjlf96z4vvr031v26s73d1a1sgjp8xv9xxv0kia4l7048n";}; actuarialangle-67201={run="1cb333pky7vq83gfriza8afy17ag9lm81zr2f3nbjz4vrk7sidqd";doc="0bwyj15r2bf3bqc7y0dbz03bwccwlh9ygcv1frnq6bc758rfksb1";source="169m5msyy0braf61jz721isba94fx5wxinzfsr2yz9hs6ic62dg7";}; @@ -36,14 +36,14 @@ actuarialsymbol-67201={run="0g8vm5wynrlj0764w7l9wfx2zw6ir0hik8nv8djlc96qlp8cm80r addfont-58559={run="05a413mb0ksviwbl0y1a14j8y3np5ra5sgjcnbrslrvavf4q2spw";doc="069vk1d1ig38r6a5a87fblq4m429crp79xqccrsk48ixswxafj95";}; addliga-50912={run="1w9wv0wbv8acc7qvcc5pb5kjxmy2nz95cb990mmgc2lxvvsaw2rl";doc="0q41i3cd16ahpklr1ddmzmfs741x5k30vaz7gz7k8jrf0579nv7w";}; addlines-49326={run="1rkcpk1c8in0g6dgyc1m6pyz01jbx19gv98jmaiybxgvsa3z11jc";doc="1gaf9ljzkdhwjg460hl79hlwdwi0mrvgs51si8k8gvialng8b1fv";source="1m3l2s1l671n9j7jdsxfljjhrsvh81bayw40v81dm0f68g5hslnf";}; -addtoluatexpath-70655={run="0c0dh3dsv5kxhd610my38k7vrsiwb5vbnka8pfwb85ac477w08aa";doc="17z0ywgiziwmalvg4p8sh2x2fjirxziy182gp9yrwmyy8pa3wj70";}; +addtoluatexpath-73424={run="0fh1879svrkxy7r464i1fha9x2350ql86pgh9b7gcl31l8jsmv0n";doc="1h2x10ggjj4sk0ipvng3kiaqr0rbk8j1i6p6zf5wa2h2kyfqb7mh";}; adfathesis-26048={run="0j60iq9nzk5kbs12dqx5jk84n14kdlx93mcypwi9b2gn7kyqzn5i";doc="0c6k4xsy0jg95qg45bqk9527kb3k3azyxwpl2zrkw0ld6k47sswz";source="17irbcz9wjnc6rj9f736i2hw4qrjwa1gz5z6w7gvq26b68pkxrw4";}; adforn-72484={run="15qz6xl8v78nd74zf878vr606s2v6iixiadzzcchky3lph30vgvn";doc="16p6y2dxy8bylhzc963iz76jbwppkmdb0m5rpfw3kpxqnx3wgyr9";source="0sfv3k98l4fvhr92vk5hw3hcz7hm7x5qsky4q11nyfz8ny42kskd";}; adfsymbols-72458={run="1ldvn006dhsqp056fcbyn05785mllly0r0hg0g4icr1a5hy9acwm";doc="1fnmd5p81gq14mjw0w05lfd1wfj58b0f1wkivi3s9hdz32x3mj30";source="1wkimmmghp6z48z9rc2cry661vqyhyagv33rxwilf3mrj06v0y14";}; adhocfilelist-29349={run="08fnrvnbrp7534b56hn8w0nm8pbgjli62v34mkalp4qkfb559kh7";doc="1n7nah8vr691k56z0jkgyav4lc8w45rlg8k9shhqhnnpqi8zxv1m";source="1xl0f33yhmbsrnmy9pby092js83vxcdaq2gfny08pjlq57arphr4";}; adigraph-70422={run="19wzsa84y7a5jbgbyj69frfqd0ahi9ha7sszppsr5bmh88gbnfby";doc="0rr6sbb34d9nd1ni86s5mll5bjx0hinwm52gqiqrwqwkr068djcn";}; adjmulticol-63320={run="0wjqjg46gbf44f2x0xf58b3f9bxfkrh21m85mh1xsd5pxdy116fl";doc="01r00mf8skd54xgzqjicl4djjzgnf5fdw5hcbf9p5ixx1zw1jq7l";source="1zyq1r0y3amkqch1lif0dygif0sgwhypscqdsqml6ik2ziv2alzi";}; -adjustbox-72097={run="03fqxxhpc41zkj8g7dwd4p3vs9c0qg95c6bdwwgvn3xkaqn6amjm";doc="11mldsmmp1mcd5kya8bh2zmkgl01ysswcia1lips3vjfiqjp8vp8";source="0qzjxslq3bni6iancxix471sl6455syp1pglnn7xa5lxlfl43ccs";}; +adjustbox-74312={run="0d52f259gznbzxl3452ar8zx2r06nxrqjaqpi78bl0d93nwncyih";doc="1mrpyfmmdmx6qsfs8cm5zj63m7fb0qxk64h54xz43dmwbqcx24k6";source="0xp5qbbpn9931xal7n1b5gj2gx5jwrnvhdwdgkdi1gl3jsynwj77";}; adobemapping-66552={run="1yvf74mlmxmnq9m0wvda9xcna8xnn382bbrzizzjm5w7bk8c4g98";}; adrconv-46817={run="1wx9a00jky9v8xmjhrjlhbl3kcdxh1n9yybpsr74g2vw4bwdyr70";doc="1ny594a3dvx3jba0lf72kjny60ix6hnnw8gj479ccfj3gw2wv0mp";source="1cndbrbw5hss1qi7z9mgymqrcmvlhj8hxw16qjjzch85xw1nrwzg";}; adtrees-51618={run="1j38apxxk3klabxrm9kpdf6zbmiqb17is5yqgg1a4576n8paqg4y";doc="1851rqb9gs1wf8wl8f7pqbnxgpikzxzw1n5mg5w0kcwd889g17yc";}; @@ -54,17 +54,16 @@ aeguill-15878={run="1klri7b3isxwa9lpc2j857y8r9n9x1av865jm93ha6nrwlzqk7a3";doc="0 aesupp-58253={run="10yd16v85zbkzkxb17gr4kf4li28ims33i1zrkpygbdf10nclxcm";doc="1dydcjdz57kn3gwb3pfm4yp6hr69pyqhy5lhm9pnlcrycvqsn8qr";source="1s41gd7ansh80z6mmwwha7pypaxwxxvrz3sdfj24pa5b2agprq68";}; affilauthor-68996={run="0xrnjg386xpa34l3n26myqkx2cjk06hmj4wnm2yz29kyj4n8fjsh";doc="1d0fss9fniwwn1d8cmvwyjj6fvl5s9jvmgclh6da7pywdw5xgi3q";}; afm2pl-71515={run="1nbb9lcxqxj2aary7a65fai3hgj4nwzm690iy0xv62v580krdbck";doc="0akl6by43kha3rr9dwnr3hhnnfqg4lqnxv5pqf64cnp17ih47wx0";}; -afparticle-35900={run="0516hjm1v88vk70ggagkj0s00n465y08fr2ys3f2gychrax425a5";doc="1ajpc55z02q8wgriwzzm4f96dmn5bpi9n81zad6kay7c7vwfa9g5";source="03cx2ak956rdwdd5ya49fh81vdwrzq9y813r1h8qcp618sr3h14n";}; afthesis-15878={run="16jyz1skb9l78dwphggq23jm14zwhycmkx3kn0sm13dcfifrkxpd";doc="091f4flclyahjlxwa640l7vmrfiyb4wqgkh19caq8fld96zkbjir";}; aguplus-17156={run="0z7mgsm9pa33gykhwzlmpa3shg7ragrz3jdp8qfakp5ck2mbjysh";doc="1105vsng0yramk84pfcg9pvzjbm3cbyp84m6sxr9wadw02z5kj8j";}; aiaa-15878={run="1z91l7lhi5pnh2ignmskd24asaalhyhdywkl9j6a7dp6cplswhy5";doc="1sz6inilvyaqhnj1z88rws7xwkhhpw35il4ppxw9kn9pwvnrn0vf";source="1lsbfp2zvhpyf1vb1ia9hdz1i796dbfqpndcfy8lay48f89n3njg";}; aichej-15878={run="1pr92pq3yjsrbax6ah01cqg7131fp2rkqqjnxwcrm4119z2ic0gf";}; -aiplans-72202={run="1sk61wvzkml66i4vhbl0zsxpgz5i3i74bxy94nklfxlypgny5ijs";doc="0lv2a885zb8r21j40rrgf1msbx62y5il8g4ixzr3bdpz897lkb7l";}; +aiplans-74463={run="1332v4a8s4y70r6b1wihh5vqqc613jk2hhwzxh5hzis5qxzym536";doc="1hwkf5mnfi41kmw43f4vsh33z0lnfxm76linsckf0bsrasaw1j5w";}; ajl-34016={run="1xkrvy06lw4ngj94zybs14ysal2pg7g71h864gq9bjw0zwq2yjzs";}; akktex-26055={run="1npcfjjg9nwrb392g8pa4yq6i76aq4ys67zil4qgkf4jyzrixln9";doc="10ma4ic5bazlmizxvwks6w3qqxbbir0rrhzj1yw2j68p0600nmvn";}; akletter-15878={run="0gigzlxkqmiqz4nwpxj98rcrxmi6yfipf5bifg1mywchnw7a1f2h";doc="0ngj7d4vdnvh99inw2vggqdgx6h2hv5z77glxjcpx8kmxf8h47sv";}; akshar-56277={run="0g1pbihbpl3b7k7c19qiq7lcgx3zrfn15065dyan85bs8h85c2cw";doc="11a18b7a592sx3wha1lpy659hgh1wnka16zf8m0cbc99f867xfln";source="0g8j0015dm3mhphg06ma9dkgc28ywlihr6pcbi254qaxgk7kdn9g";}; -albatross-69832={run="1qmhrbw7vq1gwd0xg50v384r3bkic4xy32i7sqv1lwrs4fw8aj8x";doc="0d0mgp41k3ncd326f2cl7gr6m1qsdzycy2n7l271lsglbqlbq31q";source="11winakpjawrifjxkyfsxa9i1d0k0h4jcchnp61isvl7hy2n2fw5";}; +albatross-73436={run="1qmhrbw7vq1gwd0xg50v384r3bkic4xy32i7sqv1lwrs4fw8aj8x";doc="0d0mgp41k3ncd326f2cl7gr6m1qsdzycy2n7l271lsglbqlbq31q";source="11winakpjawrifjxkyfsxa9i1d0k0h4jcchnp61isvl7hy2n2fw5";}; alchemist-66924={run="14gd0gb86p247bz2x2kcqqj2b0r2lz12gpssfz84kgvrwx5nxkvr";doc="0d8kirmkd1shkbckv32i8yxdrpwzss7qgdn2i06b6mwakisy93v1";}; alegreya-64384={run="06hrvi0dssva2r253k9ma1vd6ij3bi2d0wsrk2n6fnxvxbl5xc02";doc="04wx39xdvhq0rfl4mz8k70kfv74w6kpyhja5879g0hp3pjfzxbcl";}; aleph-70015={doc="096p2kcfmdvf09xpijwsrhkhmaggvd04jxrs2abag45wsrj75h0s";}; @@ -100,12 +99,13 @@ amsfonts-61937={run="0l3ypclhv5qdpcpy29xwda2m3cjfn5l996agas6yhpdr2m58q211";doc=" amslatex-primer-28980={doc="1kzayyh1bycmq43s2xn81jf05r18azidbk3gv6igf2vaq37fmxil";}; amsldoc-it-45662={doc="0d4hwb7hywy56d6934448lcr6fdx7qchkfzs806dr7wfzfy36yix";}; amsldoc-vn-21855={doc="1iz0zjn1v7izwbsq0zb6cvpnkbvk0nxw1b24j7dzqwk3m9j43i6x";}; -amsmath-71408={run="0z1hv5l8xnwkb5rhc15kv3g7h0crwbs4q2d96g8whm9dwgrdggmx";doc="07s8jms19m7q0qznsnsn8qkd8cpfnghy3bxbm73wmxqz9chrai2m";source="0zll2gmzr32k9wmr2vd604c17b1vypb5x0i582388czrmm5gh17k";}; +amsmath-72779={run="0s3p5yhwm7z0cigfvgnlzb1zxmiiv8ks2zbg5zd32dx1ny9c08rm";doc="143xjmpfxzy85lym0p6d7pfzcdk0d930i52hps2j3d18bdwv5ky8";source="16dxns8w6ng3jrphblw8839drrfd89zkfhiazr2j903iw4rwlkxl";}; amsmath-it-22930={doc="0xcwsk8q9q3nsz8wbklgpbw0vzjw7iw0chffzcbp2zsk6rypqf7w";}; amsrefs-61937={run="015spycf9ycxav8r046yn7lrc892nhkkrf1say1yy9karsji6dnw";doc="11fc87kbdm440v4qyhxnv654mh0m6rpz42zji38qspcqj19rck71";source="02q2x8zpwxkyrh9v7xqw35vdjx0b4fzz95xcv6vfjmynm8cpklxf";}; amstex-70015={run="0l078b9fkaai7kn2szn5hblqp3amlafr7ha0hjcn48657wsjq4jb";doc="0ydgisanqjgiagmhbai0b0y5rm6jwlmyafs6jvcn3lsgl7pfkgyi";}; amsthdoc-it-45662={doc="0ic88gs89m3d9ys40c4k7sgx6wy82c8isg2qkmd4snw5yms6fpaz";}; andika-64540={run="1bbqdw8r2l53q9870mnsyaiq0gfy1ac808qqmyrzqqz4ai41zzgg";doc="0ajjaqdfxlvsmpr9bjmdkzwbdbz6ahxfw1sj1sw26r33npy0c5bs";}; +anima-73126={run="188ifbxj9s1lgq0x4whg2052cajg9cjfj3p4676q8fn9rp26qvl5";doc="0w985dyh049fkzzksrb5hb5xck3bm5lg0ic63p38qjqzz9pp22gn";source="1y60b3095wy344js60cygkmvvl8995xcqbk6ssxvzk0r8liljcaj";}; animate-72548={run="15pc3x5xw1iji4rrhqyxfslnzb2hc2rk08hzv50aqhd9dqzhprsh";doc="1asklakr7pcnz5bnik8k8j0dc2650pbq7gq9wimclkrb6vllyaca";source="10fvcj7bddsk646250r1pgichr0j1030gcln78vfgphyr36g1626";}; annee-scolaire-55988={run="0lwc36v09a4ji5fz3pq9939jm39729k0k7hha4kkk20jc3j4jnds";doc="1f0qc5qvsrnjddp1kyrcigd8is2y9nsxc9x8a215p5xds2z5gc30";source="01mga2nif61mpkf7ifzhsj5pq7wzm2imlljap4c6wcrzb9zlhfx1";}; annotate-52824={run="12q3xk08ycz57vsrcr2glk7y48w8sbc4n8lrqaicd46cxfd4jdqm";}; @@ -123,7 +123,7 @@ anufinalexam-26053={doc="1v1k74vxidgxn5zzqz6v9zga468kcf7hwdrnvw44cd318221y396";} anyfontsize-17050={run="08dnpzjajn0k6hrf12l1p3ncsqjiwafzssa205k2zgsz61m3sis6";doc="0zmiklc2adbx5klyyjdivicd5j19i35b51ddm3nhfrcqrfvjrxwg";}; anysize-15878={run="0kkjzsk03bvnap54gdf0i797zqq6bdz39yh4dn810l5hyfqxbhwc";doc="15z3sa1zj1hbi7cy9q9wn4mcrf0pb3n39q2lhkx0ijhzaxn0rmvy";}; aobs-tikz-70952={run="10c5f1p57jy8xyrviqjvp7d07cs6x2yqx1r6v61zsjn9w1c6rh7n";doc="1xyyk394idgn0yq8jcpgipk0c2qgnnwb2zjk2lgic7cr5kjvhcnz";source="177r286p9jgxm324cfqvzicrlrnqggl1kv6q47wq9nihnmkfacj6";}; -aomart-71469={run="0cqmxrbvpcsxkca10hmrvfwrxx34nnp7q1rgagmr7x5ni8rhdjnb";doc="0b77sh1kfyxp45alc27ypymgi4xxs2knan4mrq80p7biwhij9wpv";source="0d8k1c8mvy8nq5m9y0ndbahrls5zg6wm3sshdil897vxkf802c22";}; +aomart-74515={run="083kr0n4c5g0ppa6f1m1ry9v4s2i8x6j2qgfh716r5kanplnhwqb";doc="174h0i5r0h158n922g0ij4cbagwbm9hhpjnh55girmfnmwixfxp2";source="0gy3y36m4140gwzbmb1skasabm19a9qwhzm6mk62x04ibj38gbb1";}; apa-54080={run="0g7y5l9908l4aikm0mqgwfcdg19dbllcgdp94cl1aha7h4jq0971";doc="0bzicm0x6sf78jbrqp66mgfjmcd7kw0rgkv0c6ah9945b9lh4ly5";}; apa6-67848={run="1zhm599xqx1j8yqjp20xgafm5xdnsjdh8pz1xndjhlqdxnv60044";doc="01iv078nfv3ilh8yjkf2r9c9kyn7lxxad8vl0lb4gvi706p3npnr";source="1g987ikxqvl0b1zkf5kvwg9dzy7c4k1rv9cl4r8ssdfm9bq7fvwl";}; apa6e-23350={run="1da46dhvpwmjvm3ma4zbnfgsc2yiqg9d6rdrw3bd5h2ibs3vnlmg";doc="17m97m9v0pcs58i3k7sdj9h1vifv3f0cxxyn4fzi8pxvzljwl5qm";source="1155ic0k6f6gw6zmqq8pv74hcn45skjzyarf9vpkcksj96qr07ba";}; @@ -153,7 +153,7 @@ archaic-38005={run="030a281kl48ixl4vh378bf0341lrrpvh73ws5pjxyhvs6cvyxp7i";doc="0 archivo-57283={run="19hr6vc7x9csjjd3i6mz9z27cyq4pz1qvhmiwbql2xhvmbcd871q";doc="00cs206zp27vpw06wqg7adwj73124zbp8zwfvgqsh9n544npvfmg";}; arcs-15878={run="0qahab6a041wn6s6isnjn93yrs6zk82g90x5aqpv742b2y8cj5ix";doc="05wgq5pkzxg3vj9anlzjq1jvwj7b6wvsp7a02syca6n4qvy1v5a7";source="0jnvkhhcqv7qgs4knwx1kz38x305a19kh13wn47zqlqn65991bpp";}; arev-15878={run="1nx33blp0nfqfmv2akj7w79qg1rhds40k7b58v5yvyrkx0hpn0hm";doc="1vscwahxzdcb6879pbrxdlfpgapc0bia2fl3jwilrm1has0ffjz3";source="1k524nfr5zb0nmhhq8dfaha4kv9f2ika192scllnn1bywhbpn2x5";}; -argumentation-72381={run="1clwsinxqjhjv0wf3s3dh7zk1a6sbqzlv13d7mzivzd0300bz5nv";doc="0p89lzsxflxc6bmkv42x1672hd4286rq51m5fz4y8cmklgs5zmg8";}; +argumentation-73824={run="0lxcpz6kkiwaap89jq25lrlcf9r1vvv4qq34phlrw0pv98yarhxw";doc="0pknq0z9sj62l1lkg6617ww39dgn46k0rx36w441i0c946y9nyk0";}; arimo-68950={run="0idfg33qcggv0cmh1hzpvzz690yikpmi76xpfh19py168my01mnm";doc="1yx6lp3w6s6zz31cd8hvhk4vdg2whzh62cdlhyglnb90a8hjyis4";}; armtex-69418={run="0cj112jisym4zyrjb1g4y9ryyiaj6smsglmmq8zj9xkr2hfpw46g";doc="1xdl1alazbmma8sddkfl1vcm1qpk0agg1dbkimnbniiw2xdx5swp";}; around-the-bend-15878={doc="00nc6kx4ylz9g6vmjlgyjvmy1ls86pjblbcpm5z40wh5xl7l184f";}; @@ -177,8 +177,8 @@ asciilist-49060={run="0ni7182xwr3ns1dk8i75kf1cw9wpfagrf1y7w20hk8fpfymx2669";doc= ascmac-53411={run="18hw5yyqbr8ji39y39293z7a70czipzw00fzfsqcrhgdlid79sc0";doc="0xzwc7kw7hqpcmisw5wm3n508n4zr4s207pizdhfm2q9mjij0jvr";source="1rd5qmy9miximwv1n96h6djjmd3mdgn4b0955marf2k457bb71d2";}; askinclude-54725={run="0s1938harm9sgna3cggllpa1g85yl9jv2wy4b4c5v6fksiivxzs1";doc="0gkbk6j2wv05kgfbjd4mqx5k7rc22bmqn47vk7pvr5z60dr4nay5";source="067dpl3v0ipspfm5f2fmcmg5cb6lhqg6n8216id9j1blir1ys3mg";}; askmaps-56730={run="1r6lk9szs7jm57b4hl9w4ngb9dqcsi6pvp37rcnwnznj5m2daj50";doc="1ryw8yy59mfi13rrwgrfg5y5dy3cafz2a3f8zmq5fbl7zhbylq6p";}; -asmeconf-71956={run="09aq6nxh2lhfgkc0jd2y26aw9ai20wlpl9xmifj7qcgcygn9spj8";doc="1wkhmjldmkqxhf3hqwh7cws8271fzh850g9hn4fggby4j368ky2a";}; -asmejour-71903={run="0h1wjn39dnldbckrxlv19r0xfmnv99zgsfbjzm4a3mpdj5gprqzq";doc="10grk454ll8yj0nrm9qdw3ws28nf069jqihgw1yfxfza09cfjmx5";}; +asmeconf-73649={run="0y656yrbilqzry8ar9agbzq4qcpw55s25lwr3akdwgy851dndmwq";doc="1vqamr26bamfann48cs1wkfxplxk017hiicy3h7v7xkjbz4wm2j4";}; +asmejour-73602={run="0vpa6gidmwc8hg2cv8kbfrk7kcjlzffj0qnnzd45nfcf5sp74h57";doc="0h5cdinpq1ykqlz84sy5mg2vjycypmzz48sx2kvq3cnh5raz31mb";}; aspectratio-25243={run="17y22131b9nzzq1skfdyr7cfcq823nqn3ssqrbc3bglggdfibf2p";doc="0mw7v1m9afyk462rjcimvwwikdpj0f4gjw5pbw2g9c60vbjhz61j";}; assignment-20431={run="1nxgpadadzf3d30ydc9rndwm4v53s4v10a6sbqf6yfqds7ry13vz";doc="1wyyvay22r68hfspaqv0a43s9icg8a3pj8wii3snn90svbsjfajn";}; assoccnt-38497={run="0im3x8im6kkjmvibh57hkn8nljcfc4mzp0hpimiqn29ys1yrhj98";doc="11p081b0b6mcigqsmvgf6kc9ik2480c74madjli19rw9i5nzf0vf";}; @@ -187,11 +187,12 @@ asternote-63838={run="0a3a5jjhsbvi7kdkp98kwa0q8j9chrq5azfg9vbb4m9kfkbafafh";doc= astro-15878={run="0cjf53gbin9z10g63x2kingsclgnwr6idc4x0m473hf4fvakk34x";doc="07kad1fzv7p6inh7nkrq6b34c1792h4v49rxaaxqyldmf4pwjr84";}; asy-overview-72484={doc="1ykzhy85gca230jf5w4c2i4kxjdvx3phbqa1ci6vv0v2f2lnb9kj";}; asyfig-17512={run="0zy0vxxmzg7nzwzw8z84sym5wdfbs7kyf06r6vnn05ga06wwn603";doc="03nby6d7cjczj3irqql5wpxs4fx9z77bb03lys5j1kg63ccq5msp";source="1rzicq0w7byrxqvv8pympxkwq575zqs01s02z205azaqdgrzdhss";}; -asymptote-72638={run="1lg49kni17g2da4gmxhr9mdikd22afkvzviglqwcbbg1fqgpk8nf";doc="09lx8vgc4b9q5caqk4jdkf7far5xaif8rhw75bsgi51ifcvgw9nx";}; +asymptote-74490={run="1lg49kni17g2da4gmxhr9mdikd22afkvzviglqwcbbg1fqgpk8nf";doc="09lx8vgc4b9q5caqk4jdkf7far5xaif8rhw75bsgi51ifcvgw9nx";}; asymptote-by-example-zh-cn-15878={doc="0854pbh3rm21rzzbhai7xijzw26qawffj4wd3mrwbva1406106ff";}; asymptote-faq-zh-cn-15878={doc="0z09f5as68dz66dlj370xfx593bv50ihxx10zxmm9lk27ymr52hb";}; asymptote-manual-zh-cn-15878={doc="047l3bh8vvk185wkazyfw4dm6893xpa2ksn5vfc57r5rv4x16wmb";}; -asypictureb-33490={run="1ls5ryz8c68liyyyqkjvmzyyblh9m8c5b62igz8frrj4m5vhi3aa";doc="03d4l74m9qwjvl71xfkhspf0d2xaafl9d2kcqhmil5yg85hsq069";source="1jzpagmnv21k761r52m2f708275k4pwa9sqlp88l6pgv6s6p4pab";}; +asypictureb-73611={run="0cl0zlc86pnqmfizgviivmj1pnmh0g88rj3ymq502csv6vfgs2l5";doc="1yb5ydxmyx3agypr5db9k0s4pb4k3jvhw9ngjgddbm2dmczpalpb";source="1aklqldlkwymadvdlsvql11rf5gagc4bam3kdzd12zikqqbs5jgh";}; +atableau-73576={run="12b3pnpq2x86zv7c118p28m6z0pmwjqsjj37j8gpm2g3ynlsnsl6";doc="1hhi28q59sp2j8sfc7sq6yiz8hdggry398rfkgf4kgp4kibvpxab";}; atbegshi-53051={run="00r3ayn5qa2p2j4hyxbp2mm1aqhbkjpwk15gan1b4szmm2wk54h5";doc="1pjfmnrssaw20sdq801x9jb9qh7s8l2mnhcvla4bxglckgwz2na9";source="0b0sxs3jpc6a9pw1z44iv2bwvyxm02yfl8j0mc5qw0asdp773vrg";}; atenddvi-56922={run="1lw42kgkviwh5gl0fnc4kp8x578bss6fj4d3jqp3jh0iqj53wwf4";doc="1f4210s4llsbgnnf6s91j7gpdajclscnqlkrmrsmiphhvgjihcws";source="11sxy0c5vmbf17w1h46dc033lisp4aa8sjqfi1zdzlp7ha4c6rr3";}; atendofenv-62164={run="0r5y45wzyhynl6f1bsk11ha50rhzidjgqynpz0qqx55pwj1lvqg8";doc="15s783gvnj5vd7vhgvzvvxpszsy065x20ag5i3kmhd20rdm8sy6y";source="1j1z580b9v2w8b1zqjan8fi5smnyyagnhak262cx5fi212dzivnl";}; @@ -227,7 +228,7 @@ awesomebox-57349={run="0bjnvgqj4g1i6djzzzdjdrnlvli3dm1v2w2mi59s5s8pyc5pag60";doc axessibility-57105={run="001z3ra1zgsrvhlnvg9lmvc56s72b3kip71c1cnpl6qzqcc2y6s1";doc="0s77mr42dli8vfc9h6gslq5g103rp5vk94hx9cw3w3shxazib73r";source="1bh92wig3grw2bkkdd3fxwlky7rrfabzis1rwwdzgk3bmmrl9554";}; axodraw2-58155={run="0dcls4qqm7pl0iyg7mkflqa2rd86wsafshx41xlg62din6fmybwa";doc="1l1kwxd8zq5xxhw7zyig0b8nna4fwr6615h4jjwpywcaqsnms6if";source="00nq53ahf63lazavijry572yii3jix1df9c604xnqpga9z22bbq2";}; b1encoding-21271={run="104n1g3qnx2dj91zylj5byz7yaai6dw6v0pl9240mgk1h8i0xr2p";doc="0sdr25vv9svm3r6yqyalqza4awr8k26g7fmh8078bbxkddycchkm";source="0mbzrasvppl17965dmkp2f9cbi03539p83989d40kl5p11ih6dgy";}; -babel-72607={run="1iz1xyagpf2qq1a4qw50l56bjs4b68c3y82z5qiyzb1jb4wfxjy5";doc="19k65vm3k8dqrhs3ys3yi8anrkpcds8bvpy332kj2skni1nl34dp";source="1828cb64h444lqakd1d6wkbrqpz3y6lbr60m83rls4v0my3a633l";}; +babel-73988={run="1npck37qqrhx20305wgq5j2yid35hya7qfklib3ivd23qx07vlyz";doc="1clxprwlxm1aj1pazr2lcj9nddzqjfibp3ca1ss8550c3my060y6";source="16ndz8ndaiw2b7s4f06n7p9p5nxz4i88bzlqkfc60wf9k3dmf4ln";}; babel-albanian-57005={run="170mxpwnnsc1g9s7qnlhjcryw79cy72d8c4m8bhr36i5c78my0zg";doc="0x5z4gfi6m9h5gml6wxq3531i1k0sfqrd4hxrzbz68ijzyjnzk5j";source="1w8bassqn35bxyhpw6cg65ya64x1dn9h35p4fxclcjjhmv53xgg8";}; babel-azerbaijani-44197={run="15siklcjg7wmpzgy059d8r6ivg6cib5by9a4l6n31c9pxncj7xka";doc="0dncpgvjqqa41rk80n6wif8nzdqw7vkxp2056l6sblzxgh87fvz0";source="176r483598gd2dfmfc2qhmknj913n3k6rk58mpfq69af72jq5rjw";}; babel-basque-30256={run="11a26db60bwfhbx6zj42yrzzvf8nn8a96nq5mpw29xhxlpbhrcp0";doc="04jf1brw3ljipdyxv3d001slc0iggjmq6hkr4b5jsa3z8gcivzvw";source="17mz3bqi50ayia4nb2ikf60vgpnwl3i90gfbaq4692y354yvlnfy";}; @@ -248,7 +249,7 @@ babel-french-71907={run="0ccvp500avh0z5h69fag19w4mc8fxgmrnnhy8ci79c3g98g8022a";d babel-friulan-39861={run="0gfq4gyi720kp45vcbial0yrn9i2jyx1lzh39lci0ga77y01j3mp";doc="0hnj5scfsvisf9k6iwh4awzqccm96apxrbwzlknpxn7x3zv93l0k";source="09bzwmc1jnal4ikxciwas8y342rix0xksd7qcp39nwajyg8njdmc";}; babel-galician-30270={run="0mk67w9lhp4nfbhrzyb1ngm3rmdknvv8nlqb8601hrglj4hzmrda";doc="0pzpk8d8hhvgsjssy67hpgvjb6sh3lfbn6f5cbpqbhxrgllhpgva";source="1awy39dlr086hc807zc57l7xk6zqbkwrayvzfv8ch1mqnl0d3a6c";}; babel-georgian-45864={run="1mdsi9mq6ka6ahrgnasik0sxkhq97qa223q5iy4fkfccan30kb07";doc="1iw1hbn5i0c7xhvcmap4hgiaar9rznr76h2mrgya8xj0czppxwv0";}; -babel-german-69506={run="0k82lr91vdc5kfq7wbhl9sw5sl78mg4kpql81ga048rwf5plhj4b";doc="08ghl1hgndjh6pj2c0j78ypd055hjn0mkqdw29727qmbxs14irwq";source="1l0qqnmajg4v1zkmc3gvyhbpvzcmwbx6lr8j8pbmhh6g9fdnmbli";}; +babel-german-73094={run="0hd6g1nlj1f5y4wm0b5a7v9rn1c0jb8v35ss0d9r2kp2cx8p3kr8";doc="1pjwjhj3ik74k7kfrpnr76kvn96klq5mzj6dfwp6qxwnclj1nr5s";source="01ar3fgwzafsk8mjdx6dvn7h1753l7hcd5pz11cy42wvk0bbrjg2";}; babel-greek-68532={run="1gii2nbgnixdysn2li0xw5acsvimq2r04rpkyhy16hnz50cm4shz";doc="07l23ycdm79ci76zkfijpdz5mlcgd8qcbq5s4rl041c8d4nnfi5n";source="17n58ldkgsqadbd1agsaf0bwv0pg73ybfql5bkw3ky9k9ck9z24c";}; babel-hebrew-68016={run="112c7lk1xihspknd146hgp9nbc7wfxz36d3b887f6q0mq6hf03qq";doc="0w80r70w90szg4rlzzj2132yfx8wbhxranq8zk49far863sn658i";source="1srid6v4s1r5w02148wgfzhs9jmmwzj23fhx9zn606rxxkgakajf";}; babel-hungarian-49701={run="18hc7z7gki6jyglywmljlf37aff3cndszywa32kmprbn2qlfc87k";doc="1imn8zlk18fcs2nsy4ml20xzkhpmv5lzzh28i2c2zv6klm1kmfba";}; @@ -285,14 +286,14 @@ babel-thai-30564={run="02n0zl8xa4y7r2n8zb1870b95inclcdmwq0llcspl54vjgds2yig";doc babel-turkish-51560={run="013k4sv2xj0ky344frgbkl2h836dzjl72hacgb6rcdlkzwyh5sqa";doc="0qdcg64lykk0g0gr3y4sc9zml58spq2y4yvlhc3md20mp6l3ji8b";source="0xk8c1l61vs547x7586m60x2hfqil8zq3ikpsj9733ykayfclifl";}; babel-ukrainian-56674={run="0fm0sbr6i1lx2zg90w3mlwlyg0j0f11ya6as2n1w4gbm1inmc62w";doc="1h3ag9pybhzysb65xg3m217jll1h02ks04icrlhkp97sx3gs9wqn";source="1v7w99b86iclp16qxdjfqsxnh2p9zg669pwdlman1467y2z13p8s";}; babel-vietnamese-39246={run="0xb8w1dm525xrvpsxy6y4n6m8rr6g895hysxbjcvv5x8bjvl2vx6";doc="12cj6335qj5igap6hff1qrfz4ms4s94xv7vlwdcv1hs5gabqylaw";source="1xdkjigwmmkbihczgd0hawszzmnn3j7fypsv3sx634ham8j02zzx";}; -babel-welsh-71109={run="1rar9zpnaxkphcjnzx96zd3f5fhd8vinbkb8z4y1adkl68l07s8p";doc="0w3y49r7asqg0mpiasb50jjvh3w8y8y98fj7cz03j05asg6m9rkp";source="0f57qkp13542vjm7ycgk9igs9sad4smzi98d8nwkxk3pmwpwbhvz";}; +babel-welsh-73856={run="13s553ww42ywh2i716hqskrvqprr3q0dr8vs9qr7an038la6p0il";doc="0kl9fchd4sm0g83bdry7p4sw88y66bgjy7y1y3kw3kwhcnbri9km";source="1f16n7065aigld88v5wfx0m2wjpmxjn5cb9l57mlrw8b0mwgai47";}; babelbib-57349={run="1ka976ag8w02yrbbgldzlqa5852ag04i39w9wv9bhprn84xy5cl8";doc="16iznzd8hk1hxxp08zcifn9v5bvh3dy70nyas804z8av306s1h0z";}; background-42428={run="0rxb5vdfgxxadgd3isbghsmycdh4ia9yjx66mc48n396b4psbrcy";doc="0a1zxpw8wjq1mc87glp7kwdvkrg618ybwyagdkg7xnp8r7wisnjr";source="1mb6radqhhaw7k0ay4i0mrj4bm4n0v4lj6dwbk8h898ypnmdirx1";}; backnaur-54080={run="1sj9a62s7mqms6i2gv52dls1jncc478ki51wlnp6j5hq34g8sw8s";doc="0mzpammz9ic3d56ylxl40b3m8rc0s0ilhzx25h1y781kya0n6wb5";source="06aw2vvmkl1jprdznc5cwmyaw890csjsbkqmy814ddx6py7pxni8";}; baekmuk-56915={run="0gfj79zhyg7p300bw27akxzgimvqmagk7y6b4nd7jq5wvrv4g5y0";doc="00y0iglv170b8pz79xjc0kz3yjphbb6a9alk5gg6hsdwvc6gf1by";}; bagpipe-34393={run="0i3f9f7a38vcsypmf0yv2cdsb1c8n3qin4n8ac73gwdknhhibxjd";doc="0fagwknqzl3k6vc2x9axng5zljhc4jhlqd1x59cjkbrwp8xvf8kf";}; bangla-65786={run="1fl4ljyh4ypqwvkhq7df1m85hp0vmy0xmdy2km4wwgxva55h0d1i";doc="13iprzx8j84ac6ink12arqw5c5jy82wlc2nymlfr8d226s37nac8";}; -bangorcsthesis-61770={run="1814fspfg988qg7ihx3rwfxk7c79avd2fxwyxcs8pp0pk38lg15f";doc="0lv6iq40wcd9zanvs51c7k251qnxz59470pidr0gy3swwpa8aqwq";source="1q0kdk6m143d9niwa59lcihifgfhl4j603x53dzwaj68hil5h3g2";}; +bangorcsthesis-73173={run="00q2a5z2wld4jb78jvmqdvyrp7gpb3mp1a1qgd0ysri5yy43qsj6";doc="05nwh2g2d7k50gq1ymmw862d62806gsj6y7518cwlx4i2np86kg5";source="0k9jv6vr084aza85lbxb25n2lg6qv1fhdzwq3449i5axvblhdp74";}; bangorexam-65140={run="1w44hvqiaibma89s72svgcb48sh2afhycfffj6dynnfzfps2an3i";doc="1xmjcf27x3qaqzavfcaa3b2731zbimq3zl74sbfgp9z93x5xb8m6";source="074136x5ybszfwfsd92cmxbli3b9f62rv6vdf1qb3yb2qnxhqlb5";}; bangtex-55475={run="0gbjmkkidm8xk6hpkd0i0b778my5xf7hfwq3fdq2v7ca39bii0d5";doc="1xizgjqmwafjvcf0j25xh2gzcqzcipymhmhh0r56lwv02fd34b4b";}; bankstatement-38857={run="0r9yfjq0m55bd973gqvjpy3qfdhwglwm8zki37ppj1dvca7rzrbc";doc="1qyrb00m7rlqkn77hw6sb3r9b8aap2qj13ni3bwy4qv2s12sfmyy";}; @@ -304,8 +305,8 @@ bartel-chess-fonts-20619={run="0xd51ighrn01kwb4n20dsvrjhh7a0y31py2mfl1dq34v8l6yv bashful-25597={run="0cp0lvqb88myspsbp7s3xd0rrkr1jlqcqq846mk8p7r6r4apl1ca";doc="19dbyg9njh2lwckmqnmy52gllsdwv2nvcp20marsjv5hps80946r";}; basicarith-35460={run="10cjfm3v6b7rkzc0wngg635xbyfmrnzs5y6f3sn0akdfxj0d3x28";doc="0qm4qnxp3n42zvkxyzanl4psiph9z9dxz5b2i32fpn7p3jhn2qh4";source="1my6sp0mvbmpn2bakr93qwasqh7rwmzy8lhl608lssnxk33h8x8j";}; baskervaldadf-72484={run="1vcmjbsf51jb52iqhnqx7bz5v74zxipli8ncdv8qc8h39p3r3f56";doc="0b5hrc16djjn9qp3ws1isbh5fw9arj052wzgs1h3jfmsrkzf3rdm";source="1mfpcrmhfjbmjmpzlp59qaav7d0wi1afpd39h4w3l17yy58ln0cm";}; -baskervaldx-71145={run="0kg9s2ywypd484scblyk803hdg90ic1vmz4a911drnaryra54w2q";doc="148ja4009f8b9fj5s116f6p99ywl3scbhcjyiwqrnbz0z4knyycy";}; -baskervillef-55475={run="108yndp9v2awi5vw29zbin82bcvx2fzkkhypg7f4dcl9lziwdbg1";doc="0divl9d4bgpjvc6yy2yawcrigkvv7pwdnxy1gvf8mypwhkp17anc";}; +baskervaldx-73362={run="0hw6cgp15y3ak8qk6hxajx6d3f90z6f72vc60xv2c4b44d5q1p1g";doc="182lj71x8rcfv15psyjnagq53zc8mvkm9k8vkslihhlqffk6nx02";}; +baskervillef-73381={run="128l3wc3vav5fc35dnnqs53d0r8yp9rr9q4ibj2nflfd26dymmnj";doc="1965s7cw4qjvf00z6cnf31wdv5h5x90z55qhlrm928pnw7an8ma8";}; basque-book-32924={run="03jh24rrjczpgj9d4w5fy9fv8w29wbqylx5s9n14jwdsf6f588ip";doc="0sza7d2qx89saj6rx591ys15b8gvrnalrbrkk2wcjln1x2cb95jn";source="15lgh24zyqlmqkw7wdigwvvkv6qwlpv4zrm2zqwgxj93bffa4fs6";}; basque-date-26477={run="1hikrfz1z6y294zg00arnnc6any1iyn0gkhmv9j9wsnlvylcbnxk";doc="0gifh2wlhxl5s2p816w06w5h51pg6gn2mdskhpgkq16shaj4xqcq";source="1vjq5pqkan433wisv0d437m6hbmfqyds27dzwkyd233zq73fpjxb";}; bath-bst-63398={run="1i3mmivvw3wdqphw14dfhscjrximi8wi0n9q1cqxkf89saqml070";doc="0yn148yhz3as5xzgyhk6j3wckxpzn7vw6r2mzv10ncsf8a7knycw";source="1md11iz13bbbn2i2p0s9pmqkimc8wb6k7d8wz2sgwj48c2rdsd80";}; @@ -318,12 +319,12 @@ bbold-type1-33143={run="0zvkzp43awkf5vbnrvhibkw185zg7h1rcfqav38z720cls2vgd7w";do bboldx-65424={run="0r6ds8wkf1qrv4mank08pzkwz4qk2pfyb6pvqazbf4jn4a46bjcl";doc="1b79xnpss9s1c7lmqlpznk4vvxzgp7dd248ipkq6n4dlpv0s2y4n";}; bchart-43928={run="0knv4byfxfalyhmsqiq4wjcin0q0hyj9gs7f167cddjyzcg4z23i";doc="0zyiw3f37i3shf8ihhzxagvzwnsdaymbkpcizdm2ryziglahh1jy";}; bclogo-69578={run="1rx0z4f23l22vs9lk246kff3cqznp7rzc2k6xn0nwphqxfap6965";doc="0xcq3ypmsjzbkxivak1j48mzmiixxfgf6v5fnwk22z09c5x67j6i";}; -beamer-69316={run="1igp0jcs2w20k94fr84s1af5q8mw0mrvraslaxsxcnxmh65dk9kz";doc="0y07zc3zvawaph7pwk8z9429463i99y9b6lzv9v8cacnhqk48426";}; +beamer-73735={run="00dvfsabqr5shfqq3d6axxwjfqh16kv5blvza0czv8a6s55vdq4a";doc="1b5gq5h6j0v9nbhsxfwj6509sfs1bbzslig1z647zn6afip1jzdh";}; beamer-fuberlin-63161={run="0w4asfzmjrzqqc8dsan461fvmkjn21181lij46rhissz273d9vph";doc="0hw0cp32k2gqv9y1ai733sj8f08hdn3pj60qh2ykmcqg818q4clv";}; beamer-rl-69254={run="0dq7p1zpgv3sdbncric180slinfxk1vdskzvfzsivxzhh2z1adkz";doc="0qq209gc6ssz3kz180dnd6kl2zv3qj9iwq5nzcbd50ypmm483dg9";}; beamer-tut-pt-15878={doc="0ayh3kbh11l4nyyzp2kcwzn0phqhzawppy044iyl1wwwc2v3zx5b";}; beamer-verona-39180={run="018ckad1q7ffkixvf6q9a5d4fzgpkpf9qv06cfv0rjwp80k7psyg";doc="11vv18n971pcmn8lf2cya7jf55x8zw1d9s4sg2l3q76rdj7l53ra";}; -beamer2thesis-27539={run="1rz02mxmvrq0x06xbrdqvfgs21nhkcislcnpdwx9gvrdmwpcyccq";doc="1ialsnm6qc9bwry5575b8l9ifgymidrsvy2dc786ixndc0fzn84h";}; +beamer2thesis-72949={run="1rz02mxmvrq0x06xbrdqvfgs21nhkcislcnpdwx9gvrdmwpcyccq";doc="1ialsnm6qc9bwry5575b8l9ifgymidrsvy2dc786ixndc0fzn84h";}; beamerappendixnote-55732={run="1mqx0wwb38h1aaxc4xzzq6430xhrxb70qcdqs5yj1sa7k9638ags";doc="0nvf6m7d6v8mbpnpz8bdam9bz4h9d84nsf17s1k13zv846rsp34w";source="01lkwbk5vpnpbrmjdarnz137n5sbaxw0xaich2jvcjlin46vfly0";}; beameraudience-23427={run="1p3bpgkdbm3dlh7pj5w6yvgr0iqjshn6kchdpx86zicywwd2hqpg";doc="1qs882ypjg9cp19mrpr3nl54h1zry3pawjfwx8si2b6bsngz3wk9";}; beamerauxtheme-56087={run="1a8q3a0z2wckyr3694nnkry0waqzqsgp3cmaf8ijcrfs42khxjcf";doc="19r7vjma15p3vw0nr3w51ghy7hq4pv6x92iway5rxmlx97dw4piw";}; @@ -337,26 +338,28 @@ beamertheme-cuerna-42161={run="1r6c3ar29s06b0yfn85wssxccayxn2706y9jxdx2pxsr85ndc beamertheme-detlevcm-39048={run="149ya5raar4xfkb910lk85pqpm6mrc5n5ghh6350knbmaa6bdwg3";doc="1wfq3wc7b3516s81sbp6md6mx9szbzq5ycqvsr50y3s2wfvvj2lv";}; beamertheme-epyt-41404={run="07pjgzgkjmr4hdf16m7kx2cf1448253jwgc522akfvvnmx9fi26p";doc="1a987h1cg48bw05zjh79ga23qb37s82dkqhhgvp7gsnwz10pax2j";}; beamertheme-focus-69742={run="0jsjj0rq8267yj70398bcn4yziyi6kmm406q1wjklydnclj8pi7r";doc="19qn37248i97z2pdxksm4z9a1zdkqi5p3fn8rk52y6v35w2xkgyr";}; -beamertheme-gotham-72340={run="10ndfwbwmg35kbwxdhqjvnzv7n323p1514n6jyr8z5id09phqgm8";doc="19j9ihvmayjpa390m3y8vm52lgyamnmsfkm44vrhw65v00iayb9n";source="06358br4lh23xn5jmb3fk3k4gsq6hp63yl0daqx9pza95197s3mz";}; -beamertheme-light-49867={run="133mvm4cayp49l8xvh33q0jp4qzhmvd3q2kq2aij3sh6i0bzh5aj";doc="15s2s3b10w0czq513mm2y7qrczm7y91qhghd0zsfvmy129mwfarv";}; +beamertheme-gotham-73932={run="1s1ay7rav36ppc3475p57pyd0grb3dms1zln14hsc94cpskpxy2z";doc="11x3ymsiksh38czp8920gn4jz9ji0v6w3zif422cn8mhj23ga58j";source="1q4xdgksbwkppdxml57s6j3if06y0wl4hvy4vs1wbhxwd1mbcp2g";}; +beamertheme-light-73158={run="1n3p10q7iz4plnp2g5g22dyfi6294wn6bp5cmb8shj8nlll81fqh";doc="1ms8k6yxsabq5fwr6843qgdb9q1x9j6kpjfi6wkisrklrjs52mwa";}; beamertheme-metropolis-43031={run="1pmvcyjn04pgcmvanj369hxqjha0s7lh1z4b6fbhaj2aj32l52r7";doc="195jhmhzr4gbi04zmss5nl0lm9rkg8spynwz5vqlgbci1xc2cw15";source="1smxiqwdvz4bj5rk9cmsqmy3kwa722ab5fhns67jllvzrkzy8zcd";}; -beamertheme-mirage-72656={run="0337qhmmgxj120fcvijrpaddwhkfcv4wa0p6m18klm8n5mx9izmf";doc="0l32mdxzh6h29qjhhww5kvz1b2zgsmq1ldl6awymz4aacyb8yxvq";}; +beamertheme-mirage-73516={run="0799nwp5ygfqmanxw6yflasqa867cfldvszvpr8f6jz7cfpsj9kv";doc="14vf50inngxc46swpzb2iq9agg6rjm15ixary4hgwp0vhg665j3x";}; beamertheme-npbt-54512={run="0m1mpavq8p4pswibgfhsbnvg59kn4sxz0m4p2w6zjkmy80s3naq2";doc="15kc24d21d1r34hd07zr65rp1k55fwrxr59h0ayiiwgc9fkjjsd9";}; beamertheme-phnompenh-39100={run="1smqwy1f7jz012x5hmsknvarykalz58iysnwf3px7kwg83fr8mb3";doc="1pg8242n3z6x1n4kp8my2nfllriijxwmwfn7d9hccfnsvjj25gdl";}; beamertheme-pure-minimalistic-56934={run="1z283v6ipp7c7h1qhm043g0sdfcq2dwzk9l0lyy5951y1kj965bc";doc="1chzf3lgd4sx26nbmacb7dadpk1m1rm913dj01648vbd2bz9y4zb";}; -beamertheme-rainbow-71925={run="0j2gdczhy97dif4hhgpvnmyy8fh6w0ck2jmpr565ys6jg94k6smh";doc="0rk3riwdgvhvbw7s75wf6xgspvmzdjhjn3iqlj3b1mhdmwcw6g1f";}; +beamertheme-rainbow-72864={run="02hqjr4vxbrcrw2858vdk7gc48zc379za0xbas46f209pd0ydn22";doc="0ny8a3kvk6z6jpspc8yjy6pl6vynk0yknzg59c5dvhids9bmvmmw";}; beamertheme-saintpetersburg-45877={run="1d48158ladllzj6a1np20irl0r0syksb3wnisxbbwv3kwzr7fgj3";doc="1qkzpbc29587lmckjkl3lx08f2j0q3aaidqz22r6bg896j8q8pr4";source="1r4cw99zffqsvppc9l7z9k8l93sfk1nk8pzj50nm2bmkrdbfk32x";}; -beamertheme-simpledarkblue-60061={run="11m8p3n45qf697sjzszjpkdwqfgy92pzxh9k7dx72ikpdah7ba9h";doc="1ifbh5r0sxk8nsf8cd1g0d1w26ypb5hhsylc7pni6wn9n70799jy";}; -beamertheme-simpleplus-64770={run="0ip3imjc2gz4d04k8lx9vpd4an9sqmw3gbb25rmfpyy0qfxbj0ax";doc="00lj81r295zh9lrbffq0ja1skpg8l8l3waj3d34sq6i9sf8rbg40";}; -beamertheme-tcolorbox-72368={run="0v3d42kinj4d60cw0vh8597si2dgy1sl1vd5d9kyrzr6w78pjnnf";doc="0ips3f1pynvp3qsi95g9b1dbmvdkm021r0sz4d0rq7qqgbnnmfwz";}; +beamertheme-simpledarkblue-73454={run="162b9xzd5g3r336qh1s9pprxnfrwhaqmb3s7p4pnx6hsdcpb9x62";doc="08kb80mk6cn5d062qbdhs7fi326b8wc30xydcb6pjaqhmc05klif";}; +beamertheme-simpleplus-73362={run="1qf1hf6nk3m6f289y7ms29aa5bp4qsm9qiarip9mac4way75ni6a";doc="0llfz5xsyxhxy9bgdif82l1rknwwr8i6208b64ljc069pgig4m90";}; +beamertheme-tcolorbox-73705={run="1wqbb2cf19b1bwg25z0ha7v2z1q3zfifk00ikjk1apyybjsglm58";doc="0m8476jlx9x0nklrmrr0p3wra4mc9k6qr61vb1sm4cqzhw5vy7n8";}; beamertheme-trigon-65985={run="1fdray7kncwsb166awwr4jwnk27jxnp3824yf298pp4ikg7iw6b0";doc="1l8iqyq8ib1v0d4k7bd35hb9lpdmpzplnv0fqb1ngzdn0jfx6c6q";source="1s3da6z3sshhndpaxmi3rh7zphh7g1qn4b3cxbzkifx2xqmz8xvv";}; beamertheme-upenn-bc-29937={run="09a7da5ghgf5q4qp0djp3pya35zsm45wkiy5srz8p9q8pwg04bdx";doc="1m1bc9mxdwfdm0v2lb0i3pfxgf5as1lpm8a05icrm7bdvii0vsiv";}; beamerthemeamurmaple-69742={run="1ghhmr1b5riskhqyr7x8kqjg76kqshmykw4iji95ibhnz2ywj43w";doc="1s4zb71fp3lss2wj72f92w1gzj4wlb1161cp7s1cc76nzacl00ya";}; +beamerthemecelestia-73370={run="1az6zzi421j8snqklfkdrfpd7b5s7ychkdkl94riv74zg45cnhq7";doc="0zf0f0p2p9krih4bnsjjj5dg4mb5ibkmfm35jmarx1na27b1645d";}; beamerthemeconcrete-69528={run="0661r339w4473i6d1dj1wyg2pc6b0539pqpq5zwqq7sk2c1y5dmi";doc="0g8xbg6ln71im7a6yp3hg8xpa1k0wy813zwvyha9yxj2fbqfrys4";}; beamerthemejltree-21977={run="02ccd8qqyjkvqqyxr94p1gc6qjryl83vpa72wcm5ywr8gmxci0pi";}; beamerthemelalic-58777={run="10wv3820avgviic0mcxn38yycyxqfvmf7qhb5ybz1x84jrw8k9hm";doc="1wz984il1z42ck69xn6rnxww3x4xx127syyx37wdy246i1ji75vw";}; beamerthemenirma-20765={run="0ivhbhybc99hacnrfw1fb9412f6614an1955rglkcbwxwkji6nyn";doc="04155wbw6ix7an8sblw4a8q9hbn7vzwffady4vc23vzccc2i2f4a";}; beamerthemenord-56180={run="1kb3485dv7kcj04bkgz8cv15kv7jmdjy0jcilvi5zc1vn690cyba";doc="0ls5ivdcgayz9pqm6j1wd5f45s063kfknzxf594rdipz1jnmvj4q";}; +beamertools-73371={run="0189rrqxhfg2iq16yxmc5q8yxf1r7jgyigmjg3fvgp2whdhrirw7";doc="134abczaxz2ki9b06i1d64hjalmfqhx5297s5mgy2f087as4qxl3";source="0zxhv1i5cb1k3zdkzgimdikdwgh0r9p2ix41iafbaa1p58sj453m";}; bearwear-54826={run="1xaq0bmv8jv1zss6lwx2ccx8inrmyw1r9bjv3sbqfhp2x4d5xjrl";doc="0vm9lm6389jnmcgzx0ffmay2bw4d0h1wfmsfbj3x1s1vrfl62r8j";source="0dzmlcrc4izb63862dcafshzsaglq5m88z3cxmwivmwpikhh0gb5";}; beaulivre-70049={run="1246j8vf4s1sa718g5y1rqigkh06j589f5sgkg3qvascsbacv9n4";doc="15dzb9slhisin5mm020jvaj02dz4hw2frm9zywv74lyx31akra50";}; beautybook-71693={run="0zzq2wk6p994bgl1fq68apjxi9qx9x7h5fij7q5gc95l59b9rpkf";doc="0h168l7pigmzdm0p4l0z8jdi37iwdr4hxzs5lpnnfgb710zdm3p0";}; @@ -376,22 +379,23 @@ beton-15878={run="1rjj64wnd9xvh940rl9scidhv9ridqz38n8ndzs35hyjm8n2lx5f";doc="0i8 beuron-46374={run="0zfkx9iiiz7h501ls3z1fxk2ga8kjhi21vpmlng6vvw4v3dd1xhy";doc="0d0mll620s40695kikaykj4w3ngm6rcb4xzrgk3apl43pcf7mss5";}; bewerbung-61632={run="1grnipw9vjrqy657wkrg656wmh1553wzd1x84jc6zf9gp3v1440p";doc="0ny8ps46wxkbsd5g5yxyrh2jd74b204r35lggy9r7ckk4jab2wj9";source="0y79pmsbjzpykldic1a41l188wmkmn9izhvg5p77i7phx35s9qjz";}; bez123-15878={run="13l8qvnhfq575pg1nvcpbrwyv5wvq3bhpkmh2306mds784hvcib2";doc="0qrskibmq7sv07g60gzd5cp34p21ragr6yn9g6384gib8vx60nqf";source="0ab153h8i8nmc6v5g9xwvpymjvpp605mbj9dmxdyl3ic49cpnl08";}; -bezierplot-70723={run="12ppclyf8xx9v2d3r4dx8pmbf9391m9bl1k511p473a66ri1j6lm";doc="06h26na4i4rj3azmg6ls48578qzxv9cdxwrnjmwlvdanj6p1kmxd";}; +bezierplot-72750={run="0wzci9virsb7dav917v1b8ks7dg6r8wiid09l6b95lrszhwqzwp7";doc="1rh127y9jjcg6k8i3mscshy5vj0grqhz2p1ba3mqwrg6914lyl0i";}; bfh-ci-70623={run="0097symdcy95x5ag3p4l4xn5k2nqkvsnaq7idc8064djd9xi2fdd";doc="08m5gx9lmjn56g15fpwdmp65ysxlci4i62vw8rkqx3101489snwq";}; bgteubner-54080={run="0a8zhnl1nxzg5r525sn8sz44crjdm5fmy09glp8cjj7nic5xj32g";doc="04nh6c3q2w984x7kmgj023dbpjq9mqciyg4xrypgc4zv8wvcgv1w";source="11g65q55cv4s72cpraxw7yj4qskkhqhc0mz0sfy6c8jrq7255ils";}; bguq-27401={run="1spl6qnixrb6vcdgaaxx0fk740kkxv7y73xamlkprdnrsmqrswwm";doc="10za9hbwigcbxyjwyy5cd760hqabyyj3g74w355akhfpyd20m55v";source="1vaw8sa12c94ia6fknnpbj7xxng3q3lj3h61akm590riffklw2kv";}; bhcexam-72638={run="0gkrhr67mzpcfksv76vfz68zbp296mnnbq8la73qx9wv50r95kqi";doc="0azccd6wawfblff8vd77rg1nj2j5s3mcpdizsy1np0wq1q9ir0rs";}; bib-fr-15878={run="0csd9a4j3hvgyczgnfnhp8n49j4baym7nw8sck38m86r3kn8n7ar";doc="1inpqvmf6c5zb091q5fxg0r2w87kacvg1yy1lyai7wq3ll0axvp7";}; -bib2gls-69635={run="0aakzv28qlygmn39xs1r432m1yx6rpwgqdpfw4yi8b3c1gyr1592";doc="0v1q2xx6i5fpfcbqqy905n6mab55f6nicgfkkc89dgyqb1pdfgds";source="0apw4dajid7cpgnnsa8c96370mrra73vm0pzb1kk9h49d3zcb2g1";}; +bib2gls-73766={run="1h5wk657japrivd376970ikncxp4fxwa4n5js8nbrgjjb5sqrbix";doc="0vvjfbqyid5zwlp5wqjbd8lh6imfwn29xl51s2b90l4xv1pwv9k8";source="0mk8mprkdh0hsxfg5anzqsr2r1xkj5a23ha7y473r8z82ng069mp";}; bib2qr-71940={run="0a26va1sck2niqg9w0h66c0d8cw458m8nnmnax62vpf6pmp83wf1";doc="0k7f19bs3r25faz83s9c5mmdgayav7s83qw6pfpiia64if5aaswa";source="11jxl158n0l5gzin7mc5nbz22qzrakdxp8pzf88l9vixjfc0pma4";}; bibarts-67407={run="0yqpdj8fnh5lafc9amvmnam50sgxhwsaw6fr49k2bzxcz5bx1qv6";doc="0di7fqxkaddpq3iqxf9nplz0vy4qzspala5hyh6l8zc9wdcjr0db";source="07664c9cgf85k2c096r2aahkl1ddawhcdqgf7wfrr806qi67mbz1";}; -bibcop-71186={run="0adbh9k6v7vhjz0vr7m5r6g7y22vjhkm47zldm80gvkbzz74l6jw";doc="0i3rmd02dfn82jn37iznzbgdw5mn0fzvb6d04661avm9v5p2b8kl";source="0mn414m4sydsbpkj1m6grv71rhdz3zhv090a02g22545a3lb69y6";}; +bibcop-73562={run="03cg5sil6lgc43x5pv89kh42q8kaiajab7b139nhhmvxpznnik44";doc="129agvv3d0n2z2647f4yi8ck111sykca3l854vy0jlv13k4yhxkx";source="1iwlz3k3rrymv48pixzgwbxlj16a12zggnw3shys12awhf6hwdpw";}; biber-70724={doc="098ks2h1kwr5lf1f54ayvylanivzpaa21xpkx31gaqv9a9w6qq57";source="0y8sf8c7grq0whbcad55d8gklask00d4mlj1a70d7bwwnhryhwn1";}; biber-ms-66478={doc="0h0hxs4a7r8sr5w573d6m002zdpzgs0gghwbasdi9j2hfb2wv6b4";source="1mw39ra48y7gqhh8860544wvzxpciaka5c38873vvnbdnng44mh7";}; bibexport-50677={run="1zbsilzaz68zvmbf2xw7jqw4l66clcplz3l46ggxw95gns8mgqlg";doc="17a5w095vkpp7j54h8m7f74l7vycsqbv6zzschdb3dd34scq1s5w";source="1pqs7j4xdhx3pqsc8i0wqnz9jkyg891dzl7g3cv19a6wv82k0xjv";}; bibhtml-31607={run="1sg9x0jrgh2jng9b1pd08i0f8kzhy94sq0mf33as91gr43dzws88";doc="0is3q2m1xg52h5s9n9403c85yfmpjaqqbh8lgyfqfwhl5qqmgrf9";}; biblatex-70725={run="03xw79127d35w4gm8f9l3q210nylssk68racs8ynib48llc49ixw";doc="1ra4aacrfxjknlg4c7j34hja7r51kdq2ckd77kikmx4i0sb1kbbb";}; biblatex-abnt-72565={run="1qciz5yi22svgigy5jf0pzz1378mmcbd3afck9b7m0476j48ncam";doc="15mgh1gqrb0lz2xi907d1pd53zjrwv7d8v4bjz471gs5j4awgbqz";}; +biblatex-accursius-72942={run="17wdkjrak5jrpq46vdazkfgbw1fi2ml0h86bva0pbw1jnavgc0x7";doc="067wh3p0p7kyx9nksgk3kkixcid1yfw7lpszd3wkqbzp42ckhw8b";source="1xgs32fb6jj5c3ngipnwwzlls080jfknlmxm9fggrlg5dy9kml0v";}; biblatex-ajc2020unofficial-54401={run="1csx7vad5svflb76ssdkvd8y3r2n9agqqynw88wvzhzj61fkd2cr";doc="03wzlpr5v6y67syy0bx87z123ark524fm6kqjw83v0sa4y4kwq7l";}; biblatex-anonymous-48548={run="02fssl0l50s94y6x7rv2rm0227ivgr7kfnim435j4k1l0av4gb3n";doc="0dffdxp04shrh7fsl4dilqcsnnxbjpbayy9r87hxmq3yk605lvki";}; biblatex-apa-66605={run="1hlh14lg9cay5962z9pwzslqs3mbqfd70i055r3xbgd19a8hw5fb";doc="0mqg66qiiqnffiarwi6fs3cmyyssiifv5kbjg9579lsh3f4dag4m";}; @@ -407,23 +411,24 @@ biblatex-cheatsheet-44685={doc="0y2ry2q1kvpy8dqglqdfq3rc849hmbni0k78wr1xnjbpd102 biblatex-chem-57904={run="0kv44yng5wff1xkgw8nya64jizfcf1ipxrgnf46pd1dak5vlsiq0";doc="0amx09qlk78kw6iam8b83xx0kw12k5p7q6wn267imr2rsibbs3l7";}; biblatex-chicago-70955={run="183329qdra4qk2r027axy880vlr5cz75jvr94npkmnsmahrrngrh";doc="07mwx03l2wqg93faam8fbw76pr1w3i4fdv7pxr3kba5z1is2p3gm";}; biblatex-claves-43723={run="0saj8s7q9lzjnydjh3x2hcnhj0wfm2p4rvxk5n6hi2ccfw78d3c1";doc="0g4x5jblj664ngppqpbks3d0ahn818ck871q2aqir6jgkrd13cpw";}; +biblatex-cse-73262={run="18xrh27gfcm7803iab8yn4q7l04rqwf1rx03fikj93x0xh0v03sl";doc="0d08w3m696n614lyimvkfcsm20zglwg9w7247qa7wayc79pfrdfl";}; biblatex-cv-59433={run="0k3bbbjvykc52y4557nm7kqna89mjq6g5j5hpblrcdlmvd5anq2l";doc="1xbd71vpm6vfyjaszn7jlxr084mqxw558rqyqr8x848hbyh6f888";}; biblatex-dw-66579={run="1kjvqx9yqqzhwin4zwkp9qcgh6nk7bad5nlhx63mkwp37izwlcrc";doc="0a91cra76s2134anv2jinwcpp0jkd0pn7vybbin3pgyamhr469lk";}; -biblatex-enc-44627={run="0kvya1xzxpcmvwgacb726jqzmgr944y9ljai45f0gdkw855ylmb8";doc="0mmc5sd1jjnj42aa2q1g1zaps1hla6yayl769i4bya6i1w9r99yf";}; +biblatex-enc-73019={run="0iccl9rqf876rmn635yjb5n38q6d7lyyrpf452i924bg1dawlphk";doc="1msv5fyqbrv3wdqlvpn694nla2412lj1hi2j0k8cykfrqvws75v9";}; biblatex-ext-70744={run="1fkvd8rwrqp0g8fwy84vs3a065wk8m9iaz1lk2fcsrhcw6cfg1bc";doc="0gq87xrwd7yaqb5gr5ph7bvvz1lg66w672pqad3y59p4ymlp4l5l";}; biblatex-fiwi-45876={run="16grb6hqmrhvzryijg6p4q4vf47a0lxa8bw59avlib5j7mqpg0wc";doc="10skq20bmpqymbgxs47z8ac0q5nckyph7s4xwqmpfd7pi2sksb4a";}; -biblatex-gb7714-2015-71329={run="0qj76l09fqf76xwm5y1drfpa77c320sxyb5pkhkkd3capqk8iwhz";doc="06rnk05990vmnyndnf6aldfpa8h8rbj689gymjgrp5x6lgygqlz0";}; +biblatex-gb7714-2015-74420={run="1mndqzwi0sa7fsahngh8pp65pd4i0iplfhd2dapvznw6j0r8j8ps";doc="0pphyqis9z78bvg2nw60va20hp7lxwra76hszbgjkp74vm0jhfxv";}; biblatex-german-legal-66461={run="05wf0z91b7yhw73xz70nfznic6x4iy0ir5savldd1ai67iv6h569";doc="04xrqwnsai24xh1apw4vl5gqhjd06vri33cxp0z96sp806s6hb4z";}; biblatex-gost-66935={run="0d7fcvjv4100ws9p14qvp4dvv5wzp6xc8qhaqrxnrzkrzd6w7x81";doc="1zzxb2hqi4gc42jcf21pw79h56yxwq0c0wv7z45lq0m6vc45lzic";}; biblatex-historian-19787={run="14p27qb8rdx479pj7zdvl00ir1zg8f0bzp107zfwv61ypq8zrvbl";doc="0hcghqxbjah4lyjzlrkixs6iqbkjx4d8r3hv16lgnddkndbgq663";}; -biblatex-ieee-72032={run="1apc2m5qbs709bkw6bh76v4f70g5lak0vlpy94gaqpmvz8cjjkz5";doc="0ppq3k8yc46nplh03m73wfdxhcrxqin8bgy80dgq766nhk8qfk0s";}; +biblatex-ieee-73468={run="11kw0cqjgyy4nl9ydhrk3vkg778ihzh8r0hwk5yg1sfba4din8sh";doc="0la679y1fhy9xy9y1jz6hlg2vizh21i6p29vbhj315m8hgviwlba";}; biblatex-ijsra-41634={run="0gnm3h0918lvbqwnzk9wkdcafpzz5q3cln2z1sjaylr3mgypykdw";doc="0jl8mr3ai1ybc3lmp7x477znv59az94hlbzaqmvix54rxf6k8f4k";}; biblatex-iso690-62866={run="1nkq6fa443dpxxm1w7fkj04169a50d61zwsvijg2z80ivlfqpn8m";doc="0y139zpq2xzdwj7ak46wdii3jsnjdywdxvnw5qwh58vvwwliz2cc";}; biblatex-jura2-64762={run="0lq0dllah3drjijlscwy3nvzmimh9zc0in10vld516lmd88i7vdq";doc="14l5sf5xmfi27izkds3cv933397s4fn1ah4k7jgkj7vw424bwh55";}; biblatex-juradiss-56502={run="0zi9b67y0p9zdz2n4j1lr5qgd54p3l13c132wjz749mlrv6njfx3";doc="0a6d7awx49cy86ndwfkfq280dwh846ssjkkkrgbq4vxlbmbh2zpx";}; biblatex-license-58437={run="1fg16xc32kbg493y91sjxjnxpi6jb7kki7yvy3d796w7vy86ljfn";doc="0iy8ad7k9j5x5wnnk196dwsyc5hhz8fl88wq56x80cgfdkg20jrh";}; biblatex-lncs-67053={run="021b8002cdb3h8yvqdfvidmzbdjqpybbgq14vya746hnnnas501a";doc="0fvy4ailfz2pqg09j6cqydsl9s5x36y0cdhhpvvyjfbvzbz2cc19";}; -biblatex-lni-68755={run="1z6zpq15kx0dsq035yqwal9p3q6ph6fvrax9ckjz28c31x668agq";doc="1pkjza70w9lzcn7r3kn8l5pg89dasj66c8wm8ixvahzvwgjfx9ax";}; +biblatex-lni-73625={run="0bf0655rxa5grxcyy7yldibjmfhkdcxpy8msh3nhbbnwc6p2r821";doc="1wp6jh5ny1q8kqaxsig85rm5rw2bw7y9sz87z5kwg2bxjrrwcbla";}; biblatex-luh-ipw-32180={run="13hh4x8p8hxnyz6cr22lb3djl5advrl5c9dyx6f491d2mjz7vibs";doc="0xb2wmg5psd0wi21j1vmn1y8sy8gw78350fqbmpgd6l4xw7bb4gn";}; biblatex-manuscripts-philology-66977={run="1095qakmlkx81frnzanzdszk7isp92k4cgpqlgvwz9r5gk34mx2d";doc="06vg1il1cp3j525jxisdzbbd4v3504h4yyp733prh9s0q5s39yai";}; biblatex-mla-62138={run="1fdznq1hvym9wgrxd2gsxdi534n5pbx95i8hzkz95zbxfvjpf4rk";doc="0i4716ascvd17l0nlf1wn4vddkjkzc85545wgb4cdzj847azm1yj";}; @@ -445,7 +450,7 @@ biblatex-sbl-71470={run="17avwsdkzamvfz3jwixv7w6hx5mklqxxl79jjch9q39ppj72wz8m";d biblatex-science-48945={run="0llhz0jmncjp8c2r255mxh09rvff1s0kx1lacxvy7svwj7fl6qgq";doc="0daq39wcjryhcapsx7n216yr591scjcwg7z4cihpb10igx15kbkb";}; biblatex-shortfields-45858={run="1766zipaps96ks920y5zggc0zhk8vkclqh2c3zc2y8x7jdbah1vj";doc="1fs56vf86wwpaz1ik846r83zd9bpidrzzwv4l6jhxss8hgww6y0w";}; biblatex-socialscienceshuberlin-47839={run="0fj2l2wxawps79v81s74jr4d8wz4pf45mmpry1pflm2zcica3ajd";doc="09sf6k9qghwll84bj6m7v0xw6zm040y6n878x0ywiq64jc33h0np";}; -biblatex-software-64030={run="0d2g21gn89dnl6ldxdssg7aj9jigmlh66z8s2q8qvn7jg26gxv6y";doc="1z3izka82kncwx3hqq2rh6482faw7rs11j1pfnj7lncacab2b41m";source="0rzqm6csbmk3xrqnncd58ajhwiv7v881idzvcv5z48169s737j7b";}; +biblatex-software-73321={run="0gj7l0n5rxwvffakfif0n57wrj76rimwki3sfnkilca7a00ggr6c";doc="0gmrbssx4798njr65zrwkkgs0mb4kc9934c6hlckacdwh71ia8as";source="1fl1plq6h61qf0cy1k4rlca83jiny67xw0g9ql6h5akc08wyj6bj";}; biblatex-source-division-45379={run="09wsi1nj7hcf5nswkd6syn63xhk2ghaxikz5xb5sfyci0lmnqgxc";doc="1mfz2bxfwx24a2652n4jrdw1mhrm1y7i5vq54rs7sp5a1xfg2d9q";}; biblatex-spbasic-61439={run="1pw2925wakr0wgcm33vbmqgfqnglzn8g04fapnzrd6s0h5155zc1";doc="1p0fbxqyxiw3ihiw69z6zbv2g8pbrpdiad98iwxx5j12sm6g5v1m";}; biblatex-subseries-43330={run="1c92azsgrp1cmq82ga3cvnca5s4j902hcncp64g9psgl9fm74nwx";doc="0ri6vvzcpcm2hz73dkam0fgbnfm7i650x983qcngkr0jqa43xr41";}; @@ -471,7 +476,7 @@ bibtools-67386={run="0s0mz84w97854gwsz843gvlqlgk4bs5bpd195m8xv8g9qljpwfvc";sourc bibtopic-15878={run="0rzz1c1c6vgjm2r0gv65rwvbcv0asc5049agv75yyvqihvn51018";doc="0hzy6353n1rzirfdjd8dgjhnp496i14b0z0n2x7gnisf3qksr0wx";source="0abpdz3ir7l9dvc6vy5zi9ay103ga7i92vg3z69agd758xnz0v3y";}; bibtopicprefix-15878={run="0vy9cah5mmr1vf4sm16212h36wz4623s07cagjqnmyprgm44sz66";doc="070shh1cg3hdk097v9jr37f06q0qaaxji3vjdv8v24a1rg3rrpdr";source="1v35hawmsgm12sv80wq2ld0rzz5l4shvky44l8wkxxh7i7vy43sx";}; bibunits-15878={run="0znv09kqrwvmsjsw3lx9d3mp6fm8444zbn317q5yn5hzg2dyj61f";doc="1zgj4jpl0fpmsrcp3h4qlkilflmy8zqhjamghidwzkkg1i9jsfz1";source="04lswyalfivh01hp1wj3fq1q8960dmsvnbi8k856v3dhz0pv0whz";}; -bidi-67798={run="0iisr0ac3l2hrfja1vmihrf08fnly01dcfg0665x7yfck54qyjxq";doc="11x4y6rkk5g9ah7gmbwhppwk7i6q3j7wydjvbhfdz27wz4azcv1z";source="0nhkwk2r4fj5x94w9fq5db9nh051hxzb1j88q2bfhlf9zfwgiirj";}; +bidi-73698={run="1phm4aj51ia0iwxvi1m220cjqpma70hy5yr1anrdk5gv10dwvs72";doc="133nhfpmyg12lw8jbnm3b8dfxymkwvnx0az6jvw04x767jm5ahp6";source="14yr9y7m7mvpahgiggbmfdgvv0njwgvp2khf7xf9n5qaaw0x2f0m";}; bidi-atbegshi-62009={run="0wpwp2fr233f0pac6llb5gmhz2ca41yjcmkqdil6qhpxscfpqizg";doc="1nzg4cgdhjjsalwml50xl7ac25w0qfd5q18cs8viicj7bbjp13wr";}; bidicontour-34631={run="1yj7vl5z4xh8i420y1ycz21rw0yy83z0v9nlvi8k3ph2qis7lp8m";doc="085xfi5w350vbp4vnq8kgbilnz3jxwf4g0incvziy5hxh4isqirz";}; bidihl-37795={run="09wrzqlldxy3lcxp21rdqi9bnjzza9wvdgssqynynjdmfggahd34";doc="1k67d2zd16ash4krnkwvmwx4wl668r0pdg720vr9xq6q3b139y9d";}; @@ -488,7 +493,7 @@ biochemistry-colors-54512={run="0d4bbm1p3j6q28ckkl7ilkywrjx6iqvmx0qb27rpldw3jabf biocon-15878={run="0g6r8rh12pbnbhddcv6sz9h8wnv31q6jqs2xbj5fjj7vcb46z694";doc="15wd9arkdxsh8aral3zgl83627yl4f0wdx2r8b6xb5ivvrbwaslj";}; biolett-bst-66115={run="1ap5arz0s65bqqfllzwxisp3wa327kgivw1jh1gkc4wljq7v4jq1";doc="03hj647j6b7y43djqvb28rkjixpr0y7i02420piskp3cg90hn5dj";}; bitelist-25779={run="1vbz2c27jjc94i23s1dzl9j0zf0n2935sgxgc5hq3bpaz1qxvm7h";doc="19p9f9bzn60nf5163rdlw166zpk7qlfwhnc51bpkppb0w4rni2ai";source="0r3lccpampra8dardrr7sb0swbx72aasaras43q4nx4jv6z2561k";}; -bithesis-72491={run="0w07clcgrz500bjnv1grc6qk98sgwm3dnxp543rch7xlp2a8g4fv";doc="07n3jliiqk7vpvwkg3khyj128na539pygmnz143nz4va4m3bww2l";source="1bpd75dd4adz25jmd2nml4p2qzh40qil9iqcl87382zfy3m1idgk";}; +bithesis-73285={run="0l7lkpz0vg9sckfpkdg6kslap6322q7l5y52khvqka2nl3hmmdfw";doc="0ylvr0dhy66q5spqxz2f0xl2jgbfv7vxigwg1w0d3whjr3y72prm";source="0g0kgrq2zxb1ghvk3llxzm29bqgqanc4c32dj7r95szkfxm5rs2s";}; bitpattern-39073={run="1j01vh1jy41714k3hms4nkk8j5c5d4nizgrm5syi20n8pcn3l9pi";doc="0a9120z9rsq8pqi33iv7f4j79gimjgxfqf5jhnrnmz0hgqdpl2mi";source="16bjmxm11kh0ww6ymk82qs947zgavm100nsfnjl60hxwjl3yknzn";}; bitset-53837={run="0ynyw8fyb5cidlz00f42cf21gakm2ir9ilddaaz12s7qq99lhj65";doc="135dcx0b51br6lf9dxd66jq2xa21bpb1mi4y4kk5z6ngsd1imdag";source="0yds3rhgq52sxvwn5kc32iizapbs5g21cw6avbppiip0s5x0b538";}; bitter-67598={run="0x3xnz8fvhwhixabr05rmxw8j0l03v2j5ylj7jq4gni519n3g60q";doc="1x8zzl2890c44jqk69ncsgj7xhchysbwkf66nnw0dsk2qfahc6xx";}; @@ -505,9 +510,9 @@ bloques-22490={run="1gr3521mxmabcwvkqxn7f0wcpcmzy5jdpypyafyklmnhc2ij6zqj";doc="1 blowup-67640={run="0ijgwims5gklp37j8zlc0vdr6y2l0gf3nv2jnjhbbc49yv4n8gim";doc="01an3fbg94bg3wspadjil9npbx108g5x7kg8ga7c1nza0wygsdd9";source="1b53khyhzjy9mww925crpjmfgk9cjsmcz5hxjpl8wghrc4qqahjl";}; blox-57949={run="0p3ci3xf1vndbdf147r9l1s68x72g7r2np6znizj3qqxd22h3wxx";doc="0hskpi2wnlrrqmv0s8i4g4bh03ka18w3czvnjjvhvmf7im9wq2ha";source="06zimj2liix2y0f6a35kb8q9d9asp48c58mhc3pssa185bcc7bv4";}; bmstu-65897={run="1x89sc4grkk3b9mhi4y1gkxm9pcbhg54j8v11mq2bx4nyl0bgrll";doc="00950rlqysn7faapvg9z3knb61f8l5hyy9kjxisbs80z99mxh5rn";}; -bmstu-iu8-72237={run="0wf368qz583c671r5gmslnja6vrynvpyyjldwwjc29hx6q8q4jpl";doc="0cak4j3vzazaf6ydyq82j3qy0d5zqfl1ifh07gdvvvyvgyj4zbdv";}; +bmstu-iu8-73822={run="11an3k12rrzqd8jhhlbji4fmf0zxdkccirwf2aa0prnw57h6bv2d";doc="1xddanyh2pwvxiq7d5r8yswbidqdr86qck460i9vgv2w6hqr1p7j";}; bnumexpr-59244={run="06achk9z1waxr6ndcfplnvhvd7k4z1l9mw9plh92qpj1dn48ncbj";doc="1abhn0hyps7azg4fipnyxihhzmk5fdnklb4gxxsjvnnr1grka38y";source="0arhv81y8993498qkrnlnsa8fiw88s389q6ybvndrmf85js5nwlb";}; -bodegraph-68785={run="11y62cwwjkxpr7xnpc20aw37lwcs83177w2gnxz7f3lr8192b28z";doc="1k428jlknm973v64wj1ljw470q3939kxns7xkxcfn5r3hjnqhmry";}; +bodegraph-72949={run="11y62cwwjkxpr7xnpc20aw37lwcs83177w2gnxz7f3lr8192b28z";doc="1k428jlknm973v64wj1ljw470q3939kxns7xkxcfn5r3hjnqhmry";}; bodeplot-71000={run="1vf7zkmlnlq56p162xfr8pwfgn4p966dmkridcq9crwzfcd7klmn";doc="1c0p08n3pdgsc4cvy8vwkjj9vhb2lly2iz11xbbnnbk5rndp0a28";source="0gjjaalfdwcyd5wpv9sxmrfazzqch8z1zlcqcp8pzig4id11bza0";}; bohr-62977={run="1fbrgfp1xnxa5cf5yqk9735wp0qwkjkpf8sv8gdjg6a06mpixn6m";doc="1jbmck8ld3rg0nw5rs9lbnr0i34gi2sxncri2fmcdpl8pp3xnw55";}; boisik-15878={run="0xqr3sgmzklqsvd26f2800ifs674lf0a4kgr44na2l0lf5msww2c";doc="0l0hi4n5cfm1zdkr68c6ks3gxkda5bgwlnf62y7x96q5jkscdyxg";}; @@ -555,7 +560,7 @@ brushscr-28363={run="04vpb4yvbazm9lb7k2rbv4wr372k3l6brx37fx5283fpzj3wvhxv";doc=" bubblesort-56070={run="1qs3y6vs5z5m988cj6dl9n74m0j5d4hsmnrz6xfbpw2cs9g86jj5";doc="0pcbzg1p1wpw00h7h1va4j6iivz1ky31k8aq1jw4z9s5rwz64p9h";source="11g2brc46977w61sk0q9j2wmn5q9x9s3mv6fcgj8ywql3g4r85pv";}; buctthesis-67818={run="1z7svjpf73ziy7iyd03x4g17k4y8cbqqdzi2ar0rpg48n2sxpmfa";doc="0lqvvf1bma1r5n8pawqqjb78jjgknf19j0810dmxzzzrl7mvxscw";source="1wspjl3bjpv3dgxakrb78w1kmb8i4hivq3wj2mkrwh84ahzj4hby";}; bullcntr-15878={run="0djfn002j12nb84svd414zng3rnjp79ssrdhfb6j62mx0p9j2hk7";doc="0c88in90fy65pd9shbf09bl5dm6yd3z7g535ni5js251bqa9wijh";source="00pdz4i2pkn1fbihaz16vbhsnwaybpcavvmndg7nj47jlcfplhfq";}; -bundledoc-64620={run="06haydgwqfhzpwir9qbcc72y0x1xl0jhvyfh4gx37cpfvxz514qq";doc="1yqsh1kz5hm6rfh4vrl658y50ncypwb1mdw2p4qfffvp0w5yk2kq";}; +bundledoc-74315={run="1j9096hxgiq3dccy9x8xg36lbvvkk50xz11pdy9fzmzrfi9kzcz9";doc="024mnk1frrd782dwsaw7q0wa2xy4frzipq33gf4v00442hida5pv";}; burmese-25185={run="109492p6k58bdgs4y0nb1hfnk63pdpf0x4b7az8frfff4wg2jvb1";doc="1lwgifmixkyxscy6ichwmc8lv26dwmcvy2nm68z2wq0cz7cihjli";source="1iwnsjnacafq1w3n6asj93n7nfxxyslf69jj0rfrl05fai0iq458";}; businesscard-qrcode-61719={run="0xv56yqqj8y4270955srbiw7qy8bm9r3ih0zazlkrxnrxyh82jlk";doc="0nfvak5730q4ci88dyqln97ljhjbwxn3gk34rq2b5rk5cy2inabi";}; bussproofs-54080={run="0d783i6srwanhm806hk0y5igbw99rf5x9anl7ib29pijrqvg8kjx";doc="10mn4g6dap1rksl5jnsp8pv3n0hhfrb9imldjyrmiika2d0prfp9";}; @@ -563,6 +568,7 @@ bussproofs-extra-51299={run="0ndqiz033c8dxkdknf7hy1d42y0g2hgdb091wxrvpla7ryawcb8 bxbase-66115={run="1ijrq63y54ahv7r5f75ssx2xjb2mfbgxk9pq53sfjk8cww1m9k0l";doc="0b6k87rxc8sxdqgbr61qmkrfdrzllc54svbm5qdxvknimgsbaiv7";}; bxcalc-56431={run="1lgk3zfraip1jx7hpkkxwzril5sqc1hn00km3ybicsvi53z1q19f";doc="09x2b2cdxgf7lil1vlw4bmmjn2kl84cgxd75w2js2y1znsfgsivz";}; bxcjkjatype-67705={run="1awhcn56jiwym35gxlhw4m32y4va9qh1skjjhk455plfmbydk71p";doc="1d9v4al9hyimw0bbndd7d8jjc8pngj5xrds1a8j7mgcjhkyyjin7";}; +bxcoloremoji-72896={run="0qra5rkqfwgjq6b068slm2yw8dcg07apl13rbq2896ybz4hpscgb";doc="02wf5j52xqf7jjgyab6v153qgcm03fy61gx2xpfbpir4rmgpsa7r";}; bxdpx-beamer-41813={run="05zpcwq6syy612w8jw10fqym4w4b4qxrd2i4n4hqwxv2sqgsw4n2";doc="0g0ld901kdq3558ngzy6mf2f2vgjjcngiig2pbjb8xakcq933jj6";}; bxdvidriver-43219={run="06rw5wwp5ky30s31f23gl4hpyzakn5b3vvgna8iw2iyy6rw5cl7a";doc="1qwxy88fnfsx9na6c8r56n6zhs13d8apkjq7hhydsfs7qy54q4vn";}; bxeepic-30559={run="18by54j2rg04n19whsb2zjkksrdh6f6i54fq257i2mvcp0qpxwr5";doc="0117dzkqs1sy8si4dbal9p5p6csskcby2swmf2911c0vbpdl51zm";}; @@ -576,12 +582,12 @@ bxjscls-71848={run="1nvy0x44mgi2i2hyclqq0z9802f18x326q8kmmcs7nq75b4vdhf5";doc="1 bxnewfont-44173={run="0mc8akfajlyl6vfh620h8rcyfv02gdg4ycqx18lhb9vfivi3j4py";doc="18na6f8nqlagfszk9miy5bbx2bylgspck3pgglbkqb9cgkdf4qq7";}; bxorigcapt-64072={run="12bc2pv884wi9z97ih1sm5r8x67vrlqhd19f6m1naz9rs7jcdxxv";doc="13gp6632pn7kvl12rpbz99n5imcsnwf43xx4iq9wq6xj4qnlf7cw";}; bxpapersize-63174={run="01gv55dv9676m7rkfrmz31aql5xb69drl1wvwh7k1s3xrywik35j";doc="1xsg1nvr7i1smrg94110pz4my0vvi1imqkhksc9daki52iv1jyx2";}; -bxpdfver-71967={run="03hbn8kfgr7fniagq0q1136jznb7w2470whs2cs36amgfnywjxhl";doc="1kpa5y72xvpv64srv655hh6c1x6zy12grqh181fly1m688r89vf4";}; +bxpdfver-74154={run="1yb93cir4265l4hfq7dj24fa9fxml5nlrp71r8i9bm64f0wh91ab";doc="09g8b6pc508ml507hpmpq5gqmg2dfq6kdfyhklkn8sn345sb3wa6";}; bxtexlogo-63231={run="1g8iy5a2cnfsxggzl49vbjw2fzk16jcy17vx10qp8qdzdzw29gs3";doc="19zq1rssw0sin3gz6a689g2khfc6rxhyckqxg0k0kj3gr32058kd";}; bxwareki-67594={run="1ax779x1zf3b68a46pa3d65wdna3c3vhbz0r8kj8kavak044p1qv";doc="09q919sqr675q3iklh3yid7z6hn0d6pvk2a2zchi8rd3xdqpv06y";}; byo-twemojis-58917={run="1c43vgcnkdvag1wdhivl49qm3c9pf29w89xgy0m02jrxryrjy6i5";doc="0bva1q3zxzkkrz2cc2zrin955p4r251hlb0w0gyfm156dss0iqrb";source="1msy8ja579nysqd0rmbw1xsh6hksm44ddi5q3x0i5p68k2pk1i8x";}; byrne-61943={run="1bzlyhysyiwfxgjzdsz0ax8mkdvf3ln9fnwb33px92p167s1mdx1";doc="1wn4gqvaym5gjdnxa1pjbvnk77xzk6dzvpjil59nagibp0ap48pg";}; -bytefield-68366={run="0ygrxp4il760rrm6zakij3h6v6a61bgwjjbsy2nd816yv5a325ga";doc="0gdz5scdzh64p4pbw8f2vmwvs7hl012d9m3k492718shcfzs1y79";source="034azk9zmy6zpwi7a5jchwnigg2vzcbh998a1izgb79fdlw5hpyb";}; +bytefield-74421={run="0cg2lv1vr4nxjqp7gmfj4k8kjcah4zwd3zvazg5pcf20f4zlqfjb";doc="0nc7zx6q97p156npi0h84qpxl31lia235l3d2wjmx3mkdy9li25r";source="1igdyxlrzwsrxcv52r77znzzrkgpbr44m1ii781fkm8fg2icxmxh";}; c-pascal-18337={run="1gbijcvhkfc9jhdjs07l1mz4p8lchrhnrl1yj2gmzkskp4v2pkbw";doc="17ddnb3k2q279xrrsy3y5n8qyk7r8hlrw8vd446a11qiwypjvxy7";}; c90-60830={run="0h4y0ydp0vx0hk5s46lj4j0vji6yslc0gn02rmpbpgs6ic34cm50";doc="0bwbqi9kg39rm63vzngrswsg7vnibrfxlz8fhsqb947j20mrj6l5";source="1pif2g8ihgxf3qznhhc52gi9bih5ai8a986c6l1zxlmgrh678wxh";}; cabin-68373={run="0wlhsfhi6f5wvnvi0k0h9j8xiqy5dp7fxks2ipw2ap9yv3r34pfr";doc="0h57p06mh7drx3klgkgj6w6k7x4kc8h2yi0sya1ygi94kwp5x1lr";}; @@ -593,12 +599,14 @@ calcfrac-68684={run="1rvsgszxg0dj2j3p58m26rqwl2qfinkvfiw54nq6zzzqxqqi03l0";doc=" calctab-15878={run="0rs028w20fcg5jmmnhwhvasb701j763pk4bwv09lj3g78769k25l";doc="07fxrnpnzn23lb3lrlvil6a8624vcvam1lq6sf8nrgs52fzl2grh";}; calculation-35973={run="0v7f5qx319zrwhy85lvk354a7x2vcainiq90y1jkm5cscs23xqjx";doc="1bk9yqx607vp65ifdawaldcsxm065hmyrgzwyy90wkn4kmyq1snq";source="1y5a2n2asfhwm8jylfg5zm5dy4v5s8gjl5ndizwk1ywwl0am2dxx";}; calculator-64424={run="0ha62j2mdg6f0h9rc03xaniq3kgfccihwjh8lbf6r6v609kqncwd";doc="0ilnsnlzxh8zd51h7lj0rr6c4fz9yb8dff87yjnm73ndkvia0ky7";source="1k5vbywm427cx1xvvh2fv2g79nikspwrp7sk9qcvaf69g8acs93h";}; +calculatoritems-73716={run="1bagzcvcgap6cnaqadjsn1g4p2siz8ip4zi9dsg6ny9ap5y05gzr";doc="0h1ab1dip7vzvnv77xqy1znzv1ng66qzq724g987i5rcb6k2nisd";}; calligra-15878={run="0x3wvp6crh6rg2sxzwil3jr13h73sjgbf7ar4y35na5ksgz1z2j7";doc="0pp4i750ga99x72kzy818062jvldylyfanjaf8nxgkglbyiw3l7r";}; calligra-type1-24302={run="0liaz2jv1ad3xvmaxdp3vd2b3wvyg0wm1jlrrhxljzazsxzs5d3p";doc="085bcvvz7269v68r8a153cgwgs18bgpqrd40k5xy7k7f5wy7d0c5";}; callouts-44899={run="19khsdal0siv0vvj56bxgkrj7bk1yyd3lw8iz6zijchp0by6gbbr";doc="18zy2yzjlgn9g2wzlc9i52x8g3dv32hvbybjkm9fmklsgnw8fang";}; +callouts-box-74040={run="1czs3cggbl7lcb3hn971whsnarsx1ws0rmrd3k3xhvgscih5qsg0";doc="0f31iknjkm15q8l7q5fnq88crzkzp94gx5ws9z1gc7l84fjag9n9";source="19gp2vkif0vs82722v5qpj50f60nv7hvp3k3dkz1807sm6a2nav5";}; calrsfs-17125={run="12b13dhwdxr5dc37l7imlhn4sparyrnz0d3vagjxlsiinm7hakf9";doc="1295qb7s41y2abs2ip87ipcvq15pzza0bwvj6pwpwxkxq5yrr83q";}; cals-43003={run="03100nskddcxi7z48iwm7vnwlrdkxj7xh8wgbb8bx3vfcrz731jr";doc="08y10p0i7y0jndknkwrwdws6ja78sz1qf8vxvhhhcpivxc7a5gl5";source="19sh899dbk4z728h9v72xrf54cij8jhnb4k4a035xfb7ijc0jcrq";}; -calxxxx-yyyy-69266={run="0hv01h4j0jc34z42x0j13bd80vkvaqdyp59jds1jf0yv2mshiwpy";doc="037nh1j9q4gspazcmlagqmxjfi45xbmh0pifbpmv9iflyvnzj6hp";}; +calxxxx-yyyy-73249={run="00q3wawsij9dl7gk400wccqqmyihqcn4jbgzfk3b9zbmmmj5gy3d";doc="0rvxngbx59k8a237730vcf7ahr8h8jsb39n64s5q6wra2rfkbca2";}; cancel-32508={run="18bkqkdf888nd6j187kd39g0vgfhfh118bky8r5wwzy2aq843061";doc="1x6dhr2xyx66i8qwk98li3vp40rlalfrf5lk8ah4gq03ndhmygfk";}; canoniclayout-64889={run="0x9r0xjdv3vfbm68w0cydnjgfiaydlyg71cil2l3rf1p4awk1kkp";doc="03vn4k8yp4l195k2716a110b8lad3zympsphp3cp8xx0cbfb86ab";source="134arh3nmd39zr1b0ybmz3y0jfyvwzwcrzd59iik6bzbp601nk8k";}; cantarell-54512={run="1p5idl8vqp84g7vw3q6ybwnddv8q7a0ijy6vny8jfd6583bjx6pb";doc="1r6mlr4qq61cclliz4h86bc86zkb5kr5r9bixwnj88pbvbalayff";}; @@ -613,7 +621,7 @@ carolmin-ps-15878={run="1wq22k55696jbawhlcqxj839vx1kla2xsik32pv5i2371dsn7211";do cartonaugh-59938={run="1s10sc37kg3m9hvjcicgc9i3wkk40wxi4ncswspn9a599kkhf829";doc="1y287gshxvdy4chshpwa328gfh36i3cs1g0giwga12afmkaif63h";source="16clmcddxp9a7ybvgpx7w6mf45lcqq1vzjb4r4ndggbpwawkhvlh";}; cascade-65757={run="13xf7135hjf363d9n1gx41m7awbr62pp6y1j77qmc7x6xi7vg85g";doc="0d2fkdrrbh5lj6jmvixgj7v4g3adg6s6rrrj8wxilr65vd1d8p6k";source="1vh912sp0ngr4mq391m8cdggxwpjdm42d2qwv5m4mlqhsadald7w";}; cascadia-code-68485={run="1gdy5rx4dk2722xhnl1f8p0y5xhvpscfaycks217g1j7k4yyk41p";doc="0yadwjksqxia4k6f8w0ng7rxzp1lggqxk8q6n1gmnwqqph08y4i7";}; -cascadiamono-otf-72257={run="1v0ryc1x6g1iza09zf58mfxs9yaxw7919dga4nk4w77glrr7xgj4";doc="1m4rhy5a45q0vxqg9xsrjkgnjbayhxfwzw8jxwz92vhsvjzf2sa8";}; +cascadiamono-otf-73392={run="0bpz8p0b88gx3ma4rqlv4j9p1mh8mjx3g7rvlxwz3yg8adhki46z";doc="1m2grhp25lbdkx7kwa29vvjw10sj77ihrbci7f6vdx7q9galysky";}; cascadilla-25144={run="013x6his54n8q3qp2xx12c0s2fbjca1ffmcb1kjy0yr0qy0y698z";doc="1l8xpfmdp2sc54qxx0ywh7im342nd3kbmgkx2pfzwmqz3xhpybfd";}; cases-54682={run="15f3mngrmvd0h6yy3jiifyzfrgi014g4dsqz9c5g1mw65yyssl8s";doc="1vq4x3lc7zrxsh3b7dy6w53aikx5vfzx26fi288b44g99f3h37jy";}; casyl-15878={run="1cmz40n2h7nckjw9x8wjrj0kkig4xhjslqjachsdgidd151m65c8";doc="1y1gc2a1fw8fmrs4milnqvn0i099khhjq8pmsycj4bxpbsbpwqva";}; @@ -623,7 +631,7 @@ catcodes-38859={run="0sqwy110bqmy1npqqp6m7x4m632zmg4n52snrbzzz87jp59k6kwm";doc=" catechis-59998={run="0i0bhpal6yjhama3l9q9w8ljviiljqjcxixlcx39h6qq2dh5a4sx";doc="1c11g2nbf5nk7pfmg3dqyidm83xwbcqnshpwhbbnz3vi8lb2ycw1";source="1vq6nbis9cgrsch7w0yfm1s7y8ymydhbhzvllpx2ml6qks6vhy7i";}; catoptions-68982={run="1zixqpgln7yqpdg37l4dilbqsf86bbl64z0rqg9mjcs150vp0vcp";doc="04k68w710rvkx7zp10w9a1imwxv0qvanj1x3kjbyk0d7jvh3w20f";}; catppuccinpalette-72060={run="0jwwd1ld80q3gill63nh5xd0jww4zrvjra3n4985yfal5h833k33";doc="1r3y2hdgabsq03yjdsaz26zdnahvb80lfns7i1blslhxpzkb46in";source="0l4zid278q3s84ajw30miw2i4nq110fr97qy30n5q9vq33ahlr80";}; -causets-66359={run="1m2gjhs1v7kaagqqzppdf9frhlfshy74j39n8r4phhpxjpjflar1";doc="0zw9imm84dph6dnajj8ap50kr5h18j6sd12xfd1d2asb35h5lvac";}; +causets-74250={run="1qpvik4hy6y2sr8w3xy2bhzzrlxf3285z0mkflmz13qa51n8b91v";doc="04z5jyj2pjhdh7sd2kr307y9qs1injkh4iwk8dwi8bs7p2zpl8nk";}; cbcoptic-16666={run="0y4y76b69ila35ak85wkakk6w1idjy92jhbnj01i82xpjnq9qrss";doc="08c3v6rppp3qfmg4nz0abwn2ka60wc6zrdx6qh1b591xgfwcm4jr";}; cbfonts-54080={run="06641hiw3yahh28yq3bnz3dc6d25als1d8kbjh1ldab55gb3vz6i";doc="1vlhqfx3y85ym7xaqzr7bxkzm3am8806s6bkp50mv58r914xmlz3";}; cbfonts-fd-54080={run="0gaw2v82im1k7addx320xhwwq28mcm2xkz4z90pw09r848s9fsyx";doc="1arnjpk1n9mkva1f9gsh5834kjb7m9rd49kgn3jf6acmdac67rv7";source="056b2x1fv2gvy7ldi9v1kgsla7jzhvl3lsd5wl1v0sb2rqr2jngv";}; @@ -646,10 +654,10 @@ centeredline-64672={run="1xrh8r00wrr29wiijpal0n6k48zzl5493zbfzfgwq115lxsvhp37";d centerlastline-56644={run="0wc1pwppiwycm5w3hp5ysnv3wgsw9s8m9p9ra3xbmlkqxd6zjwnz";doc="0f1x3wzxvgjxsgqparyjq4x32zbqjm88v5xdxm5qkiasai68r7q3";source="0ngxhlawj8igq7d2mhijpfcybfr6lv1jl82vs9kk7j8xrdf2nyr2";}; cesenaexam-44960={run="15n0abwviaz213q00nv6faxc67fyqz44mvp28zcyysrhmrcxw159";doc="0vqxkqgyg79kzfcxh40knxh5a3d2j6q3f778k2npfz70d2kaizj9";source="069n1sk2g5n9cqq9rchk9w5y40igh620a1j5miscgykcczv2y0jw";}; cfr-initials-61719={run="1wf5lcqh3jysn0fbzpmh429gmicqhh1kvz26jfl37f1z53g07shs";doc="1akblgsix6a59as4z5z6hhsncnsfxqh78s8gw0m3xqv6wrbv417k";}; -cfr-lm-72484={run="1fk6i02ak3rdq033dw3pd7chaa925rahdy4wiln528xh965jncrd";doc="0cvm29h85zakv0i3b89pjqywrldba6fyli2gxp24cjad6myjq0ng";source="0g29z7ispmrhbyx0icpmrpqrr9q3hq503hb5zj0033izb1ajvy0h";}; +cfr-lm-73889={run="1rd82hl14pczgl2xizmzf270qyrhg33q4g6c0x8lrp2scpyf4fhr";doc="0135yqdkhd2796y9378929z4vp0x5cl3spncwvqpcj9lndfy83a7";source="15kq6qrn8q9cnndm966a55kf2f98028qbkwra8arvadwcx2llgjv";}; changebar-71847={run="1cnqflpjsw3wim21ld1qdxm44qv5yc21pz9raw4sn9zllakr1mcj";doc="1cql656jwcf7skb8gqxwlkkwibrr2lk88igwgnd30qwamvd156lv";source="16k1319idcd7c2mw16sjcinl160lr13wimzwrf3k1kql4amav362";}; changelayout-16094={run="08bapli8zvv8p15bv3sj7l646fagzbj44dbq81apb8lhqanvlf0i";doc="1s304gpjg30kpygvg4r8r2j4bk9fg8vlb331lypd3dfd6slphm60";}; -changelog-72305={run="0gjgjwibnnq2x61wrmk7jlih4mddf6fyn9dzfa0a8g41drizr5i4";doc="02ld4rpa40v9q2gmyf9mj08bx4spxnxskbxkm3d5dyd0p5h2rq85";}; +changelog-73157={run="019148i0zs4mp3w72kgryrj3dzkrmm4vpr7d3v44aqa9rjmxjsmv";doc="0x4xpzi30qz0p892ar5g5r7q5vss2qdqpj36ixglkdkzpycklzx0";}; changepage-15878={run="070rd3drhaaw6z386v9z5rs7dmf15ci05lmlxsaay3s1ry1425bc";doc="1149csn0iphkxj7p1bhkza8v6xj39k49rylp84d1ilckf1q4imng";source="1slacsdfrjyy7hmhj4ssjkh0ln846b2ds11g446hmdvckyvz4363";}; changes-67201={run="1cqdis0b9k20nvfc912xm99h6l36jzssszqrgcshl6m2kd722if1";doc="1r03j3g11nh23misg9prjrbl3jvf45761jzbxjjn4pajynfdpm63";source="1dzmdnwh8bbg3ysfxqq9x9nw44bz55f4gl79nn2z2c80f99sqvx1";}; chappg-15878={run="1lx2yw7xyvbhvmcaj5qk2bjfmgyr4dn7q0v8q3xfkrnbzbzmcajm";doc="1c9qkc2m4rcixnif8y1zvcc0mzwjhzsbrbmy1cqv598cysc2yaig";source="0fzy53whj61n52k1ashphabpa076244dqjy1v7icrb27gd1y86mg";}; @@ -658,7 +666,7 @@ charissil-64998={run="05ysp0l1v2azbr1gjjkh8mh1qmd7rq2znns60p2ic7dsfvfr9kpp";doc= charter-15878={run="1z9145ri2g732bs4fb8i74gc0ymak33k7sclahln2bhdpxi286fm";doc="0gm9pwanxvzv0zmxq6pf54ygxaxvg56kh1ym6f5ij9akwvhf6nwb";}; chbibref-17120={run="01gyfwsfrjy7fs160zxvzhr517wwbsgh381hk626kvf87wssz2nv";doc="0h5vlzfw5lfg7chqfmbisqydmjn513rjrvw8pax4xlm75c0p6drv";}; cheatsheet-45069={run="1cqv885i4crrramly68wamd9fcx0lj96vzys39aplars3pjv0glz";doc="1ykadvnpwkyj701xwfpnlnqr313d33r0yigmsscshgr1dd52jjf0";source="01hd52i399c9nsk68ymr8hmllxq1vl6v01fvs1gpm90pgvgdc9gy";}; -checkcites-70397={run="1yysb7nhlkk260jsbslcqjxax78q3lwjkqrh8spfz2sjp97256m3";doc="10hy8ib9y7adld85w62nyi6im15frvi3ym9alk7bpqrm7853wazh";}; +checkcites-73120={run="1nqfmvi9kwqh9zrfywm1clljnp0wsvm1f3nl237q6lynar1d4pp9";doc="0q1yk08b0fiicq03j6q5rkxhmiz3s6zhlgkg4kzml4r26vx7qcr1";}; checkend-51475={run="1g4kx83kkpdd4fbd70b29hv82gbf19avd04b3bcxy8d0r7zyyyad";doc="1hzllxf7pnp7kg2623i5yhl2xq6phifc4jc57f2zfgfvvw0hqihy";}; checklistings-38300={run="0hs740rpar4jckxc2p8wwd8x39v8bghgc2jjrbca9m5zbr0prvpg";doc="1riyj6x57jb28sjswnnfyqf80jnkvyr2cvckav29j9ni8l970qp5";source="1ghb0pv2zmznyg12zqgljwd2pc5lbajgdnzr6zf2rrmvlrsgr38w";}; chem-journal-15878={run="01s4sbmc4g96cmnbhx9a6bqjskkrr6saq91cly2pfy5gr256vmnq";}; @@ -681,7 +689,7 @@ chemstyle-31096={run="0a0sd2sv9g68alicfvm28b13kdipyrlck9ipdb3ybjjsi8fn99fg";doc= cherokee-21046={run="1h8q9ysfnwdc29kfc6yj4545xk8cyncl9ns5a465kh6li01zw5i0";doc="0ijq61im5wsv64qibwcllc2mi69d72915c5qjk0dcnsn7k823si5";}; chess-20582={run="0r1danvrc979bbpcka5fdbnmxwiv54inxyd4rcsjkz6z03srbwvg";doc="0h6zcs8g6gg4fq0sp2s6gihbyrs9kkvrbqr6pdpb7j3fkb2jr9m2";}; chess-problem-diagrams-72556={run="1mz082jz4xcmx7wmbq89lbm51lyanhprxp1wy4vkngcq8yy02a23";doc="155sq9yzwdgy565flbmbac6vjjdnahsq0fzr4c3lkp126rf14a9c";source="1gvhqgxz647qhlyypvmjcz3jb4nl8icxpin44snya6d43q7ka81p";}; -chessboard-56833={run="119dsa2mjv5kjw15349bjjz2xacnd82szwdb4m1hjqb3pkc8053c";doc="0gny7vq5cm7ibvw8fjnpbysqs81bf2s8nvjhs56qq3j7yg7ljapk";source="05wcy7c9arj8w9zsflr3byy31p0nl8g6i78bbkvw38rl9azpj20l";}; +chessboard-72795={run="0ycg5plbpc97yyrd9pgaszk8jml3sfph21mm55fv02nhznip47g5";doc="0q2w1rcbf247w6pi2f7h55bb871r2hwlgbiddplqzdn21zpa9bpj";source="02443qhgipzp7iqkbdb19x0h4gbfqxy8lh8c8apfafw6cnvg3lli";}; chessfss-19440={run="1bi0lzxr3lr8nbrxj8189ycadm16l66isgslqjh1mfqyggz65gkz";doc="1xrdlw5z6dal81pdkhx8lwg18fzyfy1v4agq93bw09i94045cvih";source="0ryd536x30rv71pqvji805f9fm8ix6g6b5jravshrrksk9q8qw9j";}; chet-45081={run="1ngh07j5kjp5v1pmymckqnj9knjadqzs8ia4h4vdyxp4zprgyqv3";doc="0l628j4b4m7a5p3vvzz8rwc236wqqs7vrf698gfj8gjdbbv0c9cz";}; chextras-27118={run="0jb9dl29m57hby3hi2cfwks99xhrnf74d3fpan64852gvk0shb4j";doc="1ijm0ymdd4hh8sh4m5kxmny9nfn704prawr1c8x7445k9j1m2d82";source="0kkbsx2rqakaxq00nkvws7lpilzysxkmsijfxp1vyh73fz9cb8jk";}; @@ -704,19 +712,21 @@ chngcntr-47577={run="1a61sdmfbbryqd2gj87bm4qsva0xjmf9mkxhxnjixpqmr4gixq8r";doc=" chordbars-70392={run="1l8m2yxqrscsnwp6cgny978l4qz4gg08bicfs386rgsfyz43qhcv";doc="1y0zr4hxcqbdm1r6yrsnkx2gsbcjagacpp119gg98h9y80y5ipp5";}; chordbox-51000={run="09sghgyq6mv3w0m1vlcf82vjbdkb00gpiqr6iwlimpqjrv09bp3l";doc="1fykwcz8d0ja7f5px60qf7pfzfcw447mrfpbq8awymr1ilwgmz05";}; chronology-67973={run="0jbczd5y58a6bjlk812ncb1ckcsq1d7j8ghmivx4pr5pfcx5lsqk";doc="0g5r3by58srdydm0gps4ybsmihayir3qf2lra569ywgxy06hqpn4";}; +chronos-74376={run="0l1s640q0sykn87kabgf0iqpjg880j6s1rq8qyr0vvccqppl3mia";doc="1z9g7q3cb7g8zqknfsypgvfqy73av8fvz9xpfkrn4dbczlm3zs7q";}; chronosys-26700={run="0ii3r31dii1252bg0xfh4818az1snrzfx7h4ibr6rd5q3a83yisx";doc="1c120hcadb7xpkspmixhfrdlcmhl79jrf1wc0vsjqbq3wxjq1p55";}; chs-physics-report-54512={run="19ci498mf3yy0xhmq4ghy8yh138dzs8953ki2mqn9hj6jjx71yfm";doc="1nfmbhp3gqmf2pdallpnrx9hqlb8cwkndfri8i0mh411hrh72jp1";}; chscite-28552={run="0db7nrmm5r4b2cvcyjfra1fmskjaspbgymjsl4vvif9j3kwaa0ba";doc="1q5s4qj508nqy74cdcg8380vjbhs4v70a4jkr9wdirqcxjxs6yfn";source="009a8y3lxpxjhkd05fcf308k3fihl95pcn7r2bgy57jr4nalmixx";}; churchslavonic-67474={run="1x3b3l8b0gbariw3c48pfr6ywfxh304vfbsi10f99i3rhl8janac";doc="0pjb7dpxp0nnvh47vrqydd5gs4ld11lgf9m45nrzs1x8qzlx53ah";}; +chuushaku-73263={run="0q1pmffagw2s7xcsc7sbj4nwf6rpbyc27wrxk7j81vdzyccj586v";doc="18bz8wf1s9flbiqyqki1fpjnc5cjpfvsjv34kpjjrsmf985vwyj7";}; cidarticle-68976={run="17a2cqb6d3n5g3jhk1l5hybmpjhqpf7w0cr8f0w8kqwm2h7ciknc";doc="01r547l09fjhzrm19gi7xwrvhfglf9a0cl2v1ikncfhciy6dvjcs";source="1v9qsmqhb96b8p27bim3s71ybarygksifanwgl55vha0408s3zd0";}; cinzel-64550={run="1v29lilvh6l5iynf1810p67qx2znxbm04wavj31w5q7rvnar81xs";doc="1j7i2bdbrfadw25ajkgkygkii3prybhp4qh5k8azbn7zpxl78q5s";}; circ-62977={run="1m6siikjprch991sqbchbrmhvh2knjh3895w48wjp9par050cbgr";doc="1zmyxc0iz7ljrkklqdmpiax9alk56pf1i4dm6ljpyisd95blcys2";source="1vdj8qzym1ihkhm628zz99w6xwzhav8ci0vlckqpz3y91nkkpxaz";}; circledsteps-67889={run="0ybaz7hl9v8g0kx8v7j8llgxvvhaj40afk5fi9733iv8m0w3mz47";doc="03426fkcxcjszpm852qv1y4kb581gdkk109cyfy7bjyx8ihrxq0g";}; circledtext-72238={run="0y7c64mxkrnzwh58l3jif0rlghyxkx7lfgwc1fphh124ygrd2g4b";doc="1ivp781qdrhrsiazggb1pf42gwsn0i5z0kqdqkrdgjc61y9716wd";}; -circuit-macros-71389={run="07cbpxyawy44ds1vy6kpp9cxgv2mlh78i1wakzw30q0bj4rksw7b";doc="1vfp5yfpkiwcidrar08awgrdh6gzr4cw9w5msv1zkaihnjzx41bz";}; -circuitikz-71968={run="0sid0pqyxrljp87i7ciwnmyvapj9rk6yn7426hsc66g347a9gfrh";doc="1cv4s1q94p5rnqnzf30aqa527j6yx44zvwv9rb9r0082z9rcwjd4";}; -circularglyphs-68476={run="0d8hr1lns0973y61qmmz1hg9pc99j3w4x3iaqi0f0jlyzxc5j1m8";doc="12s7fkjlbbiica7svrha74zh3va390ay87bajjs0lgx6smqfx85n";}; -citation-style-language-72473={run="1vd2nd903fn5748bgb4l2izlvqax8q80wiyvix79w7jg9qxwckd2";doc="11sfyymf6pyf168rb4fdnz3xq1yvssy9vrn6d866dzxy08gjwdb8";}; +circuit-macros-73012={run="07cbpxyawy44ds1vy6kpp9cxgv2mlh78i1wakzw30q0bj4rksw7b";doc="0wb5lzl3qxwr1y8aag0p9bpzl32z2d9mgbcd9i8ah238bgwm6hdx";}; +circuitikz-73395={run="0kqxsl24vm7jyd2inng14pn4jbppk3pq8vr470ivan3z75j67cmk";doc="0a916afd9zab3a8jwm0kgw80zvw10ymkwa5i267hvdhgzlqdzl0h";}; +circularglyphs-73069={run="0d8hr1lns0973y61qmmz1hg9pc99j3w4x3iaqi0f0jlyzxc5j1m8";doc="12s7fkjlbbiica7svrha74zh3va390ay87bajjs0lgx6smqfx85n";}; +citation-style-language-74250={run="1gqmwl5nj5njavp60hpq6pvfk22zws82yzag3k27cz7qs6pph5z7";doc="19k2vsfp1c1ni9qy70bgksw0p2wdykai097gzmg9c2kfprcsn61j";}; cite-36428={run="07nw7axvgir19ayi3zy0b2sp8bb9pq1nl36x0wv3nrqjilvgrwr5";doc="0pg5fc41iwqc1y9m9b47nh48fqp5dpnjbx14ny7ch9irxblg5d31";}; citeall-45975={run="05nb6pywcrhqi1c9xfzkv46j2fq9y1lqmqawi75v3z56h2v6c136";doc="1p54cr0khq72z396r3vl0p9qqn2k82pmx4pjaszlzhni5v54hbdr";}; citeref-47407={run="05bxlkylmilyzvbl99nsw16saqjsqb4bcaa68qkz8m59wz1ji4rj";doc="064c9zg2rhnym0wy2kxj0617mwb3mxpc1rr13lqpwb1f1qhghm6f";}; @@ -730,7 +740,7 @@ cjkutils-60833={run="0wl33vh7pcrbyvxy6bfcjfv0xnawp4gb76cmq2304n9mp2w8dg2h";doc=" cjs-rcs-article-71936={run="1xbl2cy3crj5ipwyxcgr5fx8rjsf7wy9klpdxfkv0byhd8h0dnpr";doc="1l4ihm9wzkzhqg4cbppr8crjilbq0696lg846r4xvyh2rxcy1frw";source="0cjj98laca1b1yqbi127l0a796zlqbm3f7iaa69awzzk0dxddxcj";}; clara-54512={run="19g2vpxwjjc3y88ghw8yv0abkm69x6lnjj4p1cqbdjiyy4n83677";doc="0dkqqps72wws7dhynan243wf86gxn4chn1v5iiishkar33xvvlzp";}; classics-53671={run="1l5p09agmrik9dkhwghjg8qh407bjw5q9hviykq7kf3y006dpzky";doc="0xp87xj7328ipwq0l8xgxn2baqm9zmp8dqyhv1iy68k9wgqr2f5w";}; -classicthesis-48041={run="181s8s8yk6y9haxz66ks1v6wwhpff2vs7lxrc8kshg1mn26bya4q";doc="1nxj2qflzs40mwnpd02bnbnh0ndm8rx12mr1vyyy6v3sc6g28yn2";}; +classicthesis-73676={run="05yghi161w4w1f49y54v0c59lh8iv17qvh5zw3afzfy9246kpgbv";doc="08rxnfs7fcdpins1000fi8wm8r1r966ii5cnnwqsfafwvz8d2r6x";}; classpack-55218={run="045fl18pbqs3rxjp05mcmzhrqs94xgqnim96g8mij5v82fc7c99r";doc="1875ak0yjxlvsn1gs97np1vhy2jr2yymjxgr72p25g548sgi64q4";source="06r1kpanvp3y43jc8vrskba6qrsi115akw7yjal528fxn1lypq8n";}; cleanthesis-51472={run="0wsib3c130m19r4z3ghipvgqvmfhi1cx86670ad3ama3rdmc3zpn";doc="0hhvak1l5zc4bj874rd0i6v15v70i3aq2dlv736csvd2b764g6y8";}; clearsans-64400={run="0wd2lhl02svzxl099zfflqk94nhs84qb3b7wzb8adh2b8z9489c3";doc="1nrlrx6chgk1ysxcpvd1hb1qpagl3n7x9h0gzfjf0431bc3fxc83";}; @@ -738,7 +748,7 @@ clefval-55985={run="1wdxl93z0svgg6h7vdhzqp74clcldxqh95yimqb190cbm6v5ll05";doc="1 cleveref-61719={run="1d4qp3jl9mgv4afgdgcns5rr7agn5smiwqkmrasqchj4hqzwxhwd";doc="10wy2zndm51fy3d80cqnwsjxyczqjjffx61ir6ky3nkmiikiyypn";source="1qyyvn226dj4yq25cf5f7yzc3gx9qmxmnlnjijydgmmwam71s3xl";}; cleveref-forward-70649={run="080mcxf1aw9waaljgbkz42c9d7r6mf2k4s60cmfnwj9xwr3jcj5h";doc="1l4ka202flw12gj208y4yn7p0499ricc8xpkgdywmwy8ikln1wp6";}; cleveref-usedon-70491={run="0j2i293c13knmpv82g2b85a1y9003dxvizk073617qf312jb8bpa";doc="0kprww9mxfr45y311zky7gfhxvg5lrkxfg0mdkfgway0j2ljyw9x";source="093ydvc1mzkz0dds9fl107bj5mghdfjwb9kcfx8hw9ss9yg6bv9y";}; -clicks-64602={run="15v0yjrsnf4hqvmriffdq7x24cxk9l54a5s967nl4pqn1iavsqd7";doc="1givgqvm29fa1kvj556hfda3z1hhfzba2b7jfj46f8zsifi17s3q";source="18dpkhvhc2i7m2r5q0sp5m0zhzn1706zlknybcv3zxsnpcs1rar9";}; +clicks-73208={run="0gkbwbipgfrxncg5d6jpgqk8sqabaff81x29j9iablp29z8yvvk1";doc="1j5g6lx6m359cgjpn65n0a5k8cxbw1ky47yh0ahrbpqdg99ll4qh";source="1nc0y935dx89q8wcdhhcd6y5cj0xwc660bn10m2gzcvsz09bzyax";}; clipboard-47747={run="1i9facsdigll3rzl8xv1i85cqyvlc54xhia69cv5cv0gly00p1dl";doc="1b6wvadihwglj0653bn8fnnq18whx2hymigvyknw00fyn3xjgvgk";}; clistmap-61811={run="0xl0310x3wrk9lhwhbqnzi3gsvmbvk5smd4wq50wj691vmag9ivh";doc="116n1w0zfc6ad3nnq2wvjibpl4ywcfbgffax43vml5aixkpdlcq7";source="1cr6hbvln8mvrs6g8831153l62b4h1k5731s2d0xdm46wwmq4m3q";}; clock-15878={run="0w5z1ffi25nabsaqh91glby7ifn40c9rhzxlz2kbyvbrdg6a3and";doc="1wp9hglx1vw8zfa182m2103xb0rhg9hmp51rc7bzm6fh3iyz52is";}; @@ -778,24 +788,24 @@ cntperchap-37572={run="0g7211nljimm9a5fvry89ch4nf49xhad9ka7prdmlpj87h9ygas4";doc cochineal-70528={run="09bhgl11ps6zw62y0jvh2pfddxcgdc92scv9irpxf2nvjlyy3wg4";doc="1lg1z4nlw3w5hw1ivhbbk44qg42m8s9470d64pgzgbgfsalyx4fp";}; codeanatomy-65648={run="0pi4w20k4qcm3sbzpd2dsdpq6r0nblgjm2s3m2gclpmsybzmflp2";doc="1z9w6llgjnlmiwkz6ghv1cf2ilrfvj0r1k2c6kilsz4jcc457y3z";source="1vag4qaphfw0xrdl7b082iwj4z89x77sh62y05xs0f2bib9qlcn7";}; codebox-61771={run="0s0145rdpqbbagc2klx2w5h6mlx4ns0qlllws31qbvy6byh65ngk";doc="1pj5qnzfa7725v6cixkznrs7yybc2v0ik9q2pxa4d25rpfxap524";}; -codedescribe-69943={run="06pvhd7v4p58hdi9x0ipmwjy84x70c65phvcbayfr0d5n0hrjvi9";doc="1ybanfz0zrbflrwdpzrpxk61g2j4zwimfvjlkkh2xrjvsmb95x6r";}; +codedescribe-73933={run="0bxl6ir5wkmh1v7xjcghgaxqmwsq4hv9r245hayrkvp88ppw5hd5";doc="1g4ymzrshk8fiyagfhsf2c9b68d00drm9x2g5x2whs3ivg4vk8sr";}; codedoc-17630={run="1zz70vp8ssblnacrqdsq9nwvf1lw69mlk9d94cfjc818szcgi9v6";doc="1f3i3vw1cmdvgp05xckr748kzbairhvdpfvr844y7wnmxzr4rfzg";}; -codehigh-65787={run="0nls47d5md0b46xi1nxydzwf79xrqh6ijj06h5n5mb4sw7w5qylp";doc="08d7vyn1s4gqhnbz7f935n96ay9hk7k41w8msg8j9s937qh7fb64";}; +codehigh-74191={run="0jd7fqb58hlin8zn1xyyfqqjm9f92nclkqlcy9qhn5x0c10scxdq";doc="0adk0248s9ncm1vkrlw3d7d0c3ajl735af5lpilzsbj1b8yqzzvj";}; codepage-51502={run="0kxf5zr3mhn5pd8pzmzslgnngk8gms27ax6cqn1z0n35zvh0p17h";doc="1sd01q8lzrzgk9v1dyhf4m7a4fspjll3w8wwkbzp7gc693xg3lm6";source="0b38lcswx2x1jl6ydmvs6yr1y0kiv6gdicnbrx5qs8xhwd93bcag";}; codesection-34481={run="0qp4k2z442idg0mjnancfskj0j0k75w327fixjgdq1kl9q6jm9p5";doc="1fs5qhcm1cil5cqi8dh04zxcnv2imq4m77287amq0mbh3j5h9i77";source="1qfnls0g4z3xsmh89wjcw31gm09c7yh1g99ksf0x9ml6yx1j8f3l";}; codicefiscaleitaliano-29803={run="0im75yz3sw89ky5lcrcjhg6k6j4sgkjfn6v4srmqzcfdmn2qyx7m";doc="068234c0shvblzkcgl67a9s9whcbyjy3mjw60i8ljhs5z5wjrnc2";source="1vsb7dk4mlaacl9ls17lm4xdw27xzdgvng02gkfjvja1ja3cq4zr";}; coelacanth-64558={run="07y3hgw3apkkncch9qcl71l5xaff8zqpgcwf8is7wz1wx173hafs";doc="0ylnvl6ya87aivb10z8sq2rw02q3kljdiddjfarx70mr1jzr2hma";}; coffeestains-59703={run="1sfxi8zimkp76nc3fg7r3qyf628sh9p8rh2b8l0wq5aga20951n5";doc="097c2xgrgy95w7v5xb9lkgih65ji5jlxzdm6szdyqnf659bmibm6";}; collargs-70689={run="06c97c9h1ykxp4b8y3i4jlv6hlmlclva0j0v3d5pnn1l2sqyy6mn";doc="0hnf25h5bzlj3ba18h5rr21br0cra55s9qrcksips571d5fv0363";source="086y5m4n9fsd5cp485vqjxyyq6bf671j570lhq350bb0ynid6llc";}; -collcell-64967={run="0f0dzdnmmi4cpyg2qfdxkdl83qrcsddpqm7z9g9mxfnx4lf86y3i";doc="0wyvhcw36arrgnwq7zc8vck3m37qrn7my4r6959p4i7zhpvsazzz";source="1k7s9rkbp829wlby7h1hwlv48bzxwwghcsnmlxrs7qnh374dwb02";}; +collcell-74192={run="0d88sziljrzdzxq95lw3sr0y3pqz8mwdfn93y1nls13acqy54lvz";doc="0cn5c90l19d5x543ncncnb9kvn6kll1pyim37fxvxgrl9q9k1gxy";source="0z9lxlnk5ff1w1r6hg4mrkk667c41v3kkxs3hb4pfa1syv2l0yi1";}; collectbox-64967={run="17bz2nh141yw4cffv1w6cdnxkgi6ilsr5fkzkp6h5glfibmzhi62";doc="0j9hs1q8bzm4p7rwiikc805khkar23722ylf00yb7mp5mvky8996";source="12llsyfksri5hlncmj3bba779jhwxxdr9zcck02jmrvx61d1znvh";}; collref-46358={run="0q1g0x0bm0qjh568fp45b1ljy3w3jgy6s09ji1d1m5yrbs4dm7qn";doc="0vcfrdg9mqrfv2jlxh88g0nhpsrfwgdg9wjdn0l9b4c5h8zq030c";source="156gdfrd09kyxjiplcm38s3zj8v6bygwlpr9g952m0r72q7cq54v";}; colophon-47913={run="0v8q22qxjrbc1mpsmfvdp13iwkjxp11cxs86h2b7b9rjs0cjxy6s";doc="0s2kz7q6nkwc19jyl32rzcbbcm7ykhkglanx010xfz08vgirk1pz";source="1z2dihgwd4vbk87n0hzpipm2359fwl1z13fjs4g9r5ys7iv36wsq";}; color-edits-56707={run="0p465bc127rlm53xngrynmrxswzmp1xsivkfy3mj22h4ij6db03c";doc="04zfa0jryyw79rz9s1c0yzr1i8zla7ivvfw701f8la1rab7z6q94";source="0279n81xyiz4ipjbr1jdl0wipfy1lkl18jx8mbqcbwczw8k4fbn1";}; -colorblind-71253={run="1z9j493z4xn8ryjp22zf8r1ngkg4a4cq4nwh1ngs6af4zdxc6plz";doc="1kzawx26niwmcm4ly239x6igbhjjxgp73n7nhara02aqfz7paamw";}; +colorblind-73199={run="0gypxpn3x9gx2n8qm2qbn9vz6l73rsd02gl6skkpgm647bp8kkl5";doc="1cvcqk6sz45hwb7b74x60z7300abqds1ckafbv283irah38rnv4n";}; colordoc-18270={run="1hay7bb0xh2n2j9clvbn5ayz3jq0yjaixi35isdsf9ysvj81rx0m";doc="14bw1g3dna2ykyv4fl32gvqjs0n75vlfpc9icdk09l7zhdspsvfn";source="1bssn8rjrp34nm6qhmzcrcn6a0ah9lv5n94d1jxqhhaj4pmimd2j";}; -coloredbelts-68747={run="1y4ds4n6b6avqaqbnj5yh369bnp1f0w4mhnzkjvibhipis7n11sg";doc="0svl3fr6df2mvqpf8gfcb2byj16hbf2szdnbi8scbvrww68jmldr";}; -coloredtheorem-72298={run="1pv4svk20085l14c8qganpchfsynhc1j3j5gbww4jv1gm9yln4kr";doc="1l4y3gmyjwjqywvkv5v3lg4h6mslawmp869rrpq3s121xsdmk8ys";}; +coloredbelts-73069={run="0hpm1cdfayv5m1xvdwyil0namqa7fkblp09l8jy08r5853fa7fvw";doc="015qsqrj86410p9586xrc9bqd4rlrpbka5dym46ingrjrnqa4sqx";}; +coloredtheorem-73397={run="1ari7l9d6nw227f037vsvr37lfymyb9jfa9q2xiya31apzixczvk";doc="1abffbn5i1a6ywhwd1gl1xl3awxfllpc2cpad4fy83hmwm3bqv1q";}; colorframed-64551={run="1kys1kcq1j3c4d8mv22fgdw5l2c9ar3il8cc65w0lx4avbldw28r";doc="1xg0gbyh0ay38yk00in78q7mysnmlr4maxzv5lw3s88l0adykr8h";}; colorinfo-15878={run="0ip7py03xrsrn40cgkl4dnj3q9g0f9fbw71c9rsg9j7vl82fdn46";doc="1185m34382n9rk6w81ppb414vl77kikkhwvn78aahlyli4il51l8";}; coloring-41042={run="1ld6gknb8a59pkz50wlil5p11mnv6ss0zsjbajbw63dg0zlwaglb";doc="18y8apbkh7yqzxrzpraqhd76k93xnvgq5rana8lq4xh5z3f7skjq";}; @@ -816,7 +826,7 @@ comfortaa-54512={run="1kfxl806y2g6axx8csnd7njyd0skxx1gpw7fm3paz8yrzvyyw89g";doc= comicneue-54891={run="0w2jbwfzfhbm5375852zv9rqih3p7grvi0s79sxr6gpzh7iyvlxr";doc="0wr71zjk337h9p38nm67ga8js60vqyqfslwn7dqvzg06p0741bfk";}; comma-18259={run="1xaq59fm295wwnpls4qfw364qf9iyg97xhsvglgnnx8w7ydhr68a";doc="0g8jpwf1ilkbk59p4l372is00qwhfbsf8f3db1mxysmlxyf0m535";}; commado-38875={run="00by3sskyr1hfc9wqazn2rii739bhl2fhlwwp83h6wx98h51rfx3";doc="0mk7k9gyv2xxd3l7m58dsirk32cn7wbmdy9c0nc6i1jyfpsfhmq4";source="0719a7bp07vf5jgx00cjdgvzfnv7wbxrxna2bdjjsfyvipyr4z8a";}; -commalists-tools-72641={run="03csl4095q2aswg9jzci72gkiksms82xbj4gpb1xxkramw2xiwbg";doc="1gk89k4z8d7vln72b5pkjy52rz9sh2x322rj4lpi1yck188fpifi";}; +commalists-tools-73069={run="03csl4095q2aswg9jzci72gkiksms82xbj4gpb1xxkramw2xiwbg";doc="1gk89k4z8d7vln72b5pkjy52rz9sh2x322rj4lpi1yck188fpifi";}; commath-15878={run="0k3s00r4l8bypv1166p8jkdj1wrx4ar4w0y1fggmpzivqicc02g3";doc="1n2929g5jhkrrp7fs237h80571m31dd9x0n2dhnqfgynnc9vasrd";}; commedit-50116={run="00anqgix8vydq5ssblg5w5i8pziy8fvlva2kpwy5cjjiqgpprcd3";doc="0vvnkp8r0xbsyvzps4a20fr43cj2559cs6mq7jhja6jzvqqc6mic";source="1kzc8i6nmvw7xwz9fbfanabypissbm7hnmmgp2m8r462ywzpa79c";}; comment-41927={run="14k4y4abv5mlhn1i8f90bxfymp9vz0aha4p2gql148wj2hh7h96m";doc="1589g0dah13lw4p18cqprhfnh1184m79ddrgvc2l22bq6vb1dsb6";}; @@ -826,24 +836,25 @@ compactbib-15878={run="077l73vb0rcxy1n51r3wmcb7gma6nn3xrl543a67n96lpp5xvnnk";}; compare-54265={run="0isr7gmskv55cr4f1fa7s478v6fh65q9ijxkmbpxj0448g9817w4";}; competences-47573={run="0hijar81j2jpwk5j2hrgaxb1fnbk6qh2qb0qbbmhsqrdrfcl6xdl";doc="0ywq9f2a1fb584kpvzwg8b16qc7bpcn3dzsscs6ndqbgcy0zc2yf";source="01dccp2wqdy52kp79n099v9lh1vfambg0b63amq37ac68pwn3qp9";}; complexity-45322={run="062xi5wlg3axhrzc9a6nj068z7nskb7qwwk2wr0fzvsflqa9cp0i";doc="0yzdyn9j1jk0nsw0l4r06cr4brhz1f3lfxc918zalx6h9wnkxi2b";}; +complexpolylongdiv-73238={run="10rdd97w7rcp3bakz6w7rqqc8ndakrjd57diwgdgmswcvbqpmd2v";doc="01cingpmgirc7chqppk5bbrzac7jsnnghpmvxqvrp58cdq9c7mzh";source="0gms04afi4hikaxifnyijnxvgnzdxql2whygwhks8qrl0ib7x1r1";}; components-63184={doc="04yg9hq0wcyi1ag9y9m2fnf5h3n4fdykiwljgpw0kyc73bfyhq1m";}; comprehensive-69619={doc="0cmw36bn6pjb6ajlrg2yz5imkrxihzzdkh56xwdk2abwzaqn09q6";}; computational-complexity-44847={run="10as8msnqa06dp3hp945m42rgbaqsja8z4sc79x7n77z6qzmznvl";doc="0dq56zzw1xzzpm1rdjkqwhr6v93xiv00c1g2rmlmfj5dnbzng7wq";source="02mapvsz8j1979gy7pmwkdr6wq55v0al71ffl9bi2bl7f5nsz0vc";}; concepts-29020={run="18vjncdrbp7m7m08dnfmk6sgv79jx83bc4yvvcqb0j9mn9niy1f0";doc="1bq82dgsl6gqnrs88dzg07dn4rmc4y5by8122zqaqpdrpjxhnvax";}; concmath-17219={run="0m98kyji3v4gg1a30phmn7fwssnnbdvyjxvfpl36lnljnicpg28l";doc="1392wq35zidk71vxybrwjq79p2gf4spcv0qqb07dsgapbhr2g0aw";source="1zn35da4jlplqg7fb5ibzaah2yh1cwjqvzmx45jxg0hnsc7xmlfd";}; concmath-fonts-17218={run="061kfzds7clbxyq62ilxwcrdkfghi2lx8afik7vi9gg0hysbki7y";doc="1x6wb92k4da01sv8b35p3bly9hj46hh8k9wr22m7lj3rxnndnpcq";}; -concmath-otf-72660={run="03fv9650z5xcd81bwwlpflx81b6f2chn659w39678a2npd0n7pqd";doc="0j4g5qxib2w5g1fvz1n1nzg6mk9k20lzfr7pz09bp6gli8hach4s";}; +concmath-otf-74012={run="0804l0f5r2w8myvyf2wh15ngd1nfiyyxlpd72k0djvrq4d0nk0zq";doc="0x4rq3qi177p11bkx2g0rrdvgxlhjjypaqw674z3ini21ns408hn";}; concprog-18791={run="08yr8yk9gp35d0nvh54ysgv61s062vj446fyb87n8jipfm49mj2x";doc="197p2bdn1rqmxva56sagvb1z7kc8gwxr9zf612r6g8yb07xg5riq";}; concrete-57963={run="06m8d6z5z3dpj9i0nvp50g6pn9j0m4n0n1j3w94nml137qghawyg";doc="06z5hh9ksr9jpkfchyh2zp8b827klb4v282ipizrm1dvlv2r1603";}; conditext-55387={run="0g6clck3v75yvg7gv42w24zv18vi5jcg1q9k663cxldix77lkgbc";doc="1qc7w7xfpxarb82hf66f3i63v7ypdybqwg5g3j8qswj1a39cy1wm";}; confproc-29349={run="1s4mv0g2x5mfxnkp0i29wa3ncbx9fa05qqf734fjppdzsgic079i";doc="021kbis3c73gnavrjhqa34fsbq5c94lmjym2d4ny2wpk9xagh994";source="0dpghxh9mq2sr7aqgcj15h6b4xh7x5hvdzph6606izpff8ac7h8c";}; constants-15878={run="11naj0z8ppb6h07r7cff0lcmr8zgc29kp3x7spi60zi6cq2546gk";doc="1wgvq0x1kjgd0bs0024fkh7wis9aw9qryd7y0igrbgdgc722pjnp";source="01skagh044v62vw12kmibgd6y42z5r1glrsvi9y0h76vs52jz7hr";}; conteq-37868={run="1h7b98qw9hl73gh4zidy59z4rly9afnvmah75jgvh0k1v1hm09df";doc="0kgdggc8gpd1h7kdbh3ala5kz8rs56bgmwgv9wvxsqx4sn19q2fy";source="1y0g7sj696d6qhcw8vrpxr8gwik54slp7lijbxz64ksqbw5xjqv8";}; -context-70360={run="0y4by3fp7pghm8p5vr03wqygllji01a8bbina6363mibi0ldkc3m";doc="0m1rlhr5gh3labqsa0ckd49gnlvr4gscasg5y9d6ciic6ay98zh9";}; +context-74490={run="1zq6zl43zrp3snp4i01l2xzvafai93z5zjvmkx400rxm545yby5h";doc="0m1rlhr5gh3labqsa0ckd49gnlvr4gscasg5y9d6ciic6ay98zh9";}; context-calendar-examples-66947={run="0asc49mn24ql4fk73089viy3s6wff865xk8af7h67ffsb5qjnld8";doc="0wza057wz18yf2zl1j77hddzimwnraw5wg1579ncksywvhnmx3rp";}; context-chat-72010={run="0pk9v8hixn5b938srl202ncjy7wlxxk3qxcqf90p54xhvx3i7yhg";doc="092ygqg777232rim12sxly1wyh3pd4lngi0417jq77xki2v1r4vc";}; context-collating-marks-68696={run="12vqvbp7ns9r5nc7p7nrlsll3jp3hc4xi9wjyjq8lrmd8ly3v26w";doc="0nawd3x4rl73s4mhpq2wd1sqa8i6k2n0a39sqcaf21zx99mpiqp0";}; -context-companion-fonts-71648={run="1za6k7c01h0n1rsldlf5pkwcl150bxybdkrp0qinvixmymscl3ck";}; +context-companion-fonts-72732={run="10ic9wd239hw5sjwyi1dkzc9mah5vjkfnwh9w78i8amhvjf2qd6i";doc="0k4x5d6bmafj7dvdhqr4214gkj0gxzi0k1chi1pwm33zgk5nma9b";}; context-cyrillicnumbers-47085={run="1gk4ncbfzilj98s7k7s43k6vb3il511k434aj34fsvqh5x9x4aw2";doc="0f7r9qgfc8h92jprjqa24q4vpz4bqrrns3glhmwh3qmk1f2gyw73";}; context-filter-62070={run="1vj8kimqsmn9xhkh22pywqbn4sal5gxpxjbcbv8xmxcrby02gsfn";doc="1f6phdqxgvdg9c6f37m654ha6i226d88i81147h9x6sh01i7qd0b";}; context-gnuplot-47085={run="1pahxhbliz6fsj2va5pgwcs55b3rhsmfnjb9qjxkz3gqzrzdkfdp";doc="0l0qp9c0yvdrf8398wyac98ghrdc86lxgzr5l327gmgnk8572gxn";}; @@ -852,7 +863,7 @@ context-legacy-70191={run="0cbqnp7bpd782vv54j8grfkiw0hwzrwlrkalrb99lsmba9lfv86j" context-letter-60787={run="0bnd56v120h3c235n9v2h6mzvmd6fy1g837gjim5fkkqd7jyzp2q";doc="0l4vgrpha5kx2990kdk4pdfljznlczlji0fxqsxs292yb3yy5a4m";}; context-mathsets-47085={run="11r30c6lpcvkx7awgm70cb5darl90fvpnf37hj2mb7h69d281hv6";doc="16qckniq5v52m36m05bpnqypfz2jn4430n5x5zazx54j8makv827";}; context-notes-zh-cn-66725={doc="0pdizaybvxvzh19451x90mj81ql98q91f6cj8mfxwxa0mci1b9p4";}; -context-pocketdiary-66953={run="1pm8zaypfm575ryq0jzpnwf5p9zjg7hzb6lnc636cf16y97a1vkw";doc="1yy38pa4m7bqfb0r1wxj1g3zdmwzgdil35g2lw63ww15y03k7w0j";}; +context-pocketdiary-73164={run="1bpkm1dg7742916wjal6kzkfmignvx6imvgmkbmpamzns9la6zzl";doc="0nnf48vdgsi6pnddh935ikjghsdv60rcd103b4ma3qp3whfnzddn";}; context-simpleslides-67070={run="0dgmix9w576vxmffbm4digcp00vvdgmdxmxwjzrrkici4rq31w79";doc="17djxi04rhg61fjcmsz4yjp7mnc7g1fbfb9mmkcf7gk8dwzrvigf";}; context-squares-70128={run="0l56p7zf7f9ywb66v6cppnqh4k6zlsvwj37vxcwshwjwl9z3cfmj";doc="1qxcy1qhk77p63h97qad3jvvfcmsgjm6b81cn10aakvl3sniy7g3";}; context-sudoku-67289={run="0fnzvzpn2d24hdi5g18f1mpaqkyrcf8kvkprqdz1jvlkqld82kd7";doc="0dqzxcljl1mn7qs7hk2pahvc5791m4c911j5dv85fwaladhjv9xb";}; @@ -867,9 +878,10 @@ contracard-67201={run="1qvpz8ybjc7yx8zx4kzcpjchvxrb949rqb3905rhl61shpqv22hm";doc contract-69759={run="1z0rp9xb9xpxjrdq2ww4ggai4lvfag28s3cmsk1c5w2kb5jqdjc2";doc="1piy96g4vplzqrsvczhm7fp4wmq7wb15l4hplqlgnis3k9a4aj6j";source="1dg8zqbbpdaawwa1dh3vbh1q0qlgid6ib13cbynan4sxf4h8f386";}; conv-xkv-43558={run="13clac7dhg2p69ccv2yjzdh64yjx02y0fb0imx9lsd0knnb1j3aa";doc="12dln1r2qyadxr4cy3xbwn18s5y8yxgxid22wpb2i42n5qc8j1fy";source="02hz64vbcy7vg363vb86vydaa29g5cgji2mfpn640dgmqq0s91vb";}; convbkmk-49252={run="1hb4ahbgihnzqmcszxlq67bsiqprrxa9vf25q8yz31j70sg7s18r";doc="1h1iqcc1rjcvwg9p7xg5zq6sj5bi68s2cknsbwr6dbkx25ihwi4i";}; +convert-jpfonts-73551={run="1af437ld5nqi8bbmgp9pww2li5ldi6v5ra6895mz9i140x23jgwd";doc="022ins2j00fh2247q1ah5lr3635nw684cjgj83a3r8bp4hxv9m51";}; cooking-15878={run="053wbmf3xrhwjxp77f1myfvz3f474kpk626p8gds939yx50jqzvs";doc="1db5wxixparr81vanwkvg097ll58fqpp3qkh0wz7mbqjkansp6km";source="1gka18njp7ipa0jp1527mhig43hhvz5bcdpvs95c61cvjrmwcdm3";}; cooking-units-65241={run="1ainyz58nk9zyfg4isfgjk3g8gjw08ri8d1x9kqnymdyplxqankj";doc="1r21szkygn46i5263k6qryb1fhg9va71f3dcqxw1dh3f8f2bpcpw";source="0cvfhbr7zjcc8d5r453wkgmvnqwmx3qj0gl606sgrz87zhzra842";}; -cookingsymbols-35929={run="0kz8aaf7bp0y2ph0iia5lkrxnxch9r63iy7y4zpqcawh1ajl10ji";doc="0dws0sdcg13jpz23zvkw6vfnc34qc1s464nm2nbdybhjwc9gdbdl";source="1l1jkd6mcxdldvjyk9myig4jsi89mg6n4ab6ymq5lqf25d260h0j";}; +cookingsymbols-74250={run="0kz8aaf7bp0y2ph0iia5lkrxnxch9r63iy7y4zpqcawh1ajl10ji";doc="0dws0sdcg13jpz23zvkw6vfnc34qc1s464nm2nbdybhjwc9gdbdl";source="1l1jkd6mcxdldvjyk9myig4jsi89mg6n4ab6ymq5lqf25d260h0j";}; cool-67013={run="0sz3n82js8fq7fiffyb53ib1y49k0pg6bkbzgnzsk698y5w34v13";doc="1gpa5im88apgfqyv1l9g4mcmw6fmryksbx4nbldwlwxdvkwfwdf5";source="0ds25c0k113w365f0nylliiq1h76i753lfkccbbibs41rp2kg4p7";}; coolfn-69007={run="0y25dmrbax6wxzlrqmp1j3h6xnvvk0ls4f4rl5a4a3hi167yqrkn";doc="07xjbc9bj6chvjqv03p1c37bbqr1fjpkq468sx6cp0q6p45z17n9";}; coollist-67048={run="174l3x19lajwfghixzxjizxwqj8z2q9rys9wcly79gs8r3pmbxwv";doc="11p2s7wjrjdpzpgyhn4jnx4d98nbmbccbn6q1b8g3gr8h4mqvdnx";source="08196xxbx6fvhic3a9p8bwrr3ir4v9ikl2vj8z97m9zryrzjv1i3";}; @@ -881,11 +893,11 @@ cooperhewitt-64967={run="1a9jq9mfw37qavbqynyqpsc1i0hnbxwy9z58ipqqaffblqfj5xvd";d coordsys-15878={run="12vpxh6ll7q2jpsv85j68ij0m3b0335hflpqahk40dagybjkp426";doc="1jcjvd577886q8sqzcsqil81b2lm31vjxhbdrgs38fw8n6q9g0sq";source="0npd3qqigvp0i5zdgizm68sr1g5xcplgwfahrkak0kq4g882qmdd";}; copyedit-37928={run="1rl23bq3fbn4rajc744ra2prvm4rmh0wvhc7jjsiw7sw2hzv467a";doc="1ihvynh96vgl8ik237pf2pdfzclslrn0i7lc64skx3q7pmyv11in";source="0i2pwjj4bdfsykwv6bchp2p7x0gpdbnyx37ri1d27vl72yi72pw8";}; copyrightbox-24829={run="0n9z6dngf0z98bnzn6nl8yvy7dh1jmcdbqfxnzxarxzqq16f99ch";doc="1clg6jq9cja76j5x9laykndfqp0i5a4bfmqrxaa8rp6y2gnvpign";}; -cora-macs-72655={run="1qmd087c3hj2ndswb5rx41cwaj27h5cymvwxz90f2j9ws5mwhlcx";doc="1wjjn9ydvzs2365yx2lxdkx30fraccv90h74v7ahm61japys1iic";}; +cora-macs-73101={run="0hycp84zkax0z75rqjj9ydkiwj95w4agnxb2g1vanksfp2592war";doc="1j3rdjqnzbfcddby5r5dkyc6s16h0arij1kz0xhahsfa42jb0cx9";}; cormorantgaramond-71057={run="0ns1y9f6al6qlpd3f9hkz3s9p5s7gbn57mad52cvszcn0g0s43gh";doc="1r5wcirhlanz1rb3pk5jf09qwyr351ln7ikns4cxxsvrq75pg1rm";}; correctmathalign-44131={run="0dvgaqy8pkk3plhqlxgkxkiwyhfzwcyn391grbqv764mvh4iar69";doc="1fd32yzxj3l4sp5cp9rnwv3175jz5m5hxwlfm10x282g44l7mjid";}; coseoul-23862={run="0wqxvh5mnrl59ry0qahxzlfajgpp0yj27h0falxnr4m5iygv7699";doc="0l3z0fxsdlln0hjwkxf9ka9hw8zmmixml9lfy4kbrn88xq6z62yw";}; -couleurs-fr-67901={run="1479gy549yj0xla35f7ryvh7vkxppisvi4kz7ji9v2219hx4vkg6";doc="09fh8d9bgh0gmabiq0d9l7flkk46w8yzqksnfygmbprib15b65ck";}; +couleurs-fr-73069={run="1479gy549yj0xla35f7ryvh7vkxppisvi4kz7ji9v2219hx4vkg6";doc="09fh8d9bgh0gmabiq0d9l7flkk46w8yzqksnfygmbprib15b65ck";}; count1to-71526={run="0ggjaqkfjiramhiljfwc6bggky9c36r8qi33bnajpvjbsn4fsvrm";doc="095a30slswbymzr33ymwy2wdwbfn1h02i1wlfdb3kcdwgr3wzjk1";source="187xycnjnxg0yklilgjyna3raxrc5l1zf418xviiga4pw7ygp6n5";}; counterz-67335={run="1rad8irarp20xah97ppzipns4i2v3smd44sbfi2jy5dc0qibw0y9";doc="102axl32lgrdlav3fyzsahkcikmapivydbfwm3wkib624i1f1h95";source="0f8gspf0m2b78fr0jq7n4s3y0f80l1pc3qr1rzjfs6xdrg1nv633";}; countriesofeurope-54512={run="0387czqiyawxcjqh22czyd8f7y55kcrscxmp28rcm8wqqdh2ra0z";doc="0h06f5rpizsdqddqdvvvh5p3nhm4y5aixjnxl8s0b90wpcldwrpg";}; @@ -902,23 +914,23 @@ cprotectinside-63833={run="021581zdl2c4j6crp9cnrnvxpwdx0jhhx5ab2ax7016hzsxff8la" cqubeamer-54512={run="1r63ahd6m6ll0phqaxc02hnbrf3f6xjdghrhn7wdqxnf8n9k34ff";doc="0rgfjw69is9i06blv1dr2ki6d8lgfwg3w57r3620r7yffj7z9hpy";}; cquthesis-55643={run="143w42d3xw31dy8wdpqx01r8q9vs2an1ixnyil8n0q0af29j49bs";doc="1b7k2s3ils5s5yb3fdd6h0is494pss7s76awfn3dj6yxiaps5zvn";source="05gypg8zsdpfhp11rk7nii2vdw4rand5lw6ijkm23lbq2b5nwvwj";}; crbox-29803={run="0ni16ldwni2gyzlivd5ii2fdq15h6np4mv73raa5g76i5rw42sbb";doc="1yk96bajna3ihvyhx482jrwiccbmqdr9852w11x00xkcvvc6azfp";}; -create-theorem-70177={run="0lrky9yb0y301w5m2qc67x8adrkd6p9l5wwjamwdslb59cy8qn05";doc="0p3xkfxnvmn4l6fwp1nmzix5vvqjwbskpdncd19s1grymhyxay2x";}; -creationboites-68087={run="1mmj4xavpaqrim5w3cqs0nkrfvg23578nas2ndnfvy3zgjywwxxw";doc="0xsr0nvs95awhdjbhfd9baj7cchf3fx83f4cv5r6sb0l4lcwg14p";}; +create-theorem-72830={run="13pnxidnbc7arwzhwal5hvpk30xbmx8j58gfipqwdm3qbvm40gcq";doc="0k5x9gy2fymxzv3vx5dqj5f3xs86sa486qzgv8xswyrbii6wplp2";}; +creationboites-73443={run="13842c2dk490kpnb5ca7fxh9a2bbn41bax4i0aq7nb9a78x5a06c";doc="05rjijxjxx6b35mjbhrk8ndgmj2gk8c7nyshjnc8cmm6zhalpgww";}; crefthe-70156={run="1kwl01gnfr8xwk2zra14faqq4in4wijc03g5sdvgh2c7a9j3zm00";doc="02ddnb2399bps1qm8m63laixbrx6jmjnw7x2ivnjwlm2jg7zvhj1";}; -crimson-64559={run="1k6ff9fb5isv2mfm7zvnqziw1rlbs8qmqrlbixq33nrab24kb1zi";doc="1fmfghyxbihw6ggf4x2scx2g7464bwqy0yql38m4r0vmmjmzi34s";}; +crimson-73074={run="1b76mjvqcnbr0hrq3lnz3gprkgirwgnn7gax751hi5xw9rsm0khg";doc="0dhy6rvl2kw9ik8mgwyks33c5cc8k9g285d3msr9ii41l2lwfcjy";}; crimsonpro-64565={run="16jz8i749gk7s87h2b78nz6cclmgvfn35kh3869rsf299y4dbkx2";doc="1y8qngb1v6paqr643kh8sdipnp57lkbqwbk62r8nrxps2cvw06g0";}; crop-55424={run="1hnf65q6mg5fq75l4g81zvp4qqdb092zb41m6nl3zw2cvp8gal23";doc="1w6ql3bnghj633ar1zwbv580py4f1fmdm4vk7pa3q7vpnrwrgh5n";source="15fxivp8d1xww6j5nbfkmsb0b2c2ldmkdy3ikw3m6jjk269nwy4h";}; crossrefenum-70954={run="0lv90djyk7h2wbn04wsadlw4yqnlnawzxiypqiz3dz7icbrc40xa";doc="1x81f0pli9h5r5g68r48x15j44n3788n4qbnqyhwl2kah479zd01";}; crossreference-15878={run="0xc8d3g8j86dzpfxzfcildiyk8zi2apc9af88v2zg6zjra6vra1x";doc="1iahzjwns9zapa5y7z6yy2wjdcy6qiqrqvp9q9v4ky2zgsf7n5pi";source="0yajk2dxnsfy74r6a50zs4lc064aha0lzfqp26gpgnsx2h0bvpix";}; crossreftools-55879={run="0pdhi9yij4n6bwcwbk077sdvwi1v8ww51g2r9ssfnmvmxs4zjw27";doc="0q80k648b967q9gcy7c3lb8ywk257zbsw04kc2gazlc61scviy49";}; crossrefware-72217={run="0bddn2m8zfyrpk16ns4sfhw8c3avpayqzz1q6awj0r5bbhhm99js";doc="0dggn1is3ywv0hb17yprldq4vm0z2y56z2grf4pwaxkypj2xnwgn";}; -crossword-64375={run="1jx01w062yn2bpnpmq29rwgxll00x05rb2i0prz7gnhfv7g4iwj6";doc="012h0rf49rlx7kjjv5i86jz5v36ln437ifmzv0hh1ww6lg60phpz";source="02sbn4clwrccqkr41azpzng7ck4q74lhbqzcd75zdv59gll9z3r9";}; +crossword-73579={run="1r1yl87rra7g922bmij4xwh1prm0k368lxhay0hs7w11jklmnmvi";doc="1x58s971hbhi9rqlnqyp293fcm4sr5gbppwzikqlfnwgb21ll45d";source="1lxsv01waq5v8zyrm02j05hwczky696nm9agqq3hqcndx2jj15sd";}; crosswrd-16896={run="1c85733q3x56s1fvag4kw39r6lnx4hr1wmhsrjs0jnyf5j6lf38w";doc="1abqbdfk7c7cx1ij56q8dhz87bc8ppb3hkfmc2z5r6zv94l34n2i";source="16didvmnjfbd103skc6i9qbim4kav9vw76954yfqijz1q74c880s";}; crumbs-64602={run="0cka3j6aaxbgxvv3z7010myr7kdiva7jv7m1l4b7svq6j4md38vi";doc="0rxkzcmgvbm4mk26fwiw1wzng5bkf7byh43zdp4dh0mx82zn8qq6";source="0z88phhr4a0gdd3i4b5mvhcfxc1cy5sqpx7nvf1plmz34amiwcz4";}; cryptocode-60249={run="09jivxl23sxqpa16m6mla6zb584607ssr46vfg97c828s25n4rz2";doc="1ksjx6zcksrsligx58vg3pihylj22qqwan4r4bk7zqdwxwww88l1";source="072cqf7dhjyhgw31l8im95h2m601j1bhm4zfl0f2q7yzznk4jr54";}; cryst-15878={run="1jd8ny0a0mlhjdbigkkkkz1xn51s3l8w3dpcx5kwg10m29b3vwc6";doc="1rdclk91d2hps0xiqj4p0i4najjz9llq0nr9qvlj57h7ipyrahcj";}; cs-41553={run="0nzzcg1yvbslhqm5lsfcpqh6sbzkmnmmgyakg9l8855qpa8g9bf3";}; -cs-techrep-72666={run="16zqzgli2s0xvnnm1k7wi9b4fv0vs13g7k6ml6dwsgqwskk3r98j";doc="0zc1aqdrgv106i9m4swh30qspzfkd714kk48ahsyr4ffiaa3p91s";source="1x7q19zzyvak00ma1h246vvfw0ibrkqf7x1fhzccm2pnvjdvn4wb";}; +cs-techrep-73507={run="1zasgm8cf0qgdd4d8g9pdg9sgsdji6a4gkkik51rqcn458hlxizy";doc="01sw5dylk039kfv5i85nckscwjj806km182lkhcvh7g8vgzvzwbj";source="1n6m3rj3z470ryjbif587da2q1frw1inbaciz1p8lqb9fbwp2fyw";}; csassignments-63992={run="1mwaaf1ap05mp0lalyk89lyhqs26x4w1sx91vfsjxf697lndadda";doc="1w2mhq1yg24xz9a5ar92sky0b9j51nbb8k2k2ql114wafrkzzrnh";source="1k1iynw5nnnffx26ba5ydaay2qcz492yppcl8ws98xwhrqpjhx66";}; csbulletin-65250={run="1fw2v0z3a9lskwgbh1kcwv9jnmaz6pf3w2hg2b93zd8mz7wifvab";doc="13zdp3fqbmqil5scgdcy0ngd6gxvdxs3k8ngm6xq1bnq7wy1284k";}; cslatex-67494={run="1qdcnf755fak3kppl02yi2q9ghb17kxr2cyxc2y80idaafqgr9sf";source="0ig4a8nksmsm7pb1hxfy6gksfv27bgayqx60ygiaphcz0ir73546";}; @@ -927,7 +939,7 @@ csquotes-71053={run="1c9h0n86fgxzrkna5vr05g91gv1h45b9fjsm94hkz7xnp6h07fhl";doc=" csquotes-de-23371={doc="087c08c44811vd8p00l1xrkg5w6fsl8as64jq83m6gf1hfan9w4c";}; css-colors-54512={run="1q3vmcppk86v2y72g47ifp129fj4rgdq3rvzgkzdzwhs1q06ipfr";doc="0rjqim8zdmgrz5dff8bjkz9kk456l699k5nplhc8bxa6dn7yrfdx";}; cstex-64149={doc="1vsbq9a31ymvrj0bx48n93chyqmma3q7b49k7dmhb0hkic6h73aj";}; -csthm-72152={run="1hlhizcpj5mj5gix596ii3b8wjka1ap1rxbaqpml8rgxhgqmgdgq";doc="0cc595qp21bpa81vvmi1z625mbnv5gaqawqag6nbp1h9mrz5q3pv";source="1wd52jfsgglhy15l3s2wb5392wbmj8hwwz3f1w1hz2l1y9gchrxf";}; +csthm-73506={run="0vlln3ijyxvlgy3rhgc21ancxwqkv07f8pv2da676s1ig7sad9yz";doc="05j1npxkcazbzf92g94qw707ni08ipw0gcajd6hii2xyq0kyw28n";source="1nd8jb60yp8f4iqznx0fbc26q4lx0qk77i5j2vmjrbry2zn4kxwv";}; cstypo-41986={run="0lfg2c985h1xlnx1fa3kx1jjrhw7kmgwvalqh5127w20r0lrh8c5";doc="18yx6l49qk1ayaz13qqw72r8l8z348d20yqdm305nalhqyksv1bb";}; csvmerge-51857={run="0fyrqx85mklws5zny7gmmyscnsivjfvwmgwi52k3jk2c97nvsy8z";doc="18pmc5h44jmlh583cg0hjr24k2pj369l6ya4hqm9kwka0bhg29nm";source="0mggp5xankhif93firc5g01c6b160bkwqwbhc04wcm4ndlamvip1";}; csvsimple-72484={run="0wvcksc2lfnl3635nmpjfzzlvb734wjzcnbyrhcqv94z7knyk6lx";doc="19f4bkl32p5ak4zb5p1zxs7jmiap20lwwyq84n92mflnhzs5i4r9";}; @@ -951,16 +963,16 @@ curriculum-vitae-68211={run="0khwnk2mddfrvmn41y2d7p8704iidyaqzk7zri9gxkrhhhpqb4f currvita-15878={run="0xrcc3pash4g8mkmnzqi0llhix63hqk12vlwn98ipww68qnhfbky";doc="16v8r2vhvb9ssmnyj4zzgv2b2m10d3zg7wm2v6cn0p65hn5i76f1";source="0xrsqmaan5h60970d12bwm7k9nlf7h0flzmqhl0j3kbnclm0x8w0";}; cursolatex-24139={doc="048s5fg8c19s3zbl2dkmh8ffkicb8fd9n46m0iqrc39i0wrh7p12";}; curve-20745={run="1h1mfx67i3d2jr6l8qlfys9m6bqzn4x1wb74cjbrkdclyqn3lmd7";doc="1jv8f3izp9pvzh5qs3sh33c95v0z3wn88f278qxi0f1bc1k8990m";source="0l9cq8aji7z8qh0p45af8rnz0iw9m1hgc118482x699iqrvg96y2";}; -curve2e-67599={run="0cd0w4gkcaqswhwz8w011pn2g0yl96h8wm5m92jp646xsbq4a1r8";doc="18gcvpdckrsx42286xcdjlpmlq9s0541xkc8gx9f7s2gvjia8lr0";source="0wdqd75fsrihrdyg0h8hl99xlxgphwn723zx1rm73vzh4c5mhrqc";}; +curve2e-72842={run="112ggc53i9hqmh31fgqy47lbpjpvh9g42fgzqs41ssvnc75k879j";doc="1pyyygpyp33kkc4ixdrga9bcs66g427vnfznvy4nyx098841bqsj";source="0bc5r3nfw7prgvdb2226xpm1zwgc8siy3gkm6jzqkjjmqs5nglp6";}; curves-45255={run="150iv654y4x5lb3njd7dfjf8i0axlpf7zz6gx4wqgq06kddjr7w7";doc="1ddgy7gzw2871qsh99m0k90lgh8kf5883skcqxww0bl7b335qc8y";source="1r9c0rpi7q6ishzaaw7qnil0lzqgdvc0ybmr3j083af17snkq0v6";}; custom-bib-24729={run="1m25bdq11g8jin9qfib12h77sg8lb87p5680d5dkqzsf5y3iq7vl";doc="1ydbi1r0jvl936ziypnjqw4fsr7gvc1gksaqr05wj1bchh28cyaj";source="0sjpwz9zhr0kd4qn454nm1s4rw4a6n4qnackkrq4qkriwzv9asha";}; customdice-64089={run="11c6gzpmwh7q8dy334i2mz4g42ly0iqz6vh3zal4hi005js8n0i8";doc="1pq06p85kcki6rb5pvijly7h135mh0kwaxq8zz23l9c3lssjpj45";source="1ah7iacvkvf9hmkdysyfm83fzypi4j6myg2a215hajda1fxir3np";}; -customenvs-72291={run="1n8rvz86f4ybv3i0cx3qh1ycfpga6rqg6drlp0jswdnj3c0flh9g";doc="05wzss2hdhb6lcj7glc4ad2b417y56yf6a70lpl9h45cxbfi2xw4";}; +customenvs-73962={run="14nhmi2f8q6ai3160dg9rpy7i280zfz0xxni78xxgw2767dj1g7w";doc="0205k1azxz2j8zafbkbvfazsfwz227hxj2v42rn18nk5d0lhy6az";}; cutwin-60901={run="0camjay52m2fbg4df7rrswfn30an4s40bvyvssdcmhmqlbvsh46f";doc="16wmnp2p3hnl8aanm29sxflqcz03qc5vlk9ziq38qxsksisxkl5d";source="0lqjiqlfndqmjmhj5p4flhly69cyg175s8wg2gah1fcfv0dayrn9";}; cv-15878={run="1w9gx9mhg9wp47rhb6kf1w03mypydp01rxmypv6yvcrk551b5jm0";doc="1b16zaypfphbn9x2fwh2v0i212jx3pn84vj513lkxzzfh0if78iz";}; cv4tw-34577={run="0nli9s73cns9x44vr2npb7zgfinnywgwajlr1k2hf9jldzm09dm0";doc="1b9zd0ky6h8mlcigfwj49c4chsznvbycsphs9lkpdhxv8mx9wgyq";}; cvss-65169={run="1ja7j01vbzm16ms6hj0013q9f4wymzmn5fwdmly2mipgnfir79dg";doc="0a664wp1c11sdyhjgz5l561ngsnws5bgr78smswf2akj89637lnw";source="0ig8igf03vsi6mqb9a6cikqqipm7ja3ipm30c1gfinqvkmdsz0jh";}; -cweb-72279={run="1kc8zwzdqf1jpgfx6037c6hhafwgzmr0yp98vqn7ylwa4072gzya";doc="1sqminkqlgwfrmhhgsyy3r9cni6x7nq7vzfdjmbgyz795f42a1p0";}; +cweb-73451={run="14azphr3vlkjigckvvzngxl7m86mpzgqfwwhxbp8jgj2hhn1bxf0";doc="1sqminkqlgwfrmhhgsyy3r9cni6x7nq7vzfdjmbgyz795f42a1p0";}; cweb-latex-28878={run="0cd2rgn25s02p2ga3509pnbc70iad936qznr2yl5q6wnlvd78lbr";doc="0vc5f0h9mq7p9040ksql4clcb9y1dxq7s1a4gzgpsjyla05ps3qd";}; cweb-old-49271={run="0vx235zpflqpnrfa9kqq7wmc1rylg5bw1r26knfzvh3w1swbp4ai";}; cyber-46776={run="0vlx0r57ay6jpybs6wlc1w1qpbd62cjq3snaqplaj6dkah98kcbq";doc="007g12qa9v04z3b11cdrd9z7pc7iba0aa2g7z460i0hi2fg4gv3l";source="1kivc83wjpm2rf2myk4079f1l8pyw1pm9a2j0iqbwshic2qfm86q";}; @@ -976,10 +988,12 @@ dantelogo-38599={run="03a5l0hdlr69knnp6q464x9610mwjkcl3cw3i2q10nfm5ywr7nsx";doc= darkmode-64271={run="0pdfdc1mf1mircrydvjlanb61mlwpv8l256g4yr4jix83373hzzn";doc="0as8lm21znzpfdhf7880fsvna1ivprd5q7jc5mlyva6gny6zf3vq";source="0yy8i2qxk7ms53mw05lk8lq1wal1rx3431wqfw4w2v74xy3jpmcx";}; dashbox-23425={run="034nwqqbd4q99mzdd6958w6a3jcvvpvamdycda5blh7in1gwm1b5";doc="01zb6bc407282xhfc6ccrm38jjz2vyl96h552435b6cap68jv48m";source="1lgpiyfizg0vgfgz51wk3mhhc344gwra79k1xp95c2p6w32bgf5y";}; dashrule-29579={run="050scy57rjz5pvwd8bbl4h32w1paigyyy7dazr33v28061yap9b2";doc="1ryclmf2l90n20qf516p4qz02znnp5rgjx6pfw4p3wrkamnh6xwr";source="1f05m420qbbk25pc5snh3nb4dx7bd38nwfix1p8ndngn7l9dfkcs";}; -dashrulex-72642={run="1i3ipr74bb7vpanan6vx17d2hnc1f53g75z2wzylh55kxmrlcvc9";doc="128lpfmq5cl41vlwhgf1cldisy9dn95bd3dr6b7pn3b42sb6n56f";}; +dashrulex-73736={run="0m6vqpa0aj3s98krzxyhpr3wcaycf0k0iz5abb7fqa2rkxfj1bya";doc="0pkq2178hls1q86062i1fxf3lbph28krdbvkbgbiym9v497ihcra";}; dashundergaps-58150={run="000fzv5a00nap8ybzyijz7kx1ky4qx418jmkmyz5nm2rpnz8ckg9";doc="0zj18ikjshyd9jdrn4a8h1l8d9kypr38kx2cfsd9gllppp27m4c4";source="0n43mz7bnf05j31p99dmxr26rl6xzkc4maxra1aavg8s19x9pmd8";}; dataref-62942={run="1jcbplf8f5952gzd0p1nq9bsi9iw5ix2mzrn4z3xjaazggm9im0g";doc="1pczh1h8k8apmi1kfdj03i5yhhpncg1v9w0wb3dhzfx81fi29xc7";}; -datatool-52663={run="0c4f0byqwfkldxc1430qixy52xsidzw8s78igrxxrqhvvls4ywh1";doc="07gg85s1sv5zq1n766av958fc1qqlc9ifmyz8kd99b27yf9im4l1";source="1w5rdaqnx1mrf0vagxq5gvpxskwm5m4mbj2h4xhz78p3varn2i6i";}; +datatool-74464={run="18r3qkljhgld4dfhsjqxyyyb7znbxnj0hhk6g2wmwq38whpsqxrc";doc="09r0fnww0rf8j5p0lv5gssvfh5ci1k7fa1zynlgg5v25aq7q2xz3";source="08zspylrh8chcxcii2gr3lrml6ikd0ww5cyn9208hyndvddr92b5";}; +datatool-english-74422={run="1h1xaw2yxh2ccf9bdiadmll1bkf8fxmqdlw1izkf54kv8c5z450g";doc="0a5ccf5pw18v3svhpyq9yakxhnv0wpv2b6b615j0acrm0hif4vfp";source="0l8wq766fkdfljnqz35al0i8vnafxpq28cracp4vrz6vf9b0nvry";}; +datatool-regions-74400={run="0nqpmnq1q280m8v42p1hwfx2x27kyinvim3vd5rwdggw0b9r8s8f";doc="0avys2rsqplvz0ly9hmgyknmvi6y03sk9ld3s0dllnyc00q1rsdl";source="05h0adhavix6pan4g57rnynnfigfaqkvrhxdw40fgyqrahcz1sa3";}; datax-61772={run="0sqyx1waaw57v6qfh9q5mcf5bwz3j4v4c52x7dcnh7zh37cq6dmj";doc="1kd6qjkvdi3bnkibihzfhcabs3f6ik2bsqhg609qnk6c5cyz08i4";source="19va3a8b7f1l93b6ky1b3li4y6fhxiycg6gjpv9i3vyjhc0cr0sg";}; dateiliste-27974={run="0vzq9y9ilc6pnhg60psvwsand6sd4w5238rq3xhwnj2nq80yi38s";doc="1gxjc45zim6vykmskmhrhnkviw9i7la56d2zfyi89c5nyjbry5a2";source="0ks8aka4km6z6xcn6sihsff935z8kg74cyf3czk31wmr9qay4yq0";}; datenumber-61761={run="0jcpzz01g8n8gxl12pahhbl0wi91in08vmpwf3lnwz9cdsm2n53s";doc="1h7nm009as764cwkdxy64zh27qwwsqlchzfd2qd4wx9gpvg3dg20";source="0qsbqqh4lm075gfv9bjmb795z2awf78nr66lrsj72p6z8wa01scv";}; @@ -1041,12 +1055,12 @@ decision-table-60673={run="0v1654g69lsvcvky0yh977kz7s1b5bjihh6bfc4lqrzbpg92qijn" decorule-55230={run="0r5pxcpx29l8x1bw4hj4xp66zgkjgm0qn2ryvxy1d30dyjgp34zb";doc="0a3qvnknhcx0jx8x9gk7bh4sbnzv1mnqvdr8l03nzjcbmysvc3hy";source="1lj47s4k44pjnr0n06xdcb37625hkjclrsj4ccmkgcr61d85vkwk";}; defoldfonts-68234={run="00h2hk4vhqn54sczns7nlgsiymccwikdpl702y9m9hvhdw2misak";doc="1xl8nw3p9jhb530m7sxkrsg3qpd497q4678al524b3gz85ps1m0w";source="0ssc58p013kjdh0p56jhw7cx734ngnkm9mvf1cslcar5pyh6s88r";}; dehyph-48599={run="0fkqlsknrlxk8zazcqy4q3nisxr3a4x21aiwqhz8s237rdf3w39g";}; -dehyph-exptl-70233={run="04sp0k95yppmw8xdma4p7xryapq3k2rjckvqa1q198lg50183sdr";doc="0klzw3fx6rl4azwq85n9kxyg82hal75cgdck8v5vq70m15c26ha6";}; +dehyph-exptl-72949={run="04sp0k95yppmw8xdma4p7xryapq3k2rjckvqa1q198lg50183sdr";doc="0klzw3fx6rl4azwq85n9kxyg82hal75cgdck8v5vq70m15c26ha6";}; dejavu-31771={run="1pxcrv98xgy9hkqhclyp0q5dgpgc80bvjzs378f0dqzc1037lghn";doc="1f42z94n6dpdq481n5wmsx5hx000klmbklghz77x8pc9shgvlka8";}; -dejavu-otf-45991={run="06cdqjqj0vcxrr2nlqs2qszssiibzr0pbimhvqjpqfdv2hhdxd0d";doc="0x9j42zm6dagn4wv8hz34x7cgybi6bb86whxvmmwx5slsbb6yqfy";}; +dejavu-otf-73003={run="0hjymw3sd0m5d1m0fyk8g8977xc8mc0vh3g4rpq4aa9har96prxk";doc="1n5g5lygss5s8kfq3pq4bvrywdn40dcaxbrb3zz9lr828zl3jbkp";}; delim-23974={run="0k5h5wk4fn4qzhjcgraqjzf6ggq7rvr8d4c1j2vwxi37fa83642b";doc="167hklrsm9dh68nvl6inqck07zfg8w4gr9p5c2n8i6y6v9xlj3q5";source="1xh63b78kxngcc3qgzmcfrf4pw2saipw054pzq47vp2ajppp1sq3";}; delimseasy-39589={run="013r0cgz7ivrjfhmpcf5rdfl2573q35qmw0bhprnamij2jpvggzr";doc="02s406bh59qy6g8ckpxhgl0b4xxyr4zf91a6prhzlmbbhf96xbp1";}; -delimset-71829={run="18l26a6kmg43196y296m56s76ldwpqwacjw0csis83996qaifcd5";doc="1qpa2i3rfc2666q14pcax2iirmdavzrvhz03azxmzh2nf8l93v20";source="1d25m1lfd219lqw1a97x3pawc4ikzgi9jnkan0szdm0qncq802c0";}; +delimset-74355={run="0i23lmcv392wmsws6khn7w969vksc29kn0lrmzrxhqr19v5pd8lm";doc="1l1jh25nryw3pgvwpcym8mzyvskcp0mr9v1j29xvwbjnjm6i73zz";source="18can442p0whgdab146lvdcxf09l0wiaa1i8gsjwrk80il9sv84a";}; delimtxt-16549={run="0s2bbxhbfvq0jm4i90sh6krcik8yk2nl0c39lzr1nrakal0k5lkh";doc="1wswrw94n5l1azs2aczv6vf56ksbagniry4rwq9b16bmvdy7slyz";source="0sfwmd0mj359qkchqgm8zc80ayqp0p8ppdgfn3cmayhf2pml6gyj";}; democodetools-64314={run="0ih11kxlvnskrdbvxrakbljh1n08n1mb6hbmf08475557bp0nchg";doc="0kcn368yzx0jf04srh2lzbxj9n76ph0idfjcqs2am3cjp2mjis17";}; denisbdoc-70592={run="04y9dwkap94nyfn4cfcpm9jk2y0891dg7jg21c0ca9b3kckrcgjg";doc="11m50x8lc0694wjx06p9raj871gr9hmssblm3gnx3phl0vfrmyd7";source="0gipwjskg2p78r2z4j839yxfar227mvv294bjnl0j16w33d8k4cy";}; @@ -1120,7 +1134,7 @@ draftfigure-44854={run="0dhjlykc6p6jm6p0s0h0d74097ny29w84ns1pxbb7f8iwr8hhkvf";do draftwatermark-70393={run="1v0100dlj6y6kbcyvnslsi7a688jdm813w6752bxbv6xsxrgrvkg";doc="040xj41s6xgbxz1gnd11m58dv7q30qdki4sn88vjg00n2i0afxqj";source="10lm27jk24p2d5pg964l9mwj4gkn1xfqxw301lyyibq6wz921qcx";}; dramatist-35866={run="0zrkdhvx7f1261r5b2d08bd6a3pzldvpi69iym5k6f79ziz0602q";doc="0vwk6zfvf89773bwcxnpsd8crbkmq4lr6hksp4dn0hn6rf4smyyf";source="1xy8fm9h9qgjna6z5gz28rj0cq65wpxpxcs4vsfr4vr1p3vmig05";}; dratex-15878={run="02nyg30awmpp2yi4m6r9gbgz04irjzpbjhpp72j0qxzly8c8frqn";doc="1a5knp5hylpb1i7hkd9160bah7pps9b0hm00zgn9fk33g5xrvhbz";}; -drawing-with-metapost-66846={doc="0r1fqikx9iix0xm2w78s80knfwc7w0kf2k7fb3k25l1cj3ym14mq";}; +drawing-with-metapost-72705={doc="1w6icqqqx0h5byzmfwjdra523khj9sfgbxwxa2jpy6xy5n03gdlj";}; drawmatrix-44471={run="1806y5cdgnj61fy0lilm424x936dz2q5f2j2s3w71kzl5ivyf569";doc="16pql717cz27sic494xvmsw2mw9jxn71xka0k8fjys8j52pklqnk";source="1x8lc07xccf73vcvywmrqk8ivg5xb1g75gqhff12zgrp2vqzh6g7";}; drawstack-28582={run="1lirkdnsp35l4dwsir1xyf4a2s608ymfc3r0hmgg9phiy9i1664z";doc="127c98z547disxksvhabrpnddrp5ax5dwbgy7nmyja2dg65yax9i";}; drm-38157={run="0j0r5b2b6js88gy04d12w8wp14g7z9xcgc43y0ysn2xglcsja3fj";doc="04i8mw2lsirvzf3n8xgddd2jr2s45fbg6m6wiwjdz4d2i1pi98cs";source="0l3j52ypvsc8ma06a2z2dkqsa3vd7afqkmyrd6b3z6w3dgjlnz3v";}; @@ -1131,7 +1145,7 @@ drv-29349={run="10dqig3wmp340m9h3n4yl6scg1p2a7ccazsqp7p8a4fkfw0cziiz";doc="04kgf dsptricks-68753={run="13hvyb7qapfby45z2cikqwaj4bcf6lvhaf3b6gq7d9831gxfwjhk";doc="0jjwa6rh39qp2659ijb3fg3cqz0lbpjpwmvj6zpxv0xhnjzrnidm";}; dsserif-60898={run="0w1kihzrmk48hpl36a20fkz4nwp9z27in9xsi0fc3d6mhgdx35db";doc="0bwnnxypyc97jfcam0vdvpyxphd1zn31mc6lvl661jy10cpqf6b4";source="00hf5icf1n0rwxr2ms34z7r62g98dqkx5v26m3k7w1wd1jfnjzi6";}; dtk-71776={run="0f0902z2w00914nfhhqa1gj8yly1gpq9rf0x7p96qcxzl8wmnfs7";doc="10y90pnrwkyk82r5hmg9pnbys6bbc1cj92fhsms75yviwv2ka68h";}; -dtk-bibliography-72281={run="14fza0q3rnx4whcfnsbj1j4591b0zp3y8xgkvg41mb870phqz2s2";doc="12lhqxsii4gk40r3i94ckbjkw5zflklnyka1z6rf3sqndh3fc397";}; +dtk-bibliography-73293={run="0xr3py7lmxpf5sbhj2km24g3jjyhkl16q8np109rvnlhsf6i6696";doc="0chm00rbnmjnig9j68qrrrpi5jx9bsd4d6i6lwzwim0bi4j520gp";}; dtl-62387={doc="0kvnsr8nxrys99rp74wlxnisfripx6jpjjkqy38d3d4gw13cvb5g";}; dtxdescribe-69507={run="1k73gikms6ymcjprphzzrw6nlhm8sdg62w5ngb2g38p0hyxi0r86";doc="0fsl1kp8ls9dkzqjs5gd3s4f6cvi3dqd5mcz46dns3v6qfsn39my";source="1vdvvgf7knmqhz1qbqgs17a0m0dljnx2lwz4d9j5q8dds2i48jk5";}; dtxgallery-49504={doc="07c403zbx7sxkhhrwrfw3np20xlqhdk893b4bd6r8lqb0zipp5b5";}; @@ -1153,15 +1167,15 @@ dviincl-29349={run="1qb2cl5jbgzjfgwqnvnfbbrbzxi4m64lajvz6pyybnrwv4bax0km";doc="0 dviinfox-59216={run="0bcq55p894m5hw3zdjz7q7ns21vpzjyihg5x19lkn9k05nxrs2d8";doc="0v2sy294w0m3kniwky24lpi4ic5d8qrm5722gd7vw6ddwkwc1x61";}; dviljk-66186={doc="03pi78c8ghy2gghzk1ffrvf5x7h8c1r0pv5pcspwxz365x2rsbjw";}; dviout-util-66186={doc="098pksgf2iamq96rmzg5fw7i9dlpvdksficsz1bf8k8z4djnbk8n";}; -dvipdfmx-71832={run="1ybcxcgsha36df2r90xwggapfphbil9xhmxswaqxv03dminr8j5p";doc="0wid2ydcjf5jq34k8hsg62ndgishbg6f14p728dnyrbh6k4iqvwv";tlpkg="0mlhxv77q5nanqg2dcbd51wpbcrys9xhr22bvx3hpfzwykb5lh69";}; -dvipng-70015={doc="0454xscpjh33d5qcyiirk79y4zwpfzh4rxvgmzbd4qp1h1anjnjm";}; +dvipdfmx-73031={run="0i83g2476bp3zfgdvg11kmls969ip36z1d4w592946547ar2akmv";doc="1ay3m3i97xxx4p0hln0y1v5m266wy7c7yz3lbj5qpfznzpf4fplc";tlpkg="0mlhxv77q5nanqg2dcbd51wpbcrys9xhr22bvx3hpfzwykb5lh69";}; +dvipng-73766={doc="0454xscpjh33d5qcyiirk79y4zwpfzh4rxvgmzbd4qp1h1anjnjm";}; dvipos-66186={doc="0dmaas4m9y4px53vlg0jr73xviki338fm2n176l8ldwqj0vvq1b8";}; dvips-70015={run="0k89qqz9zx5zh13azpjndfzszgl85hq4513kaayf4k3spy9fn5yw";doc="08rbzxkkixsqdgky684djcsn998cfqqygjpd6fmvyx14hna2ypaw";}; dvipsconfig-13293={run="02vgk91y80ch4pkj83vbiz1b2ccigf152hm83p607y4n4qn2xzsf";}; dvisvgm-70501={doc="1pm3m0x25956lk1k99479gc5dn6w4bqp0ibgihn2y5gjpma75civ";}; dynamicnumber-38726={run="0y779azvla68n692x0gybg74cp3dk32219v67qfamfzz389nbs7s";doc="1appm3ddbv9ll0mbnid4xa459w9q89swmdlvdzy1fxdps4y0vpz9";source="0ydmlz697c46fx0xpnvcdcfm9sm0j3jmk47xz8znd2ghzg395fgk";}; dynblocks-35193={run="1zb7vk34k3z0cvw6kz74s7831fz17mg3j9hw60diabc0q47pwyr0";doc="1m69hys2b7fvwn9h6q3whkpcnvi04hnhx7811s5fqhdfi76v4zk4";}; -dynkin-diagrams-71883={run="0plg5pcq3zqds8zjq0fnc521wmafcjrjp9xxynsbjd71xxlqzb6z";doc="0xjz2w8gczibadzkgn5rzkvqasdmfvjj5jljdrkp3wd2pdyq92jw";}; +dynkin-diagrams-73036={run="07yqafpz530yqpgm8blzjh6iljxx2hm69n8bfwmgv4wp4h8ha4f9";doc="19dg178w81j8sxcvc8dnw1ml8cmscjn94vbrkplr0gg5p1gbbicy";}; dyntree-67016={run="19kzb4j7q7dz993znni7pixv2qljzydag3jywcsgdpqvlnk1aq0y";doc="0fa2imzfskl72fvdm1pbhsr33qpwm41dzsfdipdlgww6116rlwjc";source="0hlx970ym3zxln15pm4c2qxliaj4yhv7cnak03hhbb0dx916k3mw";}; e-french-52027={run="1pm1k7qb1a3h2b8kay9jwby382jxp3866b9m890rj9gfqdmwbfd2";doc="14719qp1qjcx4wjwcarirj7iz6qmjgwb95b308zqdr197y1cvymc";}; ean-20851={run="19w54ch23s75mhn94hxf4nphl5dcz2w1jx138kr0phfzpc6fri36";doc="1rylr9m7jrv0qq6pzigpm73z34p9n80fg5rf7andmvv0fcpmggk7";}; @@ -1169,16 +1183,16 @@ ean13isbn-57514={run="0bzvkzpi10d9sjlsc4df5v3y7qycbz1qkn7ngy97prq58wg047gc";doc= easing-59975={run="0zdyvkqydl713p61izpcp2yz6n2rfsf853pblh6xgsjj1vlhrr0b";doc="1f8151jb5nzd8hj3sii4ca274iaxscv5w8fxp758ncshr3bv0avy";source="1hha1qs4wy6s2162w61gpik2hrx73r83gja1llbq80gyvyfgdssj";}; easy-19440={run="0jrza9lf3yf4d1wm6nzwv5iyfia6625fjvflfmxsscbmwqickjhx";doc="0f72bawmxrxqk60xb61y079bqpxj8kmvn167plbq5whq5b1fsxfl";}; easy-todo-32677={run="0fkwlzgx20lj44cvwv8hqv79v528k1gghx30lvqhg44wqirkmy86";doc="1yj3c25mhkp16n49riza4qchr2pqycqmb2k80syn5w3dzrj021s2";}; -easybook-72667={run="1q01pfv5nqx6nl8sgvcpwi2607j4dwynjl2vqg6d23d0ma8ip1zs";doc="1mir1fmck3nikhwzscw6crp2n6g5k90jj2cmig7v3fhr6hchi30n";source="0lmdh1hfz3hx9bmj8sn9k39h787cgsi9mdcji505c01bljkzkbz2";}; -easydtx-68514={run="0pfd66n156hw6g2s2p8v35gjykacci9kpyx75zcl1sw95ry9407g";doc="01qw09bkafjmkmhg3wqqgw8javrar7zxrf9hr3c8xy14rc36qkyx";}; +easybook-74266={run="0qvi225dp0xav0vzb7qwyc7xyv0kvnar6bnm9v662y963zpfj6qx";doc="177394gkryak1hgw5qf0z4zkjcw5q6v7qxb2bv1i15gaaawf07vn";source="1dgrqrinjkmrba2d5mchif3wjwvhf2l0mmrb7ss32cdnjn7wb2cy";}; +easydtx-72952={run="155ppc62vynrb54d050kn8pxav627y4yprd0bsnpng9kcq6pk8zq";doc="0cfh472msddfs499qlv5860vmsl67vddrzvn9g7asw72lh15yi4a";}; easyfig-64967={run="164ncaq1l6hdrjp0zinynf825hwsky1xam2yqxphhk90438n5hzk";doc="0hc63z5456f00a2x70ckvf3r54zld4d3r63a8d4ra7502kk8s9n6";source="18f4bb9yf3f7q96w79rhx8h4svlxnv0xc6xwcawav63zsk40mk7q";}; -easyfloats-57204={run="0vbg5dz6wxzk20rn51xv7v526qg8m0ih3wikabdf1bfb4n093k2k";doc="1ncmmmf2w313cpsc9s4w0c3gzvx09r26gwlxhr9rszksvd4y7fay";source="1ih161wrkxf8sfm0zyl2m9xgmff4qs6qvsz7mzxbjl1j2zxzhhf3";}; +easyfloats-72699={run="1wj09rm9m95lq7vwc8vdd6ci813sbdypvjilvb0zscq2q4hp03p9";doc="1pd84qwf799ha5gjgi473m5kkpa6d3zg2f5gay3y6llmgvz8vsg6";source="179049p59hjhi73m9f5r8y4i15s99z7vhwj21hgazy06szgz3sr9";}; easyformat-44543={run="181x0sycxhwcfna2wblvijjs32zvqs6xl2am4hz8204mk321rjsb";doc="0fg7y02717rk6ikw32qxn6iw7l59h5vc22aif6hs9xjnbm3nhhfr";}; easylist-32661={run="1ghjps30fa1jvfkxrzaxqvy5ilacdyms6dl8bf2qg6195w2sgm33";doc="13wgq2pz9jw761p2yipf23k6lrx66bp25l50446rp1xz47yk386g";}; easyreview-38352={run="10wl0aihr4c55b08mxafr0jd1xaz640p2kj7n63w3wqxzxlpq42i";doc="0nnnr4l1b6qhp75n646pd446s7c3pc4fxsxw84gvfqgankfsx3zz";source="0p7xrqivvb685d0xcljyi4whh5vr6yahskdl63ynw836bmin1b3z";}; ebezier-15878={run="1zmsrs7dpw5gwh6h0707gxcpsnbb8qklsqnyr0q30mziz1wqhdvb";doc="03afnc0nw7yzv03n4gq38js3y6x5v0kaxi5psmnzpf2lj0kfa7l5";source="0492q2l7yrv1h51x4swqzfp74k9kb989m0lxbgvgffh4gl7zhi5w";}; ebgaramond-71069={run="0y2x796l2xxbrdkzialacnvqyf0pbb267v5imv6jja04ii61bdgv";doc="1m47a1lkm68gnj6blf6mplwx7qyc24144pr334i9g4cqadxcl3a9";}; -ebgaramond-maths-52168={run="1n8xfa9qmxsrpy78h98x95wks24fck3mykq5n8x0qasi4fabclnx";doc="1x4l9mi2cc1fx3qbis2ibshh5wlfn3sypxcrbcr9cwwhpkg07sqb";}; +ebgaramond-maths-74174={run="0dd1jfnv9sq9lyv2h2fdq0mzvg58gihm9yxcl4d2p2vwk39r21fa";doc="0446q1g4gxyg8p6g3p5cn7akgrgli54d66722h3bhlgavz636miw";source="1dzk91lpl2hvjrflslsj96baryha1pmpkpkv5zlqlv488gfmcz9p";}; ebong-67933={run="1skwh2sly6bckgc05b44cvl2pvn42y3970rvmnlh9xm2x5ql015g";doc="0fa0kdipnn5hgfpjh8rz3l9zz97i94v45xmsxjgjn40xqnai3v27";}; ebook-29466={run="1jy79jrf8cd1rljg9f3g0hzkihxkpybvbgjnkzd5y6cfz7zaynp4";doc="13cj8a88qqgi6kl1d7kb0cizl4i2pjm51hqnz9q03249av3z377q";}; ebproof-57544={run="12dqzyi84jlzm75d77crxbwv2nzyw8raypdj60bjrn6kifav7v0m";doc="1d6g3v3hskgd9wrddkhf7qxg160n6qrfgzxfswajswk0kg2w3675";source="130d3af0n0gjvnm0ad3g6pm8dy1w8zp0q7im3gv1kqbm7k5h0hny";}; @@ -1229,7 +1243,7 @@ elmath-15878={run="04vacr9c71nmrbq6hnhpcgk8g75jzdvwf6z513mqabr9d0gf84l5";doc="1d elocalloc-42712={run="0jj85nyrq2y7w7pm9pq8qdj3xszg5s3a1j8zx2dvsy6a1s7mzd8i";doc="0rgf8vijb0dl48x4rwbzg7gd1apjs7vwl8rj7zyv60vx53zzkp5i";source="100hs4drnz5jy657crs8g62281sbgza7k78pvk1qfds2y8la2968";}; elpres-71385={run="0bazzdimphnx48mqs6b1790h63v3h2khry5wf6kky9vl8c5b2fvz";doc="1n6w2rb31pqgdr1rlrqdjkj0y4c6f1hr4r1z0pcjsfcj6fccawk9";}; els-cas-templates-71189={run="0zph9nshmsms7vqhx6jz75hl9bjmmx2qd51vkdc5gc593yvdy1zm";doc="06rv3daq328b46zzngi7gs8a7di45x8mg38lvk92jsz3drf2g240";}; -elsarticle-70902={run="1l5s679vi8ikajr06kp5l472cg9x5wqxl3h66v4frfxsphdv2w49";doc="1jzskdv494wwimmjh4rmc170c4kdlxphymhl70f1sgkiddb540pf";source="0fwznyril5zbr3gkklh0swiij0gxzysa9dqsavj9vjhiyjx50wyr";}; +elsarticle-73421={run="1nby9rj7qkwbh54hcw4k70ah0aws6zgcy9rgkg67j9q63r3x6ykk";doc="0jyjhdd1vfkaz52pk2l5an346mkj24mmg5dsh7lr92mk6p1rk5pl";source="1ckiawzak1skyg64x4ivaqmhdbmsfzgwdl8z4jfr7xwnmn5jlmh5";}; elteiktdk-71086={run="0b3a7qn1wn5ml00isds27jzpz3rl8zw3zwkb211z7789pix8nmyg";doc="157ry9chl8qr0vavbp0k30z0vcfvn32ibjmk0gybc3dgiwv1dipi";}; elteikthesis-71087={run="1m1v2zvba2x1ansj27msm6l9mpwb2hd90g1c1z8g49p1b7snabws";doc="143allg6jrp9wv8rhfmsp14dy0baf4jcxsh6f68xj2zr86vmiq80";}; eltex-15878={run="0k782lxa85dsmqbcw5q8gdny1lygfsv5h2d1d70f6y0df17r57ad";doc="1hshzr96sn318b7ssv6f5md23v997xahm2232c3kns3rzpfssy21";}; @@ -1247,11 +1261,11 @@ emojicite-55131={run="08y8qg37m8b3qf2wkbg802kmx359i6ki445ljjnxybs7apvxjpn5";doc= emotion-69834={run="14rnlr65ilyf9mirbddf9vkm30333yyyyd53fjynpq9h0hqrlgxy";doc="026yggkjkkvsq04k232a6p31wvj2zxravn13l5ijxs5z66hh3svp";}; emp-23483={run="13iaipg8n1njzbnd8s622irizd4cc1cbkyc735mplvwq10q2jxqq";doc="148l1xq42avnf5gz1sqjcdprnkcbgsii3fm1jiamx18175zygsdc";source="023jc6v2l580x2d480x11z6rlknjjvx8g3qkcrvdi778h5m5bb94";}; emptypage-18064={run="10h1mlhk0841wgc70hp51jnah14si7rf2mwpkp8lfc1xr7jwwvi8";doc="00l43lhrr246hiwa717b72rc4ignqd3kljkw6ka3l8z1nzbcbni6";source="16nzgkvl9gqsnhx38dp71c3cz5rrgm73n99g2vg7rapg0vb623xi";}; -emulateapj-28469={run="11yv57sv6ys3g8h2ix5xjnjrbnyfvcma4i7vzdsj160rzi12n06v";doc="15zm7jqpk917l1r2qfkqdkbsxa2q7w4640h9115v4jis0zwgj0s9";}; +emulateapj-74171={run="1kjy996cy2krqvjpsaa31l3jg5fcpc2r5qvd31w5jira4bdv5j5s";doc="0qqspmzcj8ga3ab6rq9khv5in0jkf737qb0sxl5a8r0pl1y86d14";}; enctex-34957={run="02a26lzlkkw3dabxci7w77117n2bagsdk5rlcn4cps45xdbjqikj";doc="068qh474lirr3yzh8ggpavqsmzdv5yvlc1i93f5cx49cd9j7dm0w";}; encxvlna-34087={run="165xjggnbpc9baj9xbdkxzxsb9gdsxffmakffw0gzp82acxgfwsv";doc="0jc0wlhmc7f1vrabzk6ql62iian2n8s32r2crq34w2cjglmf69xj";}; endfloat-57090={run="1vqy4ii3dz79ffpjc5n234z9v0lqpkq93vla0lbq0791h71gv53d";doc="0y3hkihs6pc0g835nk21qj8v3g27f6rrvadwmvqkhchvgh02bwnl";source="0mdr1ga2p1ikbcs0zzznb1c89n8shrha87qm49sgzbj4d0f2gdbx";}; -endheads-43750={run="15dkd3ky14phrc9cndisa88vbmcp48wly8l27k4wvbbd0221rxwr";doc="0yp1rm4ly2005mw488yscrgc0y8awsis83wwcfh3qh8rcgm8jzhy";source="0578fyav3h5wz40c12r3rqzbsba7vqvk0r5jlw6wymk2m9n9n5np";}; +endheads-73964={run="1fvp1x8mhfw2dymzc7xv0nfbqpw0jhh70i9vdrs51d8j1g6kax5p";doc="0q8rgxzlj6f54aj6qp5bxw9igan1f405nx6pb74gjbng2yw7hss3";source="0sa8qhzxbbddpby20nmkbvhd4zbna13k2whaq04ddjd6r27dzpcn";}; endiagram-34486={run="0vgyl6rbgrq0jslb5k1796hlnzxjpavl5ab6vj6zizinr2rvh0dc";doc="1gz8ri82sx9nn2adb7sv434im46cb0ld9r4j9fz07kqn6gxzzr2j";}; endnotes-53319={run="0hm5mwxdvxhj9v51y88g6mm5fs9p2kaksmhps032cbc1inn5asj6";doc="0354v4klgz5yn1v9hkk3zpvv3x1l4b6jzla7iwxpnk9qb0bvfh4g";}; endnotes-hy-54758={run="194n7n7xcjpsxijzsjpgsxrpshilki0ixkwlbn6hxd92jjq7amz7";doc="1mj4lfvn86676s3sv0v3hx07cjb4mm3j3i3swwzxg0i48acpch52";source="1qhf4zzhk7kf0wcpacl82przkcf7g8z6jwirrzlwd39876jmhbwk";}; @@ -1263,13 +1277,14 @@ engtlc-28571={run="14lz7dw8wgksbihdvga2yyqa3qxbs382s5pzrfycx9z7503dfy0w";doc="04 enigma-29802={run="0cl7a0xh9y1lg55wdkj03n3ayyb0853nad04fpgjla6z9c9l1lrm";doc="1cnbi0n8pw2m8xvxk51j4rlyvj112cdz5zjhc9n8znj25iva8in1";}; enotez-61490={run="1nxn52jbgxp2r1zlyp3hmr0k5kwilmf8fkr46scnh9w1ijxxmmp8";doc="1jw2mbyz3xnshrb031b6xzycqckpn422rc1ddrdj7r2j5lzy7l2n";}; ensps-colorscheme-71431={run="0zx0bsxsp5j4m0zlyiwdqp79gp6b2crw7sy14fl04i2d4flmraic";doc="0nyx01a5hdcc7hrxgfckbrbwqswjzb8fi1kff7np8641a7bpjp6z";source="1iq46m8ygwbsdj05q9nbqh3ylsp6c05aqrbwr1dmv5cl6yp34d58";}; -enumitem-51423={run="0hp6sk3i0a1jwwvlr0lk4w75fc57c2fvqw9x5ir8db049380ixyp";doc="1byxv6d9g38fhd83f4g23yqha8nvr5iv6lv97w40jn58i492dyrq";}; +enumext-72861={run="1l43wm7ndsgp2hw880igk2rhxqd1rh8ych3zxmn8maz3v158az29";doc="0xdfl3mz859qq5m2i7z8yhwkb970h4arpv73gfyws6ww8vwxd6jk";source="0bpr4is6xcq45d6ywarfry9ck7pcd7cyd6jkswfhv3a7sh9r6j9s";}; +enumitem-73750={run="1p3md46gbg2q1ic1d3zhvvprngcc4n911rsxmb11r24yd41gm9lf";doc="1gv9q2wy9jpd6a4figzdqarazsgngmdifcy9w1mr8f2pgxvzvm1h";}; enumitem-zref-21472={run="1isvqbp7wvib81r0yn7sngxa2dygkfm4jn4rdvw0kp8rknam91qh";doc="12ffsw4mzwg8gnw264kvc9gpxcmrhda5pwfyml2ih50g1dj6fwv0";source="02y3rlxcsdmafy4n4iiaz2j3syg5x7bzwzfvfk87xxg0n3bvahl6";}; envbig-15878={run="1szn3ngy2iwzbc9y5fpchr5vpx5alr908q8bfg94lylmb8lx2kb2";doc="1y778gc6wl11afjjv2szypc8jf1g7gg2s0lvhv2skl1n3wpb3x7a";}; -enverb-72137={run="0nj21raz5m903d163xb3bfg9k1yml3bpvfxd3bxxvb76yz0ql9gx";doc="0f5ydk39mwny8pdj99aafwn32hjyc0ay35hf154s3lc858i5plsj";source="1j6ajqwxivg2mw71snqzsd4hx8w2xrd2xq520vw6zxwbbljkbn01";}; +enverb-73422={run="0xr4n9g66m4zv5xaki6cz9x71ipajz586va1g18qi7svcmf7v6a1";doc="1gq75salpmgd2g47zr6nd7aw1r8xpz0sxi6vhl8adypp35x8zi3d";source="0dkqfb39llxs9z6c07fjmfbkhy00b04f8sk2jbcpx0qwr01bnchm";}; environ-56615={run="0in2a7ar0c6ji7qhrbgp4bglcr2cmb9imxch8fcrwkims4g3vjp3";doc="1pb6nmprhz3j9dx2h7sw0y66y1qlvhkjl3ip28bxa133fgqab148";source="1jkbi2g2s13rngwqvr435i9n94ycnzp9xa8szik0nnmj482ah2hn";}; envlab-61937={run="0q84vy7zbjqrrvy0r2j2hpbg9b5vwbwk860q24azms2zxy50a8vd";doc="16fnyfvvixp6lfgvz32w92q35s21c92556qxbgpcd94fd1pw2bki";source="1fygp7wpyzhzh070sa61qk17h05rqr4m1wqp78vpp0awgkmdji56";}; -eolang-69857={run="0hwp6yq1zw4hilh8zygcm8dc74mnr5hhn2x4gi6q2b6p43pqkip1";doc="1w8llqjzikjhpcp83j67p97icy3dyq2jbfn2in376gwzms5ns2qk";source="1gqsl2b3aw485d2g7sblr9wi28sfq7by3y0kcj0pf9rpzzw6m7nn";}; +eolang-72724={run="0v9a8jhi8bf29xfbs22zj9r8rfyvsi60fff0gky7a4xnqm470kdq";doc="0jzp2sawfn55s3r26k4526c5cbap3yav5ksm9qf4nmp2j72shln8";source="13mcsah82l4nx8iaphsgpp2n2zhhjph97ih3lsczs8k6r39k0lvr";}; epcqrcode-70956={run="1mg50fy7gwvrxf4vyrxgc0sxljv136s7s3i4vnr3xw1z33mpg432";doc="0k8lqjzmd8lr334zw4gg5rdgj6vpi6l30p4d02v1ggrpjj74pq2y";source="1daz9xkllmim28kxz7i4vlxmr96p7gi4w7rwvxfl4pn2yd7grzrw";}; epigrafica-17210={run="1kawqgy9kbr535q1v84kk29q2fwhg6yzmgjd5i7dyg06cy0g6rci";doc="06ichmfivx1v2y67f5nxx02v75wzci6m3hhg87kc4qik61yp8lgw";}; epigram-20513={run="1zps5067mgi7xq3fpjvjln8i0rz53j7qn660khraq8ribv4glnpf";}; @@ -1282,7 +1297,7 @@ epsf-21461={run="1i973a2hp5ms1lzgf3g2b73j34xymak9f8wz88fqczcvdfnnag2g";doc="0d6j epsf-dvipdfmx-35575={run="1p0syahj7liknn447lb83p2rdv8xazpgabk39rjxga05pfn3csh5";doc="192x6cg0dh0j9dknwb320g73hid9px635p79idr33x2zq3gaaw4r";}; epsincl-29349={run="0cmjwns5hnlqi1rk6py4s07kbgflm046pycpr1lr5c1dacmiycxj";doc="06cyyhnphdxigpq4bkg28rx8h9kgmb3ywpbdak6v6ivvlksxgnaa";}; epslatex-fr-19440={doc="1xs9977g9g3i6sipkf7i9jdl8sdm69ci3161a4p7k66qbizi7zvb";}; -epspdf-66115={run="1yjga00imbdfjqdqnfl9k4dhyacqq7c3i814pn5a5fz5bbyv66qm";doc="038fw9ycr0wpaq2z2cwid80lizl6vvj5q0i4bnx4lgxkfa82i92z";}; +epspdf-74490={run="1yjga00imbdfjqdqnfl9k4dhyacqq7c3i814pn5a5fz5bbyv66qm";doc="038fw9ycr0wpaq2z2cwid80lizl6vvj5q0i4bnx4lgxkfa82i92z";}; epspdfconversion-18703={run="0arf6kmziarh1sgani0bnp2jm8psxj937hrkaslfj8fm2s46gcmz";doc="1xpj5lymdh9w2ary36sx66ib0hwbjfbbhhcipdq4nkikq7a8zmpg";}; epstopdf-71782={run="110fdqfvdnp5szsfcf659hznf9a1w9h86hnin9qna3hpya90n0js";doc="1ag14b4r6b5q6r8i8vazp663ihfy21dlh8jlbykgffi9ghcxwf5s";}; epstopdf-pkg-71084={run="1bd7bkkk5hbp0bfzrvjpmfrrvil9i2pzmzl7aaa324q7w4f1w67k";doc="1lwv6av0b4v4vzzk3i27diw42hcdqzgvis1fk4fclkyqz7w0ai4d";source="1qmvc299bzgfrf31sa4027rgkq3yjg57318mbx4gl4cwznxr7zh0";}; @@ -1293,11 +1308,12 @@ eqlist-32257={run="1cxas8g683y4i22rdakgji1r282mivmnap2l0b80rv3adg3ccvrl";doc="11 eqnalign-43278={run="0214pwf689rj7ycjzrafkhpj1rrn74h043vryihyscci03lf46fs";doc="128yh629nnxn2ca799s9zxbvbp0zam1lrz8nciinfbb10m8igwv9";source="0pdzvs4hyyxr229jlcw7766qd4npasc676hf74nx0msxwm5iq2yr";}; eqname-20678={run="1qryjgmn2cw2indmmybgzrcrakqi6a3crvdcyvj769mciz8lsdwy";}; eqnarray-20641={run="13vm2xqfm36a1fpljchnmjnl6m4fia8x5bia0h0yxh7yw740vbzv";doc="05vh8d0yyqhn7d45ykrql4dbn07f8yh4jmr6qmx1mkhyiz44c9x6";source="109ds6zn3nl17kb4z6m1xpa5ds2iwqaxqbf5jmw54547wv34havy";}; +eqnlines-74313={run="1bb2zjmx3sdjj1h0wbw6p5y6mp8m9zlq7jb5jy91ph1f4ah2xr4l";doc="0wr4nsw23xx3znlh7njdb1kw623r2rvxvim31k814prmbyhb7x7j";source="0c1b3ic3fbpidrmi0yhjcdbzp33vw6xwvvmkiwyk6mw523qzvx9j";}; eqnnumwarn-45511={run="1mv50r9g43si8kmdmf3kgcjmw10kzipq67ssd3vllja4pn9yzmz6";doc="1ypvd357npccz8vbbq8ss92cmxphq16isvw4ax0ppgxp2bh7cr4g";}; eqparbox-45215={run="1bg49m7nzw20g2g51g07d7sgq0sjiisrbaq4ca31qbybr2rxcp12";doc="0z86nwj06zn55gk32wwlxbqfb12a1fcgqizrpagm7yp0xr99b8wm";source="1ny9mcnb76yds4l7q35wdm0x2vzia80aaqr12idybkzi75a7b2yp";}; erdc-15878={run="02sf80cadhv7if8arbjcsgqkb0hhdrlpq6izqgcai6vb7xsc6niy";doc="0nv1yqxjmp4mfksmxm373pmy3zzbfcfvi683dalpslzq2qyz20yv";source="1vpghcpm9a2pvi3plh7pjki7sna3hkzvq2xj9gzmhqxcpw3jskwx";}; erewhon-70759={run="1nw8y88z39wm0f312a8r0hwmdy85nynrpq8k78l1iabq9i03316h";doc="1xmbvmnp0nl00nqdyql41dql0b856cabym2cq6yyn65s2prgxgki";}; -erewhon-math-70295={run="15yd3rjhv52kplikvmp6fax8im2250lb15s9hh61c4f4a7i79pia";doc="1yxzf17irczchn6chiyp0hkllq849ivlb7b7g17g61b6gwz0jd1j";}; +erewhon-math-74013={run="10gb58jnm5cf0m1f9ki51n8sg412qd2avxq4s6pr74mf7j9rglsz";doc="0glv6798grs5z6v5vfp12ps4b1y8nwlpbn8qjklh1b7fnkf1899a";}; errata-42428={run="0hp8pls350swslim7m3cpnw23v94vnqj9avfvx9hq0bgl99szc5c";doc="0h30iip57km31074cya5fyhlmyamix8anpk19rqbsfb43h3988g8";source="00bdq20dwwmq0nw3c271ah0bclzkzkwbr5ak4y9asnab1g6fl5yw";}; erw-l3-61799={run="0klwkq6x58bhqgc849yv68vg7w8ivvzib8rl84ipf3gl1hk42761";doc="0qkg31gi4jhgvc3i42cbj00ccavwrxfmygngn8qxfgmsphx3a41z";source="08lh56xzj3wjh1dp72ky8ckga8k73d3alf0vxjkwb6b6krzz4gm9";}; es-tex-faq-15878={doc="0wp5jx1qs4yp3y4qpwqhpw7rnilw3vb2z5xb4lzwph6zw27jf6sd";}; @@ -1326,21 +1342,22 @@ ethiop-15878={run="0h1h286nq6f2bplxxkpdg8mr70ip92c7mkj9lakxzcwacsj849xy";doc="1a ethiop-t1-15878={run="1xbkh7xx71d19ghwfq8bhjnf7jmapm13hp2gr6ggzavcmzf12ffz";doc="1lafizx606kv455bhf125hl2xqhndd5mblkd0zyvqgyir9bawcd9";}; etl-60998={run="0cg7ppbc7nlgmcnri2iz2is8c5kj03jn0crw4m5wmxvqkkcg2217";doc="0jqpybirslqyk7g9g27qbbvz3k02m2k352fxl2w1p0h7hhgk12a2";source="1z244p46j7hkzry4n1xdbzcszjgwrlxd2jmjblbrldj2ba9sq9nd";}; etoc-69343={run="1kvwyy0wxwwfkbmsh7v5kdvcb9sx7ywzcv5cx5nmv0sh92ah5dgh";doc="1lh8pfcj2iixm9r31cawfs7vpg8gd4kgjcj9yyqx0i2fksd1gs0g";source="0clv4cllb4nfchvc4zb8k25wzlhl4k5hnijl3071sq8aldiaqj7b";}; -etoolbox-56554={run="1g944zizyl05qz6lq1k13hv9952r97gc1i7is9s5fckz664075jl";doc="05c3kvfwvbg4bxf3wza5rdvh98mnxadf818rsklxa5g2lz44jm76";}; +etoolbox-73895={run="0dq67brzdbn549gmzmi4mhrn8bldvwan7gqvcymwl02rh927h7x6";doc="1s56wrgc5k2r309vgmkrs4bhiypdc52l9qa5a9vk3yghs9fk86rv";}; etoolbox-de-21906={doc="1vchha7ymvj51jfnvl76rxv466lzfpxr6xcvwafxhi78w4bk9yry";}; etoolbox-generic-68513={run="0w0mmw2f2lry84jfx617saj29nkc620vkrkg1kmnnxvvxqi7jd9a";doc="0l7kbicibm8c6p5yspyr1y8aqh5d3bswa9h58787r4hcj4pr2hc1";}; etsvthor-48186={run="19iza3bimr7xxbajmq50iqd6cc1h82kz2lixwphn9568d5k5vjm1";doc="13cijd5cx7sks5jdy67hp1a08f4y223l0hxd3w7ljnvd5azzyc1f";}; +euclidean-lattice-72985={run="11ppi1gf95g00myhnfqinxgs6kd6jc77sqfj16id2vip6xp2i03n";doc="1dc4isqim8mpv0ylvfif3q7k5sxa8vl515rbkja1l58bkwyb5n2r";source="1wl3wwbq0hzi1jkygblb50v5629kcd75rswp00d7v0imnwblfmav";}; euclideangeometry-67608={run="1pa69p2p6a4v8wz3m32xd7vy1km9zksszj7zjyqw36gfcpk5sxlb";doc="1d6340xmamzrcsi31i0vifjxhy42ml7v3s6r1r9v6vzimh1iz5bi";source="1l8xc044kcac6344v21dfysc6la90vv822mvik984zcnkbhxy4jc";}; euenc-19795={run="0lh0k5g6icbbzl1xzzcj4sw7vjhqpn59y9xbc6cn58klpww8ywdh";doc="0likhzn8afsq302aiyjk6adhjimz0naqffjrj2s06c6681z2inh1";source="0bwr4cabh3w4jbx476ygxv6afxj6sblszr47awr2nixx0m018ndj";}; euflag-55265={run="168c6y6rivahj6cw377l54jsykpxaxvv3nbmr80w19d90h4sqa5l";doc="1a65rasxx88bkz3bg51bmzdbq67yphljaa8mgkp2b69fjsifm229";source="09g2gn9ci11dca9s8bgdrjaprzb66vb47ssfnj6n061glz9a244z";}; eukdate-15878={run="17r61096angayvbdi9r3d7ljb1a5z9q9r093kpgdsi11ahcgsr26";doc="0071bi5m6v5ak6g5pxjxzq5y5353mpdjx4f2dbznkmfd23wp8j7d";source="1p6vg8nj8qipj59jwvp4izf2dv0l8490773h6j87wlclnnnlh2gq";}; euler-42428={run="0f63sy9zs0myb76wqgzww48g7clq6ni9kwnrfjkyyc4lacvd36in";doc="1rl4bxzlmw95pgcf7va9gsrgz89602a9pqvhiym15b5hdwc5cb07";source="0fy3dx3bf8idddxsj29yqd7bsv7cyyg8q9njmb3p0mw7laqrkjxl";}; -euler-math-70296={run="0iyn5pmk031v5z21l2mmrl2c6fs4g2dcp5zrs5h3cv285jrpa1dn";doc="12w9inmaxw5skyw2jmhhxqfxvzsf6z7dfajifj5lj9388890pdgk";}; +euler-math-74014={run="05fqgffa2ak065mmndran8hl8pv1a9fskqv8kv6vkwzq4162xbii";doc="0bvcr6p0kjikblbiyagln8plfyd15dsmqm4a1x1bp5gli0cdbifz";}; eulerpx-63967={run="1ls9b076rc73cbc160ms7df3w5m0x840y7s2mg3wk22vgc461ail";doc="0qwhb6wxm8fviqi5kdy1lcplarijhca0ymrqnxfnrz38z3v4xycs";}; eulervm-15878={run="1x0zgqw15r5z9mf4pcpnf1bdbwbpwbc49ij7gjrhf9jzzlkwraf8";doc="1bbd7f4dz3xp7ylgpi2wh9jf8nz4z6i2cvphfx53xvg555ln5v1m";source="1if22m5h8ma3bvrlp4jzzhjm410r5r7r2ij17prycj3cpj4r2nl7";}; euro-22191={run="02kkwf4psrmp7n5mqyrc3745kj82p3nxswad9x8rw1hd7a278y3n";doc="1ajqx7axgqpmbq4kl2gmk97ibwbijqsq6z8ln71qla61j0mkgj32";source="1hkzjy4vmvh06pk8bhkpz09ln5jygvyhwzyznqkrzffay3i89cll";}; euro-ce-25714={run="00ypq57ri9vkmc85c5l5qzq098has90qllm9lnv4jd73l1my7pmc";doc="03pcwrjrjp74s2xl7pahpr76dls17x76xvhck9izgsr29j6kny4d";}; -euromoney-72221={run="0ik3g3zwfrf7f3xyn7xrdalgfm1zydjd0dhbiqcrqr0pj527262d";doc="1zaxya5s318fycgvdx3b2blxhvlwcmwps0n4762xfw203n1870r8";}; +euromoney-73069={run="0ik3g3zwfrf7f3xyn7xrdalgfm1zydjd0dhbiqcrqr0pj527262d";doc="1zaxya5s318fycgvdx3b2blxhvlwcmwps0n4762xfw203n1870r8";}; europasscv-56829={run="06vqrnfzcq04mjk38q75n1k1dw3ap7z5xnzpjmgss8rl6mjn4v3d";doc="032298ir415l36gakqalg5n1nk70c47xbm2svvg1ygb32sgn4afp";}; europecv-69661={run="1d6p38swfpphw04zzf6a0rdr6xmz3rrc2gsy2gbd06hjmcymc7jb";doc="0s133vzwnp6jxbpmk0mdiaycr4q8x0xh6ismm38qhfb2zy62pp9a";}; eurosym-17265={run="1bf4vwygyakr999k95ki53fykknizakz9npz2i1h3r5ci805l7z4";doc="0vmh23f3ksc3b3hym7iv7m8rsddk8vdbqr5ib49bjqylppvxrsnz";}; @@ -1354,7 +1371,7 @@ exam-67600={run="027v4pscys8rmrrrz7m2plc9blf0bif3rjykfhw597rmnmgmhxcz";doc="1cwc exam-lite-65754={run="092wb5wjk452i252g4chnjzxysmbhy30q4cxir32mx54z41yf0dj";doc="197mlnayyzgr9v4yf3w6m72k8fqavdy4k2q1c0v7slsvqad320f6";}; exam-n-64674={run="0j4bi7j167fkaz57wfav9ybv5b5f18ql0gscvdxyf9vh1czk83n9";doc="17jj5s75fs0sxpak8ywd6lmss3iq290316mr5gyxm3v7r26ji8ii";source="1lvcxbdwy7xxjwzbxzrykym96j1qa7caqkdqhhx4qxdry9czpl43";}; exam-randomizechoices-61719={run="13dqgkh1isrg0z97z7bfd2b952sc2xr7w7ykllhvmzicr9gcml1y";doc="078cryxhlnwk0k01pwypmdkkjlna0fn70kj1xia17jq2xvc2fpcd";}; -exam-zh-69917={run="0a2w0swarm2lav45w9v72bv7gakqnz2h5fp8895sg7jmbm53bzvr";doc="1ia5nrldj26rcjhypvyqmqqz9fs9bni3birx24qdng652s11k48l";}; +exam-zh-74149={run="03c9bddwfnzda60baaf3y6xc6a5gcipnf79lq7zrjrwfda8sqyy9";doc="0yixq7pwpqz29rqsqwr0kvph11vdpza7ndav90f3ag5xa1d1ala2";}; examdesign-15878={run="0y9kqiihidv24553zlijr6fspbayvram1mqgy9kmd1wwskvbza3w";doc="0ddgn0f086qdsyssg4gm6ynlcnnsd16qpvn2g3wzija7ai5sqkig";source="0z5539hv1li9vw0d3jx7q9s844f29wi9xr5z30hvzl3721rnkvzg";}; example-33398={run="06ld0b9gi8s7y6igijylfvj2qvj3d45z2ml9wd1zfzkpf32pghmy";}; examplep-55265={run="1a3pdaqzc9jx2yf66vmjg9r4w07b8afyqijl21np6sf7rrsn7zg8";doc="06jqa848zzswd5pbfrvr9lh3i4l5h8wf3v9g179g3q2yb4dmvjwv";}; @@ -1366,25 +1383,27 @@ exercisebank-50448={run="1algypm3nhkbccd9k1w5qr6y75hqiinw5dj1h4fbmripmhdwircs";d exercisepoints-49590={run="0vr2yxqx2ng1f9qybapz61146lvsniv6mjwl1yfxk10qyvdw3pnv";doc="17kz9fyd7cc4pa4j6dsm8h5zpwfr68wg3ndbswgh2pgwwvf63777";}; exercises-55188={run="1yvdj03hr40732swfsg2br9f4wx9855n7a3whlqjdnczp6545lvi";doc="137g1gvwfxm3gid5xvikrqk0iw75csrkqgrwmh0hda28dd4zbdwg";source="1lryxm36phhp7p269zzf9a200k9k0v8zw8qyqvyk784vmvyilv7z";}; exercisesheets-71063={run="1vsdznwp42kyw3yv3681vrq5vkxv4p1926fzsinzmlji94nx5cn3";doc="1lnda7sw89bxyrf00yysk5frd6m0yx01ckcc1nmm65biv6fgrsv7";}; -exesheet-69838={run="1fsavlg9j9xi2j81djhg77k10a1ag7aq8k3ykv53v8yn4s8n2gym";doc="0awa3sb3wxspvd3mvyvva92iwgrsb1qydh3sdafmnd5b4m0nncys";source="09zhns0ndza7jgmjgzmr4a3h3rrh5wshi2ssb8sfkr10bf1xl2v1";}; +exesheet-73235={run="0k446c27dj7phzx5srhd9hmrjmjhkxa0grc4cr06a9yki8llqb1j";doc="0x6yafb833rzrml8nkbnkvrnqh4r53103q8glzbqjzwb61kg0glk";source="04309isw7chr66lkxjnshn2n364mwlp78mah8cnx5md70r3p2qkq";}; exframe-72595={run="1vai0cqayjqic9ldk3dlqv21r2m3yh57gs9ld8zwvzms1jk14qf7";doc="1daax7cb33ywqjnjp0hhqzkr94qw7lp564jm6d39k162by4wsb2v";source="16r87bwj13cxbmbim6jkwz358a2lpfinl7r7ipdv693bk4jsrrc2";}; exp-testopt-15878={run="0g7q4ccfamsd7sr7wb0qsw74dnwiyz0rjrniaxm5jvgaadiinc7q";doc="18i2ym0da8vp3xxy5q2gaykvja3dga4l64q9zjxknkm50vj6dj23";source="1xfp15q94icdq773ivdvk4n47i2k3g3y9smdvmxw5m9f35nayypl";}; expdlist-15878={run="09yhcdbx3n7gj3g2v2yh4navgdf5ik4x281h51kd1lzdzbbnf3aa";doc="1qgwn2ignri6wh67wwjsqpbk28jch01m8fn0nw6lpc6kfa4a9g6v";source="1m8dww4i5w0hivs904v8ls1dhs35vp3qpbb44ihwha0zsbvghabk";}; expex-44499={run="1vdbsxn85gkg24rx3qhkwcc658zjyhkymfspysxkxmmb8rn42y8n";doc="1mgq1knfx1lf0vr32wa2r6v0sr49m0xjnsdy0y42zngfi1mizp20";}; expex-acro-68046={run="0hdbjdkqsi6nw99g3rqvpd242mag8k7ggl6bb0wj99nzfq9f43sl";doc="0ilsi8ddsn7crc19qf22vwff2xc4lhpqhxpk6mb7id5fd7xpp0pm";source="03addcn3axfzl3i502clngi1bc5b4l5ndq335xh6x5h2566kjclc";}; expex-glossonly-69914={run="1505m6spzvhxmyg5hv7wncd1izl1qzkn5sysfjpdykwwg2prjp4s";doc="138yihm7vp0m25l00i9q9gn85cpssnfn2n53v876bvlkss7kz765";}; -expkv-bundle-65623={run="1mw1cdl4phkm29yxb747whkkd81g9a3sbbnkhzgskbna2zcjj0l4";doc="0cwydrq8k5z6j62wizgg6n1n8r0h0vi4ijky59vvz8f7b95j2xz0";source="0cv1r3daz5lscdqyjgmy6xj00b4i280bg1c93b2kd9x3svv179mg";}; +expkv-bundle-73212={run="0xk4j3c9nkzhw8g69mg5498lqgb2dryjxgyqn2mwqpc5s89scfqs";doc="0a5kdxgkzlf5rm4k71qg66n013pfmhd453pdy3s4dkf3b88p6vrf";source="01wm7aly8fsrxw8psnhg7kp53qjyrz3sasiziv0qgs4qllp8ywz3";}; +expltools-74292={run="1sijy86cb95na2shzpyd6ix4jjy7hr4y0f3zaay8j3l3164vhfia";doc="1vncrzr1akzp7fpw8bkhaqs04xiqz9dakzzy7wh6nv7a5wphn3ws";}; export-27206={run="0la9v2m3n15hgds8mmp1c56dz0a7iqygjk2qnd99n5924n187wyd";doc="0ipbs7rdwjp6jrr4drgcs73mc8fy6bav24qfda1an7byglgcf2nm";source="1q3xbj3zicbizadihwb6b75c4d95b6wq0adi45wbqf6hzj05bd5x";}; expose-expl3-dunkerque-2019-54451={doc="0xij1ycxnc3hfzkl0bfs03s0zzzv6xsj3myvykb6n836j1g66g2y";}; expressg-29349={run="1hcrzh5xhvzhf7d9gfqfxj7bi89ds5rxa8m6al12mdr5qpffzzkb";doc="0kla1swvhd43xcvns17wlcvq33wvjidhkqnd4i587x9mdn69s8bv";source="07w45g2nbldwnbrbrmdq9pwi3xbi6cl2mqxaiyk78jfgr033rmqf";}; exsheets-67300={run="1ymcfy9i2ll048sc0gyljcbwa06m9q0g6nxp3csvk4a367wv9cxa";doc="1l3ln3xkniyfgmhrs37rixszacsvalwq78fyh72v8ca61krxd35q";}; -exsol-69343={run="0w51rxp4lw5v1xmhp26bqalarp05x1ynpskbgb2ci7b3g1xcnm0g";doc="1hjvmd9rjd5vb4d7794iii26yl394plf3ajihp7mpmwbzjz14w6b";source="1837xcdlwxnw8944c787b4yqlb2bi2sijx0nnr3vfvidpwsa7ys4";}; +exsol-73991={run="0ih5jcbdrycrzkkvjg3lq7xnxdjrzf48lf77hsizyflv7sk1cllg";doc="0863vvw2a8zvqfhccszjc9lxgd4b4m2x16fkf6rvgdjnkmgkp6nk";source="09xdhhszy2mmpj18mcjqqapjrkvhs5cwmavv6w7h2xb4jc4nxwml";}; extarrows-54400={run="151qmfsqqj516ky9j4wbzh1618r769b1bqn4rc5fh51p1s28k8f7";doc="1iw3750iikf6dc6kyid86r7kdzkpi1z4la4zlj63z26fczivif91";}; exteps-19859={run="1pmipr1444l1yai8d9hhrncvimzb5scn80pqij2g90lz160962r0";doc="0ymkwhbl6r64pxhr95wdw10dvn6q95mkz1pwa1nb42sdcljizrsg";}; extpfeil-16243={run="0n2j976a2607zsgf2cda5vljl497c1562rn7cih11h6vpx76jx9k";doc="0irjpxz1zk30myk0h1wjhzcxdpyqjfzxj0lx1nz56v4f157myn50";source="1yf2kcx73zp24wrjb59zd1f35809k52cdwym9xlf5fy32rh69y08";}; extract-52117={run="0yfxyzmicqczvn6pc7ykakpm2hjsrsb243n1bs0crjsvacw29hb2";doc="0lkljkwf22vq88nj21ca023ysa0hmgcsh7a0xhk210ba01a9433f";source="1h06ji378l32a18nbf2plhk4q3vzihc541d0wkw80ik53m0frn0k";}; +extractbb-74250={run="091q2kgzh32sxq94rilp5lw6yvs05s4p9rsc21g3r2c5663217d1";doc="0mh0nf7cmg08lz4zix928llcx0rf6mvir13w5lnf8b1zrqgv611j";}; extsizes-17263={run="1249x8lklry9ibil9crfvy2x3hk5afnc3g3khixqf54jcb29zpg8";doc="06a01bmilk7hqr2k9237i6x53f6wz4z4vhr8n0qc0i3j09n5i0ps";}; -ezedits-72273={run="084akg6wz1ls94bfn7gksri7fbil4pjack69gw2aqzvcm90ch6zr";doc="043mlir2abx3xd3his1vh534bsi70mz4x8dhc00lmkyy3l35i05g";}; +ezedits-72849={run="14g3bvmza7yvafqqsh9v8k2i7mpl65jny5wlkapiv7rh15zcp0yv";doc="13p9qg12b61p6bjyk7l4zsng8hmapkv8jckrnaba0102y7dzav94";}; facsimile-21328={run="0mfzqrn76b2nhz60rqjdr55s6i9fzw96ya74nncvdjjcvaqpjrjk";doc="1i3vv6a8r1mmkmpjwr66r0isha7s5ksp5cwgx3rj9sl3wfnywsfz";source="0icxnmiwmrjsp1lhhdkcgsjif1s396lkdxp73vz59afzhwdm6l0b";}; factura-61697={run="18p09q5r4n04r3pr636zxbq2jp027knlzphd4zpns3d2szgw2j05";doc="19d5nsjxzghmk56l1v9ppr237ykdrgk7bql4cdr4d2rdvqbk4r19";source="0l77127yc8r4n0iyv4q3ilcs9hrfjn0y56rc805av4gdrgil9xgq";}; facture-67538={run="1vfaj6hsjnd1cmgwrlj08bn9zr52zc1z9h1dpjq742gf8n2f9qfb";doc="1my5nlwdik253073yhcjbvqkgwcw5kvmg2fm2wladlgcq8qav96d";source="11nr4df4dywqaq1bk3vzjc6s9gd5kxdksicij2fmiqx4a5309ijc";}; @@ -1395,12 +1414,12 @@ faktor-15878={run="078fxihxiy9bnszy2nj5ca8ys9hhhazkawwi7x2hzwfh3n4dyqz0";doc="1h familytree-63739={run="1a6hvncnjzrjb3bpikkjlmamnrsas5221hhxmlvfb8x05qxjxx7x";doc="05m6n4lzz0fc2hm011kyvnxnv93gl39jd1lx404xz0kjs0l94cp8";source="0g6i47agywjpqi2if893jpm045kwda3bhlm2afd6gpjynybpmhmp";}; fancybox-18304={run="077xd75n1lpy5a4gdgk88p0ai2is5aj4lf2cfxn7nsyhdvc1y6gv";doc="1giimlw8zfksar2hwarpnhy2sd0jsdlxzfw6gz1lmdb8xmwkx2nz";}; fancyhandout-46411={run="0fgyvrww1h79bvwf77h83p2lwff5b564gk8cjjnkp26zjpphah22";doc="0r5wzyw7z8gsm2k1y06h9gj5cfxnclawicxdjpq50dnb6233ac08";}; -fancyhdr-71883={run="0i213lj161gp6ih7hy9b5bif7p4rfxq7qh92ghxa3d4di320rclx";doc="04lgy2mzljk2f69ms4lmm97chcml3ih081m8b0r2hby8m2wi3sdc";source="1d9rrrplhxv5pbcjrgb6kb7376qkzxsadnxp58yf21cglmagpg65";}; +fancyhdr-73790={run="1xsf1qk8qa837s19qzvqniv9ymd7lf2nskvc7wgqbnaybkx98nkq";doc="0xf108vx7c5kf390p5bcxkm5xshypmdgqxq4jwa1m39ds81rc7dv";source="0zwz5nq04g093cd0xhkf0vci4g4biy8iig975d9lq4kg83kxby7n";}; fancyhdr-it-21912={doc="117826hd9zl15i8qf6d1pz2qz57l68a9nxqldxyk21acc29ifalr";}; fancylabel-46736={run="0fyrhiknwb658rg4lkdkfb221yrvzfs5g2rmxfas69p6aambyv36";doc="0fpxag39xa2piybkb19fldg3ykwb26sg700jp8hy6kgb8afp4hrw";source="13hx2k4i8ji3a9kxd8j2j177l4d5asz79r9v707d8i8vkxcm1ild";}; fancynum-15878={run="0vfis38yawys70hv4vrrnyy820dj89dqp38jbg199pbb8y0qf1kc";doc="01f7d3him9gcm7p8567ljamwrg2jl25xs7w6jm05l89dkcb34fdh";source="0cfm5da0gk4y8plad5khzhf9gjyayxmca67qpvdj296p86xxdi32";}; fancypar-58895={run="1znfj0zw15g4n7rf3za61ixfy7k8vyv9nikkran9bvd0jmx6v4js";doc="1qdqw4283qv1i8njlvnds87pd1ssx239ycd985rbkkxyd0brrqa8";source="1y35cm7q0qa2szmkldv46203gagzxwz4cam7yzm13s78wyig6mcd";}; -fancyqr-72472={run="0ajxvh30xnb8k9akf4fmgwl699sqic6qyrxaza1dgjm2ghlnfg7w";doc="1nzfw61ngxmq3rlrl8a50i3d9w4xkdn4341074jhp8vibpc0iljv";}; +fancyqr-72986={run="01l0mh2v7p90h145hi7gg103vf8ixb2p8vx4ifxhspjy1kn8ij8x";doc="02xh9w1h5i21madcrn01b0lk61dfkxc1ciicbmd4is0zm965qyyx";}; fancyref-15878={run="1ns9b3viqg45w3pmnh69fdrjc9p39pfnqwwsfl9nnx04pf8b0p8i";doc="07g7ynr4qjv5l8v71ymbhx3vf000g5qq63c4i8q0iq35gird9yac";source="1p5xd5a6lwv71hp1sx490qwqbjn720gc1fpkk2inmmq6h6vwgpdy";}; fancyslides-36263={run="0hfa5jklvybgx9rji032rdmyh2qr63fkyanvvs0jmg1bkpqw7s03";doc="0nqqvkv9gsl3jp22rjkxrzklpz6dfmm3wy3mc9f15jv9iy2zlrr9";}; fancytabs-41549={run="0yxr24fnjabfzhyvfj7nhn26cc7hi08byw7zzmky3nnynxnxc2p6";doc="0f9b7rvnz5syq5dghj426k9ypppjg4q9wzs8v3jl8af94xy7zrig";source="10p8hb18qrwp2dxsjybrawnlryl97k854l11c0327r39qiya61ns";}; @@ -1408,7 +1427,7 @@ fancytooltips-68931={run="03b31bifjnl75hscp908x58r90zrp9hy8r4kf3lkygqvikh8f5bm"; fancyvrb-69536={run="1xsazrr8rw8rwxq2bra6ypsv217r5rrzxhqrblncm5g2blp8x815";doc="025sy2x32w7h2dih36iza9v0lrbwpr9q2idiifdxjhs1clwx01rm";}; fandol-37889={run="1l6h2brl2d6bnam6p6j0p1d2s13jnva5zkr1xr4sarzzxj6zlz2r";doc="01ax7za7wcr644ncpv3rpfvl2ndqlppqnjzbjp8y2d0hawc3k5m0";}; faq-fr-71182={doc="0bhri2hf0zlyk942ibk0pgqkkrv04ghka25c7yvnjdhpq68mgacr";}; -faq-fr-gutenberg-72499={doc="0ihfy0z7fs7q8cazld02ypxwa56gj61ml2h109iw8zv0k7xaf77j";}; +faq-fr-gutenberg-73163={doc="1ap9kxsrfvycdp84mfq0pl3icf9qrzy093gxviv5969w8vpvqf9v";}; fascicules-54080={run="0zlkjn8kg6vb58xp2xh7jwjk6dmk6knzqh8v7lrdbmzhw9j28vwb";doc="1jkhj04gpwcckp9zqanaa9zhplgs2a5xqnn2xf6ir6qifiv3403y";source="0d7crimrdcxlh8hd24qfwqnadxfjsfrfnjr4hx5rrj75mm946zmj";}; fast-diagram-29264={run="13c2r5prb7dg05j0r4lkdz36v51zj6v5p2c7q22gfkbz1lj1s6s2";doc="1f3ghs0l6mj2q3iw74rjjb12y8151cccvhww13h4kzc30vacr3r2";}; fbb-55728={run="101yfs3np0mlwgfhiz74jh2jngxnb395wkcm9fvpmrs4rp7wxx4l";doc="0b48vqwyhmygv70gsbiknmmysd8pz8m27pfj52zqzzb0kphibynl";}; @@ -1419,11 +1438,11 @@ fc-32796={run="0bw8ifh6sxgii5s3vx9d87m4rdfmifdvw70wmj2kwqzrij1ri568";doc="19p5r2 fcavtex-38074={run="1rnfrvbm4baslmmakf3s1n37razfzbc6d11b5yfhhdhskq2aci5c";doc="05ixrg17jwd315q5c52c4b8smcihj4rzrxjparrgfimivd85i3h6";}; fcltxdoc-24500={run="0bnz5b9ibr3lh5qazdanlvvpp8d1h2apzkw61qxr6kg9ymmk2w68";doc="0dvr57jz38v5wflcjjp19rwjbisbzkdc91fji9s1yrv27drawijp";source="0k54q30f7qp40fh3clxyaa40xhsa28qyavn13km65s1hwvg4hg9g";}; fcolumn-67729={run="11bqaca189j79cszypwmijw166v3j9pkm60y2c2wyraj4ss4d1k0";doc="034crw2fxf9m7a7zvsi2c7fafkqkhn8vfxc97dc7k74wrd5g3kwl";source="0dqcm83g989lkgjkb5q9s4d4284g5c2y36y75iyq4jhdh2ca972z";}; -fdsymbol-61719={run="19kqkmjsi5kw5s6kkgf4y7nrwjhyd9pgq02y3f43wfdml9jwlvx1";doc="0ddy5d074fjmkvl3pm4akqfq7d3f57y09cfmrs5wfgvvb51gfcvp";source="18hiwralhdsp8sj8yr0c5pj4xmjaiyyha1y36sgca2xlacpw8ah3";}; +fdsymbol-74250={run="1862n70svn61kdmfhr4xpgh7zsrymzj21n052dfy1c83vdrp2s53";doc="0n4n6id4ypxmflkz8prlqv1ahahk3rd2pr4q4q4y8jz9mln02x8g";source="1naz9986wrg9h14v452n8xj9jps7jbsbixarcfi771gvd00az9dd";}; fduthesis-67231={run="1cysdwj1gl9zpxqqcb563x7ssvc4y6g96cn3afbjk5hhw8381h1x";doc="0w1dyxcyxjpdbmxrv23xlrhg21kq2wf1r85dkdaw3hs76800baqb";source="0spm9cz58xa2fi86zcbs4qp4zxcdvaq1ll41bmp7mkykr369j2k7";}; featpost-35346={run="1p8xb6kmfhhqvxcmgf4bkw60p1py2s1pyn54700zs8vlkbxlqy6f";doc="1hy7n0jfdidj3an25j0m5bbv2ks40iviwzwijlk6qqdll0k26z33";}; fei-65352={run="02zypphy3s8z531zmvrdz2df0c6viyfnzfmn5hgc8js557z8iw3f";doc="1nimda4g0gsf7521ibmqmh5a9hfyyhdp28dpiqs0wq50ysl8phc8";source="0k5y72pwziakribc9m9yzm860pg1q222qarvrqxyjqchhlikcrhd";}; -fenetrecas-68779={run="1fx9kfgiiqkkfgj12x3yph2218az86h99r9idg7q5rkx9h04lzg0";doc="1qcg04kcvfmrgsza06fd2aam27ixwydis86f430cfli4x3c4c7ap";}; +fenetrecas-73069={run="1fx9kfgiiqkkfgj12x3yph2218az86h99r9idg7q5rkx9h04lzg0";doc="1qcg04kcvfmrgsza06fd2aam27ixwydis86f430cfli4x3c4c7ap";}; fenixpar-24730={run="1l79py58dih05c4kjb8cngzs3bzpbhc72f4hnz2r7nfwmjp86c56";doc="0fbx9wms2n0ff1cdpfavqhjg56przd7hr515vh81g8jgnz68s24l";}; fetamont-43812={run="08c8xjgam1fx3aa4ikx62jfh3f4bws0ngk428bqzbrd8q445c3jz";doc="1zlhg0wgchgkk6j8v23wd29hklpzb8q4p690pfswg3zakc0dcbgp";source="024bwgb36iz2ylwsfzz4wfgsyr9djdd0p23phadzmc8qzxqsslph";}; fetchcls-45245={run="1pccfz68chmnbfi9qnrmdnyq5kvkq6ir5dl09jqbjlcw7hw82ka0";doc="0if19dgb2k75qhyka4jiijnl3msk8y8kj0fzhriarsicivwd47ds";source="1qb9ymkvbxmxlpcs3drcyk02bc372s0vhw6wwpig2bchb1hwdl44";}; @@ -1432,7 +1451,7 @@ fewerfloatpages-58058={run="04903zr0lk50i88vywpbzpg908zkmy0w8vcfks55cmbfb2ja37qd feyn-63945={run="1pd608v8wl7007rjmsykwabr1h8jjk1s78nbmq4a0541rj06yd0p";doc="1dkfi17i6lz464bwmr5r5295y1avvsn5rpdw4cv80rd20lvhnyyp";source="1vh6kz22gpmch2rdlvhplvqqd03vd0mn5m0a123i3xfbka1myza7";}; feynmf-17259={run="14bl9c8yz1z596281kysyyjbf727pi6mdnwag6gfqs1nsinq0a2i";doc="1ql099wrlddb4fyfrsirx0vnhcbh0wgwp9yixhvgxfk5pbah8v8n";source="0f9ghmp0hcmzadsfljfq7pinn69251dwhcdk4n62jrd07qdgqsyl";}; feynmp-auto-30223={run="1yhvcxiq6ajjmlsvnznzvp35sap1qsnj54zv70dwpl29rkrgrmsp";doc="1y1pwlplkz2z7lqz84ay7ch1lw4plh4n69isqzsvhilnr31fkf0a";source="0ja5yqs9szyk4s2mk9cbjf6p98dagwk7pycma84y48kinkl96s0s";}; -ffcode-70740={run="0yis8f2xva0s0y7acavrsz89r5a3xjl0a1sp690czyhvjs5csq94";doc="1b77gsgdss76jmx1i5f3rfvpw0myzdq4z0vmr3p10j3h649625xp";source="1gxkkqwj9dkli6rdxnk80my85gpznn8dfzkszrrzrjfp1nyr20zn";}; +ffcode-73318={run="00sadzsrnd9s9qj7dd6iyjsb8nqk339qs87246q6dakrkiwpdgw3";doc="080rpfcnh87ihi7q3b48j6s3x4ba6azh9a50ixksxw4ffvbhp4yb";source="1rp1pf6m37b63a9a9lzxfzxkvdzfyg2r6r4cslczkaaffbkbrq9g";}; ffslides-38895={run="1mpfpawdhh16rl6pnvxnkj95gf9hjs49gj7cwfyngmqkjc2idi8j";doc="0z5kpim798zxj20p70dpcgmwg4vx9mb0zrmq620sprxxdr2gd059";}; fge-71737={run="1f6ibw87kbhpf3qxjh17jr1lsh9kk9ynf1rngzyjwbq2rk2id94f";doc="1c8nnpdvkxcm6218mrs18ipjf9mrl1cqyvv3p31x41ii8wxkvjm3";source="119d70668gw3za0mksr93wcq9gpzjn4gyv8vmizlabi0ip1ycgy8";}; fgruler-70917={run="1fx9vwrgc8fv7w2b7bvxxfqa6nsdj1pjck3vdz5445xssn0fg7vr";doc="1315rzhph291y9wil0nnmm5sxwrk1vy5wzzv13vq6c4wqfz28ssr";source="0mpi2m0ffhnjdwqpgpfzlm0lxpm8in18n6y530skp3zjaw08pk3d";}; @@ -1451,6 +1470,7 @@ filedate-29529={run="03fwpi529pp6bqwr37ns8nas236nhh7nm592rpjyrvlyv1w30ifp";doc=" filehook-64822={run="0h0k0fgdwzm50jz0ibj7zsv1sk355q13x1djc3pk4fg1f3czhfh2";doc="00l8hx1sn4sn1mqpyiz9isl5a25a4a64nifq6q2jlw09df9gmf9m";source="0bd6fhrzy6bh42yb44y4bh01zpx92crca8zia4lyjmc95rlv6gfa";}; fileinfo-28421={run="0x922migfx9y1nqqs9lv4ygk3cvqj88a92cj1kb9xkgykp8c6cqx";doc="0rw1pdrqghgdwzyfrc0y44cj1989lrvpab4n42qxbbb9srhmary4";source="0kssla41sryd278w12syrhsi5aalld94vjcmddldcc0l8l71sz5f";}; filemod-64967={run="05lipahmxgd7cy76rz1j3p2z4k31gj4q7ihvb0zbi44g4n26hz6v";doc="138481q84a436a9ns587qcmmsv7p9fb5wzz1gwla25jigx8fb4fr";}; +fillpages-73550={run="1a9fm1dzsdri8nqhhqslwzpwd566k9vyyxkscwn99hfcxskbvwsb";doc="1fqdzv6ixr4nld12blnjbhvdr0lxfvy459pmchph01zr04402dwb";}; fillwith-72006={run="0pxy8inpv8kc2df3gqq74z2igq6i1p6g9yz4hzp50apajmv4karb";doc="1v7ry89ryjd89hdk5wnjqay2hamrnwf3mkijh2piq9nmzwajww53";source="0cqqg7qzwl102agdp0f8m5vq219d59q01i4x0k9dvjr05pm5ad19";}; finbib-15878={run="1dr1ivhfb83ky3q82dzzv5vvc8bl84iq7am0p1rc8fjlbj95i4wm";}; findhyph-47444={run="0b7qqz0p0l70r6dl4jhx086dxywb0vlln3r166pj0yl5jfjzhpna";doc="0n7cpjxz3adj4bcmc1vd548lggcchhqfahdcvn4w9invw296hhlc";}; @@ -1460,7 +1480,7 @@ fira-64422={run="182wpm6dkhs41y6kr4bjc4rpy0b62d17r0j60a23znfgglpriy3f";doc="07wm firamath-56672={run="1d9l5nsx0qswn1hcalzsrxkvc7mvpdqk3h72bfk50h91lfm2i567";doc="1w6zlskvs54x192nyxa83qnlqhvq98g64k5fv6ch406nkivifmgz";}; firamath-otf-68233={run="0680qh4drixmrvhv3klkflz0jml06x8k9inl2c8ym6a8adqx43nj";doc="10ynw2ckqc7vsv5hq9kv78cvn6yd23qfbyv5060sjxl91w6qxs63";}; first-latex-doc-15878={doc="13ngk5pia5vbrbb4jrrlq1lmyja08m7cy4ydcjasxha8kns001ss";}; -firstaid-71628={run="1k0kww3jpsv98c7aj0p68hkjdwy7xd5s9y5i1k0391icj4anynzw";doc="1nvh9z2z5gm3vjz0np6qfd49858n33i7v186j6ki4kmxh30d72zw";source="1665kv6yqx57y06nzi9x16zssnqdfdxhir2dm7kqrsdlq3rar1as";}; +firstaid-72968={run="01pjhdzvpq2b6y66b232j3vb164p9hksam3641rz7mwrwa1qs9l2";doc="0306ykpj2xbq1klc53v383m8dbsw08gj4smf4kalnybqhhj6snk2";source="0b3fw3cc9rpa09mr3d8bcchgj3s42zkp7ypndxbzcd0m52spx3m4";}; fistrum-70187={run="08cp0igysf8fiznhiparcc8w1raqzm7wwmz2havsjwy8qy66zn54";doc="029w914wk0g3kbi1i8zr63m0nmfm3nsaamksr47jnv5iyiyv55g5";source="048g8x5q882668lbzz0ji1hndfkd2bd777s2zyyq59bcw0gmavbl";}; fitbox-50088={run="0jk46rrq01bbqkwfqf1rdrzwv475mdmz4hqvbffkivnbwj1vz18g";doc="0gb5gpdrdagilxsklq1aijr5zfl5n82nwal1h9qls0iqzjvgizka";source="039q5as7939zc5nby6m6piz5h0zphm19hqjkdyrgzw1q4r9ypzc6";}; fitch-69160={run="1c6myhpv9ix6cr6snn5f9ky2z5caam1sqjgg0bq1bj8df3acdv80";doc="1gdgmviy8pqqwwsvinrb8qsgsd4gw6bx6xci56w4nmfal729r6g4";}; @@ -1471,7 +1491,7 @@ fixdif-66606={run="1gxz7bv0h2485pwrs7b0zhjcafkgzd1r0ikpjjw0gh4iqc3bcqd0";doc="06 fixfoot-17131={run="1zszczpwcggczq428ha84g71rvgml2zrx2v74nmk1damcp35pzlv";doc="07zdbq43l9yddc9gi4i2qqpvz0xxmkhxgg3wl329j25p4h58amra";}; fixjfm-63967={run="1v4gn6bwlb294sxrqgy6j9vx2dp7plbagkvmw7vbvp6wk8dkza72";doc="0wiihlpjzvmh8dynf0nbhmn8raxflqxmzpk97s1qv7kkvpc79sy9";}; fixlatvian-21631={run="1qm1jj803a7zgqbjn4q4sg4mn3pvd600pfkqabjvp0ck24r1pw1p";doc="160bb2khxfhl4g48a5cbj8xdxslgxvav1c0wiq3w1ajla278qj28";source="1zfdr8kahxgkhxzg925lgls50prcgyp6hz1vhis1241f9rd6r3qs";}; -fixltxhyph-25832={run="1lvr7r5adw566q0hbvmmvmh7igcm8asl0ispd3lflik886ycmmlr";doc="0yfa6a6dvzx2jjy1jcw7phps4wxz3ysfhk5mxc65qss9kmc94mwq";source="0ksb42pc0bm64pgszgph6g0rnksd9fhb48z97bnd9jcsg5rhzi12";}; +fixltxhyph-73227={run="0z9h54dpmwx6cz6zg68b9drqhws8c0p7c44p56300g7dc45cfkn9";doc="1mhfcnsvlrrjz29v73bl74jcgvjm0dchyvzx9la71bzabrcr43rz";source="1d5x6bmw9wbggj749k23n7j8jr6bbkfz2f54x3qwsfxf0ymgb6rp";}; fixmath-64648={run="1513gzvwpddwhbaiaw2jw4qs0c4bbiym0dmcc88vzypqsbnjs13l";doc="17y6wwiq3b8l2p3nsfwm50g7lzip8aqls5ysgr4gvz1l8aydl26z";source="0pzyg8k41rlj5gvqq86i9jnys9plqbxb3qvas8fv7k5kvqc43riq";}; fixme-63708={run="167003w7a4xhy35fj6xm7mx1hvqn1bh1b563sih3adrwyrdnqjbd";doc="03qddrr56q77h8qhrx9kryx1d0cab6lzcngsbmyzaj1g81hvwsxl";source="01rpq9xd8rhy4fz8g1l6354pyibjsl90h591w7l7cz7v0yxldy17";}; fixmetodonotes-30168={run="1pca7qpkqfd8506jcjgr1kwcymbcljzvsq47xlvvly3qzac374vv";doc="0icin53y7xj0dddsi90n3hkd2wrcpymlyhfllyqfz7ac8y4xn8r2";source="0aphhsamc6x1k891ybxhnqmhiwh0my9sj90x3w22gp7zhavgrww1";}; @@ -1495,7 +1515,7 @@ flowchart-36572={run="1b6gwbnd9xjcvjxgnl6xjq6lja1a0p2xnrdlbrhs6ka6f6pnrbl2";doc= flowfram-35291={run="1ccmry6f8danw6jqdsck7pzwjsrh5vcfy99f8kzyqcbbrzl5rn8h";doc="19rrav68s3wlwgaa4mhgqsdlr1syfpvp4jzc80cygi0fhv2hn7yi";source="1hrs58xhwawxqd96jb5hjywbfra6az2qkap0p5zap9zkck8ixz81";}; fltpoint-56594={run="13zin0r1hcfihji2h33q039mpcf86lw2q017ss8848xpqs41fb0p";doc="1yr5d1hs3bdd20df25c1jyb0hcizwq7bxjbcn804b97sjk2fk8gp";source="19qy8da4ppsd1agh1c3xs9fxsl6z8c60lcyw4dd88mymk7yk4ysd";}; fmp-15878={run="07ml6i8lqcz737fm33g95nx1hz1p0z251h7pgxvvvdmn5dml1l94";doc="13i7axi1s8qqgdvdky20dckmsa95q2q54z7cf6zgd0znzjy6d4mp";source="1fd8h6dndrc7hphs87y1lfplmkrwgn1pxgmvf00gfhgkg1zf127b";}; -fmtcount-72583={run="15m0n1bjc0fi6w8i7afj0sglzx3cfpdw3bkrcainqwnj3nnk7ywk";doc="0n5f49648xvbj257fiz83j9mmj457kfsv7zv2jmpp14bi16bfqns";source="1jqfsan3qckj5j1vcgkb54iqcfzxccnczzk4d5r7rqxpn4cmnlbs";}; +fmtcount-73821={run="1al1idsmnjx2cq1zn1pw1mmn51il667p1j5siijk43kydk4y4qmw";doc="0611psfk8mna4cwmnykf5ymg3s8mw0yqg6dkbh5a4q9h82c6271q";source="1sy88f8s1jf8yjavci9va1q5vqw8klmw8j92vx64a5d2fca54i7r";}; fn2end-15878={run="0cj26s7555q49fi382pbvy65xa0yp0wbihk3y0magblyxjn72wdx";doc="1kafhgr4c9d4pjpydd27ha1pdbxk364qv8dmcr7k3l7xlv31jv4f";}; fnbreak-66615={run="143wpqpcqaamjvg466cwpggcayxfqnf2vjvfvy7xwgky9sfql05q";doc="07h1xr1xgih5j8mmqvv6v5kavnb9yzrh94g0m42rjqdzg5c25fb6";source="0rxbjgb758x82gvjrmap30q4jsfq0424r3xszbm1f9b4wb48xqxd";}; fncychap-20710={run="0x3sjslvz1gsrr8607q9r6k8683p9zcz7p0kxvr92j9ls1prl5c4";doc="0is37brbbdqb1szx3rwgmaqbl8vlqr82sy8svam39yrbnzd9v1k3";}; @@ -1516,27 +1536,27 @@ fontawesome5-63207={run="02ip5czslh9120nrby3k9qn0niy8bryr4190yyhibnwkr9yaqj4k";d fontaxes-55920={run="1xm9a33imgfsj1r6ky6c02ir857ccv5llqgjyfh2rlvk9xprmcjx";doc="135xhw9vda8l3cc76ja8akfj33wfmmys9wf2f1j5n1p742zj0g3s";source="0mq9rmi02p8lnkg0a8s1bi7rn34dg82n9cqr14sjrhqfvpl3hzr3";}; fontbook-23608={run="12dcha7gkyl4ycizd2469i628l8qvh1xzacg7bv7b55q0dip2hlb";doc="1ywxxp2ygc6xjrjsmq1ax4p9v0z3hpmbcgsnqm3vdnnda1c0gn33";source="04ny0n1wgs27ky6fpf0i8ivhkj6ypad537mlx7rz39kkjpl6mz96";}; fontch-17859={run="09jpw4fc3kk2w1rxs0lm5sfvl8v12y9gch4viy6hva3sh3w8yzin";doc="18si3pz2crkyx075cfnz3ddwbgyccgvyxfzqd70njxqspz8xwf23";}; -fontinst-62517={run="1jqhfib1ml33wq292x9ff03shyjrn2b3grw44cxzxndg4vq7mn1l";doc="1138mrjd4lbwn05kksw1249ffjkdpxi88m8551wdmh6q2bnqmw6h";source="133myqzr4xlp4a3pw8ld815mpl7l9y6rhz620ja77sv4fmci76v0";}; +fontinst-74275={run="1jqhfib1ml33wq292x9ff03shyjrn2b3grw44cxzxndg4vq7mn1l";doc="1138mrjd4lbwn05kksw1249ffjkdpxi88m8551wdmh6q2bnqmw6h";source="133myqzr4xlp4a3pw8ld815mpl7l9y6rhz620ja77sv4fmci76v0";}; fontinstallationguide-59755={doc="1i6im0nckcr9fzs0kc54dvcj3jvjz2j8jd55xgjm0r569qjj1hi5";}; fontmfizz-43546={run="1ccfywcywrrim1hk7g0kg0bljq034fh27qrr8w8ypcyjdnafkhxg";doc="1fcsrwbn8kiyw4032kkjg2668ax0kfcb6g4kzgp6bjcmqzy6q1zc";}; -fontname-64477={run="0ylpryn5wnjnf6acjl6kp67i0vl1dz59xk2xbxb0fqhx5ib1gdgy";doc="08vfa7n2bzjsay7b7zaigkq7imlfmq92f4firwc3rx9hfm7hjbn6";}; -fontools-69241={run="0smka2cr5al8f00hfcwpbwkddl7g2zcgg2jrak2j8p2ycibvfgaa";doc="1avxm73plf2p0xk0gh11311bfqbwlxdyvgx9hpg623ngyw90wkaq";}; +fontname-74432={run="0ylpryn5wnjnf6acjl6kp67i0vl1dz59xk2xbxb0fqhx5ib1gdgy";doc="08fy6ngahpprgf3iwp06gb6gz53mvkhdrr44lchi7n7n6bjqjfsn";}; +fontools-73362={run="0flcjgr08acs1vgycsjbw2ppya9i7x22hnhvsmshx9hfdn5jbyiw";doc="0h06ak1g6fj1vhqx6j1q5c426ldhc0bl40xkykk314sdh3f0aqas";}; fonts-churchslavonic-67473={run="1s8y5kri1sjhsbz2mdszwy12vz8k0b5ad0rp383jrgcd710n3949";doc="05kgbvjj4w3sblsjprgq1gg0inrgrx0hpim8pmbgqj6w8xc1n9kq";}; fonts-tlwg-60817={run="03fs5l62fbkz9rinnraz9zfz1byjd74xwvlfqcv4cvbxg02dpgmm";doc="0l4p30am56bblp120lcs81idahw3wrgmbrvi0jzfnvzsyd7xh068";source="06zw6amxdkmb9cdjvkvwgah5x33ksa9iigb4dcw6b9d3a0q8c8ya";}; -fontscale-72614={run="1wm6mirmjj45il64wsss9spkksv6arq1dhz947rv6sw0gdm57ci0";doc="0nd2kwvr6222rnnjcy73i47qz08x51qs4p4qgl6mbk08cyg4klwd";}; -fontscripts-72672={doc="06kpnwdzvv896l8xw619kwl95cq7qcrbxcdsmq7ryg3pjvphk1ac";source="0f72ajximx1x627ih1j9ay2hslxaajm0isarzfr66kq694lj2mqs";}; -fontsetup-72261={run="1by2h3h72f7q4kh8p40n3jc90szrq6qb1j9vmpckdchlbaxbzg78";doc="1bjdvi1vkw0q2gby1y4sx7khmc1ps5bi9q16x7vwyii4bw9hhrrm";}; -fontsize-60161={run="0614lcl1cxc7a6irrjinp5x1rx2cbzns0al7d9f3njyyayp13qhq";doc="1c6p4yz000rdcmjkn7pgz3ckw3p42xkz4clk5dz01fnxifmmlf1l";source="0lvywzrc56rfkkwipwhqahkm8a70cnff0r01rpl92d6n6znl278d";}; +fontscale-74423={run="12cijmqsp3346vbrypd2wd63fwijg9j088d55nzykk5j3jm8ryk2";doc="144r8nzbjmha2kxdnb3c60fzlxhppikpdmv61z7q0s3qs707zb4p";}; +fontscripts-74212={run="1c2nldjh5x42ysg81b3jcaaydxsrl1idnvj0si1lxyqk7aji23sm";doc="0dbr5qf7pr932hjbn5s9lcvi97s0p7lpqkx19xyrkcln5nd75i79";source="1l833wacmvail9fvz07da58r2waa9b85h6yhl94r26gyr79zb4kq";}; +fontsetup-72734={run="0506w69vc5x5ls9r276hvw5cgr22sz9333w7ji2h8mkmd2swsc4a";doc="1c7g6r1g83h9rrd29mcllg9ar57zmwn4q4r1666wrliih6jim52h";}; +fontsize-73038={run="1wrjv0p81by85zr6mldlkd1qrg45wfpbqhfvd1nwwf2zbqd9di5j";doc="055dva4k677ck11klk3dzqmz0h3vnqp804yv6h44chk8b53j759q";source="0d2di14p2jzm55l9gmxf28jran7p53xkf4899h1lwk7fwarkr0s1";}; fontspec-71237={run="17886vlwsyfknxk7l22a834p4yc251jv72kw25hhhf3j7kdzzmv9";doc="1mlqmw225by01p2dviq2436ywgqbk3kigs46nagikpfzi8wf9w9v";source="0a1659g3v74n7v2k3cy1b4rb9b1g262j36ii71bi3i9vzvhls725";}; fonttable-44799={run="1vz99pfw4akid9hjf7dcqf1fx5h30sr25i1f9q6a9frk0wpwff72";doc="1inb0ai6q8rjsrcwgv8ns6as60ifdidqzqb8x9ygaw3j5ykzr02q";source="1qjilvy77072jpbdc4p4qfy5d4n2ww2wcm5drwvai6p2aclqf29x";}; fontware-70015={doc="03w04hagary4si2f86wbhill731l7q9rmw3gmnpccs7cqlzamw3m";}; fontwrap-15878={run="185mzghp8xckdq7z6cdwznrg1pswflvfy61bhsnpaxx8wagny1zk";doc="01knmxqj88g87ljvxmf8rr72i2gh9qdmx7zsbwyjmibiw71l6pcm";}; footbib-17115={run="1vr72sl8q1ccql2p42v3a9qw01a50v1c1rxpgmz39pp65w4z8s1n";doc="1xyq88jcg6p7lc44n2ky7538r23d4n0nhfkq25q7xg0dh8whbm34";source="0ps56l6ah0i398f38bxy4yg2i1p0ajcwczxq222hl5176g2z28jb";}; -footmisc-70885={run="1xyx6fj56vj49m9848i83jbq7k3hycx9pd5nvc3cd6md99bmx9pn";doc="0ik4rl9nmad0f9zjx600sxvlig6j3v0gw2lhxmkbs37v18p0xqy1";source="193ki23hrlnw0vkh2r54m3y2h54kzh989pk6iwjnfgf91d8nijzf";}; +footmisc-73202={run="0a6yw5z7w06fwv4c8wbah4c53jm516sl2arm610dpc0zbgayw9lb";doc="07ygnmfp41k4y5a08viiqs34jsilfiy9wm0mzfpfs2bhh8sksbfx";source="18d5j54qdsv9zsfnpbvsz5w1nx59s2w78rvbi6j7p7bf73n595jv";}; footmisx-42621={run="0f6csxzkwbf4nlw6z9rfyys1f7fc0vpdi2m36g7y3k9l3j6wb3mq";doc="1962sivh4jipsxd0z0cpzpd0jdw8v4afbpzfinklivnla2c9hp4g";source="09w5bfx94533q36z3k0a1sf9jx6acz85qgqypgn6b0b5mkhjsmar";}; footnotebackref-27034={run="12vxch1i8x0k8d760vgq61i7j3kkylgbcxj6ggdv8wzd20h4izyc";doc="09dvvnjvika3617zx438ca8z3fmdkqbxx9y73pdhn6gaggfmzr72";}; footnotehyper-60374={run="088mh736125609bliars0scv7v7bx315ajk801yj28vskg0ki5d0";doc="1dj6kpqar8bh0qk0qma2ckp68cll2ncllqfda4ffmc5ljmjp98m9";source="11dg59x87a8yjq8j413gk4p0bmpq8awwh50c6vs9rrcgv67mbycs";}; -footnoterange-66149={run="0z2v5diab3xpq7x63n0w71r9yalnypyv70syh5n4nr79ahyxcmmx";doc="0gg1sc5dv9kpxavrdkc2865fcwkyc9j24bvk34l06fr7ib43bja2";source="09qa9gp6pv37kcck55c9zv3ky79xdw2ivkwf94nzbw475ryw0zv3";}; +footnoterange-73642={run="1hw5j4kzw648vnmnkxip9471292ncay58addycvij1nlpr32dg77";doc="0s88hm72z8cr8078n6m3ncp8sfaaj99fqg0vv82y4cvchh5q3fhl";source="1wxaw8r6x7an8vz62a74m20v88q311pc5w89w94gslxngdwyrw7z";}; footnpag-15878={run="1qdl7lpfy5nn6qx026b9aqz8nfs958grh443lkqyxnrnws0n2nww";doc="006w2w6aga9zazlk8sv8maqi4s1rdzqyphp0lpa8qv5q23vcdhl6";source="1hh2754as2yrmfz4hiyyl8nlshsfdhpgpg3ifhs6h5s0xz947rw0";}; forarray-15878={run="0cn062f805lgy5m45q6flxj5w6gjfa4w1ip7zmhxd2z09s962jf8";doc="1d6m425lfg1g8arjyz4j3q9253rdmfaabaasbpd2ynhjr1abfh3c";source="0dpqr0hff33ddfw6vs0pnk8yhaa4gxkxgn43qgx06mx1srv6rz1i";}; foreign-27819={run="1hqmhy3l2hsjf2hkxhrsdc3z1mn3zx8718w90g8152x9k84bf7jw";doc="1gnaazl1ds76sqdpbj773k80isyf5hmjxh22p3hs9zxcpnvdhng7";source="1ziafjxcncsba0gbn1qjf2w2gn2g9z55bpcff71hr9axhp8xgpgf";}; @@ -1578,11 +1598,11 @@ fullblck-25434={run="1bxnzkidpszq5l2kfilrn8ny1gw680gcx9gz9975vylh5kissrmh";doc=" fullminipage-34545={run="0zy9vk5a0bljq3my17fw4jl8rhd7vdzcmw550ps8zbjbhxphssrc";doc="1n9lzacq920lmc18rhavz17xnm92lm964pglf6j8i7yyj5aib61c";source="16q6f9nss1jx3pw1xq0j82y4gn70hdjaj9m7pq3947m6bkyz92vd";}; fullwidth-24684={run="1kis1p158phkwxdfhpb4ihfs2w7wywj1lighc44sfkpima9c4nmx";doc="056k7w66rh0z1kxf1m91sbjhg8kdy9jvfkwm3jmi5mkclil5ihi9";}; functan-15878={run="0vxwabhbnw3dlxzlqz4yi4l4iw17a0w7lj3gh2q4l3p9lhzr9qmp";doc="1jxx1inlzrbzm784zwkz55ykdqhn9ncz6cixs2wqh2sx1dih7cwn";source="1a2x71qhjdr2ayii65qivjmwmxzw6id3vljd8nv3l04xnp6p5dnq";}; -functional-69908={run="08j53y7lbrimnydmh5svmd3v4qs4sh7ir9ng8g7rzpl0rakzy2bd";doc="1wsqln5346ivbcpwzjhfilsgc90la1is2r159bqipg51jnlicg1b";}; +functional-73156={run="1011vk784cw12az1wl0dmpwd4pwajj8lw7i8g800f927pgcp045q";doc="15n97b65hb5v7504ky378h4ahjys8c4dac6aa48n6r7nzss8902v";}; fundus-calligra-26018={run="1rnrqblg06qkwcy7f460pd1hnh4bwl47zyswa1iv4iknx00rd8a2";doc="0jvbvalqyj0kyf6cwr6zf18ylckh3fwpshwhmnv7ldg5r1ylia9j";source="14a0d7d8mlsw7qwpspqc2rmcdyhnfy6l7f57bk9v9jc8pg9fxb6m";}; fundus-cyr-26019={run="02zz37h71nqq0f4sf00fiw80pq1q3yadnhqm2j3niz13gms9ydl2";}; fundus-sueterlin-26030={run="1zpcss3lzhc9zkh8b91138ycwj8pihch318zr9pc6bl3ifq37wq1";doc="1pjka7j1378bqa32h0b2dcinf6ayjmzcbm4c1sdw6dsvrzbnda3f";source="1y4bg8r2hmpa38hdgkrk99v87cphikdb7sq5x9aczbmwwgmgw8fp";}; -fvextra-72282={run="027xfq6g7cr6qkqqfnkws5lvyhh78jlqf7bms29yvmv7vm439lzr";doc="07f44pj2hvv4lzdbmriasjgz31bb3hp3z16bh99dhp2y730bijpj";source="1v77w1hd1lw0a7lvnnsi9sndxyyni09d18fxrznbwdw93rgri289";}; +fvextra-74465={run="0v39zbg63s0v1g9lsdy35pzkw35kjglwxmf3l5my86xxski7g6cs";doc="0kvvlr9df5xgvqbjp7h120nwr5wcq8gxql5kc5168zdcrvdb9cg5";source="149g42hv4x3vsfhbnnirir9n6lawqir11kkr1ikhngy2sfizsy45";}; fwlw-29803={run="1qwlknaljj8f1cpnln328az913cdwypr7w8m8iqbqiqhsl49siap";doc="1cib3id21xblai43gkn78ypz6n99vwzhzmpdifdm8wv001x7wb82";}; g-brief-50415={run="0w0i9mqc5wg9za3n99i3fkn4bw78l8kf6glh0k6rvrzss0sg79cj";doc="1ikasv5w1xr5ms6836q1bnk7b87s24m15mnwsbdyf7cnsh267x6k";source="01j6zxs8vpiiimc10hhl93xcixwlzsih5k56n7v9a1a3czgymad6";}; gaceta-15878={run="1yimj3mxyjj36ib4lfdh65sz5w71rlp41hhnzz84kgb5y103wpaj";doc="0vvadcqjj3hvjll9nqn3mam9ycas0zs810qi2jnq6smpm300c3l9";}; @@ -1599,21 +1619,23 @@ gates-29803={run="1vxn3j957za9j6ryf3nhy5r744gr63m78xzvlh0z10sr0bpw46v9";doc="0ig gatherenum-67201={run="1b5j4106mjdswm519nb9sswnpnna5v6wcy4p8xbccv01044iqlk1";doc="0afd1c352075ix46y0jrhfwlbsaibchvz3xs916qi3hd8a90hbpx";source="05dri0sgr8h29q3zxcsyhplhrkj1wllfb42d8scy6hp4mkmbsr06";}; gauss-32934={run="0jsbvm7sh7bhs5yfl17fj1gbdqgpm7qchf07y3p7k0rxxg0f482z";doc="1f6ycdq3lpylkdwja4f89plz7wpnz73wzgjz74far6r9wr026443";}; gb4e-19216={run="1mi8nwxa418wqp9w64ya1i0ag0pdm4cx08fkmaa302bkhym92bal";doc="0nzmhjqdhl0x29c70iqb8b96pjnx2vm94nk3xgid942pmx44skxb";}; +gb4e-next-72692={run="01h1x9v9zrqyyi88iznyfhjizcslh0g3n0cwwlqxdygajm52lp4p";doc="1g1xmasj3pmk6vy76bfkp7fnmhivprs813mn1gg979gr5ya1kap0";}; gbt7714-64633={run="1i9a732px7rrgq69czdqrvnchwwxzl7cmxm1pdnbkv6s2yaakgdl";doc="1ay59q9s8vq7bqvif314xjr34k9b9g4gk30w3wsy7k44ijs481k2";source="00qbmnsyv87q81m01lgflnypwvff7xbqfkf750pfdyd18g2r0x2d";}; gcard-15878={run="1pcxw9mg6hadr5c6m4z3pdzs0b9jw22injdlk46xxhqy5gsafa7v";doc="03686fg2fw1k1j5rrskxpb0yjn2n5l697l66gww90jysq9546iag";}; gchords-29803={run="130b2svqilpj14jl5slw11b9dqhq1nvdph6y3qcq71pgng5lhjjy";doc="10mbr14bjxcl4p42r0zsqag5sg8yzp1mpi0s7fq7i9197kg8i77b";}; gcite-15878={run="0dl1plmbn4i5hzmjz48hyfl5wj819pg6k1kjsdycx4wi0d9ff2pr";doc="175151qpcykxsf1a6g9v6mkhr6m9cm5miw3ys6j5csrqm3vsl604";source="08h5kxah5q9105n1awlrmiy0zrl3rafb8v3nwp4qfakr83q3vf3k";}; gckanbun-61719={run="0bf42j8ismm450431pqvqgwzd04xsr7qlhb9di867qdyiy6hbrpv";doc="1rpgm6jclifxzs4k5ybkn9pxsl60vl167jjhffg6d319g3miy7al";}; gelasio-71047={run="0mb66kbagilmm189y3i9dp4alh2csq5ch14g163pgs595d6a24q2";doc="1yqw2j0wfj76zzam8jd06kpb2xxcrqcsb53rh93r7x8hd1dva2p6";}; -gelasiomath-71883={run="0p3cq4cgpddxw2p5r8zaqh3pqgayyslig1jps9wlffi93wr8z1yx";doc="02ycskcnlyw29i6fix9lkpbshwq5nqrgzil3s6zk2nzs947bqcms";}; +gelasiomath-73362={run="1qgkw2jn83w1mh4fccdlhxrfs1ybcqmwn29vn18748k11f08giq7";doc="119fnv79h8zpzmhr8wqadli7m3302in7g6mbwfzjgndpn6cf6mfa";}; gender-36464={run="0skwbiclrpl1n55dr3lkw86dvqy3f1n0b271ygsz6rr3qa43478r";doc="1gamaakkqqf37cwwzxjbyfhz25gdzayzdkqk60xls9flp7227hbr";source="1l5p8ib5lbvq2b8pizpwpbcv8aslmi8dd554win7ssd6vhgb68j1";}; gene-logic-15878={run="0fxddiswkvfzbmcckl6mhyipxjlr0yf0579i792c6rvrqs5avyak";doc="1nd4bxrq1g1gxcrs9lvnakaivla37p218pa4ns6jyjmimfl31gxi";}; genealogy-25112={run="0w15jrd6aycdjh8qznvm549kzwl15v2zvs7awgk96380nzcsmhqf";doc="08fxhib7wydjbd3bf24kw6zbbz2sv6fhgmg4q2c1lgxddmm8mpzy";}; -genealogy-profiles-69580={run="13371cbcx7lg3lkzzybp7vdlrkw5nd9v052d749jygsplqby8f9m";doc="1pvh2s76kpxs98l4yv59clijinjg5agmniaibl8srpwpgcdx5ni8";}; +genealogy-profiles-73043={run="1x370rnk1mc13ysl70ba9vqmw4n1frnavv68bzxq0h6i21ac9fww";doc="0g9hf1sc525b4y57kr2dvvphg83c5x9r26svkic4ch1fjv44blk8";}; genealogytree-66513={run="0947fmawi8xzmv9c4k4355fkgjivkkjrjglklk6ar7jky2xsg62b";doc="0wvqkdhk1lmvk79qla34l14hvcjmw318vddz1dhl21g0cri7fl60";}; genmpage-15878={run="0fr4m2y3vfymlwk7ik7rymifyam2jhbxn3qr2sj40zbcr9wbah6n";doc="12fxwrz5gpswyf523wm1pg99zilkgrpq8z3ls5gw9j7bdb71nj1l";source="0q7acjs7g1xh5kcmrg20k9jayaf5vxz5p5amjjd4xj4rnb1wdlj1";}; gensymb-64740={run="0rsck4ysx86d4gfr5a1w9kam98zzclb78v5hgdmhag74a0qs1n0l";doc="0826rq87q35knzmwkhz6ipigx3s3hkzcypy977qa0r3ibcbdr7ap";source="1na3aqqjfp9p9zb7hyzz6wdd0biiigih9fq6bxygcwflbwbhks6z";}; -gentium-tug-63470={run="05m3qcb12n143sxy12zm0bvj9zvkdi4sqsriprfkkfg6xlvk396r";doc="1yw6xs5dpmvk1brwry30ak368xddbmz5z2k79fpnyrx9a9z57j37";source="062g0b8bn41aynm3sk02ciapiiwl55whynvnz3gfzvlja3fn3xxp";}; +gentium-otf-73366={run="0s7iy209ldsqdv7c1afgv95wybm7q79jkkz9yqq7cbsni49pr0di";doc="0l6cp4iyf2dm950li8ad5d579d6nv43l720qryda38z2fxmgnkrp";}; +gentium-sil-73571={run="03s590n4w721ph1mv7k3q8nb8akl6v40whd2xz0pc8hb4qy7nmig";doc="08nvq6frhj78qwspnx8wkhyq8lhkf6zcyqwy5zjj51mnjv8gfvfv";}; gentle-15878={doc="1l5fyfdbkpqlgpgi1hrnn2sz8hchlnp7z5s5584czafvs10jg6vx";}; gentombow-64333={run="0r3aziqnq1pm2pfangv4238rpihaarndi3xhvpvfj7mc31b3mygr";doc="0vqfamrsy4r1wqly1196cq2w69wydzzw09y3jg5llvyh95a6dp0i";}; geometry-61719={run="0wv4c77fvaz8qg1ffjg3y06r3q4xjfxkh3m7a5s9ynwmfchcirgi";doc="1npbvp9g9b4mp8w768gzx1vxsdsi9zlrlfgc65xmb0rqx7z19zvy";source="0dm5zakrp71rxfa8xgj7ks0gfvmrm93sqi6f8m4hw7ls7yqm3y9f";}; @@ -1658,12 +1680,12 @@ globalvals-49962={run="1kgzrymfd5lzvb9dqlb4cgxfszpzhvad859r7sl0dl282596apgl";doc glosmathtools-55920={run="07s9jh24m9d9y01kk6z5lw9acri8g8vjmfw0mgdw3mwpffmba5mx";doc="1ya15q1nb7xzjxq7cgnl9q8pwfr1xbih6shd89krijr2l3rrycws";}; gloss-15878={run="09d8r16dwl26a76a2gky152bafjip3r3hf41bxxcb60sjvnz2qva";doc="10vgsm0cvcbfxwi7ly38lsvvg139y6abmdsv91qxq3s1pn1qxg6d";}; gloss-occitan-52593={doc="1q00j5r6d2y3gf8rbh7f7rdfjg3mg1c3rrfqd69rxyam9n92h41r";source="1cb92fpzv7cqqxxa0img0la6hrgxw6azb6j2rslszk9hjghbcjdg";}; -glossaries-70866={run="1s1dajw08qr4hy37788lzmgmn5gmdfdfg764bcprvnjxrfmimjiq";doc="180788q0j4fmxffq5z9j6qxp95c7w9l2w4s11wqlrdm99niavcpc";source="0nnirpbl03j747f423j210a382jbw3bci5xkkqgc1z5r8qi6cddz";}; +glossaries-74424={run="12qb0fhi9f804k76c421yzk09km87cifmm71lqfxwp75jxs0xn3f";doc="1k4qzd6vcz6pw68pwmbsszld0kfkq97m04n0i8lss2zp843qlp1r";source="0pdzqmycj00cz85l6wqs9frg3b0ww00c4mja72j354h3i1b9n9ch";}; glossaries-danish-35665={run="0qdyvkx33a9jgfa7y1pbm1lg5v1ba4xrxxg0hyfqi0pmpkajqb87";doc="0gvpcl8881g9xfcxhpa3h3c5zc3467ak8mhmr4szgjrsi4nsrnv6";source="1823i0b0firwzz9038wag2qg2h39az1xsj8484w36kbij8q7ygld";}; glossaries-dutch-35685={run="1ipxgp919h2jh5jajq72dwaf6v5qi7xjplcihjy8j88zakd9iacs";doc="10k1xh64rzgcddzaz7qawb2qd353j79xn3754byhn4d1kz6nihxw";source="0g2kfnxmnnqz8y095b125d7ira54s5dpb5shfqld7m52cranscy8";}; glossaries-english-35665={run="15nm7bz90ijx674p16d596jssi5915iy43wc1qb6gbbk4s8y9h3c";doc="1dckvl8g0visp5j8ip9kvmis7qw1n81xpjw136bnbm28y7a5m4sn";source="0x2iw6g9a6dzw22p05n3v7vbif8svhnw9sjqfmxn020jqnajza0d";}; glossaries-estonian-49928={run="1p2d21rx6vs8gcsalbf5kjyhmz71gbbn10c4j4lsy7rqcb97zi99";doc="0q8rsf08snd2p4nkfz2ry7rmsbdpixgn14n1mk4wkjclrbnjszgs";source="15xi0xl53jxfqsz7dwbmcrnlshvs2zbdq38v3izlyz47aaf6ajdx";}; -glossaries-extra-68409={run="1k23qj3hmimg9yc25chxlg2bkznb730c897ly9hy9bm1cvwgbfwc";doc="0fx3jqn01nxn6slb78ilwkgwn2na2snihynjmirp4r17xx858dqp";source="1gg4341smvw2qd6wglywpaa7kziz92mj2x9vwmz28h6pnsvr0x7f";}; +glossaries-extra-74445={run="181qsf9j3bq3ajxfhva2mq7axcr3bcnfg5qlzsz772sn83zgyq5m";doc="0p146a9nzsdd85l19fm4aydccr3jg6whbnkdwh6fwbhkw7s38cn7";source="0qm8bprlkfbv5r2prsrwg9k1y0myarvn55psgnpbnjx30gsw4bb5";}; glossaries-finnish-54080={run="18la9s6gblpqdqa1vcvsddzfxadssnd1mrg6iwl4aarq57605cql";doc="0zjwasnxi1fzc3xq8xjmgyrfcxpf3sbfgh6nzz60zdxd8sz1wvfz";source="0jfvjka4i94vh88jfpyysm6r1q9wwg7q29s5ik8d3da9g3n1bhyj";}; glossaries-french-42873={run="03i8xx80d740c5yv3i83zbxpm9kckzj2kbdsakxa3sp9b0j0jk0b";doc="1k5gkdj5madigzvs138r360nrg6d3fn145xf8g708bk43r92100r";source="0fhi17x6kk73mismll255b9nsr8hm147zd0n3rcndbih9ray6c6a";}; glossaries-german-35665={run="0h30icsisgk45ghhmngda0nqsjzsm23hay0sxch00ix5qcd19s27";doc="0jmkcq9h2kfjzfwysfps7nqjl7f0zmh5s60ww9kll8ypdd4a1n0s";source="085xarcnj5cvkljz70m27c7390jpj8kwndpyb762pr26dxvgspqh";}; @@ -1702,7 +1724,7 @@ grafcet-22509={run="0yz1f2p8dn3a1ws5skmznbd4ih9bri6r7vr6rx3zcspmad1fjg4d";doc="0 grant-56852={run="1whd5f3fc72balvgifnb37583v0882xq51qa0fbb92b0a0c71nid";doc="0zfz8gj8di6sx9k48zdn5hv5x2fj5rd8dm7x4h2k6xssrj4aw7bx";source="0pmg6kjzy6wahhz3lk742qzx8m5afz8lqsl05zpkcmi7ris9m9ah";}; graph35-66772={run="1bjdw1kvds8iahl1chrzmzaxm5ad7bb5c99yyw3rd390pqbh8y92";doc="02kx45b2c9d3f0f5h8xw2mnqn1mrp7v8975y2gqx1ln2x61xmjpm";source="1lm6531f5s5j1l2fasz0fk0adask83b2w1plkqmk3zxrn4rcchw8";}; graphbox-46360={run="1hvhadbpd988nvrlcppvv3bnm5lzmlnxgwmfp6r4mgsr1q7xgg6j";doc="1gls7j4753s16q6lgdsaa3yg8fc4vzxh74z7qr2ykz9b8ij0sdr5";source="0nfmfn7y1qqbm4yifqxfpxn9yw2xb9yj4smv9fmxrs57ism8d9dp";}; -graphics-71408={run="0jhd7c884phwsdzvqsmbm1kravb9va84xai3ygggvlrq7cy2pygg";doc="1xnsf3sxb3p9zsfhvxa9lasj5qj0bimv2bsc7arvi9pzncwbhcjv";source="0hxhhm1sbpnpwskyh15mig9gspdb1dbcpambi2v99h9d24kph256";}; +graphics-72739={run="0ff56v5lrd8wf6ah8mbnl3c6snjj9rbhhvj6xx28gbyy77mhhq2g";doc="0xlxixj7vhhr8czix9s5p1kpxw2xwd14hx49sj8y9fyy1j2wp0s8";source="1sy098jdcym6nqk8vwrsanakdk9j4v1rpfim753m7szln0h77yy8";}; graphics-cfg-41448={run="09yifx2ww4jjjhl5k8b5vz78711289755mw0r1rcshk596qvn9r5";doc="0rfjgc83ryg3s5q01xnkk8bzw7rx7m96hfxq85xjjn5qxsgy8yqy";}; graphics-def-70970={run="12j1rni39k8fyf1mhvbq8v7vdv8gsmspaqm1gkk867nkxhaq25dn";doc="1i20y2pamb67awsd24awx3rxjp6a7dacm7855lrnxqzmwayckmz3";}; graphics-pln-71575={run="07afbfn35jh8r0857avmpk68id2gsvij9g2h8d2cb0kjjc1qfgi6";doc="193x69lfclaclyryr9sld0rz0xxp53w25jpcl5zxp7sq909f5bf1";}; @@ -1712,6 +1734,7 @@ graphicxbox-32630={run="1pl1x7n7yv7grkplpx7fflfi4cwzmkmh8nnd77i2n5wdlylyabxd";do graphicxpsd-57341={run="1fganh87hpkac141i4c8f5bw06sfhy3qs14blx466h1nmc6308az";doc="12d820bdrnlq0v6rzd72icvac73vq7b7sq2kq0nab05xsdi2418c";}; graphpaper-63116={run="1bba2x75pd679qd6jcm5dd2br5d3gr7s3r8fwwid8mmq30vy72lg";doc="0a8l3wz3xrxnwp5s7gjr8qgmdbkrnwc0gki6i9xymvys385c6q87";source="1343djcm9sh6g5v8yfbrrwzg8x68rjgwpicq79md4f4gnsmz6lvv";}; graphviz-31517={run="1gpl57lb4wkysxdhvqajzxjb4w0m5nxdxi841dzg0sg2igchfab6";doc="09aa9yl3zmcc5vlvjvgaxfmhj83qk4wgp4fx90bgn28kxnzhicxx";source="1w878b21va1y0mz08wr7mgdxl09hmbmxbzfnpv2mdqyy01lwpzks";}; +gratzer-color-scheme-73199={run="1m66fdd6w3bk8hbbrqm0mlcglyqyvgzi2d4ii5vvlwzqib18mjyf";doc="1d307i3m0kaxambh5bwhrd4zn3nvlnagamcyq6mc0xrgzx7szdpp";}; grayhints-49052={run="0p65f12y0v9s13gkmd0limdcsz36lnbf0975c4pxcsc42i8smvqk";doc="07qpkj60rrl1pc651qa8kpym3bzcc0qkfwaggcyin9a65a5snnhf";source="1g32xq2f1ncq124j2j8xm3vdkhv4sxynxc3wzx7x6s9i91p5l59y";}; greek-fontenc-68877={run="1lsyx2g792b2m7rjlihqj26dkz9kaskbrbwzvkjd0x0rzvf9g3a8";doc="1qrn41ly963nnpwchs1s1l3mfsi49af1x0q9vk4zms4wcd9w34wh";}; greek-inputenc-66634={run="0bg3frdqlja36j7l4y1m41nslqy7bisbyqyax581arrl9hv9p0yh";doc="02wghx50h2x7p9kl6j7kkg185jra9pijcjrf3bkx6c7d1spvszcv";}; @@ -1719,7 +1742,7 @@ greekdates-15878={run="0g8cgyrw6lacr9cjig3q1g7rvjdwb0p40b41rsqg6lj6y7m25ya8";doc greektex-28327={run="1v39z550xynw4kkqjqcj7izj2cghkk1g2swsy9x9c71sz95r2bw6";doc="0g4m7sb6ppjj0nxgv7pwwvc5p07jdkablcqasdmj8p44ikg9vp59";}; greektonoi-39419={run="1dhbslqclyk5d8a9v9s4af4gxdy39b35zbbr3k5m53gsd0kcs5w9";doc="0hmxx4pcirm2v5xpl3zyij8r1zm45f373dv18vxj4xr3sn6b7p14";}; greenpoint-15878={run="0l27vvxzyiar7y1x1a3hk0sswfazi356wsbnx86dp8l766qcc3d6";doc="0zlrfv2y5ixhyqyr5hxycalg6bygvw1f6bfaxqdpakwiz7k3zabd";}; -gregoriotex-58331={run="1z3az5in2izkai2bf627zj5966ypv1z9z9510ynallfi5q6yah49";doc="15qh7jfz42bj450zngw556z57dzq99cfsna5008yymgqsyvy5jxl";source="0p6xm22hr6ka4jm9zrg4yifsc4125g22n4x9zjvmarbxixj04573";}; +gregoriotex-74490={run="1z3az5in2izkai2bf627zj5966ypv1z9z9510ynallfi5q6yah49";doc="15qh7jfz42bj450zngw556z57dzq99cfsna5008yymgqsyvy5jxl";source="0p6xm22hr6ka4jm9zrg4yifsc4125g22n4x9zjvmarbxixj04573";}; grfext-53024={run="03ff5n3yc3fxrayhyapm9qhd665r15v57vri6ajb5xb4m18rkfqw";doc="1f5kvnnv604qllqim8qv40cfpx0xaxanigqnqwmjfwf0n44akcfp";source="0i5pkqrc4jm3cgwzyhw1r3kh6b0b7sb352bnzid7h8msiwx32y8k";}; grffile-52756={run="02cmm9q14h87dv5h5ci7ny7v4plrry54mz15jddx1zkfx4myykww";doc="119xqz1n57mghhp7db19ffrv1cdk1fgpznlyrn3qgvg2926mx104";source="0pmg9140plqv27mp936ca0193ihggd243mmprj3l0d6rf5dajm8j";}; grfpaste-17354={run="0y1zw0l245chmlgmi7cmg2yp7s30z8055wnrbm6f45aizcvgdya9";doc="152b029w1203lgfmxdmhq3nh9h2hcdx4xanklv59rih9ha5l8j5v";}; @@ -1750,7 +1773,7 @@ h2020proposal-38428={run="1yz8bz4nmccv0v700zz7x11fjdqhs4hgkz8cd6bnqr3v0n8k4xrf"; ha-prosper-59651={run="030zapbv83x0x1vh9px6klqnivygjhzi48fz40jb2cl17b38xnx1";doc="0i9714nqgv3ywxfybg3m9lcrng6v7ydxgfvxva7zpjpmsm3mjfvl";source="0ljl3szba1p1jj7fyw6qzm5h673d63hqwpsn1jzapk013rnxsfmp";}; hackthefootline-46494={run="1l2iq2k1bil4l5nzxrfi4pg831kxn22ld7402y285hlhv7cj6qfc";doc="0w10yipva3ixyp91iy2y15n312gk5fw90960p3adla2w1p4qhs4c";}; hacm-27671={run="05layzjb8ngwmqvg49abdi55j9gl1l74sm5baipm0yi0k1kr8xy0";doc="1d1znq8r384b4xpc9f81023asq6yrkbvyif70wjn7h64x1wpnnn0";}; -hagenberg-thesis-65819={run="1sz41ng6wpr0zk0bdhfp6iqnsis2bpnr4k27hw5c94384vxa1w9f";doc="0czc359n4h5v83idvvn7nzl7azzwcdndbinssdvh35ygy68v04jy";}; +hagenberg-thesis-74267={run="03d2hknh1fisxw4dv3gsjakg56bqs2qi21rj0al5nwi3p3njbv8m";doc="0wx17v0cg9f5j4r9mqgvzdac94a0afwkvnl3ci7njbajsjpg5nwa";}; halloweenmath-52602={run="0sfcggpqhai8xzpnbyz1vlvh7cfl3n2m7z0av4drd7wqzas0mcw2";doc="0k7qfv036aa691902chj1rgcf3z2xd58xfb2r0b5z80g6944xjrk";source="0ir0xr3aiyjiashy6jl39f401ccgx3dhlyiqx4h2myiwq45ay2ka";}; hamnosys-61941={run="126amkwf4aapxk26n1h7vyv08hgyj6gac4sz6v76qilwpp6m6sga";doc="1n2bk2yp8c4bvqcjq0hahfs14zlrgrgj9jwvrp903c46zb83lfc0";source="1jxdiqbvbkmhv5p3fs3vl728wb6izfx9wbjqyylzxc9fr7b4qpmf";}; handin-48255={run="0xcsmfa4jjhrl3xkglqwbgvi844q1f9zjgpyix5akx058qjvwl7g";doc="1k3ar5yzyndnfqkv3bhl7q8aczfbaaghv9mkhzpfri4za5ks6fnn";}; @@ -1776,7 +1799,7 @@ hatching-23818={run="11sdpa2fbxqz8diiwyjvx5fwfycby0rdav6941pgfbzsbqd3ys62";doc=" hausarbeit-jura-56070={run="09nf6pz7xqhzs0n7nafmmkpsy5ksvqvnwha80yv6rxasnazd940b";doc="1na417f6avcar3dmgk5wrggj99mpskc1j7fj4qkh33rii7yw6f4g";source="05f4qr5cz06k7hnjranx6sbqniv4h77dy0rrm6bg4dd6hrk474q6";}; havannah-36348={run="0zdbwl36d8a374yhaqfb4f3561ncch10v0vh7nxj22f267lgl2n3";doc="1pkkslz2f66j606j44rq32dp9qhfqcr959wrp8j9xgkw76i9lprh";source="0gyndaw2g2j2j22njn32839mihqx3pl7sij35vhsyahyamnipk2h";}; hc-15878={run="04qricj1nmmmhxwsam901cr43h96ymc7qdb1m52byniv51i8g0yn";doc="06q64drrpgm7lzp45hrl33cs2dj4mx1mjpsd3paqgsn2xxqls2yj";source="0knqx9smbx7lyr1r6vn50x3x9zldv14gb3484jqk28jvm92njnij";}; -hduthesis-72513={run="02rsxv5vymh1hgk723296b0m5ib1zjswhynbvncr6xvn2a911fam";doc="1kx93n4rl2m0nvw7w8n53z7idf3yk9nw88rswic1ldwhsva8ap4w";}; +hduthesis-74515={run="1d79ja1xkpqsm66aha9ck4fn1k62xywxps7x22ngilik6mn2k5j7";doc="00pppg0c8lnnfkzzqfrw0z0nxg02rydq4vw7nhf8v0iav51ls3n8";source="0q3as36s4qjy960fir4wf1ssjcsfxz8fq64m6np2gjq0m66yni62";}; he-she-41359={run="1rr8pdpizasdcb1sfg74nsqs67xh2lcwd8w2rjaf719bpx9372yb";doc="1lmahrp33iv7bbnkbiwpkagy3rm7j0wric7m1fbzdvkgkzv274na";}; hebdomon-72033={run="0asmyq3wldn046v737747fqdcmyk005k4zd9q2av385jqy0nja3h";doc="0ak8mc4v0xjlq91jhgy5c9a4pxmca0w54hb64pln83h98409brbq";}; hebrew-fonts-68038={run="0024bhlbj59gq22gafanns4gi8mii8fcd6xkwaa85czgm5yqmazc";doc="1kv46s1x86gs2b7h9934hqlpp4siidnarb1shj427vijfg68asnp";source="1m4kd4r1i3sj4x0liyrpxckdp4v6xvy79xwmkf3glzrmzq79vdz3";}; @@ -1784,17 +1807,17 @@ hecthese-68584={run="121l6nj57aivlyw2gzmyqyi90ql3bsrdjw0qa6gy7i7ifhw81s8v";doc=" helmholtz-ellis-ji-notation-55213={run="19szfdy3r6i0ayfr4qjv99dy6h97pqcfr08xhy3v9kzqm4d2b5nb";doc="15d4dil3r44v5xds0n1lnqml7cyncpyr92prb56rfaav669hflbr";source="01zdhy1p6idpksjh1ak1lyw9j536bzr130bjgay471k9d76n38dr";}; helvetic-61719={run="0c3f1ly7y6404z0akbfbbfql13sz717v0n0g69qjpr69hi4n0nsl";}; hep-15878={run="016jjvmmc679sk23dy0g09a0s0n176a5pyq18snvi9xajh2c4xw5";doc="0czpwbhpgpbij9b97dlb3qq0aa9vyh12p81sdm0hwkj3i16yawav";}; -hep-acronym-67632={run="1y2s0fmrm4z5laq55xyhs1h85pjk48y92g0rzl1hmrdhqk6l0ikg";doc="0mbhbyv9bbm0k856nbi6f46fn5a7z2s2ixq435gvka8r713ns5s8";source="1nqv1qvqrxz6fd5lxrfsmxmgkkz005hymxk8s3xdwhla982nx56c";}; -hep-bibliography-67632={run="1qqidgnyi30zgmcfp0jj361l5sga8ds1b9wqhxad3hfzysa8bacx";doc="1x1bgw7sqgnlqzqxx2zbvcxdpl304vbn8wx26rdjf389r0rw3yzy";source="14wng879zmwzmacx2w8m2v1l4ha169xaaalmzmwc0lbj5rxhy44v";}; -hep-float-67632={run="1fv5bga9nf341iij2s8llh6rwvxf85h8hnilhlk0jc5s105whj1i";doc="0y69ymqj9lxwr4v3lxsvz17lms045k2wdvc9dszvlrjg2q3ac81y";source="1xmfqk8q0q0xmwsc4hgmvvajij88vszqimcfw0ddf7bylxchxjjs";}; -hep-font-67632={run="0z92gscinj92pypc6hnvdlyd0n1hdkh1kbnlgliv6cv2swyddmv8";doc="18nn2rxq07xxv14ds95q5rwlqfskd6gl96gya02s4fi2lz6ys55b";source="1fzx346kva3lxk4hx9pkxnj7j7jmx287gylpddb2pdpwkkc8spci";}; -hep-graphic-67641={run="0dwnbl9xm12v3hdpki7nzbq53l29rhy762rxbxvq7hjbjdm5zni0";doc="13f1g76vqqm5c3ivdy41gix2bzmd6z73bqlj9cyij15jzwix9dan";source="0y9d01kwnnlgx0cbr4ifi97la7cz56l30z65spbq2ilm4xlx7yqp";}; -hep-math-67632={run="155by362r43igwgyyq6fqd4j0r3qs12fx3gfrlcdpqlxnjg9j20j";doc="0xhkrd51y4br7qsldynnfhvy38ilngb3l022hpddid9yg5s49k5s";source="1zdrlvia3yyibmbypz519bx764jy62f7sia9qk6pb0wvwxbqmc0c";}; -hep-math-font-67632={run="096y39y8fkqhd7p43kv8fairn6q85bapca1ir8v2mvspr9h2c752";doc="12inm8vwlwnwzr6hngjpixzf6b2ckcy5l4a9dgqgvrh543vwvzjr";source="0p3365139k77y4kmwg09x67n67vyfzzvy43s1jn8yda91xnn02sv";}; -hep-paper-67632={run="1zgyzl3pyb0ygfxgn6pb9wcg75iysxqbpr6awa57aiah0hmynmm9";doc="10fwbgz97cifhx1pr0li91h312ni0g130jg97d2vfpxrn2drq697";source="061dap6lcrbif2rlkk7206aha72h31af4ab6wif5xriz9bj11cjn";}; -hep-reference-67632={run="046vf4p8nn661w3ag3l0z55zv4nw42n2376b1ab2p6sb6sb7l86m";doc="0ahdg40hpb17lask2bswsc0qqh1fdalvjgc64scqb1ppfiq62sif";source="1z80z7sr8ipsc15rns83141m3rw01s0pmc3da8d2vl7ymf4v8wwn";}; -hep-text-67632={run="0kmjlzjq8qwhka31nyyvdgvycyb4nlxrdp1fnwf1kgarr656rpky";doc="1fsjsx0h1wws4z1vbhc4ynaznbf0lwxnw34i98n3cyqx805fg1dg";source="0wa27j0xyi76nagz2yh240yhghd72gq2b4078yvnfs1bkjf00127";}; -hep-title-67632={run="1mihii4ndrrk9wxvwh6kzg1dh55xfgcww26plsnn390yqqfan8fy";doc="0iranpsi295spbqpm8r9zv4gq3gn2231pjksp6qkmkwma9xl4af9";source="0ldf8yjqqxdkpyxxm51q40y5w2zhpwv19s0770nmazzchv7hs23y";}; +hep-acronym-72984={run="06ca4b56flhr6zbhrp5dps13gd53x3k4cw3zdsazjr40agpcpa4l";doc="193wvcbsi5yz35458cxjfhk69i5qj8lh8p29v8h1ym07zdgd4260";source="1v0dyn0qlrhyclq4k7wn7c46nh2hadhd52araajj19v4y6fwhis2";}; +hep-bibliography-72984={run="1xam5c98rangjlz46lnh2lmbqivqr96j9l12dpb26v5si75h5z7z";doc="0ga2x9cmzy0m7z086qy4pd1qlmpv1yw2dzzzk4gxfqg25q0226j2";source="1b5mag7avlcjkdgd6m7lf4p3xa4xlcd6pr6ifcj4zbfhs1db476f";}; +hep-float-72984={run="0kbqcva1bp4spbgg6wxqrjvgcgrqy6k4pd5wxd6lqa7f6lb1i2l1";doc="0skr7w539ybvp8bldj8675yxz9gfd517ps6k88xacglmxs6n6gdc";source="0dfain6fr4w1cvb8ylsjf8fcgp2g3h7hhcvhd3y2q685cbnpzisq";}; +hep-font-72984={run="09l0dg5m61v0r2mzy50qmmb41zhm5zrwy0g8gxg6a7mjmzffj53r";doc="187bffmibmaw97xc3di93z98bysl6hchkjfrfmx17vvmd3n4szz3";source="0pf2hr9m70kpvkh093n8kiwn2y21vi05h343x5r9w2hpabp0vnlr";}; +hep-graphic-72984={run="0amarqsbrrskmlqqm0q9x7wgll0zq35522b542fdla0wzszdww1n";doc="0a022l4drx6syv9a1rkkym8fmhc30xa7xw6j69m49r9ky2ci6s5z";source="1z9yy8a162ry34i2d90i7ws9ss32lbx0qvmhi3svwrn11h31vx9z";}; +hep-math-72984={run="06qnxa061qi14n4k2i1ghkxwafghw0k35nh47k9vkm3b75z3z3cx";doc="0rlxn7bihsbzf3wfpcmzgj9skvifp6wvqj0lq0qq7vy5vcwp45rj";source="0yhqxdwlyyn1gh6f3am9cgz31ymksxnimr1qarrbgri0m7nndg7h";}; +hep-math-font-72984={run="04wvbjzhf3yglmbk208vndp7iaa07g6kqcz4ixaj751agcpxqs2c";doc="0pxrdn5lxckzbsp0h5sh4j6ghl52l5fvfnp5s4mwzkssw36y7f2j";source="163g9l7b8ijn0zk5w83v2gr0y1kx152fq9hmhzlgw3vnxyx3ij76";}; +hep-paper-72984={run="0dvbzg7p315ihbkw3kzn9wrvj67n5ig9wzn9skvm7dl8gncgrl05";doc="10r9sbs90abvvfm2pykxfrcrmj6awpip9vd2059mz31ibxqcxsgf";source="0j1aw9q2cawmy7br4kyxdrd860v3rg626zn1q77mih9hn0zrjj4z";}; +hep-reference-72984={run="1ay7da1p17a7kcllvx3d1arwjd75d46z0aq1z0pmz85f83jls3dd";doc="109xv6x9y3pb2m7s9lhxy41f1q6v642jj29ycp5k9lsf4hprrxmr";source="19rsgbikxmr7mayqmh1bv1m8m6w28dix5i8k353x5gs3jbzwr97k";}; +hep-text-72984={run="1c17jv87d3hqs5azld3vf8srxqncgv0glxl41csvij900gvpfs30";doc="0xs09vddjsa3qyk6h4rblnkasmj294wxn2spaxvnw1l2cvfq8bbp";source="1b9lr38q54696i8q4lrncy3flkrwz6y5qbm2iqc4wr6m2bnvbrln";}; +hep-title-72984={run="0xk165mj18ksbg8j0lwbwg51rnx92kavarhn7w15i5b0qmch2wkp";doc="18x635p0s38s6bg6s99ccz8siz2d85pdkxnwg8dr0w4rgb4x0c0w";source="06dywjdr0j144vxzb8d77klv2xj0rmam0dwzyv11aa9k4rfz8av8";}; hepnames-35722={run="0almnyzzdf0q50r6qi7i6c4pp9aakyzdzj2jxkj1y0h5smi602ii";doc="144wikhsm6mm6f459r4paf0chas0crzvd2rylpynhsmkp9sk3fck";}; hepparticles-35723={run="076w3wmdywai4pc02k8nk0qyc4vmvn9x6lvidmp4z6as0jir7ydh";doc="027pgn4i7n6b2zk8ikyqj4wlkkw1njq4qcfkmy0bgqz3al08zr0b";}; hepthesis-46054={run="165n2pwn04vsln5xy6lkg61c1bp65zyqsd37fmmd3xs7yhv7xc2d";doc="1cql3rp42bb5c33sdfip69g9rd06107zg6wmsmzkv8c019xwg4y7";}; @@ -1813,9 +1836,9 @@ hfoldsty-29349={run="0ar4swzfczqafanfzhwyw7kx765w743r1davbypc7lglcxwjw5y4";doc=" hfutexam-68829={run="0v74nqzv0v03rxkfk8iyvj93rnrjj3dmwj6kmbihnvc55qbn20xb";doc="1nq3c4r083hdhgi99n35p691b2djys238dylwva6zw9j80i6vvnz";}; hfutthesis-64025={run="1wr9qa2zhx1py23q9r7wigiwy2ik4gicaqb30mc6m095flk5ms6i";doc="00fvnydr7bcyf9ij674whpgxizcn2fpwizqdnh0srxm03znw8cfi";}; hhtensor-54080={run="13mx7mg5jqrlyxnx19n0rs2crpxx2gp6m7l41m6l2ig5vlgc0x1r";doc="0k5fg9ad5avnsg84xwlcbzffrzf6y8l8a2m0dqw3clg7zjmq4prp";source="1pay0c1z6avkb44h0iibfn6xskiglym0fckfqrdv0bablk3cghjn";}; -hideanswer-63852={run="18v4sis4yn8b1zwcvrjadj7qzjya52wljvxhajxsnl4pgslkjcqv";doc="1rr5sy7l21r4ffdcm7bmlcs1al5bn4gsy6p2ig92f921f21gar4y";}; +hideanswer-72949={run="06mhmmw8544s25n8b71k70gkjk41svx56mhbbaalvylrcfisz8z4";doc="067dyb73ra6s04wa0nk5jjs83i7ihcn8ipzvzwqnsq843y073v16";}; highlightlatex-58392={run="1pmhvjxp5038nnxd9bnk3s30wgzxvbzq6z8cfmvz0k8h1nzkc1a1";doc="0q4v0dvr50wd0qbk8xvn7bayyq00kj8b8wwyn6axia3mpjmr7a41";}; -highlightx-72619={run="0q1qxvpwz3bs2004mm0kylxwspdx59rzs4f43gmpx5is4vihb0c8";doc="171vrd54mc6ai5irympbr66knccxsnf1gyldpk3f62waasl3xl3a";}; +highlightx-73069={run="0q1qxvpwz3bs2004mm0kylxwspdx59rzs4f43gmpx5is4vihb0c8";doc="171vrd54mc6ai5irympbr66knccxsnf1gyldpk3f62waasl3xl3a";}; hindawi-latex-template-57757={doc="0q35drybrlcfcrhrd5691m66nd17b0m6hkcsqazpb1ck227zih61";}; hindmadurai-57360={run="1z3590pi02n90hwsjmihxk957hcqgc3kry3cdwpwaci43hxcvp2m";doc="0zws4bzz6fkhxnpsjxj15wwnvbd6rhxqilabzzvm43lv0y21hvlx";}; histogr-15878={run="11zbm3d05j6nrzwb3hpahli54lf06aly60arh4fi9k52qcbsylv3";doc="046gw7h51w5s8p3rh6kwwi22xxj8bspbh7anf2cdzg4w88dardl4";source="153lhmgh0n224xkg7dmcajj7bydnv21spihh371hj5a461d4h9k7";}; @@ -1838,19 +1861,19 @@ hook-pre-commit-pkg-41378={doc="0mikg4p9wxb28vgwh1acgdhwa2fqnc8rw3jg355d6s137m40 hopatch-65491={run="0r294p098z0qykrh9r4yxmc0w72mz1nmxqbv418pmbn15wgj031v";doc="0qxa6maigbzx7hc3nss3wmvcpyc9wvhq0pbzni7j0hqyzzsz3vv9";source="1kbk80432fpq30zgix8waxq87kjd2bpcv72idaly8yjbj4pa1l1x";}; horoscop-56021={run="02kazmk5sa40x0a4zb30gk9lkky0ak825gczbr5z8wchwpy4i1ac";doc="0w9sgk2j1fzkcfzn76zpygrlyi9fnimp92mygsq2z6rpblzd1qyv";source="0c6zkcb2057y9x7mz4q3nwin8h8ax71yaam21m91gk6ad9k8l4ij";}; hpsdiss-15878={run="1l7mbnhds4c6y1w5vylsx8j7b4syl2j785l3xzvk89nc5g6ck2qh";doc="1cxdd1340b1gkn915id7xcdac2zp79r1yi5g3wjwmj4kbn7z6sbp";source="1dar4y0ajqz93znww0fkf36li50b82hbxixi30hi8fm8y2hc3j2j";}; -href-ul-69359={run="1gf2kcqh60ilzkd2i1fc782db4nxqgrizz6h2p0i2lvc4qplj95i";doc="092gjbvcda2xacj0a3b8y6zlizkkyzqcbr6qfhdsqyds1sdrzpjj";source="06paqsz9is5ksj8lnny4d4g7z3wkfgv8lnyl3nzckj8ap0f80g34";}; -hrefhide-66189={run="1lbfx61xyvnm1r24h6vrp3pnmci4j5abxlaanhni19j8gvqkri3c";doc="1sf697hjryz1l82ag8h2kpxgmwa4fzmwb6ki1wsnl0y1qkl9m1k0";source="0p4vqr3cjnbdsrkv049jdd6yr54xz40lvgdyx6z2wf79k5fj4z1q";}; +href-ul-74515={run="15z5h7098zj7w5kgxs3qqqx0cydfwk5fzn6bazzvr71dpbcqwyls";doc="10fasmdsgxcgaxfgpajgzbpglpq0zkfs9ip95jfyx7g7g8im0f21";source="1ddhvx8n685kjgldyl6n8i30xqqwx4yhi3ww9g8wsyz4sbxxlc58";}; +hrefhide-73641={run="14bsy86niknzgrqxbnpnzmdpvzfpr88kc3aazixl2l4jf5c4ms74";doc="1ab06ksj0g86lwal2m1rfbw6bx0skp2fir5qmsn6p65sq9pniaz5";source="01n0d4wlfq4nf6z5xb160lrms0apgmvznr2wjj7b9xgsizhasf1i";}; hrlatex-18020={run="0klc0pb2b2dcixaqhgxinhy18rp0lwck7129zi5qnpygzfslpdws";doc="1dlxj4rv9gaxd6i4ns4zmhykhxwsacw6m3m2jmk2lkc3sw68hsyh";source="14cw35brx8mqv05zbgrvfmmjhxyryx7dmj8dk0fkimqbyvhvv9sj";}; hu-berlin-bundle-67128={run="109hjfg6p3g54pz7n6i64ggqjmvjqzmjp6ipddji0mnhkhjfww6b";doc="1j2vjhk6rnsj86a59cd081vfcqnb93lz6szis05cs53k8pa7yh52";source="05x8cwvh5xkjjw069lpw7pbsnb5swvf9k2c6l2s1v0w1wrpwg7b9";}; -huawei-72668={run="0zl102fi3gq1ria2fyaqa8c68897hfbc6qvzv6bg2ybr239g4dm4";doc="07pxsbqf9bnhdk27130xylq8nzppcvxsajgyvmrqf7rjzf6p0q7c";source="0pz6achsn42s464wk3524wnj9692sbnd5qvcwd0sz4lz4jiddgjp";}; +huawei-73148={run="19axjs3c1l5695gcvn1kisw45jr5pkhny9p9cq54v3k6ld10ka6n";doc="0wrvq4k9j7nz363irhqagf5sc6bj3lagyz0jql4mhxihr477wfp4";source="14p4s617q3sdf2fmvz9mj0b3bfsgd7fyqbq1qd8hlsjkvddraw2l";}; huaz-71180={run="1xx46x7jl2p094qmiq334kc3i96p0qvzchc7j6xjzxrccam7q0s3";doc="1smngp2biqjwifkbm24lxr8vdhphqsh9adcn2q6zjdzqfhdpsw5y";}; huffman-67071={run="17pgzpbhah5m0gljhkqymv5lxpl5bxxgif9m7rnad20x4nmyzz68";doc="1r6a1i3j8s4843gdvii740dl5rbilgahcrs2xw1zcqpq8z4xbfnp";}; hulipsum-70928={run="1xgrmwlwwc0zy2wh1cq5c0pfzvr3q4xrx3hxa2npwccr48zd6xrh";doc="0cic3266qy0prrc73y2jsgvd1rkbzzr48sbvwx0h109x5m84484b";source="1n77qxvwvzyylkh5rl4d7sigb3jz24yc9ir3p7rwici6rbd6d7l4";}; -hustthesis-42547={run="0c5akc97v3fh3skxpgmffywca8kyswmaypkyxdzwrqb1k2z4xknp";doc="1llsyhbgdz9k6swry84q539yjsvcxj6hgirqcw4vbvsdxxxsbyn1";source="0nqs1ifkhhzspdwg5nbqgpd2309aw9r65cav51vxpn2abss1q6a1";}; +hustthesis-74356={run="067rdhb1bx18z7k00irbl99a6vwikraqj0vwcc0nzyks2gsn2pgj";doc="1lnc12mzz71lrh769jszmrarwy173x46qdw38wabrdsa529b835s";source="1qi8qvnzvnvh58rdrvb9d5xn900mr5bzzjhzjbw4ky4bik9nnkki";}; hvarabic-59423={run="1cagm9zxkhrck5svckh7i0c3zx48vy0h6f2nhishm40g9q9r5qay";doc="06g6wmxqgfj9zz2ph7gwgndgkm2kzpd4ci7pkwl5qm41ik96l7a3";}; hvextern-70795={run="13g05yyv9s50pa3pp1rgd7q0h3vhvqm1y4w92441smwxz3f2if2y";doc="1l5nrcy64bj2brhbmpfbsfyh388frfazr1rf7fi0jgid5bnqss2s";}; -hvfloat-72452={run="1g1s8hhfvhcmsrzap1r31bfnphm6qxmrjg8z4f72l3sd7b0xxr0g";doc="0xq8hxj2i7qd4yrj01irfl53pl5hslyy2al4r5i33jp4mgwcpcs9";}; -hvindex-46051={run="1wk4q29iyqrk83kafwhah5gvvj2ywpnqzvnza6cwrkb85fd1q2i8";doc="0vcdmn3xc4cm3rkdkzi0qvqakgkc3hrgy8nycr5c8vcb6xaiw0gr";}; +hvfloat-73130={run="1b2ddnq8flpks06k9245zp1vq8pxfkkqwl24wj2228hagyjwavp4";doc="1ns296a19k43xvxwl77ngkm6x17l8bvpgc455y6ghjs7pzd3lyb5";}; +hvindex-73580={run="0541mrkfhzgv4mqw98i9fp3w0l9sawargjc686q2ins0slr06775";doc="05djjp38i2n2bbl7wv99cqf8znyxr3nr6nl8354n5qj92hj7dav6";}; hvlogos-72538={run="1ca76n80yda50y22jwpar8xccrird0xbklrz3vq9jdv1qnfnj35g";doc="0fvk13vrhw3ww8q633fzkmhjg4q08hc0grwpyywc9g4xyh66rs14";}; hvpygmentex-62405={run="1rnra0v65wmz8yqwfa6zqqswx0m7j54z6wpzvbrp2d5gx8azsdv8";doc="16r1sqsaw8ij5jxf0ygm2kgdhxpzsq5g61jhj9rq0zhpjma7fhdx";}; hvqrurl-71361={run="1h7k2lj2bdnvzkr2v31ylqvgzpk5mj9vfacmzlh7vs89ndqppnn6";doc="1vmzz92z98r7ckk2lg8lx18c57k8qj8g3kcgp6bs8wmqg3qb4y1j";}; @@ -1863,73 +1886,76 @@ hypdvips-53197={run="0ax6n7ki47jyzp5g8781c7rv54hwrl0fg7d1bwzbj9bmqi39df4v";doc=" hyper-17357={run="12737gd2nmnalkgl4d2sh45r4d621zl6g2zcih98m7dw8qr38w2v";doc="0hzl3fzgmn6kyl6p4d98l9ycisfhb9v50a1m6n8q1k6jpvr10z9f";source="09m0kdcs4kqksqwxf29yq4l52kb2mj5pxkry010ibwqw64cs5p74";}; hyperbar-48147={run="1bj0v54k85isn3p48vmiygcvd3n06r4mqcp75hf96mmp0wvmczg5";doc="0fmrz4hlzd8clxx150fk4zbkdgbnhg3b7ck10225b0n1lqgnlh0h";source="19x81f6bki5mnx1nblrl0ji663q0pzkacy5lbjsqyr7krdc33fyh";}; hypernat-17358={run="09lnsw7ycwkk71fyjk8zwgzdjv8ff3k028q7hr27dqsiyg4hjg7a";doc="150ayv12ym9h68a09h1xakdfzccpix1pff9blkzjq6iz5imzzpr1";}; -hyperref-71883={run="1cmjzbslyp1p6qjpd139adgxca1633mxmz1qh4iqyz1z597jxdvp";doc="0808x95ndm9526vhflss8b7p9ly1h76b0y3zfpxy82w373ib9mg6";source="0jkqqigsqdym3zdi2qnj8jzhfc58v7g29ykrqzlnjj6dm02irjm9";}; +hyperref-72773={run="08d6nd4lq0i79s3a3s44npqj7y4md359c6cnx8sphakvnsd2jdaq";doc="0h491ch4gx3wkl28qa2fd36fmnyc7g8zbcy8hr85x2c6hi9qlxha";source="1zqwcdbq6yghkhfwkjlqirjchydr8zsqpiw0kvpwvixsqbcsbr6w";}; hyperxmp-70694={run="15ikvw9kfarpkqymwz8cvmfkz23zrx8iqd50kdhl4r0rv1cn5ly6";doc="1gy961am7w7di3nw4kkq78v2ailjbak0lzr8d91mc2hvj8givv5j";source="166761v3lm5kyflaw3j74h8j15ha60j2fsx0jkyiwqh1pj1vylhl";}; -hyph-utf8-61719={run="14jj24fr6v74vj8wi2a9k9zk9vnrvmy1ni4zn24dl5fdfw75n5ik";doc="11n1blnx9i7q2dlhyhf1dxs2vnldc9r8f3k6diix0i1np8hpz05q";source="1cff5ijmpxc752n6cmpfzn1a10ihrkz7n9l55gz2k2q0a00m2ssh";}; -hyphen-afrikaans-58609={run="1kn57mzrbk0qhz69b1ysdqjv8xirsb40yz61jx146kqc4p1y96lf";}; -hyphen-ancientgreek-58652={run="0lhy1zrg27748mrx8yz5qxpxl3nl460l5l6impiz3lbrgnld487n";}; -hyphen-armenian-58652={run="02x9p12zc78w1x7k2kz019as42d5kn6gxfl4s72rd6dyrqii7bc1";source="0z666y580w1kpxssdanz67ykq257lf11a1mnp1jrn08zijvfrw9c";}; -hyphen-base-70247={run="1v64mb9iadxbn6als7llcrngg1pgpbcs16kd1yp0w74lsdimrmc6";}; -hyphen-basque-58652={run="1dy9fgbh4i3d9ar8wazwjvhhwzyhbys68icz3zjvk7gk9nvbm9aj";source="1yhsbzf1g9dm70jfixsz51hsfvn26cwfkfxvhg7xv2piynr4v51l";}; -hyphen-belarusian-58652={run="1n5md9kf7iiwqm236bkdsl4fb4vd6a03b6q1arvfa4l4yh8jvr13";}; -hyphen-bulgarian-58685={run="19h61n6ip8ja8kn8p1fb79lfv15pfzdhhzih0hg15cp1891nzlql";}; -hyphen-catalan-58609={run="1aqn66448bbiycmjyhbxikr4l5pvjvl5vm8gpzjinngiw82v9j98";}; -hyphen-chinese-58652={run="08sbasjp9b4wl15zmx0diayqfa9i7pf65nnsa98lbc9rpyydvhn3";}; -hyphen-churchslavonic-58609={run="0yh63znzx0bqqqr6x70c7laikxx82ph85jw48i0jh9ziv0n5gq8s";}; -hyphen-coptic-58652={run="1ry5srs6qr7z1xj1km0jsc3z278iylrfq79ji31kxmf1qs7rwpnd";}; -hyphen-croatian-58652={run="0fqwf7val8hfdcqww828cfq3706wi0w0ypmvwkkllsx1nv2mqiia";}; -hyphen-czech-58609={run="050b4vmp8n9nwqzagpw7mq1ciin9rwgdicmbk1ajl9gvci7q1q8b";}; -hyphen-danish-58652={run="142jxvssj44xh1p8d0b298l0ri33blvac5syvqgx71cvsbwpc6lb";}; -hyphen-dutch-58609={run="1hxwpb67c2hzzfk6jchhzbj2mfxzywz4zqm3z1hz9r2ywahram59";}; -hyphen-english-58609={run="13h2gli0pfjg797i4i86dihmnrpp52fjr1apj71fgjiq2453zsdq";}; -hyphen-esperanto-58652={run="1vfrf4wby1gmw5gm8h4qkyqa3hsx00nwj2qs05m1kn119k0sg70m";}; -hyphen-estonian-58652={run="1x8by00sb45acj1rkd5az408i0i2wjdabd992p4d599sf8b9dk05";}; -hyphen-ethiopic-58652={run="08dyf72ygqh24h15na2ssl2f4w9jlffh4vhy6lvrw2y6kss1xr8r";source="0j55k0sh4dc53wbngadz4wy86k046bsi4l5a329044hk24v4ydm0";}; -hyphen-finnish-71880={run="06c9r6dfihycr4vb4bvnf08d3p94h5n5g0ayjpha6gl08ab6wmv6";}; -hyphen-french-58652={run="0j41s8jl6449lys7zvjy9psynxlxlbcf23qh9sxf81rk5srzwkdq";}; -hyphen-friulan-58652={run="102sxp8901hln47nj7wng556bmrn0hqsljlf0v0ll8lsngf85h33";}; -hyphen-galician-58652={run="1l0z14m9j9w1c9kkm61r1s4q9fvbblhdbrqhg8gcddfh0b85qllq";source="1979y5x7b1x8j9v4ifc7k24zb6pxd00z0c6j9knndcaj428mf135";}; -hyphen-georgian-58652={run="1ja7skdhwwdy3idgjf508dbhbpyl3a7cj9mx8x1rswywy924liqf";}; -hyphen-german-59807={run="12x6z459lmns56s7h15lhz0fvz4dw1v51l1a4akynlbs3wh1adiv";}; -hyphen-greek-58652={run="0yknyhys5j5d34hlzw5wqdm1gw74p6bvx4dfx5kylvwjahj6ys5x";doc="16ikyzvd161hn95mi1swg0a390liwz1cq9534i5nvzh1vkyy4wrx";}; -hyphen-hungarian-58652={run="0d0bg0h78ij9b9anmdlwrlddd1xg09c2k5ganwnydbpj81c4z425";doc="1r10gjxyk8bkqjiiz7pij7zy4cvspvhnimkszl2sv0zgrkgayw68";}; -hyphen-icelandic-58652={run="00lnbm193g0zv7c1m47yz90gik1bd80718y8cmz5jhxz9ny1l271";}; -hyphen-indic-58652={run="02xnj4lrkvy7gs4vlnsvili90p6p6byh659mzci1ad4x36z4362k";}; -hyphen-indonesian-58609={run="047j1835ny6l0ris6j5haw41m9id38r854mx384kfm48sa70bs9x";}; -hyphen-interlingua-58609={run="1gc3c86zbjv6j1kw353xwhzrqrmq41rbw2ah1xrl7rxvksmzmsnr";}; -hyphen-irish-58609={run="0kaf1as4jrs8kc7rr2jg3cjkxr0x4fxn88gqjxdjdac6xhlvg0w1";}; -hyphen-italian-58652={run="0xxlpfvcy4frkvxjgx85nz86z0n9cwhgsdfmhgzi66w8c9c2r9fs";}; -hyphen-kurmanji-58652={run="164q51fkcfslh1vdz19ilwjbrs0v96a4pn45d6n0cvv9vw6gi791";}; -hyphen-latin-58652={run="0l7lsp9igylrk4cvjff8lx8jk5biisss3wkcil26cca4hb1612aj";}; -hyphen-latvian-58652={run="1p5kaf7pb5qxj6h3bglgnsqx9rys35i02piswwvayf4bdmv9sqx7";}; -hyphen-lithuanian-58652={run="09a4636b77fc2rmgc2b4jxl174bjc4ji69xply0yls4b69727i1x";}; -hyphen-macedonian-58652={run="006fg0snc4h98fzdzwdhk6ibhyrvqhs502wn2c1dnizlry05fdv6";}; -hyphen-mongolian-58652={run="1mdgs6gcvzly6y2i5rlxajk2qxjac0m91ayqb079mz8yxwvmq6xp";}; -hyphen-norwegian-58609={run="1sp47h5syhcb12nik26iy6xs5dyxrj5a53vzr0scbc0s746qi4gw";}; -hyphen-occitan-58652={run="0v0yivzx0xl48isjlnxfzvlrx9gslg6srids1aywfqmybffmfw95";}; -hyphen-piedmontese-58652={run="04sva2d6dxaick0j30izd7z71vpw8q7xx0xvihcvcgb62gb5bc7a";}; -hyphen-polish-58609={run="121aayyqidlz8kprwkb4ydzqakw1m7a5ysz9zvw7clb65z5yd69i";}; -hyphen-portuguese-58609={run="06dxp3qddbh26wv1wpwml41vpbm4y6386vgd4xn2107shhbvhqpy";}; -hyphen-romanian-58652={run="1720vcpvmm086k0ndlbp0rkzmz7f7mnmb4wn67jm53357iamkchr";}; -hyphen-romansh-58652={run="0dxcw56bkl7ddqj9fahmghwsdkmi7ncr5j319hgcgnlbp1717rkc";}; -hyphen-russian-58609={run="0vlnw1xn92ncl31yh6i7k386n0hp6vx90lgb1kxs0a3zrxcds0wa";}; -hyphen-sanskrit-58652={run="1svx84qj9vr2s6pyxn8zz587ph37g615hi3g1m4q6glw9hgzsmkr";doc="1k6vsa9xakzwmjma4f2vm685cyb28rjjj5qmpb7l0fpqpmvndp1d";}; -hyphen-serbian-58609={run="1v0v281ws9dyivqd1nrb5ms106vlvmsrvka5jmnzl1wnpw34z92c";}; -hyphen-slovak-58609={run="1vn6i784fdz35dcbxdcv85886mbg8vbjvx0w6sx230gjjxs1s571";}; -hyphen-slovenian-58652={run="0fyzw8r6v07p04m44ky3n4vkkq1dmfkl58xyx65pcpj9399bdjy3";}; -hyphen-spanish-58652={run="17gq675kb397kqd87qg4x03wj2b5zkjy8ynzpq2h1flh1lf2zfwp";doc="13kmgf0lwxm54gs39lm8vgg2hhajvqwviql1chhv2l7d66mxrcrm";source="05r3c2m5xfs6yl52ms6kc95v3x82zbs4py9ip6xznshfs5xakb85";}; -hyphen-swedish-58652={run="19rdzs7w80gf7q2xdkp1z2zc2hgq7mklfkrfdwzch2i50zzfxy6l";}; -hyphen-thai-58652={run="0k35mjibmsrahiv71dbl82r9v978gwkm42xjnp3zb4kgc0h79kc8";}; -hyphen-turkish-58652={run="0zqizvrri9r9bldqds768bslyipqrs06hx96b0nn9k6wm1y8pvsf";source="0rjwv5b0jwnwhlp6ifzd6p8iid59zylp2wbfk5crfjnknrl48qn9";}; -hyphen-turkmen-58652={run="17bhr58r8sl4fw8w3gqsb8lvpw48vdijr16bdk7n6ma0183vd1bv";source="1wlqx8wb0wsqhdv823brc3i8w1vf4m4bkb2vg917j5dq8p8p71aw";}; -hyphen-ukrainian-58652={run="1jpi7argypmrx4yvc23dx777r157c7kxgwpsix7cjjihakmx1s6k";}; -hyphen-uppersorbian-58609={run="0rvb1k16rs9hvb9xgf3yv79mh2gkndvk85blmjjsq49awwgkd8y5";}; -hyphen-welsh-58652={run="1klj6ir4b918cx96jd772ps9fl2fljh8kwkakdwaqqi8szzr65d5";}; +hyph-utf8-73410={run="1gj8jv8r0w0i93wvhs2x4inlm6l99a7yi2q343nkkwrmx0fyjpl2";doc="09p4xqbczi7gzfhqb3jwd5r4asff8ydkk6b3gajbr8r4p15yg9nr";source="1skj5n8ax4vvf6n0qnm2cyfy8b40cxrsrw2hjxbrw1v6s2r33ck6";}; +hyphen-afrikaans-73410={run="1k5xdwm3s4my2ckrhalb0cigl4cwvlrihl36j5259rnhj7i3zygq";}; +hyphen-albanian-73410={run="1bl6sl5fi9inqmjfny94dvdagmz0h8y0sqs5kd8p08x7nqd45ayq";}; +hyphen-ancientgreek-73555={run="0kjk2d41xdbzvlipyd99xv6wld9mip2q2pnvrjkx8h3dzpnqvhrd";}; +hyphen-arabic-73555={run="1yl7qb0ibhgcmkmkwjfq0nf6mcbpsmzrhz0xl5y7ymfj0qy420wy";}; +hyphen-armenian-73410={run="08hycj03ixl4hdlicqv49j3divfm2j1zwig2kdi4mry4qxizp0sx";source="0z666y580w1kpxssdanz67ykq257lf11a1mnp1jrn08zijvfrw9c";}; +hyphen-base-73526={run="1r4l6hn6wbwks3r2c6963c4j479zqhwxdpr4nvxyg8rhh34di5nh";}; +hyphen-basque-73410={run="1pvrq434q32a2qng8rh479zfcycrssn0igq114z0zlsh5dig3ls2";source="1yhsbzf1g9dm70jfixsz51hsfvn26cwfkfxvhg7xv2piynr4v51l";}; +hyphen-belarusian-73410={run="1g4ndmpimijakkzax0g52834ln646dwhpqd6nix88bj99s16n103";}; +hyphen-bulgarian-73410={run="0i1qzq44a795ysv9gjb0wakqzwchy910mns73nffh9h3al8zkajc";}; +hyphen-catalan-73410={run="1fz6zwfnr9q0gjy0alg6p7c5nc2h6x8473ln1d4lngczh7pzhx8y";}; +hyphen-chinese-73410={run="1cnc2226rg72aqv5536pmy393mjxyrbr270mhk7qc720cnxv1ypp";}; +hyphen-churchslavonic-73410={run="1s137xa9jnbihbf04ycmg2kajxmbkx3cm25xplwx190p3f9gf8fx";}; +hyphen-coptic-73410={run="0riyxz9s29wvxp2skwlg4cpx78a1qnvpg57d7k9b3z11xg6r7a4k";}; +hyphen-croatian-73410={run="1qm7rlkhy02p808dv7n0402j71rjlpdqbnvx9571wbcb5n9563xa";}; +hyphen-czech-73410={run="0cmk04my6fmsjcmgs64x6bw4dcdrhfk3ilbs65xfi8cn6v5jalip";}; +hyphen-danish-73410={run="0mfxh4p3w7hcfc4ycw9jgqydvqfbjs9g8nprxaa9balnbfm15n6m";}; +hyphen-dutch-73410={run="0rapx9akxjc8nrg3f8cwh8wk43wf6a6zhsf6g4zfb0fyjkfprxlf";}; +hyphen-english-73410={run="0858pbqnnd8f49x97wxin2la3rdk7f79fb7294681ypw0lfhslng";}; +hyphen-esperanto-73410={run="020hv61hq6cf08qg32qs7kgnc7zrn5zbw9hx9xyh9bqdk8rqz71n";}; +hyphen-estonian-73410={run="0kv5d9a1s32r174l07y145wc3n4zsc8jlyg6xi7xxz6xyzqc67jq";}; +hyphen-ethiopic-73410={run="1z2lfysdp2ni5bgxcgm1d7czz698ylrk0vninm446k4vdra1yfp2";source="0j55k0sh4dc53wbngadz4wy86k046bsi4l5a329044hk24v4ydm0";}; +hyphen-farsi-73555={run="1ahpd754bj3yp4x6i2ddc2n81yy4zvhq0g7mhdsjphxgd39lw7ij";}; +hyphen-finnish-73410={run="1gj9idi2glrhiz2fahwpyy2qg9mh9a3vzfl3x1yy93zgbazrgygn";}; +hyphen-french-73410={run="1xv3wfihpxl4h7vvxyibriaalvc6qlcb8l0jafvnn0bapj8fcx19";}; +hyphen-friulan-73410={run="0vizhqz9mz3lymxjk0qzq26nhm1yxc5py6mna31rm0hqh9ibyv23";}; +hyphen-galician-73410={run="11faw27v27khysb3304dra2hkhl10kb88xw9p4jlkl5667nz6as8";source="0bs3rljp4hbn8br6p9yj6nk12q0s2vjb0lssjiilwnmqfjxxid52";}; +hyphen-georgian-73410={run="0hx1z1nrblivzwkxsc1mrv3nfawliy1zgc4v4zxczf76ipfb6sbz";}; +hyphen-german-73410={run="1lk3zf8ivy8y8kshych7lk5ln10clqvn518lk4v1l1hjasa81z68";}; +hyphen-greek-73410={run="0bhszg94237wp4lx2mqchagpggc2l2p68bkpx1096xqicyng61hx";doc="16ikyzvd161hn95mi1swg0a390liwz1cq9534i5nvzh1vkyy4wrx";}; +hyphen-hungarian-73410={run="0j2majjlnbpnl94562k2jfrb5xz2am0xg8nhj24sa7fad2z6d5q8";doc="1r10gjxyk8bkqjiiz7pij7zy4cvspvhnimkszl2sv0zgrkgayw68";}; +hyphen-icelandic-73410={run="02klv5pzh599bv2f2918xw93xy2yv48nq4wi6hfcsbspsq5dym46";}; +hyphen-indic-73410={run="1yhywah0mgz92splyddrg32xa8kc05y4p1cccfcfwmpb4yx56snj";}; +hyphen-indonesian-73410={run="01xc0vljv7ikrd0x769g3yhq787rn2adpsv3izdvgp4rc4xfjzcp";}; +hyphen-interlingua-73410={run="024j2zawfgqkq74i3sw8z8yf4q9lym4wll8ly4rr79yqci70hqjc";}; +hyphen-irish-73410={run="05mz1q8pw9a5hbqrsgsxgdph42f6hakd9xk1f27cqk5g8bpyrvpi";}; +hyphen-italian-73410={run="0vza68bgmj7ilim836z9pj8xxss7cm67daad1s23066vlsr7nlf3";}; +hyphen-kurmanji-73410={run="03gl7a7myka73ki5q3s1hdlfwzznbz8b2db4z59gc9fijb7wmrnd";}; +hyphen-latin-73410={run="0qf22bpfvyqf103jz08l8w5sna0lqafk3h0a5jwcyjfwsd4dpmic";}; +hyphen-latvian-73410={run="0x510iw9a8qlrr8bwpd4dzyqfcamrpkz6z62njwja4ksi7ia2p0g";}; +hyphen-lithuanian-73410={run="1yqdi9jv5ls65m2fax87ld8s53h0gv2h05jnqh0jixbch712cjci";}; +hyphen-macedonian-73410={run="0mi29rdw7pml9vxzz5bd9jk46wkndiv67l231kf92c9hkgrf11cs";}; +hyphen-mongolian-73410={run="0rxkr12jcpkxn3vwfakbd132h4vh2as19h9lfp8l3mibsrjij38g";}; +hyphen-norwegian-73410={run="0syymkrq5dxfwvlzpar4bl2ni5zd84qdrn68wmjb70asvl88mvcf";}; +hyphen-occitan-73410={run="1gdywpkirg8zxipl0djs3c1qnf1f26s5fm75ba72rs8dhmvw3q6p";}; +hyphen-piedmontese-73410={run="08448mk94kvfsndg2dxlv393hzq3zllyk0kvw1dm9gcz2ddqn8z7";}; +hyphen-polish-73410={run="0hfvrvx10q3jj1q13nc2199wg54bx3vi48kxyklx47qhldf6xngz";}; +hyphen-portuguese-73410={run="09mnd1bi7wwqbir109q6055z0ylkzngsqr2q06linz7cr8aby6zp";}; +hyphen-romanian-73410={run="1a3kxcdqq2ra4d99212r5sjvycgc5rbssj0qvvdjvyjfpdkn3ihv";}; +hyphen-romansh-73555={run="01yp39wbcs8k52rnr9aqlnwvnzbzvr9z1p4pknksblhxhr9jdz3f";}; +hyphen-russian-73410={run="155ijwm5cdq337hr7xdk3ivhxcqf3s1mi8dnrq4kk31j136k1vvc";}; +hyphen-sanskrit-73410={run="0h0pj1mh78bx09a3w4nph7c4p0hsp4c9qqminjbmwi4vkzf29a4v";doc="1k6vsa9xakzwmjma4f2vm685cyb28rjjj5qmpb7l0fpqpmvndp1d";}; +hyphen-serbian-73410={run="16k21qmjkpkc7vclw2xddx9c0npqpsgbvryf5ajbrz3xpv105457";}; +hyphen-slovak-73410={run="09n7wicp3nxqgw14h13vw9qhcphfgi4vcawkg8f0k0wjz7xs68wr";}; +hyphen-slovenian-73410={run="0hfqqww72c8lm3qn353qf6nmvd8rv8yklfi2s6jls9hfpibcw94v";}; +hyphen-spanish-73410={run="1aqzyd1vrmkgja3b3lshkci7cs1hz4i9m3f1ag9wnd9di227h490";doc="13kmgf0lwxm54gs39lm8vgg2hhajvqwviql1chhv2l7d66mxrcrm";source="05r3c2m5xfs6yl52ms6kc95v3x82zbs4py9ip6xznshfs5xakb85";}; +hyphen-swedish-73410={run="1qk0wcvm85df4m4gmsfbdggjk2zrdy1h8rkskjwyizzhh881bmlv";}; +hyphen-thai-73410={run="0przqkw7yg833k85qg944ix1nvsmyli68j0w9skswphrncc0zcw4";}; +hyphen-turkish-73410={run="07rf80gcavzmmja7hi1x1wbji1x1rig3kiw7jjxad2k2qg3gcl9l";source="0rjwv5b0jwnwhlp6ifzd6p8iid59zylp2wbfk5crfjnknrl48qn9";}; +hyphen-turkmen-73410={run="0jx3ryif8w1ka6pa7lyhm880cdhhkk562kvdily5wccrfcpmrzb0";source="1wlqx8wb0wsqhdv823brc3i8w1vf4m4bkb2vg917j5dq8p8p71aw";}; +hyphen-ukrainian-73410={run="1sjx72wq0r4xii6rp2128prp1m6bifaq54q8ai82n0dkamqmvhvk";}; +hyphen-uppersorbian-73410={run="0m3i5cialcnzhvdvk1h89w043pxgi5xc0nijaxb90a3cyds6cyqx";}; +hyphen-welsh-73410={run="0yrv0qccyaps3735g0hs89v3az5bzr492gdbzjm3qka2ghvnqamb";}; hyphenat-15878={run="0ckfvjxdv4rb8156x2vmwl15mk9057i2lyg9xhqkmvqh1ani4lc4";doc="1lzpdz05dw5m8ljxf5f846m1x4nv5yrqbg3sixf7dgyhsmpfxnls";source="1ddwv26nfl4jwz8vxs4fwc9qw8gds1sg275g2bg9ci8dfflk16k7";}; hyphenex-57387={run="08f915yqpx6qhc2dzbicbv9cijzpgcl4jpifydqcc0x68y51qrzi";source="0lqn354bskaa6g0bn9g1r3lbb1hj9si5n1ki38awayzp1yj8a3q0";}; hyplain-15878={run="1kpaxdya6m7x4dmrxqzrs6k6agxsg8lcg5yqqdlips887lf609cl";doc="1q5dh42gpv4n9ps0yqyhcscjn47qz4zf35jlg56xgq2w5229k742";}; -iaria-72670={run="0725fm9pinfrp9dq78602zl7rrh3x18awqd71g5zkahvl0wwz27l";doc="1p8r2j1q4wkr0dgg3dh4nwr9lsmc01ik7gh7x3fm6wljf8lq85sm";source="0zxyndi4j5xidvijsbgj0nppv28454c4sf1zmb4xhqxv8cnb4qn3";}; -iaria-lite-72669={run="10cm9k6vl89fnpgfkimlka8nazkrbspwqqw78hjiyr1xn5xmkpxa";doc="06whk9snqjykih8by3jlxiv8f9qhs26jak2iw5ar6qd0hcqw2c7l";source="1291aak2a0dxgfcljrnhl0zw2bhzy721xg1gwcshn2yl9x0wz4ih";}; +iaria-73502={run="0394as5f4529vwq2pxhzrk26626xgv0km064nbbii6hi4yaf2vh0";doc="1shzb9ghznwsy325hl8hqra16scrdf1afa10gfj0bnbad6jrbhwc";source="0crqrkl3qkrfz7hdi5fzy6ns5cjiw5qns3pzjirmw3zkbw82z2jw";}; +iaria-lite-73503={run="16yc5y4syqwsjn8lcg4zqg82001y4klr6gg921fw7p7iysd9b93k";doc="0i2qx9n5jx0s05284b8dkns5cysx0l81q2pvm007sg8da5alxsfc";source="1vwvpi56jy8hwd30lxkqlaj6vw2ff3gp3vd742hrhhap77l53gq4";}; ibarra-71059={run="1zgbfy74np8v81rbmgki2igbb5pisrv3vi51rsf7bk05kjppk96z";doc="13skgs8zw737mqiaznffn1bqy60blc3jv2npvf0j9zsdhi6acv3g";}; ibrackets-67736={run="1cd32hk5wl2xzahk9xsrnmv8l5r05hqi9gz64d6k0lzard4p494c";doc="06ifqb5k7z08mzd8kkrkj3r37yfwgy5fw4zygd0an5470pk13zam";source="1axxyjfhkany1k2c6rzsyqilrq15809fd73r9hv0qmpbgca7m3m3";}; ibycus-babel-15878={run="0az75laq5fxnvn12348c3985148isz4n7nv6hd0d8amanm80h779";doc="1256n1qa6zpq509rk02llcixw3qh3sgi9f649pv1hjk6xdy7nxfl";source="08x3knpkwifgi2zxv78bnfn10ix7l6rf5nhfqi6w5xck09l7fiaj";}; @@ -1945,7 +1971,7 @@ ieeepes-17359={run="0nipchw9hdlc7am3n052bszilwj192pfcnc9p5alqnffrd8c4rdj";doc="0 ieeetran-59672={run="09j24j6kpgjx58yghh902bdpkns025v9av6ym2xwslmv1ya31pka";doc="0y3bw20f1sa7dacqwrwc43masap5sz23vna8bbkf4p74rdgl3bkn";}; ieejtran-65641={run="07y254kl5wanv7d2jyzhwlf5z6n542217f5n7gdyrm4jryzhb0ly";doc="1l5cyqlsamkn3yjdia1zbv7lianq8jcjl83pkywimxnybw0kvdbl";}; ietfbibs-41332={doc="18ypa96z1gclq4amka28sv26pm7lycak68zf4b3sf1bx4ldnzmxq";}; -iexec-69420={run="1fn85bszr8ryaykafms3y0yfgm469vmikfg2mpajyn5bc7pmhnb8";doc="11j9lf6akvgsqjb9h9i69qxxkwa8h2092v4znf8yjrdcasd4fwbs";source="0254awws0vimn7vlx4gjxn03dfahdzwzvmxrj6x5mmmw32xvfhhh";}; +iexec-73480={run="02ys7ngagjaw717irwmgji73ndxv6m6s2ygzljp5b1axgjpniqs0";doc="1an1i0ldiw640xgjw0z8fn7qyb8jq6c184gkwq0119kcgyd2fnym";source="1l3f8vi8kq3g8wq5vivmp40cp49gidbhi5lwj4x3q82k6d7q6vm8";}; ifallfalse-60027={run="0pn37mzlkpswyykciwgfkw981098gccqmp7wllffr39qxhcj6gdl";doc="1583p9f3lv7kkjygqv368ag70jq2b184j47v32aqpgnwlmyn55jr";source="11636chvmy2icfq6f7mvdq0fpcn36yl15g9ffpp0flqdq7c8nd14";}; iffont-38823={run="1a4zx0mysk6i7awvcjv2y1yid1k160icrkqkvw34qsgs35qnqbbq";doc="1iqchl5nra5ldmv5ddpwjcm84whpsxym34vphj2zxvzl0hqwrc2n";source="1x187pafzgg7h2vvy5dfc44y37q45lkzqfkxh8b52pysxxl23014";}; ifis-macros-71220={run="1hzb4bv3vkqhyvdhcvrbwnmd1hhh2r65sap91vwpdmz11bn1a84p";doc="01z4wxyba5xjgd9jgf8zd72vzz8qkn5wm68x4bsrb0js2v10b2mr";}; @@ -1956,7 +1982,7 @@ ifoddpage-64967={run="14gi24l4m9zmyhckjq3j1svr9858rm2idr1wwjwmp561wp7vr6yz";doc= ifplatform-45533={run="0abhpfw3w1mvpg52xaw3cngl55sszk5ji9a38yab8vhknh3d3jby";doc="1b41nzn666askfc1kkm1lwf05ggf2ml8gz3rrki4yw6ch52sl2sc";source="0g0qvbvv4j87rxps9yypair00z6il5hfjczkrmf4fkycw714sdqa";}; ifptex-66803={run="0yw0dphc2pdx2jrm5khzrnp6rg3fbcfc8z6ppwmyid8iqxszpdg3";doc="1mbdhxl2fgbwjbsk8jqk3709bv8k3whqagls1vqm5386lbcycvkv";}; ifsym-24868={run="1bs3974l1jdv0b2wwa94861hnb05kb69bsyhvsgh6k9xgmgwfrla";doc="11k9jfqrfmshwpmni6bm0324zj7c939k6shvi2l69k4w0kx6phlb";}; -iftex-61910={run="0dzpfyc2ld4kbdwj457fzmf733792gz1z7n7hpbn6z7npnkg6i8s";doc="07wvwfxwv641lmk0p1gplv7rsvab87v9fgzamizqvihf2ys506q2";}; +iftex-73115={run="04q7hz4mx8b6r8dq1sm4hq6cvhiicav85panlidkbvqsxyn7r9x3";doc="1y3wmv0bmhpc2hx64wp7v0cfyl09lvl5a8iw1svvz46wmxskhh1f";}; ifthenx-25819={run="0bp087nfq5hb3a60ayprbz621nmk0acisizkw5i25n4kryi6vc63";doc="1hzz8s2xlz2pij81cfgjad8yaamv8l4iaripj7bbifkq7gy38afj";}; ifxptex-46153={run="1wb1laq1nn02klvjgwvjgansi4anmjaik04fl0lylr7x5996qa9k";doc="0bh8bqly3zzzzgs21cb51a06023l9xfig5qjfzrlyvfqms7wj19z";}; iitem-29613={run="1sdsc28fw1lrr72s4wwgwk0zxk9720ll5xbvap2na4i3lp4vjghf";doc="0grgh5bslsl67ygvz2cd3xb9adn3w4amhpkkxnh035vkld91fxh8";source="1fk3c5rc8ylf9jg5id4jnm1gjnrvafiivhr0lpfws4ddr2pmir06";}; @@ -1978,14 +2004,16 @@ incgraph-70635={run="0wfifn80d5g9kyhcn211gmn9lzra7j9zagsm64hf685ncqsl9sai";doc=" includernw-47557={run="1w51v1v8x7wzibcy40ss7ldra83wbil8w1p978yvs5kzbky3vw2f";doc="1zl5fsgzb7nm1wi6ddc3cngqj3apmjwn1wkmsz785nss56vk9f7w";}; inconsolata-54512={run="1mbf4m3ll3r4nhxnmd3ridq7kdqlcjcm3g2q2s6qxgn4b6j9ikvn";doc="1rh7kisvs33v91r19lnqgma705dc3gari0g153ws8bd1px3ivsdm";}; inconsolata-nerd-font-70871={run="1nizfnhy5dzksdsjfxz9cj57cnj2rk6b3qhxhgrzz0ci727nbw5m";doc="10niby7zw5d78pgy6zzy8mmhss951lrw6yfb2qm7850mqi3b5skf";source="1p7q26swxl78rfbnsya4c9ljl3khvzi06lhm777ai6fyx3x85rw4";}; -index-24099={run="0lx5jl7nckbn0brsijlq78mm0gjshf8m1dqjhgl0l59qi56x5f4x";doc="117h2g30zbw5g6x3xlmpgq0k4fqixh0l8ah7350q1sxvddxfcc24";source="06acw1yb5z4f887p44l9afk78kpnjv9djmbwj55bac23ml2k3ddr";}; +index-73896={run="12hmpvvwavgxznpsj3f6vrdyyxw47jhsj4c7m9mf3wfa76v949v0";doc="0jgk1lriz9kvs87gr6bssxpcy4glf0ksp1f5lmfcgy0d941mkq1k";source="1zaq93d8hvwd3iqb56in9h7mj2x6ibzwbidch3ld1sv8x6vsm02n";}; indextools-68555={run="1f1r8k0psa7g9pk6kkgvyi9dnywsc4n34svfq2pj8b1gmp9918kr";doc="1xrlfkg43x4g66ip24spnq7vr915z0q7zdkqmi8g5zls8y81jg1c";source="056vrs54jnjnn3c2kvxfhhxf5ms8cpb004bhd8f9whb6c1hdjqpy";}; +indextra-74328={run="0gjjgfnn9ff2m2l70lb813fx6pg8j60r9lgc3j00mg1s4yp86ly0";doc="1gnqz8rrx9z31pr5lj28va1a79jmadvmx9x1dm0abzwlw2v41pk3";source="1ms6pzpa40jny8r9jkp8f7zdswlsns641krk79ipw79q05b1056g";}; infwarerr-53023={run="19nlrbfmqbkjrrx9x75s9nd6crg1lzimb2fr3hfblaivj6lx8p4r";doc="0p1s0v6p7ygkvz5f3vgarcrl85clfrj3ivzrka62djqyzn4bb3yb";source="1x2mkqyx7gz0bz31na6mcdyrlj11mxpjlzc6gb9pk51sdqjj0bbv";}; initials-54080={run="13d5pvc2q6xc0i8nbjpifn5xyn7wzln7gng98nnpjxhk5y67bcz9";doc="0676gq5dx4pqs6c0z7i48gi53mlapplmms8s66qwpdq1aksswdcq";}; inkpaper-54080={run="10989ja1vy9ca451gc0v0mrkqi25dwv4fdvw9y4k6z26g7902hap";doc="1dmvkq44kyxd5y4l2kc9wvgrhgk4kkfw0qfqzi2faf9xd6jssrhk";}; inline-images-61719={run="1nq64ymrmfiw19bcbb25gmll36xbv58ynzvv140089pw7xn5x7bm";doc="1rjppia3m0kvf433ansxhmwvii70i4k53iqk9jphhk2xv2gfd16v";}; inlinebib-22018={run="0v37ifnjpvsrcbrjd57yk3qqq195jqvr1cgvfz2fsrjrd2ima822";doc="0w4j64dxh11fysqpkldksv2qg816shz0dj16jqgbksxkjsig1i16";}; inlinedef-15878={run="0k6190v8lv2l96qpmh3pkblhwn6camcq83w75rz09517bnysm4yz";doc="0gz9m7fwcdxs6q5a33v7n32x5jr4hbxsy4j2shwv39j1j2amr1vl";source="007648wrb4ar04g0851yw663cvlmdyifidp854y87yzh536hfwi1";}; +inlinegraphicx-73069={run="0zz1kgl10dbvnszwh2yhgk079ggk9fnn4slz8xadrgr93r2cigfv";doc="1bygw6dsxwwjwvjdr9k4pj2qkv5ljlyp9kz6cy4prr35rvmfkxbv";}; inlinelabel-63853={run="05qv0j8gvdqsdc0bg51n7mskbx88gv2yny1zffr409x8pvccnhlj";doc="09jnbnyc5sy1grvyjxnlrr3pg91ispqd18mfdk9zj8m6lwy4gh1l";}; innerscript-72066={run="09cqjy2jphv4qnxy79ql59hb3qwi1hrm1gnm6l83bmpsn1bnj5qg";doc="0zaqc6s9fbnzj642z6z73l50ayyifrwwqk16dql97n4i9s5nlpx3";source="1h0dqaq680dw958q7kwmf11p7jmhvvv92gv3pkkgndwm4nxw2bks";}; inputenx-52986={run="0jjf29lj8ha99r2x0vz85swkr2aq6v2jwis27irsi79syfq8bpbc";doc="1kkblvi4dhfxsij5lmbdvmnapskvd5yahha5im2nlllh8crypwv5";source="1681djxj8c43i93ip864bi1p1fpn2dngkvh18zs0234ls0gkwiy1";}; @@ -1993,7 +2021,7 @@ inputnormalization-59850={run="017dxyy2lykvcsigpq5vfklb2gqg1aprk0xk21sxa8bdsn3hd inputtrc-28019={run="1qy90zwai5ciajsiph6sgmzmfi16qgvx389hvxsfi28wccpm5bh3";doc="0fcxac4jsvhnc85p9nwpp44ij0yq4q1lxlw42dzhg88fdkl57srg";source="0b6kl9a6ilv0i5xnlcfjgia40ynl28dbz1rvcvak3637fva07ghk";}; inriafonts-54512={run="0kbf9rvrml10qk5pckz21ag217wimqhdxjfk35ll0a17hc9yzj68";doc="1hbhfhmnjya1cmj1wzhvbny7maw9m2dr7sv74g2ka6gnl1n4rx1x";}; insbox-34299={run="0ylnp3l21zx4y1bwrr33v8d79vlgz5frna9dkg62gz1bhjbw7f7i";doc="07iw7py0p0jfq5np89dx9fdvia3yk5mi0py77xrgb8v4gx7k5g3k";}; -install-latex-guide-zh-cn-72158={doc="1k3kcf8k90b04sk8r9hqpq272y9dkyybdlv3k61zp7w2vrvc3q4c";}; +install-latex-guide-zh-cn-74375={doc="1fdhyfvy9nw840i7qb51pkv2l1kjawjx12khznlba3rrr4r2l2n1";}; installfont-31205={run="0lszqj128c3f4wbcrvzzlvj25jl5rm0n5qfj8rsn65ycxvymbf91";doc="15x8jzcd7bwvbjid0hr56h7dw39n2rg6wbfz4b02y7shp1pn7hgp";}; intcalc-53168={run="0llrnayqwdqxi91yh7panbbiljina3bynv2hxhi6sssaw3pyd92l";doc="1vav25plm639410p59bi7bsihsyys9yaddz0bcawxn72zi9b96r4";source="059pqs3f821javya7brxvl9v2mifdyw1vg18hr1zgzhj7bmlxh14";}; inter-68966={run="0f7s4mfj1phliv0dddkhsf4gpzi6xmyxhwv26bsvgvs8saf7qsha";doc="1i12ppl2fmjv4nxvslqqrn4ygrvmf9aa1lf5wlsrwn238343nkps";}; @@ -2014,7 +2042,7 @@ ionumbers-33457={run="0pfs5064cya5i6h3bcypsm8fy1bas542kpy742gmbd4rdw8cbxgr";doc= iopart-num-15878={run="1fx5sw6xzsamlrnm7nl965xrgmgffq85kkxr7ayka1w578p6f8jz";doc="06hrw0c3arhssabm3l6fhb1kh8bg4vp5hpafqlbyz064a60m1p9y";}; ipaex-61719={run="12rd8b6kbnn2hvsimmfirfq3nj436h2ckg5129qxnfnqfqr9pkl6";doc="1g2z2ichh3wdjmn9jjd48jic1b2xw5sb8sksqv0hm043hk5makaw";}; ipaex-type1-47700={run="094z08ygcklbk7nzklfmdz3lfmicrr40i0wzxmia93v1vpsjb4gh";doc="0946rj1bh2hi0779ss6d003wi4xcb79i9p432jkry07xkr3fpy7d";}; -ipsum-68861={run="02df1xdzvxv5g83bw493kh01vqbq1nf2ls5f1z6j53f116k8k154";doc="0dsq0h7hgm90lf5a2mmqgf9m002vng1cgfz6y21c85ld70ds0vpk";}; +ipsum-73069={run="02df1xdzvxv5g83bw493kh01vqbq1nf2ls5f1z6j53f116k8k154";doc="0dsq0h7hgm90lf5a2mmqgf9m002vng1cgfz6y21c85ld70ds0vpk";}; iran-bibtex-71972={run="1azg0f3jnnjx7732s4s0i2s8b6pffgkk7h4hx1875ax4j34i08pl";doc="0sskw0fyg685yjr4hly8wblif41pvgihiam9rqdgcz2yaz7m1n4j";}; is-bst-52623={run="1acvwcg568iv9lskld9hjnyvqvlsmgnbg2akrd59kmh8mmbkydk9";doc="1hlprbjkamq1w3f1n2dzayy9v14kxj8f1nr6d3z99c7v7kg19m75";}; iscram-45801={run="0h6pciksfrabg7wgxsgzciw22cp6gmz9cb3ifdsqb4n4qk9fga6m";doc="1p0p4w7pkyc9xp5af1afmsibbbrylcfrdcbn16adscw8y6wmds05";}; @@ -2028,7 +2056,7 @@ isopt-45509={run="03skmw4hmib197p3cfbhf3mbhq5hrjavwinwc22drqmca370v305";doc="0jx isorot-15878={run="19x89d5fvjpn66y8ma1h24dwapw2x6a4nxbw4ixp7xqkycyhy0wg";doc="0jrglpxxks1fbwgvmx0w3fjcnsfbf805jv95kawvgz1ix3mm71v3";source="0rfc2jdd4f5yds516lr9m28izg3lbf6wwvpsh9hrl466dakgdayz";}; isosafety-72227={run="183c5sgf6qbl8a0a5m9sirh4y21q4l3dg8k2672ag9c8am1bi1gb";doc="0600fldyf4ggf27riz33jggfr6mw48s2l597314ccis75mp6avkn";}; isotope-23711={run="066b5jw98ynyc15jigxc1idp79i89hwrq19rdizzx90s6xfnxlgn";doc="00w5bxh4dkph9d4z0x8h6akcv1i2a3b5vfr4xbvq1n8k4i8ss7jb";source="0x8vrmprpgpgbxp3n886yajdd9mv27r9shkyz9mp1bd4zakdgc8f";}; -isphysicalmath-69343={run="0550hx1ybxh8196q51zc1966jpdbrb0zprrzg4ss8x9yxkan13j9";doc="039miqrgiymmsc561mnycda229l8r3g4cz629xkndv0rxz3civb5";source="00l19fbwvpv0xrzjh0chqp73k6cvgj2bidalr3c1n1g21zai6c22";}; +isphysicalmath-73239={run="0lw1qcs7n09h9bmbfad3jqwznq86857lpr9flymnxbxhjsrhnv67";doc="0m1pdfcabqlh6mhv6m4fqk75nvgvpvf4ypcvd3hqgqhn3dqrxa2q";source="1l4nxl3y7s7xb6bqc8d84njj0i1hq5wxvzy0mi4kgmw4zgs3fa2z";}; issuulinks-25742={run="07rpm9kcfj3dxsax8kp5r5mvrgg1c5yrpbiirsk44ybjjkhhjscy";doc="0qlz8y0sszp1jsnbbgaj9h2zcz1yqk827pwzccfi4wdj4rcpvvam";source="051b05k40zs5amjxnqav6ibdvj64wfhcf16a2hlkaf5kpmpkmh54";}; istgame-62946={run="0ym2l6nf8prgwg6sqfjlr6mmhv53q3aksfznvgy7ypiggg18rq5m";doc="0ggkbzc4xnmx5h18af4h7zhzp1kcgfiqdl28qhrhhcm1d6vc1x2z";}; itnumpar-15878={run="09cv6x74vs8m10fhk5ka6i1c6gzbs5qaqbk7i7mf2zsdg5w447r4";doc="14273y8zl42gkqm915271n15pc6srsjvfbnc3jhp5xcjcqnq3yfk";source="1wg714a0ipv9g81wgmjdrm4l4yar0z2nqxr5khiwihk9nrg26yc2";}; @@ -2041,7 +2069,8 @@ jamtimes-20408={run="1sn588j6v6gxfgk31r861s7cpfk2ir7ip75hm31rxi8s8hv8s7s7";doc=" japanese-mathformulas-64678={run="0x9k23g95j4wqf02ibj4zpfgxa3vlhgckax80lwm5flvr34bbgdv";doc="1iy8q3906bl7j2ciw8l3162pjw067qkbkdadj9v727x3lg29aay2";}; japanese-otf-68492={run="1zwjissgwzkjrmh82xixax57wf1ycz239yl9wmcsnn3wcz04jg89";doc="1xzwpyzw3f13ij6xnhdhmxxafiwqmbjbyvv6c6cfbzdw5cpkvayy";source="1cs0daf9dyx5z397lak5qmanwvkbh49nflfaq6ikiqhm22hg3w1r";}; jbact-52717={run="0z0x6jrxaayp3w441r1zwlqirvv23g0b8h9xgy6r3ppi71glzqvp";}; -jeuxcartes-68266={run="1d7izhik03gs35xl4vran8adv5xr4vasc7nh55h9ya559v59xm2v";doc="02jvs63xi0qhcdnrm1m93cjj29i0cp07hw52m3143iadvargpmv6";}; +jetbrainsmono-otf-73401={run="1yhfj8ndlj9y6y3n1jc61k7hbg8sj3rmgrwgfdpbbdzwnvda33zp";doc="1220jdib21vkg42jwpfgzkhpz3rinjinxd7fd7wsxbylzbgc55yk";}; +jeuxcartes-73965={run="0ja64vsj23xm89p2ljvpfqyiwgbzhvf7zjna71n124fa52n0mr8y";doc="1y87iwf41gdqjk2k0ydnq2p70wz3qgkiimbnqb74msn9cip0hqm7";}; jfmutil-60987={run="0ygrcnm9d0dkrcz5cx86j80rdqwi1j9zs28b1bjnfb4vkd5r0fs0";doc="1vz9wav5ggsz9gkkyflywsnzjsw0p5paiw9wfx7x3ha2lgwv7agk";}; jieeetran-65642={run="07b126wich0dkvc7f581566rpn17qbnzx02hfgbw1rjkqnq3svsd";doc="0r8fsqx2nqi1jw9r30h6w3dqafl8mwhih9vxpibgfnp2lfy01a5m";}; jigsaw-71923={run="0ijq3mwfb51jj7vc7c6sdkvm0ns9fymnfvjbpnm5bsb99h39c36y";doc="1dc4wgh7dxsgsgj9sssd8lnvhayxmfg2isqdswhwqqab2m4wa1nn";}; @@ -2061,13 +2090,13 @@ joinbox-72239={run="066vlyvx8kc5kiz1laliy1p3hzgfbi2bxbn3mjli7mkapsqk4vzk";doc="1 josefin-64569={run="1f93l4f6gvsnnzr0f3gpvl9y9i034rhxcdz8c282bn5jdzg93j7r";doc="04sva62hzfphzcmk4jhmp4yiahg7kzjcskviq31lhy83d3600aa2";}; jourcl-65290={run="0skrm2rsr2y7q3mgzy8wcia8n0r2ixhdd222i0vc2figi9ynbd99";doc="0x6jxx8ckf9rmg6qidypqjy7kpi0l30npb96py62imyx4cfypr8x";}; jourrr-68556={run="1gbbnv6x903hibi2gw17armhvdg9kg884wip6a64nbvsr6g4rgn4";doc="0385yzr1rrq5rv0rm6wz4ik7f9s8zkkfdhxq8yibnkil5k1psrfr";}; -jpneduenumerate-63893={run="0an70r9y0vklglyms7n2n40qz8jd2ig9m5i48xa81z615403bf90";doc="1kb6g5hbsdi4qxcqd7ginmkg4q1flqjbi1v2d8ss6vjsamd360q4";}; -jpnedumathsymbols-63864={run="1x9jdzl2hljcm8ia7w6b2rb8zbb41y7vyi88rvlvy3y6i5v3wkcr";doc="1i9f6llx61c9lcy1lidgmidn7k870pbl2m27yvdi40kcqs39zkbd";}; +jpneduenumerate-72898={run="0c5w9y2gapdl31axl2icjq1q9v77cyy8b7d4h7wmi7djyn1lrjkx";doc="19d9x6mz9pzdbmn97l8yvkijf2f5vp4r8ay5xyhgbam1msdsa3ka";}; +jpnedumathsymbols-72959={run="0ihfz5ylf6z7lrwhsmy8swhgx5xjhrnjb769s2wp9hx7xnwk7yyw";doc="0wbhhmshvh3a09a8vjx36h41g7yzcy1jv6ayfp77imrpgi8b6y84";}; jpsj-66115={run="0yv7lkv7sr7qhqv0rmyislf0a5rcd125kqwbnfj3696cwhm5aqf4";doc="1bmms10hgyl4gs91i2kpds2mn9x41ks8fjrislj2zl8y3vqdkc81";}; js-misc-16211={run="1b26v330702mbd9bviq6sr7pg0338hddzc84z55fsqjd85fp7zcz";doc="0bs30a1m8cbv2824xhj6k3jiv6dmdp6jjzsinhfdwiizc2kzriwv";}; jsclasses-66093={run="0g59rxplv04jkjzy4x62lldf62glsr9dwgr550cpw91ws2izcx16";doc="0r3a8z11g2ngk97bd79610l6wnjy4rdgqv2prn3xcmqhrzg3xf00";source="0x8laaf3rw2z1587qx6ghvcmga3gykvahrjma7x9m8mg6ljh3jpj";}; -jslectureplanner-70443={run="1wz5kd7q9735qc47ga89f47f4c2g5lf34pm05ck4y1yqlazzl11b";doc="0gbd35lgbv4z4s64sxqnwfk09c1pf69qh1839lwn4j5nayd5aavs";}; -jsonparse-72654={run="1zhxp8ay43xw3vc4vfc0rz0aklz114sl6nlbnk4gc4qvbz44pxij";doc="1xjzc1yp2vndk9m26f4gm8kxlpv62sjz4gip6l83vlr7wbx68dbv";}; +jslectureplanner-73640={run="0wh74hyyd0jrw3ijmd02skk2pv9nmkrkxn2k1mqyd2b9rhq250b7";doc="0m7sfp4r6mxdmrgspwp3fpy3a6i125r2lvh9x2bz41zsmcm0rsdc";}; +jsonparse-74289={run="1cj8khq1m769ygs8nxb48iy7jbcq85shl37qrxy2rw4ljmci3dgn";doc="1jk9hz0qqqjrcwpjdn0vs665lxs9msh7hbaqz0cx719dmnnisz3r";}; jumplines-37553={run="1d5w5nh0pkmhjjjq9x2n4r72ygjh2mrbdr23vsrh8cyvj3xym4w1";doc="1q0mzjyfj8vfp42f8m11g6fyx60mb33g5n4i7pw9r0dfx8y4jvpd";}; junicode-71871={run="0ybi2ll1ikpnxl362jl7lwmr54p1aqqs4pn47q3ffxh2r2s5rrmm";doc="0qxwdr0ny1xi4jkwbxvx072daack0zl9pc3gafy9kc52c9s54nm3";}; junicodevf-71920={run="0a1s931sr3yyq22bv6y0jhqwphgfgifjnq8x7mnw0hlihack42l2";doc="1j3l4nmnpbsqnv4iibflci1blvim2kg9ls13q7bqrqm73kvhkyxa";}; @@ -2078,7 +2107,7 @@ jurabib-15878={run="18s5jsi5wp0cac968ysqajwrway4sv1scf6m1g2l86jkp8gl6jm8";doc="0 juramisc-15878={run="00dkagnyz7xrkn1kdzb7612qsdc00h2mkkhfv2xnw1fhrcsy11gf";doc="02prrfg5vvy5d9y45hjx877438r8syymjj9q8465c3y3jn4ka9fc";}; jurarsp-15878={run="0ylww99b12splqpkci2hps4zzi4myfy0agxzz4m3s8q74h4bqj32";doc="08bvr93ax4p00lmjkhy09bfm403lmzhq729gjjw6skla4wbvkmci";source="0fdxnj42qk4cywsxj8x40bfrkp0yqm7qh54jp3qf79gkj4hj6yp7";}; jvlisting-24638={run="0ry7gnzgl2d6id7xgpbdhg8pj920105fd9qyx1a0riagp0pgyryb";doc="16z6amx6czmipal3sbqmdsc1v5x1p4nyy5wxalicy1dki1f4zpyn";source="13al33s01bw43sa2ffz5zlxgaqvhj8lrcz8y7x9xx43wvvxjmdz9";}; -jwjournal-72172={run="1a2ma8f1d5g63masf9xg12gf6z13lgff28r6xbpb0sdkfmf6022l";doc="14k95xgf79dr8gj4n7879pqiq090x4lb89p1sydsdvhsgw7gh7zw";}; +jwjournal-72788={run="0gmw2xpkn9936597pvhpqxsnz6nf5lmg1h2ls0hws0rl5z2ld1af";doc="14k95xgf79dr8gj4n7879pqiq090x4lb89p1sydsdvhsgw7gh7zw";}; kalendarium-48744={run="11f8zkjfxbk5w4y49vy712ivfqx66m86jdddygfjskp47gxcxby2";doc="0rbac32h90cnp318a0chj1wfzfrvz2y140siqv5slld90f7d5546";source="0virfajl7xr8yiksxzmr68dm11m4240drg7xn72gxbs7jfh48wqy";}; kanaparser-48052={run="1cwik91vx5bzq5jn8xjgr4ffz7n9d2qpx9v9xr298afmadg65h0x";doc="0y7j8qp9j33hw80dypc10nr28x2zn174sq1rbbbr8gc7vsvz5pyw";}; kanbun-62026={run="046zvhsmw56a30s01pr50bv1m3s4q1fnv8hbays3v56xbj8rk7ka";doc="1qsz9krhmgav37k0386il90h91c0sxk1q2zvma272fnpbw5rbq75";}; @@ -2087,10 +2116,10 @@ karnaugh-21338={run="0a8bbdd8khib2bfk4n6527d5ggx31gva1fkqbfw2jwc5194rk360";doc=" karnaugh-map-61614={run="1q4xrsxjmzvfhivg2xycfpfsbcb51nq1cq255slpc06q4ycyxbnm";doc="1mnwkmkf4lx3cd11rzgqq2rlfc42728zi6xj67x38wqqpi9ak15x";source="0vphzrj1y5r6zmlqg4wxykqqww0ihgh6rw3z59c23f1v3j83jj4r";}; karnaughmap-36989={run="01b0ndcd6vcg4y6v4zbi6cymfprv0s4vhh20hwlghh3wy5aknwvl";doc="1xk80qqqpxagvwp1vfh9vgrqihakp7bkd89alb3j9bqaikgdiqdf";source="11b5bjdccy4p3w65268c8im3c6bam9ql60mik8pifwfbn36bhpqd";}; kastrup-15878={run="139ynj6jr5iniwg4ry57b61bpalchwmk2lvxpzi6rzhp42ifv1j1";doc="1bzjky4plcl24fg5rwbjizixwfn7nkbzb6wwydxd7s2053zba07a";source="1c4ijjifc4lwimzrhp7ym5804fz5afmccn4bnfayypmjqpc8x6jw";}; -kaytannollista-latexia-71784={doc="0fch5jz9zpc94iwln3bgvgmsrvmvwyf8ll6av9868k4lbyifsqzg";}; +kaytannollista-latexia-73292={doc="1w5d5gz4ijv4zd0lwl4y1qi86cklig5bflwxqcam3vzjwdvd5kjr";}; kblocks-57617={run="001mn33pf532iwp3d8likhbc5a4nsgq72dirbilbdgaxqxndmx12";doc="14qyg0sqrr5b04j2ramw9zcfhbgmc9qfyy5im9la4id4b4zxrk25";}; kdgdocs-24498={run="1p1rcb0lzcsmgyqz5750pl2r73fd18k76gry45zfsr7750kwx7x9";doc="0b2j3mw8z0f3d4pffqw2r9zxpmyvykd36sskkhfg7wa4q521nf3d";source="0sipsvbi9254zpg0bmcfin60szx9q0vnx07a9bdm9ma11qb1djpb";}; -kdpcover-65150={run="1a4w58r6krjg4aqpkg9r0pk7553nd6fqx22jqk37vd08scgh72ls";doc="0lvzbr63skkx12d6nwci537zvqcpp563qlf29id2mki80gqsx29w";source="0crbr3xrv0yfd64qjx72yz55py9h7by4rkl09l06sfwpn5ysdzgk";}; +kdpcover-74399={run="15h4z73gvqzjbr30ii4isdssfrsasl8hp90zj2cg09z6ll0ssri4";doc="1816isb7laj769w0qy3i23ib91732m4cgc3jp0i6r6b711fcs8d0";source="1hhl640l8by4w17cb9ssm5dw5ycsbm8gnxnnc4w0wq2p4zliw7ri";}; kerkis-56271={run="0hcaw35viqpsbpy82knib5lbf3ngvmmkga96d48v5s1zd6m7fwdk";doc="079i5x6liqgnkc3ii65ka44r9pfpf7k2gxhkbklsb3hm51zs06ld";}; kerntest-15878={run="15695a4q6ikdy6f9149rblfc4fx25hmpyczgr1z1q8x4s5ar7dr4";doc="1fmpngs3q7pwf4z284gg9b4cfw55afdsnzg6qpanlryk6czbch16";source="0gwz65xgxii7vriw5sf1zi4r97prf2c3dwawr3ghhgchmblimf8l";}; ketcindy-58661={run="0v3sz01qwd2pnnqbf4v8g0xwhs3zqxc9qihfa13df43rw644m65v";doc="0ch1zjmg04pdz96dhyl2iy380hyjqcscxn0kafj94aldin20256w";}; @@ -2100,7 +2129,7 @@ keyindex-50828={run="0fsszjcw1r3kws565pgc5j7chifbkf3dh1hnlclwwsjpxbji4n6c";doc=" keyparse-60277={run="1jfxrymww3qh4bwgc74dn6v5xwsqc29y835k4rpwglkb14ncibxd";doc="1i1sklid586igkcbhx1mjljxpq2yl7sd8rqagygqgqsxjzg91jm7";source="180fkwkm01cspp48a8msmws9bq1pif3i80yzjxs7md9k01hqzniv";}; keyreader-28195={run="17cfxcn374q0pgf7bbqwc0yrk6r15d79h39hzbvf7yrgj4r3880y";doc="0fp2hv3azi287gz129gqlsirw4dr1d5lqhzxliyzfy8dd9b2cqb7";}; keystroke-17992={run="0h0ci8pslybspsnpmv73qml22592vp5lr50qqppyhw8qkng22gsg";doc="1ig565mxjnji3ng8vsc2wa3jyp6mrhma4hnb3shwnrj9g2kvj84w";}; -keytheorems-72620={run="08rzd3gvffikcqjqg6hjyigr6pdw8lyiwcp05xqd3wbr0zlr9mnj";doc="0zmylssnj64gbq9bvf0bipwgidb7zwkbrs51ar5ihn1g8hnapcwd";}; +keytheorems-74018={run="056g7c1zzc8pc0i1584cdarf09gmw2cjjjzy66n59mpw2qgcbayn";doc="1l427ij1dhj6caq0mfm50ldf1igapq9fgxpzpqm0rd7rgf2shhqi";}; keyval2e-23698={run="05ssgrl08d55in1wkam99bfdfkjhjrda6j96b6nmj61sp97yg3ig";doc="02ajr27zgfjk5hwmqm05gdapkg3d3rk1k9k3nqm4nbvwhx5sahg5";}; keyvaltable-65416={run="0r8y69sbis65hdalck66n5hxww7nk5z2psb5qzx13dx6qhnqknz8";doc="1lhk840aj1sxj6pwybrpg9gd3lm9gs06q1dhz399my6cds1b9bk9";source="1k749a0smf6wdcsb6cswm0adq98ylg7cq9yir410wkxyxdfwj413";}; kfupm-math-exam-63977={run="0r5zqf6qxzbgyhg13xrr8qwqb5cjrik670fclh089qsz2kihqb6n";doc="1lxab23k08wrnpgjc68lcn1r41c793cncxfd8mnqxml4lyylfcwc";source="0c4fpj08y2ixf9c8kqzyl0j4hrjg9mrim4fg6y4s7mb4kcw0138a";}; @@ -2111,7 +2140,7 @@ kixfont-18488={run="02zwdm6zja38n41pvzay09f38cam28rr9ag6yy1m5kmw8421xp11";doc="1 kluwer-54074={run="15av38sb3pzffxvrxlbwxzgvhnxhsjhkr3qwrlqswwq1sy4a2ssc";doc="1cx0xya0s27mybl37gw3yx1rmcyvrxnrp8c4012gvmqiyqyx4sjx";source="17w0ybfzs9x8yixzl8cfldqi42sq2jpkyap8i08mvp8krqgviz1n";}; knitting-50782={run="10x5yxlrnj67gzd5kz7fvnz0nykvvi26sdm7i3n3d0si1vjzvczs";doc="1zm6s0rd3zkir9vxvbc37big9ygnyhcqpr4p306vqavvmf5g7p57";}; knittingpattern-17205={run="1ydq16bmviqkbf9zkrlxsh33bfn8nmyzbbi1xwfd7nsg1bhdf6d1";doc="1x1bswn2sd1w19g1szc573zayk43zi3718a9yqfzqnxa0qxvxsqd";}; -knowledge-70594={run="1s4flnxixjw6z9w7sdhpfnpfj7lvzmjycnpzb2j3rxfafvzw8029";doc="151gvwqzkl2yxdzx2b2mcvfwb7w13s9m3c2y5vv4yrfy7wfkx0py";source="0r95p5vqxd6x9hbcflfq8d00kjvwk41r9harslzh9i3i5lfimalp";}; +knowledge-74193={run="1jsx4b2ckad7gfl2fq1qf6bxphknmx1vylk41p6picm2cjw0g7x2";doc="1m10p3vibdm7cv9s9858x3kawr8zf6h01rdbr8nk3wdynlmjx8zh";source="0kqaacdwzcl1c6nivlp2z544nim25p5pwxg6pbr20s82mi1v4q22";}; knuth-errata-58682={doc="0rcyw7dqcwlnf9q421k017hrx5c0d9rra6rcr3n6wqmhxmdy5mn9";}; knuth-hint-72019={doc="1rrfn1ajj1fkxg2lr7isfdlkff6hxq37scdf370h2vd9ra484ykx";}; knuth-lib-57963={run="0dl8z340n6m6xn7wari4hir0syxqi0kl2fhnf0bvnmkqhqwyzpca";}; @@ -2124,13 +2153,13 @@ koma-script-sfs-26137={run="14qhq2h6pfjy878nkglbif7yjc12g6q32kl4xfc7kk3kf9syp0kf komacv-57721={run="06df0hx1rm87vgsb1g8b00ak77n6zs34c7mb76k22fis41qmm3a2";doc="07sxwgrrik3vadlp9a4lk3jmcqnvfzz5ir8l33zi7sjrapr7mxxa";source="0vd6ha60dz9ddmf3rkbbw5h602fkch3zifcjip9nyfs7wgnkg3r2";}; komacv-rg-49064={run="0hcf3aw9r3hr01f9109rid9c1c36gmg9z0258zlqgq9l8qs0bryz";doc="1g985pnkhlhyf1285w9g1zx86vldyg45r4dyp1dq02pka5nf33fs";source="15v5y47jj0393vkikpv5mqdrrygs66b20gsmp03j6v6iih52w7fk";}; korigamik-71991={run="0napq587a4j4z0fw0ddhal0h02aymjj92cbxmqrrw19j8k8g0b2f";doc="1lxkyaqcan6jxbvi1zavbavlycp8amz6qmah258y87yl08m8c475";}; -kotex-oblivoir-70491={run="16fs5k3n326amyf1i1bnk6bai8m9nhg8n22ij3rbpa69q0639r0b";doc="0nphzrlnya0mcqx878v8zmqaq0cw9ky2qi8ci37nx3rrzmxlv0qr";}; +kotex-oblivoir-73766={run="09qjwj0dwnx19p7lci6hg6skbirc86il40j2yhvj9c3s8ygqq0r4";doc="0rxiai2z5i03afkm1m2x70v1pf2k11phkvwxqi9vacwy0a2a90z3";}; kotex-plain-63689={run="0nri3fagwj6mgkcx97750khsyqf94dx5kxkf5ny0jiswnv192v0j";doc="16376wpncchxpsl57g7rgzl96w9hl3qyn3i4qw901y00smr450hk";}; kotex-utf-63690={run="0gpdg9c7dqcg0jfq05i5gkvycskipzyk4cmfrncd8mm7axv9qd23";doc="0x0y67bn28fy32awnjyq2zy4gqnafyvbjkhs7hipghxf87p6snrz";}; kotex-utils-38727={run="021hgi7iw47b3c637mk0g4v52h5ygx5w1060bpcknjlbg0qb09aw";doc="0l7dby446xxjwk7vl1h3w4xsid4dqd8zdspj1f457jy4qwjaqf88";}; kpathsea-72376={run="0akzfks6dkkf6r2acg7k643jsdli8sdgclkbv8ihpgn073rck3wx";doc="1kar9qdy3dd3mwbmfg7lpg10cidmp7i32wfk64j1kmywqw8rsyls";}; -kpfonts-65583={run="0i8c7agc9zs1vzjq8w0ghkwk81hrc2qghzn7hs1wq3vdbc3wk4r5";doc="1q8h8208z0k19nw7idq45hmzhvsrnf7g3708ch3kjwaj7r9y5lij";}; -kpfonts-otf-71153={run="1andcqf9bpc7jzw80kvjvcby60pkmfim664297af2vb6nk1apyny";doc="04c24743ijwfy8xxkk9lgx2wvp8a2shk6hklwk8a9ia66rna023l";}; +kpfonts-72680={run="00yvnz9x25sfd5bvb0s308gfndyxr7ar9mr69k8136px3q8dgzj2";doc="1mb16i25ah5z4il4mkbfigg5bgsfbmz2nynabj20a59cjcs1zp9r";}; +kpfonts-otf-74015={run="1jjsi4h8122s3wl9ycm06i7fp4cqv51ibw6v7d971fly8z6yls0s";doc="0q8li24br6q91ahv8z3j48i9hwmmw7vv67gcd50hs4adk3h0hn5p";}; ksfh_nat-24825={run="1qzn0n19lslf2qg8fvm844xx5k7s8a275a77z2ynbb0vs1w4prpw";}; ksp-thesis-39080={run="0hcsni8p92pm3l7mi56jj7mlcv5rvdpzwbv1jv5f1hb6xyx2pn4i";doc="01pbmmwwjzd5cq4xxmx3fknk8d4q3fda3680g344g5s6ra5i45nj";}; ktv-texdata-27369={run="1md2iv0csmr5f2mcdlb3lacccwifd6iv7yp6123gra5xcp06k4y0";doc="14sk7x2va8ja65a65fpksj2nd16v6rc1f0828gmm8j81d13cci6y";source="1ws256l59plnhmw1rycfznwpndni5i47liqhazddwbg2hragfahh";}; @@ -2149,10 +2178,10 @@ l2tabu-italian-25218={doc="0bgfmn5v80rdhs9wmjj6mki29p28ip1d29rmgbw4jh4z6gd4sf22" l2tabu-spanish-15878={doc="1p83xflgv8x7nq9mylh468zn3hz5pv3zxprc63q51fwx0ylxfdbk";}; l3backend-71991={run="177g7sg03g4cyc0h7d026j8sjww0pglnrldw0c8v96wb3s67cgc9";doc="0lmchdmgk25ybpj3cxafi5b4mhnh3sfbjllw5hk37ka17c5hgvwj";source="13sgyw19s6f187m8dys76z6pqpmzfxwwbvfgcz7vccb8bq4zah91";}; l3backend-dev-71211={run="1fxgdsbrx3smdjfyx92xjl6rn5xgjslrbj4mfdzbmwr135wxhfjb";doc="0r6ksx8d1lpcl97pnzlw6il11rgvq0jhpbhgrgri53r249cqb9zx";source="0r0bng8i5a0gjrcb32f9glr5qn6dr70x34w7zs2jcx96lagz1l5r";}; -l3build-72567={run="06bzbf0z946n9ckbxxih28sks4v1vazlirq3f0sljxg1vrx542hg";doc="1ydlz9z293bzb812zjpdfvnhbh2gbkzjmma0k3i9dn8gsvvaw4s5";source="19gd017kip5dn3dh2a8fmxlkwp80fjfqhwm7jf994rc16jm2d5g7";}; +l3build-74232={run="17461qk8zkmkazqvqsh8ikd19v0hqb2biwhss5bgpd3acw2b6ngg";doc="0riknrg12asw9zcwnlqk1l29naz2ka2adk34l8wjds5xzm7y52si";source="08yxghrl0sb04py364q18ss8k109a496qdac6viqhal6plaviwwn";}; l3experimental-71991={run="1vim6ms4mp769k6hpiqaghpavaibgvggqmfff54y71wvk2mc3hcn";doc="10jssa67rr3alldcbzh90kb1x2y5ys6xiqhzy3nr70jll04zwk7p";source="0n8lq8s13aflzklipn4gy31hbfyhhk0h3dgm6cngpfr20zl06cab";}; -l3kernel-72625={run="0rly9bvyrzpzm4wnrp9gbfgqpkvyj6n02w1mdafzmi1vff456n2g";doc="0a1kifyd3jw7qdds5sai5nyss4b4w3p2m8a2g9hpckhqsxm1sn7r";source="1mw92y08gp5ln20n3j4fcq12xv4604vj40w98i5fm92f87f02186";}; -l3kernel-dev-72506={run="0wq7gc9fndf5q0fg3pcpc8qaw7k9k63krds77gihbhhmdxmshb54";doc="17gsk4gz7jv7zmy1v9af3w2l64xspvik69qyy8nnpa5i24giazmk";source="017k37hmywbmlqw78q76dhq3f6nv92kg6c1jvf5w1b1hpfcbcpb9";}; +l3kernel-73651={run="05ngrwcyrnx1lnd8s4sscmklmsasziihkhj5rgkpzp98yi553jnv";doc="0j8cqvw3j7h1dxqak0s0g4ql4q7d0g6ahcm84481vsgw730vkh20";source="16k8cwrkmni75m25gw3a49rc8gfly78wz0wp63naaylmg276lhgd";}; +l3kernel-dev-73508={run="0hdv2cm2nidd0p56zdk99bwqqghc01b7c7q0fviq9aybvbwbsbic";doc="1qw8infky1h9ki4xa4ygna42z85arvj2lq588r2c8zyb2d5kvhzg";source="0ykhhcqclg2950m3y3fv6dnffvp30f5lrv3bmilq9qajcyvx4i7m";}; l3packages-72128={run="1h97bi83k2c66kh8zhymcsma28nypd8galmam8fc2ywix6b7z930";doc="0xihfdiqj0zbkr8sgq3b3h4f6a7hnbx9pib9b87skvi42z81kbqx";source="1g0ax3za92684j1iznl5kcixn2pvnfc7ligb3fj5lz30pylk72ls";}; l3sys-query-70889={run="15l8agxmgnkjkb5dqjariysb37hlpx8vnkg18qrhr985mnp27pgx";doc="0fch557piy82k9813r4v3jih48bl3r5b6lmcs3arxy8l9lfydcbm";}; labbook-15878={run="1qh16jjmpyqdfndfs91nmbfhwxif5ygk35zlsailngpgnp1r2x7s";doc="0za4mp2zq9s1z90sgqcvf6zac7w0wqbf8y5w1qrwmlv6r6kg3s1s";source="0w7nff8c2ffrn2ywz1dahd8n4cb959b6zf3ka0s913nv04ifdkgi";}; @@ -2167,50 +2196,50 @@ lambda-lists-31402={run="17srvv0v10mczvvmxr6sfhlr8zks589c86v472g4rnmf4bl4my88";d lambdax-60278={run="0sr5im1ag7lzz0rkvnj0biik9z5ww6yr03ykn2w64dg1nf42chf4";doc="07fgh2x639fj8wb21rygj7yc0c7bcq4sm1bhdrsxzgrwjxn9rbw0";source="0sarj3dsqm18zx176p6hq3xv717fzdpvipvdlv8l5y5pcvasz73x";}; langcode-27764={run="1hj7zyjxh64fax5rv32558sp2ss986fxx0fqd5xb9c07s189cs3d";doc="06bygnvh4sdv7mp17c94wx9v1lj4zgih1db6mknc3wiifi5jcx8m";source="1bi25gqx2yi8f6g8hpnqp9f52qnfpyafi0r16scap8w0sbnwrib1";}; langnames-69101={run="1rg0hn4addzi72qgrx303skf35c03lslrlf8ry790kwr27i7lna4";doc="0ix2gk1gzvsk1w0r1whr2imdml3a6f9avw6yfkf54n5hnaxm7i6n";source="002rmwkvm5b4ay1cbxc51ibcb27sg571l2r5czfilbavh0000piz";}; -langsci-70025={run="1va10za9qfhdmb9c652rh2n3qyp1v6pyjc8aia7hndik3j3p22f5";doc="1imd2wlkd8k4wfjangq43mvr4m3xj295vrwmqjya4p0jhilh13ya";}; +langsci-73027={run="0858wzl0q1zrmsivkrayixbzd7vfxza3l3bnsgc50drlzsg30wbh";doc="1nng5n3bpli7hvzl5jq0arkxka9dc2sqq7cfhd7llq36f2ip6agr";}; langsci-avm-66016={run="0xnprm5fcy8knxhldl54c5vhir4klgsmmy8l9306hmlykmphwifx";doc="1s5bjwhdz1fwnkvnrx7f4789cy0f2l0qkixdd6va6zjvylihzl4l";source="0ifsjndp9lf06anqcl79kp7rhx9gc56yw5xsr4lb4fshzzg6jwnr";}; lapdf-23806={run="1lfmn6axzbfk03j6f12yqa0vy3gzvw1ylpq7k2ki4prb3zwhx9sx";doc="0h9wy3amir9wdqv0b8678mfmcd172zll9p5v7sf1l0w3zlbw5msy";}; lastbib-70376={run="0ml8h5s22lp4bbf9prjjdgrvsahwaksv1kpnln696gj1g3hqh63q";doc="125h4563c5rny3rbizb6imdp1r8mc1203jkdzzw0p9113lmwliq6";}; lastpackage-34481={run="0wjpjd3b48fj4mqqdx38sqalbaa9ab3c6rywyjqhvrd1pxfap2g0";doc="1123lz0ki4kww93952wqrhrw9l2cnk4wrrwyi0dxc5w1yfn2gg87";source="176fk84mbb6w5ql94381kz05lh8q8im7ri6rfjff7f4ymfjnh2jk";}; -lastpage-71883={run="0sn4w9j0mrqh76hwiwfwr09blrz58fj3g3af5xf11dvlb2b7pkkp";doc="0pn7in73hsg95nywis4xwcm4lggqb1snxalz9rn372xnivvjcrvz";source="0f1yx9bz6x7av9awnq3cf3aj18c4h8fsfahavm3hra23pc8gdg8d";}; -latex-71629={run="1r78ch1lk1ddmc7criw8x14vmy1fawrg6j77992iwqy7zplaa3vg";doc="076r37f3x21y5jpbc3nm4dxjv5iqbdd7dpdxhc47znciiw9kj2gw";source="0g0cq7ysr2gc81c7z6fc4ad77z8r7qfhqrfxjplh57ipv371838b";}; -latex-amsmath-dev-72549={run="01574d9yh9zsdp83jw755bpx3wyjsmx6q4cq52qdjbpfqay1ipc9";doc="1v0d3vskq6yyykz88a9sx55jvbkgzd9idza3baky10hggh14as3h";source="1cf3y4liq7qapjw378vc5lqmlw0ah45m8s3sacy3gnj0h59k34rl";}; -latex-base-dev-72549={run="1spy0q5vnj9phwq2vrvhjjc0x4qjdjv6zg6frl1z0f58v85ix27v";doc="1dlwmwkryip3snk5sfm1qkz5j1y9ky9lwvg27z074i4i1mm4a1k1";source="0xd6f85zxfn791g0zqflp0fx71c03cawgs2flzvwz5d7gd0xr945";}; +lastpage-73639={run="1f6c79my2fja1jrj58z37yxrimfqnia4c1lqcb6cs8ii2fy6g8jb";doc="1897y8yvjm8jqyjnjd1gffq4wrbyhqm9dx8alnxw8amkwr4y6p6x";source="145lfy9sv524lghkn1gnf1chljzd4vhzhq4r0fwijbrc5hri640l";}; +latex-73643={run="0cibfpk4zmfjd2ppas6dz1ayv7fvhfgm3q090h1095iqhc0rjhqp";doc="0pzkcfp0kvkifga6gk0qbzhbk9ppyzzqyc33sf81cyhrj1an54ff";source="12f7937mr0k4kgkk5i1dblxylkpdhm0hd6vp3jzlsigbvyxvmbdh";}; +latex-amsmath-dev-74216={run="1fxax6qszl28lfq94shcir4ff34pkhx0cx2sxq9sgk0ks3zbg4bw";doc="053ga7bxdj2axs2y7l6px10v801c2rppxx000zs7g76pb6xdl9r7";source="0rgvgi5q85fzqp9qjn596djpga6vbnyfbbykinqx7b4j5k8zv9qi";}; +latex-base-dev-74216={run="0bfwc8ij1b1iwx621r2bfhj72c02p3gkc9zzzxpaq71clf9l359h";doc="1x3wqdjbcc6pzvzklv5dgwljdmk337bpzj2bwj3phrm3vhnqwxii";source="0mi3x41ik134lbpnbns09hgkl7blf44b0lvk8h3ap7784n7xgyxs";}; latex-bin-71362={doc="1f73x92hwybkq6gqhps6gnsy8rs12zwxbfnp226d0bm6b2ji31z6";}; latex-bin-dev-71362={doc="0az1zs8422hhk82lsa7d5m9jyi9hs494ka127568zzgmfars509b";}; latex-brochure-40612={doc="0xba20sy8q10ac9hxwnz9axh853hrj06vp7mfn12ajax31miznmy";}; latex-context-ppchtex-66687={run="0ai8w4r3lagkgval65hxnb8fqg8lq0j5kailyb4dzv2fjs9x0sl1";doc="1wbgxydjicb10mnzjixnz1hhqy4xzxv6k92wf7fb2w486mh89k5s";}; latex-course-68681={doc="00s521wrc5gqqs5jvd1ljl04nighy8q79r0ama783ic27a3k0qhi";}; latex-doc-ptr-72417={doc="1gddkzk7zfxq24l2k6cdcp8s00wx3iddy6x96n7qpk9d79izbd5s";}; -latex-firstaid-dev-72549={run="0xy4c1bf3z3i9wz0k353kv3hyfgk71grz8sjkxjjshrsk11631v3";doc="16ivlr6wxq72myympvz245j15mfcnwxv8as1m3a71absrkis4gvg";source="1q59grxd3q7x8ln1k7cdj5zv51iphjxmkk6pkqz5wk7bwfcspsqb";}; +latex-firstaid-dev-74216={run="1f8fs67yvcnlrlpf0lhailvr966vcp84ygr6rlqpvdm9icmjkrcp";doc="055fa1mr3f0g4d5mx0xl1l4v99rassrdam5ra9b87nnzij22j9m7";source="05cz0j415irpq1z1pznbwidnjy1qqrrggcnd9kn9mshyins30v8q";}; latex-fonts-28888={run="0dh4kgy4mfarlsrgqw4dm5zgfhcfg9qzh8s2wjk6w2g0jfc8rf3v";doc="0243qbrs2w7qh17nh8m4ivj35gfgxsnqxza281cvhh7g2fv47f5l";}; latex-for-undergraduates-70199={doc="03s686vbzpjv71vlp5931vxyx8lckvl5819agh4688h9m98w54s9";}; latex-git-log-71402={run="1fiianjvycjbdp5pq4pzw6rpssxr6093w9s03mx37wzp7r7xfgxv";doc="0bf8bwmycs7qwsixgjggfr5p46w41z3xjw0vh2wlcdm9zrxi3fvx";}; latex-graphics-companion-29235={doc="01zs32gck1sl9zlbhghyjmjwxyvw0jha5vl2hd10knyrb3z4dhxc";}; -latex-graphics-dev-72549={run="11m8vihg8nqvmvr9bzcinnqqv89dqirypdp60ixs6v8700x14wnn";doc="13dn9gskd6qlznf2l71mp34i79gkarlx4wyypvdsadjavxr80gpr";source="1jjj5h7yxgm28ly1ia50ai7vnaphapb5iwj8x3qb1dd830ccn4zv";}; -latex-lab-71408={run="1dga0vwkrd5aqgxwlg9ahks31cpjf10xq3cv6zrv37yyyb97na99";doc="1wd1k28vryxvxs6g30vl8ypz0cm7qkbw6wdgxhsvm58gxzpx4mx2";source="0awa7pr81kb89pnn8qrc71nq90skr17vbqaq2l7582q7f600wi0b";}; -latex-lab-dev-72549={run="1q6qdlm5w8bkydfzyrgh92ajr3w3qq3lyznrskm2sicsd3is5rpb";doc="17mr78ah7jr3598yx8vpvcp8x6cajnvcmikar9xqyfxxgzhxfr8h";source="1jhh4ljd5n4pva50nv3zc290qkgndh0r1cmlplcq8n9xb79xv1g0";}; +latex-graphics-dev-74216={run="1k1i88pwd6fgz9flsk3gr65dv1f02nw452l0zchzlsmg3sgf8j1l";doc="14r4lrbw11m8gmpxi3805picm03dfzf7sxzsal3vsl1148nab4hn";source="1jlz5n9svz68g4v6hd7yrg42bwh09di6dp0a7gjjgr99cxbgf0rm";}; +latex-lab-73665={run="1msdpx5051krkp0vfr29l6scdm3czlnsrp6adxhvkhm6cq9fw2aw";doc="0z5d1pv6siywn3yw27l9mdl0696gv1gxgb4knsc80mj91gy1amg5";source="1015pw5kilab85rcjmmh094g92dsrxx2zvbrdbvmm2mh6h8bngwy";}; +latex-lab-dev-74216={run="02ndnxkhx9cav69afvnff92rcpxyv70v0v61f967cvn010vqhabi";doc="17nii1lawm4a662swd0mdpkbxvsndbg7mzrnpims7yxn5gj1wl28";source="0kv2vja9bchm802p0nfvjdf10212i0faivy2q1if4327allqr91c";}; latex-make-60874={run="1dgw31znxh3ch6xyg7y0ngnkjmpny7fbq9nhapd3am4l6qb0598j";doc="0jmms953klgv8z4k5d8rj2l5barwxx02pmzk6ihpp1wdggfjxrfy";source="0a5jqry52x11iga5ky89b57l1ww0hbl8z0mkkv6nvvc7bg5gg6w4";}; latex-mr-55475={doc="1zd948d9y63js7980g2bvxpf67hshh2xa3n2ihbzwhpw6l9cbh1w";}; latex-notes-zh-cn-15878={doc="0w9rmd7b5fnfvix653n9vbnn1k8yxlaaak79ipvm8p53dx75xfxd";}; latex-papersize-53131={run="0axx2lkwi1xq3qdaazhb6i7dssx8q2k0nm5vf4b9p5ldl1ky0dzl";doc="1dkra9b0wv8s4f7xn36j1x1p849ziwlm4chf5mrayp0wmx8qshc0";}; latex-refsheet-45076={doc="169h1syday30qiw032k14fhxikdwszggvqz8b9ga4i9wwxf1vh4m";}; -latex-tools-dev-72549={run="0ly0l6kznl9wisk3ch926w4sw8894249gkr24v1l3yhisiywx6rl";doc="1ykqs3rcnszw02yb1vqr01bj61fx8hxd7h6kq2q009ff9gqfhpkm";source="12hj6fkrggirpvgjbc2jhl480fgjxq7ly2k5npxxx9v1gprl29jq";}; +latex-tools-dev-74216={run="1xs28svxdhpq28wpidh8rp1a42g1yhqhbpw3xwzg1wxa05a39cmi";doc="06a63pjavpjg4gf411ly634ifk59mpw2xykiys3dllph33cmgiqv";source="10nfnndc9ggmp17mg75isd1qikghnixyc8v1ym9ijidd8khrxb3l";}; latex-uni8-49729={run="1sv4n2v0m3lck7x320cwbay23k7r9fh4wm1vxg9m4grphc72n2b0";doc="1y3p08mni1ng6dyp0g98in7hh3mbzqq42249idy90vjhc177rjc1";}; latex-veryshortguide-55228={doc="17i8zmr7mjfrx911psdy9cbn05c5inn4ixqmnjkpr9sbgsninyc4";}; -latex-via-exemplos-68627={doc="11nhv72ixwr0g19nr7dir5awgdapxq0l295hm1pcggr62wqh67l1";}; +latex-via-exemplos-73369={doc="1gvzddi8llp24jwim8lanxl1js7vw9pg0ndliyib99p7sidz6q11";}; latex-web-companion-29349={doc="0v018lwf88z3qmzyqpyvfql7dbwk5a9r0wj3jfjc9cp2ksl8zf8f";}; latex2e-help-texinfo-71252={doc="040zsibf3hzm29llq6272qbgv2cdffa17gyw57781cbnfyc2k9bz";}; latex2e-help-texinfo-fr-64228={doc="13s0zjwk3m95kbx4qrz2xwp8kifzc2zmasp1ks9l2acf1nqfac9p";}; latex2e-help-texinfo-spanish-65614={doc="1v3wa99phdmsiajbq0ad4h939cpwjwzpq88h6s0796h5fr34hrvq";}; latex2man-64477={run="04m5ccx6z8nvp6z8dm7dqhqyf8h9snmaz4cvd8i8fcwfba9znf9c";doc="11nl9ldkw3f90iz8r23jbgxaa6yq5p61f1db344nfhy0wimx15si";}; latex2nemeth-65269={run="16fd74x6bz4zfj2zlvbfw160684ff1fn1rkpx4y34avkp0ivs9bq";doc="0f50qxbwcas2gpazlq0ja4m6lcbwkkwlp19qb2v1lflfgian39c6";}; -latex2pydata-71283={run="1ks7zp9hg9p13fl9axld84v19v82hm2rxnrzdygczvrq34wjpa4m";doc="06c6h91r7xkbz0647hy1rdzim7dw9mx8rd04g265ah8pknrad5hv";source="0z41b1z3vjrr0dcrbzl2p68kwjqrdv2l4j1if1bj40xknsmc1vzp";}; +latex2pydata-74446={run="06pgag3262zav47sm88yzw4xw2h60x8gydpa89n223n49p5w4m45";doc="1xyfjm3n58s5q747zvyjmfhi19mhf33rpkp14wsfnwd42y5ylzhs";source="0isxcdvi2q97jz6y6s4xygg3vanl1509jj7w1jaj5lshg7sv11j6";}; latex4musicians-49759={doc="1zvy2pa93kyn056d5n0irzdq5xmzki6d35zxacxfy19r0g9rwq6f";}; latex4wp-68096={doc="1a569y6vss3glz1il4hg2f6718mj24spp4ahdj6v7k6y7ppa1zii";}; latex4wp-it-36000={doc="14r86fwhb9zafmyv05pqfi9962dpxj7wq94acm43gv8m2rsjp52k";}; latexbangla-55475={run="0jh2x97r6j8lrl5kq5m4bvk139229fwf7r8g8xq7n0qywnfdr9zh";doc="0hgcqd8vqq67zzdn7mq4bps3q56ad3nmaq71mkcyricgrkn5xxmb";}; -latexbug-71550={run="0ln3s6cpjxxgwd91wlv76c21iip1srvfy0zmniqd3bh2m9w2j717";doc="0zxzyjvzcbgzhkfalap195yzmvdra3k1vs00n0j0grfnl3w7ql5v";source="0zgkb9v0d2rxdlninyks9vs5xr1k18j5lx632qx589hm0bbvagsj";}; +latexbug-72762={run="187dcd8zyvnbjgp4xrqh8vwy395cqy2wcfkn0q2a4v8rlbqax29l";doc="1qdy0glbvmdp6i7q544q4bgzr7c7sj6kk0503gn91nisjdh0smxf";source="1m3igcq4l8gk53gm6jlq92rvq7f7h1wq4hyly59kwnc1zcrl262x";}; latexcheat-15878={doc="1383rsi21ma0291asi779bjr33m7fii019di8gv8kxwgci692fz0";}; latexcheat-de-35702={doc="1cpqcvqkkyb2bf87yjvc2migxawnacx5mva8dapma7hmwx0z7rhm";}; latexcheat-esmx-36866={doc="1d6nk9p9adlhgr28mnnizrxzzqlk20zw2clcddqlaa8pn73dqhcm";}; @@ -2224,7 +2253,7 @@ latexfileinfo-pkgs-26760={run="0lf6pkxjqdilg10i3fwmlb1nvvag6c5bm6pbcd50jjbd1q39i latexfileversion-29349={run="1yy159skv29hp0qxpghmq5zmay9yi0ndkgz7lbllj1ymkgxs5138";doc="0k20c2kw0xarjlkdhjyx9h9kvjm2f3rd98lz097xj8xvk0fs0zp6";}; latexgit-54811={run="1kg9cbz6h70496snqqa2h9xfknm70qf96xyvnc829k5v34jskmi1";doc="09rlc9nprx6590snfg7gakycsam37wmmscybvm48vdn271vvla9l";source="1pn4gv4prwsnnr377xg2x3kf3kmi8pxgczbi9knzavkd53653akx";}; latexindent-71840={run="0m7qxmh3yqw7w0yfnm0vpp44jmc2xl83m0w420w89663w5sv1iih";doc="0nd0axz091xah177xjxsda3ccgikak9cb6yxlab4499ikr98njnk";}; -latexmk-70909={run="02yyz8m5z1ybihbz9px1r3zygm8cwjjnh184pgkrdq32wr5w6ica";doc="0m4s52jcxiqqvg6kr188q56dc0pba47r22zivyfjh9ncbn57j0y1";}; +latexmk-73224={run="0dkji96rcig99dcv5imd3gnnigwiafk2wpjsikv0fh4jvnk5bh7y";doc="16r30a06ngsm665hpmv8f6a48fwqd8x1k2kqldp4rzx1im25k55j";}; latexmp-55643={run="03rgabck8mcxnbg1avl638nhxdk6smvyd21v2ns61hx3jn09cpv5";doc="1ad9axqv8h2s2xckrdxcnl8kazpgijrgpxmbwsb3h0hqb3liznsg";}; latexpand-66226={run="1ky0z3k9lwd2815kn3hxpdhcc92spp4wadc5s4hhjdjah50b6zpk";doc="1za2s4qvkfpqg2s86z33y85lw4vbi5ll52if58dndbg47mf26939";}; latino-sine-flexione-69568={run="1k8inj0rl7mhsjyzc39w789jlafqshh9sgy99szxqbs0jilgfb78";doc="1wccb0ksrrysqjp68l3wnf6l4n3s64ny3cvxiqgalrf0mlfipxmi";}; @@ -2242,20 +2271,20 @@ leadsheets-61504={run="07w8h1wv322dy0b69d13b9k59m6iid53rlpn20ps5ss2j20b62z3";doc leaflet-70652={run="0wql7sgbqvbb27mxzapbzy2cnmz2payy5g3cv5yqrlxqpd5fqfwl";doc="1z1vil7mraxpcw2addsjkj9dqgcsx2v47533dkf0xnz7b0q7sbrh";source="0cwhrqmfz1z14jk8shdzp93r8clxzxpj4jhmmcfbvax0m2p7ks76";}; lebhart-70049={run="0y9lrkscmfjsg3rbcwbfvzj3g40nyb6a297myyzmm2n0lpq11j6b";doc="0nypg814pxlcpkd0y3vdhjk6vpj4j1ka08kkkk00nmdyyy714f3q";}; lecturer-23916={run="0alcmds4ds3m0rpq6r46ff56x78kv0nbdnfn80s9q638pf1vvnvb";doc="0ksqm6ibcakjf2dir19hr066gg2dxa5blfiikr1j8x966lfdjb09";}; -lectures-53642={run="0qdhkf7z1rnxm2ql0ywfk11y3aqp8yr1p9202d4ha6729n5pyima";doc="1xakcm4mmhl4ahnvcpn7k748v4j2m8p6d4p455claqhf7xg4jz15";}; +lectures-73727={run="1g6ixff5jby4r3frak0p9gfyp8dyhyvs5srd2z14h3ggr7xcilxw";doc="08py238x6nhvgvl9hskhj79s40jwdyhfa4mcswjqpsf6n7m5b898";}; lectureslides-62292={run="1x61bpgp5ddgld0v05qb5sg2lwb7lzqn6r65imshvcjz1xbwpvdb";doc="1awy6zgj393q0lm195hh8ky51fczm5s19d46fc7mivxyh03w3wk6";}; ledmac-41811={run="0ipf7h58bylrfwg8yzarqvpkl0kr4k3z9hl6cjzxwlh16s5fs76i";doc="0pgkv08nsq0rmcpck9vq1hfb4gnfqh274hclq4grk182fpn4ggiv";source="07fl3lypnxz7sa4kjf3xllwqakhrwgx8z8r7l6x8id96n48zri9n";}; leftidx-15878={run="05fi4rp3s0s9ank7pphdwxnlnanc2r88dxhyxbz64fb26sja25gy";doc="047a5clwf0r43r1j87k2zfv0pa3nrii213y0zhv5r3zkmwvm1qky";source="0a8rzkycppx8qayqw3s7ndzz2xp4zqgx3qd8dp9s5ynlm10020nv";}; leftindex-69660={run="1hc88b88fs7247n9q36idpdsh1jb39d92sp5qr2dky27fgvnz2mr";doc="13lfzvsai75nyb1xykvd8bd0q7dpwb5na4afb7bikqw6iz3dyhwa";}; leipzig-52450={run="0wml5k749fgx3vq10v4vc970h6nqm6qflg2z4jajph1h38kj2ryf";doc="0znm18pkrf592jfgshmr0d7vk4d4yq4wvj9hqsfg9nrjd4l6a66x";source="1sxqsgahdr0srk52iqdacsqn7sc73iv0n70nsnpvgfsczmxa2djj";}; lengthconvert-55064={run="0zjyynjlq48sywr5gyi6nhryrp8hcl41q1djjp73ingi2h2svz47";doc="1id32l1ipcilhkk4w9w2q8rfjlk99f5jphvq1hjvqdnhz4q1rk69";source="1zy9bnibswz834k24fk5srl0ahx4i4hlrqv6vnvwb3h8z71izc3b";}; -lete-sans-math-71836={run="1vw39n3s9zbzcj8lxzzi4n531vkcqbp37rn97a8k85fg0k9szrba";doc="0qrk8l1jsm3yfipr55zglc7v9zg9fmh413rnk9n8sr2c0wmy5i9j";}; -letgut-72638={run="09rkqn6l49h24kmr7sw7hq72fszdq007qz86s0nrk19rdfans9k6";doc="1zd1qgdami7hd21hkk73vhlb89gydn0qix43qcbpk97irqvr8nfl";source="1acrvkb8shjq3j1drrj6a4g5sla0bsxv492gfgp6ara375jpqfcq";}; +lete-sans-math-73129={run="10clzam8g5c5p3rhn3s7cxk357zjwfjyvinpyik9b13bc5vv8rsm";doc="1pyi8yi61wqmgyb6mwqbybdm3w3q1zfmn2wf1zcnf5hypqlqnx6g";}; +letgut-72713={run="0y1qqgbdha9yzv2alwrlsfhfqq7w7kjxxa28n1qgbv8vrxihvv50";doc="0lbgm8b9mw09d0mqqv3hawd36fg70p3si3dnz9lmz0bd2qd6ihja";source="06jxz3ksb0rir9jdcn3m56qnx2s0bhr6p28v27jhjlriv0b0brd5";}; letltxmacro-53022={run="0p16zmxngzzp9hbg7bxrh087gxj7hg4avf4a9akjkg56834hna5h";doc="1gxldiflxvhy6ca87f8z3a3zzisrwz6f9vrx2r9gsfw72jyfa99y";source="00ykjx412119jxwf1zaz5bismfr0i52psf5fagdiybbshs5ac88x";}; letterspacing-54266={run="0ry7rri76dgbrkzr6na2kkh7bn0jpwkhh9b5qw0cl5xwyp81rddg";}; -letterswitharrows-59993={run="1b7d512g9gma07n7np7f92qqxijxs2df4h0izq5xffd5jf438m56";doc="04hrchgbm25b8g8d6ywchyijngk42lh7z5gq2g2hnddl7wp79kv3";source="1jabbydsy0xn79p2c9dg605kfrc6g3c25jz72hnq1ilpny9zbihv";}; +letterswitharrows-72723={run="1q6jbbphhjmn95dzxy1rl841a6m31ly553zp5g46ix3lr6dki791";doc="1776djp02cq2nqadmjga7dirf87rnw36igl6fri668i2ybzi5pjd";source="0z6pr5dqla78g39xaxrx0pblsahj6lkci4zhbrn7k39jr0bkrs5s";}; lettre-54722={run="13h1jsgjp5k82cq4rpx8gd114l49m1pzplksrwjylx0bzimlzgwn";doc="1w82fhhcdgsxwsnprx2p61ygsyh525im8j1zalcw0bji3i6pm06i";}; -lettrine-71627={run="0w7k1c526ms4f4abmljdlkrmvvpqfb4zpv89x42fa6ggd4cfsq9y";doc="1xzgmg5h0r231k355a799kwizcahklx4r8ghp8a5l66bng3v9xhi";source="0fmz893zpg3l0g4ahfip51rphj0f8246z92hbn5pcb5z4jpg0fx5";}; +lettrine-73660={run="0jcr3713hlahvb4yrp8qlgjm619srs0rn7v67v48jdzxfki6dwyn";doc="1lvw4ndwv8x6dabs1sh44693599hk91q67a8y6j26833mwiwqzwl";source="08fs33fld208ddkck4pc1z0jfpjjhps2cnwcw1mydv0ikk825xxi";}; levy-21750={run="184jkjwm17ms75j86njpkr17ipcamca3r5l1fcg8vfv00ffj9fp0";doc="1wbxdyfxm80w3h8bq8z5yavdwdbgccvhf4hm697ss5yshp7l8gfs";}; lewis-15878={run="0ws9vk38j3m0sprl9lak2sjlq13nalcysk95gv68h90x04jj5zdl";doc="043kmzddal693kl6fds0xl2wwmyzvd9cqs8dmy1jzp0mdi6qw6vn";}; lexend-57564={run="1lqqn007dpp24jcgpn9fdf7ysb99lgrz9zxjw27qm2439wrzhc1w";doc="1h7s17x7grhdb1hxxg6wql3pwy1w08iywpynymrqn8748s93yy4m";}; @@ -2267,12 +2296,12 @@ lgrmath-65038={run="0i1mag3077fs18xyznbgh3mc87sz35ihz4n5yp243h3c2qg9kyax";doc="1 lh-15878={run="1k2nn4zpxdgj3b10xdqzldcdbw56ws9735wp0yajkhxl72ms0705";doc="0zvcl1zfbn7qv9069hff2a2r2d33xmqr31l4di24y4p33y3ylprf";source="040n2hbkaypam4fhyb82ncy1sfyvg7fdhykw9fnvy42mlzxv1p3y";}; lhcyr-31795={run="0civwbn156gky4k51189s9lpqcs06wjr32pviwb1gzsfr6rc7vws";source="1pwlcsilza9f2f73qsvbr2xxxbs2dcms08jxjlnpk8fxcpiy8j6z";}; lhelp-23638={run="0j55ilp7wn1w8vs60k6iangc9h637f2jrnpshh9glryxj9jjgxqn";doc="1is5s8iqyb41fr2hr1kxf68xrlb8hqw3v1fifl8645dcgp8lac33";source="0iyp664cy3n04nn4499ryzx00sr1iip1qmdlpvjx010r7hq4dyb7";}; -libertine-71061={run="0a1z3f7fq8r6vnj2f47dai75lsyxr705zdipq0v9dff4m1cibs2v";doc="1apcrx1q97yw5m6pks8kv480x47ifagrxg14ifhxl8zv5d0l58vn";}; +libertine-73037={run="16hjdl8cdjyni8cy3n63gp8gx6sdy40yqwg4h1wxfkjjvk2w7jwg";doc="1msipdjj79awvd1kra3vicps38fkf2nj9279aq2v7wg7jw0m2k65";}; libertinegc-44616={run="14fdpxgsmq9dhgl2065rdsp0fnh9h0xcr0jzg4k5gka9irazxrzx";doc="0isvl0ghjji427p1fd1w0yy04c6zjmp058k5gkpsa3xkhq3ijvv0";}; libertinus-61719={run="00f4wjqqz4hqh2ic8g162mnn95s0p2v1qshbm0zrnzjy2gr51hi6";doc="0zkv3fgkirq6jcz7ywb1sjnnw8vfwfgd3y41lm4ds547ra8zp2q6";}; libertinus-fonts-72484={run="181v0g43g18ciqqba3h8ii0knh7dnfjdwn7y8a82rx31asilgfnl";doc="1lkgg1xwp5ngd10r7gyr5jngif1xpfb67p2r1f37jzlh7ni4fbmb";}; libertinus-otf-68333={run="1gxgz9lgiyw9n00ss64bb5zghzb5hzli6s8znkaq6fcgnvaf5ra5";doc="08xig7pz9322x5kz8l4dgqc74hsdzrhnxp8kz577gbkg8mi5rsf9";}; -libertinus-type1-72354={run="04w9jkdj7djfgs6ryg5n4m61scyjbhha4s33rvzm2vhbsq8wqby6";doc="1fk4sz78143fyw6p410vj2ilpcyx1h4s9wbslffdcxrsyq6cqvis";}; +libertinus-type1-73445={run="10a86ihcf69lxiypzpb8h9j9nx03fc590jjr8k6n9cwgnmg2cg8c";doc="10wkqsk9i61kps8fz5ifyv758vkvd7wfn9hx7s2ki85nigc9h4dn";}; libertinust1math-71428={run="01hbblhzzzwrzrcfk5a1lpz3k52zfzlmfsg4srckkp64i1dw4qps";doc="117xnybd9v8biphxkwqs6k7brpmayplv00wr05h16frmr649d4ps";}; libgreek-65004={run="1wazhir2i0bwh8744867akraid5cz629yjj6aiipxm6gjj913gy3";doc="19wbh1vjycvplflzkb79dr3ha2115jc8lf0vjrxx7qvnjprygs8q";source="0d8x32jq6fcni0g5qa0hcd3vyxj5fcqa9yg3m2bfb049p5ms7s40";}; librarian-19880={run="1rri0fb9ssj413w1g8c7p79hn72gqzncihhhg3ws3ldl9s3nm54d";doc="1i4m0gp38f64y59zcsyg2j7bb6zycyf9z5yr5wf86l6kh40cc2fq";}; @@ -2281,7 +2310,8 @@ librebodoni-64431={run="0w630a8xgw6qs0d8gw8g13slxcslyizi0mmk3phyvhiiw9km40jp";do librecaslon-64432={run="0jwxqjic9p2k55g7f8j75s78rf5bfpcgbjsmg36qk7m9zig2v9im";doc="0rj21fkpajmc4gyr5bixf4v644kiw2iq1fzxs6fn91fcfkwdd2dh";}; librefranklin-64441={run="0g6vlivwlwb56mm9a509xfssp11ir60cvrd9cp2hv9ym93yqkcgs";doc="1gvsanhdlbn3wnx2yq7brvzh7wj4nwyvdjybkmazlb6ih8ribab3";}; libris-72484={run="136aph3s7hnwqhngvwpb9n4hiyw5by56i0iiljkdhf7931h4a187";doc="1bxwb4zv8f38z7vpgwbl7ii3khb8l6sh3df879wc5pj43x3higqp";source="1kfgkzczvmhvh9n5v8319ffgsgspwnfcp8ay1pdldl4ha5cs6n4h";}; -lie-hasse-71883={run="1yc63vbj2fcrd34x867wwc68xqbv4k62vy3y34byjs2d9gmrbc1r";doc="06g6r7f86fvmskcl963vcsyc8vmwyhbk1gs927jkb8j8gkn4fqqy";}; +lie-hasse-73069={run="0q2r448c1d98271s761g2g5az7pvh5d5v5g3xv9qs3rmrd82pb31";doc="12fl2l7nd2wqfpm37zv9785l6ccg1694xdwncdxn44anqn5ls7hz";}; +liederbuch-73548={run="0p0vlicx29ipwd9xw6xigg02q0p66p02jkv8qvir954fcqb38vfm";doc="03i8zfjdh07ikjph7ng4bglzcf09kakmcyz65zvhn7vzch4b8dyf";}; liftarm-71309={run="1vsnmv1wj87m99i3rdqawxy29zdvf65w9hf7rynsw9xqay8sbklg";doc="0shyl14d4mlqgabj1sy5d0ry5zfhsgh7vr01982xgz1kf7wqs8m2";}; light-latex-make-66473={run="1rjnvx04hcmiwzqg9gh1l2w0vnj0qfm22snjzm9hi7i3sj1kx2ja";doc="1mjmsg5mgz3fyn6v65iy75jz9jvdv4bxy8lqsgiifv1c5660lgzb";}; ligtype-67601={run="1xsdzgcbmn1djpvsjak0bav7vvaa94rc5byhvhajfb5npqrz2rn2";doc="1yjsbj3m44cj1lzzgxkzl1wsapqfcjh6dfyaqi971k79zh9420vk";}; @@ -2289,17 +2319,17 @@ lilyglyphs-56473={run="11mb49rcsi051k7yd7s02k9ca5g4mmifdjx1nqkvs6rl922wcyki";doc limap-44863={run="1hdv2rlvxbqm2wnn3x2xrmwxpwbs03qnlfj7k1s8mfpp5smmhd2i";doc="1qj9ddllgvm9zqjvfdgg2sfdyfzpp8raf8n1l0zrg9vpiy2imdn3";source="0l41pd8xl969ax257lrcnkxs0pzb3q1fmiy8ijz9jfrval3rqqbw";}; limecv-61199={run="1j1j3n86gvvv8jc8wycmjmnx9ci9w41w38fkxjsmx2mvc8frsi2z";doc="0d9gg2gf16pynh395sfqyr1bzj664snv54x9bb5a3zck3b9kbga1";source="0m0li0wa9pk2p5m3gqzr7n78qglz68akw7f5nq69iddqwh5r827b";}; lineara-63169={run="05g4pmwnwmlh9zlcn3g2v5cpxr0pa07xr5kqnx0gb3ij32348kz7";doc="10bl6r0sa41hnyf8c6hgwgji33jvj9zy1k39lk168xv2wzkarml8";source="1fgdbxkgph3x16axccx29llckvankl51izxk825jswbgsxgj52j4";}; -linearregression-71466={run="0ds177ny8yrclrg2wh9pdh85s01lsyb65bmm08l9snjw5fih6rsg";doc="0k0hc5cig827cbaf5hvrhnkj3nd6x14s7xchg6121kw9v4iknpz2";source="1qriygs3gvhyg3kvisd87skk5m9pazj9bvp6rpn9y48k83sqr845";}; +linearregression-73123={run="03nsal0a2idghkvj554d74ras0yn7xj27y57n6gxa7nyj1cghwyr";doc="0208vcqagmfik6fchlcrapxbfwlhzg7szm1b8b8j8c9j8bzbnwfq";source="1mj3jbd1ilp3s98zsc889kc10l452lnbpjl6fh5dz8l5a1x7bwqb";}; linebreaker-66639={run="1v23krvl4nf8pz1p2hl7d9pj23c6c8zw7hgcacyjvzd8sc22jsi4";doc="0prq9r6acl95w8cjrmzxlg3hxiq1qmivl0sgdcva6992smmls68p";}; linegoal-21523={run="1arnfkijq4324jzyq2sn681rk9ncbgv6zqfrvlbs3vic8wxj5c20";doc="0mjpbkf6vw0n4ddd9abrah7rxf51gmgayspy6jpnai1wrzv0aby5";source="18v5r4hj2jpqay98njcyijwvrbc067c49jrhja6i52ddj6h9q4wz";}; -lineno-67171={run="0qgm0wlsq04w8cq435px8fxp6p9k064i7j42dgi9xx40fzar0k7c";doc="0clfrg91m97ija67d7ykd3yp8r2zng0rl8hrhdi5hay3b0wfcs4z";}; +lineno-73638={run="000cdhxkv851ch31p26mbsmjxcs6w9mpkc6z9v520r7scj36qw8a";doc="05djm6m7jyr4maacahjghqzjjgvpbp79538860zmbcrxk6yfz5dl";}; ling-macros-42268={run="1qr7bpa2wcp1hqx3ckid8h41lp8idhqqnnbdv42j2nhcy6f409wf";doc="0lk4whkamzsf9mriiz06ynpp962w5473ppf4n36q3bb13amyp5vk";}; linguex-30815={run="16rqzqipzng4xd7yz3i6416231cfphqbwq8n6pfal83awzd660jk";doc="1l0m6k9adq0zr88zbqrj4jl286mwarr6fiy4181bwxm9w9kkxs04";}; linguisticspro-64858={run="1aq5sz202hipjbimm2n8krb78q54ybjyxbymmv1nxdpjxk0hixz7";doc="08pbwqz6rqqmw814c54g124h6ni6bpb39gpd2ibp5gxn21agqa2y";}; linop-41304={run="1dff205vbsayq2jfyk0vvbz5yks6gy2bm4ylwwk28wmi55fqjycp";doc="134jxv5bqklpdhd3wfbqibsp21jspmq9iv3fik2igwsbn20dzw4c";}; lion-msc-55415={run="02xxyl35xl6c48x0fdlfkcv4bfhz4hghp1v3ff6pf9yl3cvqlh15";doc="0nycprcfi6769r47llwma71hzdb9a6sprdkkk6p898pmk367wbnf";}; lipsum-60561={run="1rfz9f6gaha6ccx1s5kij2zkwdkm6i2laxv5r9jyjvsawqwr0lam";doc="07wwbyj7i8cdnq8g364c8pjfkc0l739932n3jcmkj6vs7qbmkikq";source="0349nqaglq7cnwi54p35anv7ycsd7a92jd86l6l2n9pmvh7z6py6";}; -lisp-on-tex-38722={run="0g33w5hwgpw7hd62lij0h5n89n9r9ynlxswb34j0aqf3x7nsdh8m";doc="0rgjcldb2rg330cp8m5vxbi380xla73jb36nn94b2awl4g34bpvd";}; +lisp-on-tex-73165={run="0kkink94rfi97qnckcnpa8zww2yswnxvr9md8apq9qr66x012jf1";doc="1zffz286mw3amfrmmjpmrb3ks9l3jwfpf8nfh2lk0y6ri6carb0z";}; listbib-29349={run="09rs3zkymlnn9fgsclnfpn1mrmxnqy8kd5pmdiphlga1iwfj5z11";doc="1nz6p8z4yvh91hvk02y184xl6fd8pyjlpjmlv5zpmcjillv176yj";source="14jrkykx2myp5fghh9qj66i5g291azm6cihi12c53bv1ijcyl1ik";}; listing-17373={run="0kpf5svycd71r8p61y83wx1k99fwxm95qz5fbnqkfrq3c0113h3p";doc="1zd0mxh0gxlvqrwxvycqr5yzs5fns0hrkn6g6b4m1v6njv2f9lna";}; listings-72368={run="1gizmbvrqf2icswbpf0qfiin14239jq3sw3d48cpv9yf10q0cbg7";doc="01p6cqfvk884jgnv4ras1qhk8lv7yvvvz0jwjfrn77c7y6z57mg2";source="05xa6ircvck9irhs6a6s8hj4ihvb3c1q1pmvnyay55sj2kkza5q1";}; @@ -2309,18 +2339,17 @@ listlbls-67215={run="0r5ns594dxmq7r9pkk2hk482caapfdar1gwbdi6fw396pcnpw8p7";doc=" listliketab-15878={run="088f2lm5lfbns7hd1m06f3zn1cjcbaw427z7zl5n47ahrvcz9p94";doc="1llrdgxp9mghs51sz4jjhbdllzlr1xgnfskask532zwn1cm6f4vd";source="04xfgaqpcskx5m8byysvd2rji31km9c6cbkfzf3ybj4a5bmbnq58";}; listofitems-70579={run="0kpq0ac0v5yk4gvwrzdkp262npralqbdvsx0ln3zqgis025z4kzb";doc="0dgmc69d5wxj5dx7liq08vkw58fm3vg41j261xxw49hlacjl43z0";}; listofsymbols-16134={run="1qp5y4rbnlpaa3nghlxjn5yzhskvan9rg0g45wqmg6yk9sdll5b2";doc="15sr2n0bsvwz6jqgyspj6kxg511jy3fr18705pyp815hg4maxizp";source="1sjg64imcxxqq8bsqm98954g47nfambr6vsyizkz8zqzmnr5vd80";}; -litebook-70777={run="01y8bgyrkn4w3sps3dv39gd2iny810wn99lxam8cp5jqk0dy9rhc";doc="03cz3yg1h7xh44lck5igcy4a4g23k9rcdyf50ncgg1v1vvj01kjd";}; -litesolution-72036={run="1w14zfs9cj9g9s53lkkswa25rx35pfi6hmac414p1y0619mr2b48";doc="0fgbkxxbz9dnvjswvgbnq47jvisw76zg4lsdww0k7a4vg9iw6cvn";}; -litetable-72539={run="0pzwd8ymvi5nm6lx24g80wbkdgyshb08bzm6b172gsjkzl13iaj3";doc="19z07lwv5nnxi45wif90fgiwd4x58n6nbphmfgk62w3rnawgwcwc";}; +listparskip-73155={run="13hp2cd55ihpc23pv2g4r1wf9d6p90n25sa8wyz4a7s0fr7xbc6f";doc="1rrmq2q8adkjwyhp6b08d4s3bzj9p0p1ljlngkndxhl20ik8kxdm";source="13jydlarq6vpq3aad9i2j0vx41v0qxdqyaydpg7p54qgvz875v99";}; +litetable-74398={run="0mhx11y8azpz0jzgzzz9vn406ni0fmmwdymfm6m72gif491jaimb";doc="0w5xr3fs4dfl4inp3al7cycrhicv768qs09frh3mrisdlqw5b5z0";source="139a9di0xi47djfirlixkq4zcb36rgvz9bsaqwx0isfxg20zih0g";}; lithuanian-66461={run="1jjbj39d4idfsx86lmpj0w1k6gr6mwr7sxvcm8wag47rgd05czcf";doc="01r1wraa7jgvblc3wrdvkhccp4ba8ps112ip1v31vn4wbnlvdyax";}; liturg-15878={run="11l8ccpq2mcnpsfxry6zzjihj3s7s76p9plh7afprd7j2nnq1a79";doc="0rhyz3162nzh43nrxwkynr45i4w5pqb5ip53x5j2k2a4cb4k1z86";source="1hn89rf3xi66bfc3kzwbvllfzrxr62gx60ywbh8gkrw813n18lll";}; lkproof-20021={run="12bj60lfqlqvyk020lv1l6iinvqx4cvd6lfz4vhblfx3gs3xmcqf";doc="05sppy6q0c2iangbzmxv5qxla8slc2k0fx62f6n2fg1ncgvfl7qh";}; -llncs-72613={run="0bq87pnwjx6ra0cfai7116lp78lrldzm87337bf4fwdh9i122nzx";doc="1m8brm182hn9q075xj944lg8radbx5dhmszknjg2rag2ilnr8dj0";}; +llncs-74290={run="0k9z5a777qf459vri4vcsq4i87cj98f7kh4cvjg9igjk4lhbk6vi";doc="081kxb139xjjh7ggn88s4q15kp3islj23gr4926ss3s5d84qdcl5";}; llncsconf-63136={run="17x1sjs86vl03dxcz3qbwm7r21hmzvsvsr9qa0xii8fvp1yb5pxz";doc="1dq0v5wczbhk1ir8fl97c53sinpqnvv9v1hff1hzc3rhbwh5smh2";}; lm-67718={run="1b4lc6ipij5iws4rgpv3sjjwrdbaxnwiqdbyyj62jzc3yk999m4y";doc="0wdnpnsbg4gvahqq8lv8ny36xwxgph04sjn64pl34srn2pk1jsxd";}; lm-math-67718={run="0vsmzr71d5iqhr9bwjnp7khzlg939mvfnbg846854cxk8wfm9hzn";doc="1j6jcki1hxdr17njy8sfpb82mxh6bpllccf3hnjvylvpjf45nxm3";}; lmake-25552={run="1fk98049965cqqyzdl3yl9iblk87gwwrfccr5jqpdm5v6m8mcwrj";doc="19yqngjn320sng4pg835rffk6d2g3c5wyma46x1jr0bccv8s1990";source="1p002ywz3pxip5v4cd346nmpg0gi7wamlcl7bc6f4zvzqp0cg41g";}; -lni-71883={run="0d64n5fzhscribyvk4hijwy24d2wcs7nk2naz0jiv2yfzpl19j3p";doc="1kfw59j88icvrrn2pn1b1an7kff3s8268q6hzdqm3z813x91ckkv";source="17whla2aqq2rnxvjvabp76bsi3h3bg0cg2n0qwz298l5hkmdcamm";}; +lni-73766={run="0k8v3qzkzrc9n17gkr9zmh4k96w4vn1b9hgfsibgyy9ib7ya1da1";doc="1jwrdgm931zr4ibpdhbzdhfvsg433rmjbkdck5zc0b38zz991whm";source="0k5si6wfnwlmr315q3y21f4iswpqk14ppw9ivkfh4kkwfvy6ngwg";}; lobster2-64442={run="11kx0xhhklgrj3rhc5q3c5hi61444vr4936fpq1nma1yxn7mbyfz";doc="0l51mwqiq34v22pa4rjj4c6q7w2x9acdfy02hb8gmn80i91fijpw";}; locality-20422={run="1b6xi8zzc9x8bc54bs2s6ryn7g2zfpy1zsdddlx3j8kvmbmgv6j9";doc="0z0vrx1dy5qqgb2kx08qc2r06ljqnfsgiz58hpy6ylnlyay39ipl";source="16xp8pc62jzgcmdhqpmfi54y5aaf7mx6bqgwslpwixgwym0i69qy";}; localloc-56496={run="0ynzcib8hsflpjhykfl348pmc508g4i3ig38wjsb3gfm97mlhq24";doc="08aiqc04rwinqr510r1wkzz43qq4nks1varmxyjbnw9acndn94ak";source="1wcl06i82xkp6m5m311pn1ax42avlp6n54ad1j450apgygdszmik";}; @@ -2329,7 +2358,7 @@ logical-markup-utils-15878={run="0nc8kgyplffng9429h0g4hynlwwxpcvnirxg7rj62zcjcg5 logicproof-33254={run="10b55lwrrq1aqmp9njiabqg59xdrd5g8skbcrlhs621s1999dq2g";doc="119zgxwx0q6c4ghpb30mvpdwrpr0xvk54hmj6qfpih0kxj0zp1az";source="19j00a28pz5dp29sx61dnrpqyl24sx9apf2ck334ap5sw7awnc70";}; logicpuzzle-34491={run="0zsg11lw5x28sik6ifj2v1zjvm3pcv4vf7w2pfxcr395vmw33qm9";doc="08vgi2s2cy09dhqdmvmq1ijlw83dgjd7xjfdhj28vm9ny16zmydz";}; logix-63688={run="0syvhp2zn6rpmg1v92k9df0q4kv79flvj93m7761675fb8jcki0h";doc="1l7kyw1pjr4bpj33sy2dvkb1fvl39pb1mbvwz29w6k4038hg50hx";}; -logoetalab-68916={run="1qmw240mqsh2s7l2r8nvw9xh3zwa99g01szjaxn94d92hnqmb4r0";doc="0rkj5gcp01xcw6d3vascvp3nw2ng5gxi9znj81yasgw09w2qyb43";}; +logoetalab-73069={run="1qmw240mqsh2s7l2r8nvw9xh3zwa99g01szjaxn94d92hnqmb4r0";doc="0rkj5gcp01xcw6d3vascvp3nw2ng5gxi9znj81yasgw09w2qyb43";}; logpap-15878={run="0xrv4x46m54b4gfa805naab6fgpd72fwqnyjjxw0idy9kb3s3x5v";doc="1zb6qyxrqy07m65i18dcli30gb42y6c3ffr22cpxa7r8xmaprcg4";source="07cm2gcnv6d7pzc9d2v3bdvsmykqf00bbw177mqyjaq1chc0xpna";}; logreq-53003={run="1zj1vn0yfklngvfvcr0p8hchar220lwfrznsq73jbw9zzjx47v4f";doc="143b5bb1jkc9j1gd46c28q4zq8jlh9wrngjw8q4prw5dkfnf1s8m";}; lollipop-69742={run="170q59wqy0x5zhziaycmfglv1wnc5kf252ni1r4vgrrs3rlwiirr";doc="1wj858kqp27amx3jpndsqma152r40agfymh9ah8s42pn6kfl4dkq";}; @@ -2348,7 +2377,7 @@ lroundrect-39804={run="0s44pbvm6iwl2jyffnxriqlmpp6zs1y70z4aix8wwfasx86gq131";doc lsc-15878={run="129vlr2gnirf47vs1drcsml3w4jcwg78hmya4r3nspaqm00b17gd";doc="09faqnv9k96nwjcvgmml9f02vdj5hadbmb1lp59xk6jikvybv436";}; lscapeenhanced-70967={run="0kzkns05wdpinpffbd1yzwa28fcih0cx46ikfaqqv9y71ydrg16h";doc="1m496m3v53i74r13y2p9ix73c8ghlann6sqisv0pnfisq63haxas";source="0kf051c0wlnqi4rnyl368gyrvxkg2hvh88n29nl3szf3a0jbb5bz";}; lshort-bulgarian-15878={doc="0qg23asq2i5mqhp9xblv5hm3qxmd5886d5x0gq1fkdbyy9gsawi3";}; -lshort-chinese-67025={doc="05b9fq4jhh9xifn2lj58fs17fc0prx915gwfz47s92spvv9fwbi6";}; +lshort-chinese-73160={doc="0nghrs3cpwxfvn4qkrz56zlai55xcx1aq1rhrp1pj13qs0dcqgza";}; lshort-czech-55643={doc="0ar9qa0cg0mjv6ydgx1phaa1qpiy25s3jciznbylgi5xprvnnfa9";}; lshort-dutch-15878={doc="160r060gmw6f6lgbnyvfxafjpqvyr4jwd56ddkjfm3ir2bfl973d";}; lshort-english-58309={doc="0pzqdbzynlwvpamd69cmfpa8jdcvq96qjr9k1fy3dxpzi2mapvhd";}; @@ -2358,7 +2387,7 @@ lshort-french-23332={doc="1hdl0w7b1ablx7qfcvgniz7dcbgazb49b8wfw7c08hlb38gxfqh7"; lshort-german-70740={doc="073v7zvk8xri0f05mr0ad770p81akl9b9cnia1q4hcma9fk89k10";}; lshort-italian-57038={doc="085ydria5q7s648r7frl54sa1y4kyr569zvqjjkancfd83h873cg";}; lshort-japanese-36207={doc="0mfxig980jyzhay1i83d69p294hgbr92v3kk2a4z8ca3fwzy8w74";}; -lshort-korean-58468={doc="07660lrss97hswmis7rgc419h05mgrvsfrrwmnrwk5yn97flhhqd";}; +lshort-korean-73823={doc="09aninhhszjjzmygywd4w9f1phw15jnq2x010wllbmlwi03y26as";}; lshort-mongol-15878={doc="153k4dzia30fpx847wli7i5p407a808gmj3p7jifq5bpx479qg1g";}; lshort-persian-31296={doc="0b1b45nh2d3d3zv735dymgyllj6m8i57icbihjkl1im0nghrzklk";}; lshort-polish-63289={doc="121y638k4f4pbjpa4q0n9qj2w57624q2d1v4jz09qh399fl5yk81";}; @@ -2375,7 +2404,7 @@ lstaddons-72068={run="1cixhsw6vbfq06bgfmxmcr77sg5gz9q3kyvpmcg3szgfbzf9d0gh";doc= lstbayes-48160={run="1kpkr8xd1k1iinrp1ljj1wjphn0c58l8f6hci0axvxdklr02s3h3";doc="0x288aij80j9vy6bscj3w257nj0y3z1hf0rf9yncs13jsxr8rz05";source="1hcgcvnki1xkh4ni6jqcazl0rjbhfmm6gbgsp9n5qavdgnv7qzmk";}; lstfiracode-49503={run="07fdzwb4k0dv2mf6yl31h58i61hmw0gfpgrjdnz3v2rnw1ip8kgq";doc="17a8sg0srw7096r3h7qa23msi6pq0dagap3a0rcpclp73z3gh3wh";}; lt3graph-45913={run="1w5n9y7pqy5zmn6w9bx58nnawvhp5467d150qxnj3c92gh0qbj5i";doc="157y7a7gpgm6dc7hawdhxr0v3ns5kibykhkg3wfb5r5fay47jj4n";}; -lt3luabridge-71704={run="0hb9wawnigiz2ad6lkpan3ywpjb94a62wxpl1s1m80r9zqhvi6b5";doc="1r33sq02s87bzsz1fcslf7chlfjbl0vmihvycqvwfg8snvlcmw54";source="03m07prc0mz72i61xrkp76fkl2g2n02brhnhklxrqy60li74m1m4";}; +lt3luabridge-73139={run="0g9z8rqd2yfgcx6rsa1bngrnd8v6snivlg4wqq2m1bl9zy4ap10s";doc="0xvqxymfxcqq2630091y81il1nl5akpingf48j0w139gc46rfn35";source="00r0fsl6p4my1nm4ag9nhb7xy9mbwsr8pn4wsh9vkj8423rc8fx9";}; lt3rawobjects-66619={run="1k65hvwwqqw26mqm248fd23xk4bgm864bqnyc759faya84ib8n0q";doc="00l496344la7q8jz0nr895cxir6zn5pcjsn16mc3cd7lpiclxs69";source="005iwxrraxmirspq3881mc2pb8iikc71p4g0dwxbqp38c8v8djb0";}; ltablex-34923={run="11gazci0c064iav6124v4szdbj38anqwnfgh8pfpdq9zff0h9g5n";doc="0jjd5f3r67lrbl4vyxjakm8l8pdrw9vm1dzhl5305ga8vvwb7gn2";}; ltabptch-17533={run="06ww90fh24s6lmzyvmqjh5gcr7vp3lq6cg9q6k6194g4kay6yx5i";doc="0yb41cgqpgcxk27259gfz14v9bpndjg51i9nmwr1qwyvaqd6jvjw";}; @@ -2393,7 +2422,7 @@ lua-alt-getopt-56414={run="17czrz46xlbj3xkh4jwdq269mqaq7165kpkhhqa498hrkcgdgaak" lua-check-hyphen-47527={run="01q4j9bb19lf838pd7l26rkz1xr7mxcx4fsgf5xd4sdif18h56qk";doc="0iaihbrppn1ap7bqvn37rk8b6m4lwdi8w4zkshiqya1mphhsfjg2";}; lua-physical-59138={run="1rkf3cgzw6lyld82p8crv8h3swk4acq7b0i9c20q5dksrxcr7vmh";doc="10kzyj9k5fqi0jjkah3xx2cgn1ssvc3byihvs66qpavd2gz25vg3";}; lua-placeholders-70850={run="01gss4qp5pad8ny0x4vn3d9a8l75ycvzgqzcmmsrrcpfbpq6mlj3";doc="0m7jcnwl74kb1yw636214hy0n9hr2d44j5pn9z2wi7z9y4fi4yxp";}; -lua-tinyyaml-66776={run="0wm23v7rm1mr2l10cariiyzv8f64aq0ms154md2ww9ad4qmsf3km";doc="16990nj13x5452c5mb8ha4hy6n1iyv2xsjqgipv27dhz2g176qy6";}; +lua-tinyyaml-73671={run="1j18v5ijgfjgb193k45k46zdxz72dwdb73vb9b95fx47xn2dak4y";doc="1wlx3r9x6ixqvcisg8l1s9ym2qkw9asq6nrrj5kyhdmh4gahzfxx";}; lua-typo-70978={run="1yghh7sayjsg7yrmg1f4mlxhap03mzm6b6n7d7d21xn7zqg6in79";doc="1ijan1fabyrc3yn6v7xrgbd375g0c05jlr7d7rn0jyk3sg54sadz";source="18bdhs59r2lij6x2l9jrzd1942714lqzywla58a5yhqvvw8yyvkf";}; lua-uca-71218={run="1c3fzmpvh0vxjvm52vr3b47ifg73z0w1gkzmqn27bpyd2sk2ci9s";doc="1p32ijgbxpi6krilwk60c8988ppfsxk19pwvlfwykyja67gwmrlv";source="179zsipslbbxzi64gdsxnc14cn7n7gafmykf7i37zbwyk09yg44x";}; lua-ul-70203={run="1w4prgdq4xmx85gq3hgklxhsxq69spvsqnl4g51wxs2l1pi3dk4w";doc="08kjlrjicm93cp32kssvcjp2j23k0wgcly88xxpkzl6x67nw8qw4";source="1hfld2d2qppvbk0w7cjj9ng888jwi3jqlak4cbnngcijvwaw3hj4";}; @@ -2408,7 +2437,7 @@ luacensor-71922={run="0yvsn5fg0rk11syy22pmmrph6kgkxwf8q92lr9i2wrimr4mxsqa0";doc= luacode-25193={run="0qk8vadwymhcm7yw3sffdh9i171hl8vg07j1b5gbsl1sa70cpam1";doc="11d6ak1dvdx64k0i12k4c5kh24f5vqy0ihvj9a5lxa9gqypflrga";source="1fafh2nq66cz01jsbkb0mk907sppahlswsbb35pa3q5j7iqjzyav";}; luacolor-67987={run="1mbiwswai0sq8wi4vmyrracygdd3a1g45m3qanpams683ik1syal";doc="0aqwjckc7cq8z80bjyl6fz2gqzrwwdvrlilpcf710wlrqc5c023r";source="07dwvksaxidr4b7z7fx68q2kcclhmpilvy1xk1xjjp07s5vgqkkh";}; luacomplex-68883={run="0hd7g5fg9dbacbkk94zpjk7yjwx3jp70l2ia6wnzx8zqajs4hc7v";doc="1hsr4308z3b2g3g94hcn2cwin3awhhxb1hzy2c0nx77d0byx5kkc";}; -luafindfont-72111={run="0cyh87zbvrwp4n62f47xzrbz8wp7f92fqaxdb7zzddxl3vw20f63";doc="0df6f8kfs7167gh0z23ammfpmbbr5fml9zqkm9l13jjs2agzffw1";}; +luafindfont-73987={run="0g4dvkr2rb7k6xl3g35g0qr7rdpr3f4ykh71q2cx23z2wyb6b9kq";doc="0mpisli5z9zcjv3dciajqm4z8sgjvphkxyy59vmmazkz4135dfj7";}; luagcd-68893={run="17nh27fkwjrfpvf0fpfbqcqi00bgchw0zf3iznp3iqmjyvrdwn8j";doc="0lihscgrlrjrc3djqr3v0zwdzwhmlk7r33rg0agasdhcndw5hb3q";}; luahbtex-71409={doc="0y47q58jggwzy5hk9n2arh0g4a92pqcavadzxa38lpadf16zxbck";}; luahttp-67348={run="0nrk066mdzlw8z55qy8w3clpfdiy411mqni3kmn17adp5iswc9sn";doc="1xinhsfcl4xz3xziv0ch0rhgrqqzmrr3hs5h23hdyadayxk4wxhl";}; @@ -2426,12 +2455,12 @@ lualinalg-68918={run="0ma2na0ms6k07aavahnpfz1wddrjw2zqq0znxfmib50m3nqh3r5y";doc= luamathalign-63226={run="00j2vngg8sqbagyhmjv8lr8kzfsllllmm2gijhxbm8xgf8r7f01y";doc="0b2zkyzy0rq2cfbk205nixvflqcxgc1sfxiqbiqhz2yhai5y87i7";source="1svawaz0lj4zilykjg46av8sky18pwzqfnyli8qldpby4zmnqgvi";}; luamaths-68883={run="0gcri65p0y9rmq19rgf79jw98i855cl30al9cpq3znp3jjyikfrr";doc="1sv4ygd6ypf0hhcbhydcr1ap7ig26z476i8z0gs5mzfs08rdq5mm";}; luamesh-63875={run="09ldwjfa0dfhgqv2clyqzd8nzq596h9fz72b1jh7vqjwkn5774y7";doc="0xnk2mcw24v6002v523m7amj6qc4w3h655l1ss4rpwvv6virp3kj";}; -luamml-72049={run="12q4dhl4g8zwh2viskipblg94dacjd7mrambayf1fyddz1vpkk55";doc="1i7p1bahjvcfyzdmx61y85vz9hwmsjh9ix1i0c7d1pzsy5aizjr5";source="1dry622ncqgvb6dk0ri213vhjakpd66d5j0r2iz8wp8n7j4qzd1r";}; +luamml-74515={run="1fks1zvy8p2sj52fypbvd7a9ywf20pcqfw3kfba71mdcl32n0krp";doc="1lwzky154nj9g47ci05hyb9f9d2v7837ykhfa641j5k1xdiqf2c3";source="0xidqw4fv7ljkiz7kyqv2ysk65548lqjdb88pywm100dzzm27pjm";}; luamodulartables-68893={run="1f250s8836j4kgdzii56c0248j5sp64f5wbqkpd6p69wjz7pbrmx";doc="0pdk7x09gmdv0lnwkvdv3scmbgfgpyv069fa4s5hbyvwskbj7fmy";}; -luamplib-71964={run="0mk1vh5chlm9l6pv4mw3pxvd30n9fjgw9wyvavhk9q17vqgc6935";doc="0rsdp9ycnza87vrwc3zj2yldw315sk49yi6xhas2fkn9dyv3s2ss";source="14jnbv0js2mqcarspf2ak3gjrk4gipx85ghg1qika2yacsnrv91w";}; +luamplib-74110={run="0kcm8nfvgbpja3dlbrvln376cy1793wx4zsp8cns4j6wz6p9nbyk";doc="0v4m071yzxlcmlbnyz8mllkm6909acz1i121m13mp77yzy368s8j";source="15j3bl11ffpq87l8xv7qa6yz9pf6rnajnlcx08crp0vii1h2bn6d";}; luanumint-68918={run="14z8vvxxivi2i61r1ydq1csbxlm3621y4j9hx3p0m9s1ngcy4ryv";doc="1iss948y9rhg7j6am6vyc5y0s1cmn43k1g8vgcjlzbp8x88mwlwx";}; luaoptions-64870={run="1lkx7ynl6xci7klgi2h7qbyxny65nca74xz2bhnhch6zm38rgsa5";doc="02w3623ix7g67bz21262i95gn1m4gzvlvn08f7v0x0q5lm7x1f3x";}; -luaotfload-70232={run="0zkj8hshfxxs9yq5gjmznafr88gz4vd551lh3pz8xskw0s1qh2cr";doc="1rzwrh3c3rj4j4idqsz7vwy8xb0sn3zhggndwd1asx8cf2lzanyw";source="1jmvglj1mv766cxzj6bnagrlby2z7w3gkpqls19ic2g9a154i62c";}; +luaotfload-74331={run="06mxnf3b9s12wmb9anad4is4haai13sfgjlfddqfrafmvdapxcjw";doc="0fk4hm47nckg83rvv022q86cjgzyaqlqcsj4isq0w53yfyhb4a72";source="1jmvglj1mv766cxzj6bnagrlby2z7w3gkpqls19ic2g9a154i62c";}; luapackageloader-54779={run="1ynqy88drl04ld2lycrpvjj3cxddmbycznfamhl1bmn01c1q9784";doc="1fn9kqab5hyvscjqmd34vxjkdcr7bapgw7w3ckwvlsslxrv22rfs";}; luaplot-68918={run="1lsc02qnqw6p2qamx2754ywk95yilq8jvn3vzra425iy675gl7kg";doc="11xl1j11p52zxncgcmg1b8x7isixz4vissfxzppc6ndv5dvqk3aa";}; luaprogtable-56113={run="16jmy3cvn7rmzf5i03x51yp5l90kmrdy0iqg8ji4z3xwrf0iq79x";doc="1d0k83dyiml9abnfc3b9l4n6w18lgm37bijr8xj3chyv04v85392";}; @@ -2440,20 +2469,22 @@ luaquotes-65652={run="0cjikz6739jiqadp28zll72i58s20dm1i0q9kbd3q2y69l3l727r";doc= luarandom-68847={run="1qg41y50fmqq623wdc7rj17az8k2x0fwgjynq0f6213swx3nz3hd";doc="0lzrcg3vywprj6jksnwr2abd9qj1vcqqqk0fz9nrsrg3hphn6v0x";}; luaset-68883={run="1cnc3pdysh2xa8jrjn6kx7lx1avpr6x11kcgyhbbzizraara656z";doc="0ynaizxiqh3lj1nnp8wcvd88z5jwpym2zcfvcp28nzwzhvvagccf";}; luasseq-65511={run="1cxp3x3d346k7j6kh1bch4d83xb5ihb6h9jv8l98jcg0fp6zvy74";doc="1pxx09mvdn6pymsv7959bs5xm4568nzx78g8ikyj6hm00zqphaph";source="0h5zqaz5cvqgy5nghvazncwdxg6cmbv6sjlvp6f6mkgy2plpvbxg";}; +luatbls-74021={run="1grz2vhkcmpkg8gw0vd7860pyqpfakna8ah20a0xghn5dd3vjy8j";doc="1kw033in9mqlbinvrgnxs1isw8q4b2pfsqqdxnm07ji5g99k9pxy";}; luatex-71409={run="0brnqkmhixf3nqvzrxjnl1xmdl5svmd1zdlq0kds6irr0vr3irk9";doc="1b8d2kykcgmw13k1ip4hhf52kxb01lmlg1z6q15h3x39pj3im66c";}; luatex85-41456={run="0ss7c5x0x7sx6lsn1iq6lyyp6w0xb1iy01s1f7zf7mlb9n1yzffi";doc="126y3priwz6anp8sj0296bnxd53lz20nchpxw74zphfpwrv4hzih";source="15bc8g0pgrkqpb8q2dhb6zml2d4jwrripih9898mmalsjixy62x7";}; luatexbase-52663={run="1zrwz661gilr4iizcfsxwmfr9dgx7v28lypaslmvp3zaf52zl2q1";doc="118azb2x20gyaj42r5w0749dx8rzhhri1nz3szy9vv64h0fig603";source="0vsg8q5k8l66sy3d0bskr6cv1f95lnhap3b9yl754x7ynv272xcd";}; -luatexja-72546={run="144i9cm1w5f7lhkzg3nqbly1xxbh2cpmmpg3cbj5837cjq0k8azf";doc="1xkijlbgb76b1hsa370b6bazg7nzq8d9r3y281bggdmc9frbhknv";source="0nivk67frgich54kciqh9b7ddfay95gk085syzjdmmbjjlway5yv";}; -luatexko-68243={run="0kr9i78a3dw18rfws0xxc7kjd4n61xgzjkdlzb83yls4fyxncz1h";doc="0k69i41pjfqifqjcjw4962yvvgwb07a46igvwb70xsrm8cxgkm20";}; +luatexja-73790={run="0vqc8s9nk4zgipq4hza2kdkvnwg7lj75fridwjyjvm03ijxmpg7l";doc="1g0dhisll5hvzj2s2sfac7h2bsl3z8hijgi9vp2aixi0xxvva0cf";source="04mvak8iagvbfs0gp3h9pd765yjhzcvbm3pjxb4ynffr46wb0fq4";}; +luatexko-74359={run="1myaxz99f0k7sqjnmbfc5ajph1g7nz6zxsw0gmd24svrp4gzphs1";doc="1a13if75k55gv52zjrwqdf430prm94r6cvm8alw57x24idmfim0r";}; luatextra-20747={run="1dx2hc1md8csvb37lckxj4987zaldfd73c86y0ni8fzd4zg55s7z";doc="02dl0skcr30hh9wgm7bkdv5zvx3czcdkxv3zdqnasdk0b7r7mqh7";source="1yq5i4v2dxayhfzn1yw987i3zjm6gy4fqckx5kybzh8f6jr9167b";}; +luatikz-73087={run="1kpp6dilffhn0gsimdbf6bx32j384yjpcwl2khkknvnsfmswciqj";doc="1xd62y2wx65ih39nks7q2zb7qmy4ha373512pn45lzzv11s6qvln";}; luatodonotes-53825={run="15syf4k00shgi159j6ja182k24xhfw71zk167wwmy57y7kwm5cam";doc="1jcybpcd500lzkwa33zdmsq3svb9hrh8f56j4qgwm9cq4wb721f3";source="01km6y8ajgaaab9j1bdp4s8gj3iw5b7cfdl1yngp41ph22888aw2";}; luatruthtable-68893={run="0pkw1q5jw8id57mcz2sr1mb1lwafara5kzvq3yrkmqp8s9ml5ns4";doc="1i6nplzr640dik1rg668pai86vip0qgsfgizgbd7v4v7sjs24s76";}; luavlna-71156={run="1a27my3snxd2lx82k4g2613d7yj4hxd0lwl6f4dsndi00crdgm8i";doc="1l6pg6ppr7v84mym752ribllzgvl7ngvfxmgvmq67l7n57xxkdb9";}; -luaxml-72574={run="0ykg9yz98arcklidz28ds46ydqazyanaacg2s3lf0im6sq3ycqgk";doc="0r28c40lzxsl0pm75lrq7gsyirrx1c54w6din87f5gra95xc7f75";}; -lutabulartools-67714={run="1vly69bgzq9pxapl7w1f7cppkx5yr5yyi1gxv0488m2z75522i8k";doc="0iyg0vqm675ak5j1ax46zwq9gcl58vr2r861085zzxicw4a1fh5i";}; -luwiantype-71820={run="1fyjcag9ywf2cxk4wwfrj34pgb0jyn2b4g9ff8v08wa6v5b7wngr";doc="1sg92fqlryijmnr1vlzz1ym2rjp9bfsznyzclgf9v5wr8i85c2f2";}; -lwarp-70067={run="0bfvsw734380l5g7y0m6phyd99x28ib4s26mim5smwlx13sgzvh6";doc="00ix9xb95k3qqdaf5mcvkj99vz2p5mj76fg83hiw5pwbdv6p83j3";source="009jifl4fkx89157h5dmfa658wj0pvzhgxff4krpj16mlik3xarv";}; -lxfonts-32354={run="1hl703cxwldq4ams7044m02bmnvm8vkym7xyz9cb8xkaqfyqp8cp";doc="1lfrcfpn9a260bx47nw6msvksjzqjqms5d31nprc800wk2vb8sf6";source="17j1kys5hrvkymba91kp8f1kq5vshc8blv5pm0m6yk6p4kdnfkyh";}; +luaxml-72858={run="0bwfzd8bl1ykd7302x1qxaam8k3886p9ybwbz525jvbzkj6lgnnc";doc="0cxaccscn90y5y34l0w9v7275a09rgj7sr9mphr20d4mmac9gj0r";}; +lutabulartools-73345={run="0m196jgk6g09ch15z74v5vnwvqcklz1gfrb4gndvv72kx003wdrm";doc="185dgh7qaspxac7fr2p2gxfrxkf9n2z87x998ayl3d5gwkw5fwi1";}; +luwiantype-73719={run="1v42h8iqjlan3hvvw1j0xmci5gjmxhv6s0g0sws45k4cp5lg6cvg";doc="1x3bnynzmki1hbkbs7fxj685x2g7idddlbb512c1d9mxakq9nrnf";}; +lwarp-73623={run="00bn1s1lpdih16m5by70ggxk909pk6x0c6gqsibskxi5wzdha3a2";doc="1jd7rdqdw5yfr8sy5xsyvkjwhl5rhga9z2ngfdhh42wrbsyn56zi";source="0bhw8gfss5cvvca78v3lh2aqc2vhn3prp47666c4avj1vxbmab9z";}; +lxfonts-73728={run="0cpb0q9wycbhis8bjrvm6fya930mxvxcy3x2md4xq96k3y1ximdx";doc="0y3i916hl0q4zrzvnvycga0ccw5xhdv4cybhcf8v0a7i3a50g2yz";source="0fkb3ah1r3zzlixl99s3kn02w7zvwks3avdcjhp3zc87qc63bmy4";}; ly1-63565={run="04g9labqzn9c10asy6nn5s6clqq2cnbhps9jf683qx5di1pabgp1";doc="0l2dqyxd005y9k8xpca04vyzbjxx6vzr7by1yz4qm1dkccnjprh1";}; lyluatex-66880={run="0zj0n5bgawhkw0c04crlkb2m8yabb0r49bysphgzabyl3rvd3i2s";doc="01x3xkqv2f8gvrsl0qj3d2y6bkzmzbphzxcqy6s0f4rp5yj3dw35";}; m-tx-64182={run="1znv3xc5462jmm3ydrcnfj1nj7dld9f617xw3fl2gdwn083ivawh";doc="0svgf4a6rgisj614py6l9hm4ij7b4x75jn84s2ydbxzyv61bmmrd";}; @@ -2465,10 +2496,10 @@ magaz-24694={run="0ah5blj8qfjqgnmygn35r38nj20sjyi6yjci4j9b90d8pz9w7d6n";doc="041 magicnum-52983={run="1bl7lhjk9glvbcn4lqanb3zprqigvxj07f5nm8zn9vpja90fyn6n";doc="1as8l73v9bamajin552xb4xqs08ik8sq22kqdc3psisv4f874kk6";source="1kp0d8wgphbh4mkv1qf9h2c1f2nkzqn9q8fln4v35yx2cay679qs";}; magicwatermark-72044={run="15yvbrydfgsrgxndadz6x4g2b74kjlhsda56h5aasgi8rzbvaljy";doc="0cmsax7dw8j75wl0ld5prmfh481ysifr0c4jqkrr056dsiivihzj";}; magra-57373={run="02zwkxc94lzi5wf29wws8ia863ljq9bq9swkh8k8318v5z4dv5ig";doc="0q6ss5ff86ckqyv8l2iy6mrrigzz7yavizqcy3w5s6jhjadz5v69";}; -mahjong-58896={run="02dkqs06dgp74963awkyj7w3in66h91hx5rycix61d0qz4qwrvqw";doc="0cxzzcngiz7796xzf0k1njchhw2p2m47kpw2fhrf1cqijwhw3jxb";source="0ygvmg8c6yp2mwlffr52jf5shl0qh26p0xlfkj39zzabd8jv2ay3";}; +mahjong-73437={run="0vqn4yh8bqa0m48q1xwdlgljy8gkjm9561p6dvja85rlp97w9dda";doc="1r2ix5rm1jkv0bgc574xaqa9c1d321gm5048w467an4iw30y1bqg";source="1xp10f1xh1kwrbyb3y4mv02rw6143jar42x1sdqcin85s04qlqlj";}; mailing-71862={run="10218k22cl2wxjp56dr80pacgjwbxkixrv19brjfz0m2i9g2an5i";doc="0dz4v1dsn5z1q0mlzjirargi67q3jvqbsgjd879f7kcmr3s3zvad";source="13cp9230cfbc4a3qd5s3m007r1g6kw1px77452yxxn28lkl9g97j";}; mailmerge-15878={run="06z9cb353sl9q6a7jbvwwdd0zk3kw5xmww0r3sjiqampxib19i9j";doc="1dk2a71x04nbc0rcmd3axhz8yikzlw9ab1nd5k1ki7pmclwkscdr";source="1qkmlfc2dvjhrh2xcypnp9wansxrb9wzvniwfb7sll2bxjcfbs8c";}; -make4ht-72626={run="1gvxx6pas6fk34j2v6053br4ripv6zml7lvrrrdvmq9jbljhajb7";doc="1cb6yi57y3inn8zf5bgvs33rvb3bpdz027s99r3wrlc0843mrf62";}; +make4ht-74150={run="0xvwy5nnx79qfz8vpy538s6ziy0lbrxr3rg6wmx2yj0n12sz0bss";doc="00lznwbyy24x419dx2nd5xk00nhbl2sq09n7sgnqb2bjv98w9k8z";}; makebarcode-15878={run="1ixhl4k89mng2dqfc0wa0fq52xpafp15gghnyx28d9j1163wxr7d";doc="088wkffs4b8y0clgcx1impzbxck8klm32dbf6p1jyc2vpi848irk";}; makebase-41012={run="1nmlgv76zy1ajfzbdv7hizby3hhciw41s10hbnlbrfdl27w14dpp";doc="1vxwgjk3dj853qbvy2fyqzni2qkkjhslf17xvxskq97w8fcqr13j";source="1f8aliax01b9ir5wzk0bjhqzicl26xa63khx84s9haplh183qk2m";}; makebox-15878={run="1v2xpiabjcgyi1d0ifpvzcll8y01lzs48bs19nalv37jw7hkrr4m";doc="078bz2pism9harcyb9lq8kkrkq984zx2ya47yhpqxnrd85kgcxfb";source="11gjpqmc6dzccv3yc539ki64hzpn8ns0zzjvanw7afbn5bkyrs91";}; @@ -2492,19 +2523,22 @@ manyind-49874={run="0c5badlrh2321958z75wi4ggb289hnyy0i17bpf4qw9sjym08pz4";doc="1 marathi-61719={run="04nf43i9z0s8hndjwhfdyysjxz8k1jargsrx03k19i9lihdjfjs4";doc="0ybafny55hvpv4kia7jybybjn4vq8f2g7h770xzq2b1mimyn7dkc";source="1ja8kbhsbhkcm0ig6954l6k5absdfppikzwawifp33dwpjkk6w0h";}; marcellus-64451={run="13blr2k1vk0kwac3chplddaplsjacablkky68yq0wccdrxhbxvdr";doc="0sgcjmkgailx7nvav1gs370ywi61ysmm1snz1f976ppdbmhh1v3s";}; margbib-15878={run="114ifix2wa74ix9zz1ml9bpyd0pqzj2983h29n3h425yq98aiqs8";doc="01zam8vg63igvhdzf3gwgm3gjrnd23i8ra2cwdj4w44lcvapdlss";source="0qjpbhs7g4qdhna3kmlv4pg5fk0b3xwpwagyvnl91gn3q4aml4s6";}; +marginalia-74109={run="06raramd0qvw50px27jj1mrjpbws0ipax6z2nvj9vmayis0k01a1";doc="1qwy6d9rmk6dr1pnbcpvq3ygyrc6ahlxf2xfiqiizhrx6r9yj2hm";source="1lpxffaa2f35fyz2n8whnms97wzykjgs07znx4pa8ypa9a5laldq";}; marginfit-48281={run="0x8ias8bv1zaavin929782cjvp7aw94r18lqvv10v3vgq20n7kjw";doc="1cj1fidjvvhhzn9fxbvyh75dfb78wxi83bdxnwbpc6rf3ax5bl03";source="0rrn2lrqg3a1yz6l88qkh8sljr18p1wx1vxyrzg04pzj21lw8kkh";}; marginfix-55064={run="0arldbc20d1sncwanx3szam53yv1d5wxgihj8lm4jmda1858bmgy";doc="0kk9cghi0y1zfk6ya3pfs08npdy7v95i4db5a89v2177cd6z7a78";source="1k1384nxhiywlvyndnvhj6a35q433ddc019ckf8al2b1ngg13y0w";}; marginnote-68204={run="1jg3f25jhdywqaxy4qimxr7x0kxjs279m7a3kf9lvyj6igcijml3";doc="1n1kswzhxdx7b47l4gf4cbihvzy54z24gg0sz4syvpy6nq23fs0b";source="15cl27n5q30i70ad91ajflrrcqb5wya1cb400jh82b9k7a6y8ych";}; -markdown-72484={run="12gf9ry0wkhfvj3qq9g107xkj7az188dypwnyaj4krkj4n20iizl";doc="1vc5cn6s0j8djz1ygbn2vb12i2jl170mqv0706j3i6hgwf021sjz";source="058x1gpx3yn50f61kg2s3aakhkgcb0w6ywqfwdq7cn9yy0i0nm43";}; +maritime-74042={run="0xbb1d0zr263k7cazq9r3j6gg0c0n5444b18r4gvk684ckza16gn";doc="0g3mbirvvvnn0xryk4gvngizbmnxzhyf67m43zzckr9rnhi7k6i5";}; +markdown-74198={run="1brf7cha67l7ar92jppm62nq2rc700n8wgjr3gx6vwvm859m9zr9";doc="0g5qinby11grp4ykd94hl0rpy4arfqrgg4264daz6yb0sbjgzcp2";source="0j2lkkg177776h2vss265xfcqb2xqh7wlf5f2dkfs3hag1zn9589";}; marvosym-29349={run="14i2alqxpz0imgdlx03gyg2nn56wrhlc0rziyx93h4ya9nz6xzbl";doc="0qyfyz8qfcchnf78r71fp5p16hmsrq6xf54g5mnwjb4p5ipbd9np";source="0vbiq807pazw2c1ck799w8sy3q8wcpb6smmq5qqw4nqcxzwsxk78";}; matapli-62632={run="0r6xibqz726d68cli8izl20r4x2ncvrmlrjb711jz82qxbgs9kvg";doc="1cmyrnrijghjm15lhi2isza0dishbll3k4hpzq84jjjbcbs4gvyp";}; matc3-29845={run="1mp6k50lm020xqrq2vwl9xyzr5jwp9p85c6ng3k22g4rqsxhrb3c";doc="17xh063gahp5m83vj6x8waqwvf4hrvg3wi80z70r94bag0nqqf2v";source="0pq4l1ays56ry5v3ig76h49kn7hdk1gi0wqx9b29vkdvzmzrmq02";}; matc3mem-35773={run="1asybbjj93wpbcn577cqkbfi2bkiq2hzv5b2lqs31igawaa0vdhg";doc="1fgngv22falzvrsynzzj51jaf4gfcw88jwbljywixqb9xcg9igcm";source="03x6cm78yhgfljhcfrvn49favgf6h11w96s9agr96xmngzh4z40m";}; match_parens-66681={run="1cp1qidfxnrhq5hia9z3nm4ij2g0v1rxs4g5fb8srmjpik10ss16";doc="0c5lcbkp4f7c8dx2nan6bv6cwicgk1520grbxs5k3r21sa2m9p8i";}; math-into-latex-4-44131={doc="0k11j92h9hpxnyciczknhl83b05avc0rqdnwn82ssqi1k3qixibd";}; +math-operator-74357={run="1w8n1in8vh0b08wvr367bs68mf1zfdqjac66z5hlgrrvmqfi5h78";doc="1l6j3lyfnkw8q7z5rpd3sri0y8sfp84rd2pygxwhjvamgsmpcmws";source="0gaq75k4nznik2b0qv1q27ika6mfw88mhsi5kjki5q2z7cw7fxnf";}; mathabx-15878={run="0x0amwdxr6mh6j1m1q6wawljzjf1683xp1fxfqyxmsk0spx032mn";doc="107fimmxvfmdjdi1rlk0h0m88q1dbc9q1qwqhx1fwfjwdn62kvsi";}; mathabx-type1-21129={run="026pnrn2y7zrl8qfhjv504bjk114z6kd6ich2ic97l5f3lhl9nj2";doc="172dhvsqql6fk2hfqcw19bxsqwqjfd7376a5wwzcvdgvx44s294v";}; -mathalpha-61089={run="12fsn6wsgixbpnay1szkmv16a2wfsl60nkcbyjksy1j06gr0yf5p";doc="0ryvikvngpgnqbcf5mp4g99cg0r72x53p7q6h333vd3s2qjah7x2";}; +mathalpha-73505={run="14qi0ida4x0diajh8ynwifg53n92s05gpd2dh1ardirm6nndw38c";doc="15zzpi0hagi0cwh9sid4acllxd0j70ri4w9818gd58irsfiwwqv1";}; mathastext-72671={run="1bkdwyfmsv34m58rgncz45vkr7sdjq56bl3nwyn62ic02ym83sn0";doc="15spad734n0c97bv77haxhah1i27abkfc0fvmwsypxv7xr1bjff7";source="0rpv6azh1676qg2f415wpmli6x9v49qw9crh2aqi3s7dvgmnic85";}; mathcommand-59512={run="1mp9g6q271ymx59rq9lkdaadi7dwz3p1d0qi1495rrn5d9fpccgy";doc="1bjky5x3bgrfmfripn3dmabg0bg02h6xpl3s6qncqgxs0bnfz2vs";source="08l3gbrxw3aa028820iv2l1r5alnvzd2wjx5fylxs9lhrwhbmq2b";}; mathcomp-15878={run="0ciipbbi89n9aakg86czfmasfnx0k6rq7f8v0wkxk3zk2m441cb9";doc="16q0b81y748qnyc2gycrb3jhw1i5yphmf6rpivwikzpk2nrg3ndv";source="0xdivrbkhn1fh75ws54i2vxgx3xqaqkpfjir5q84vwxgmxfv4cja";}; @@ -2512,7 +2546,7 @@ mathdesign-31639={run="0jd7xfwavfn4dsss35splcxrqj6qwk18jw7qgkwshpifp7m79l2v";doc mathdots-34301={run="1wbxvraw5lp77chgzslrrz022zgqn2fhmzk85cn7ggafip1hr9s1";doc="1ldl9l92y893dg2ksqn6n82w43a2l8pylz3iq4glcphalhggydcb";source="0dkpj8cychzl7gg4bp41qqi3y50x0dyz2pxanfli4a2anh2dy06q";}; mathexam-15878={run="11rn665k5vg9w9rfgcp602v6cg659d4c22gikkgjpslc7bzrlrkh";doc="1lv8zdp1fajq1nms16v3nk7f0bc8az525nnjjjzags4rpl8wkzh8";source="1p0lalc0ny1zb8gc4bbg7z9pm6airbg63l1k0qqmwg10wvxpsjn9";}; mathfam256-53519={run="0s97k46ysqvgs6a8aq5q8iwab390s90drd3g0ixd8zmv9a4hy1z2";doc="1zk42fsknkbzyx4m7xn3yjw9lrdvf6m7crnqsp1q7qb2nv3hn1br";}; -mathfixs-72653={run="0zfwawfniigg1yl5imf6iflf7vqcxz8i0v46mmnfa26kkq8aa085";doc="0c0pgfyr1jacry5c87cwmv1c01371670mfsd2qjsivi2nsmb5a58";source="1qr8fcqrxmyz1q2qgkrzk3b557c8psxqfwgx5ar3sb0jnpx5x9l1";}; +mathfixs-72887={run="001dzryilr5nj07yff1sdanv6n39kqw1ig3lp2jrs72x4lq1rvqq";doc="02yk0a9nxha307xnxfnlhyc0c560xqgaplvhzhlr1q1f2g25np00";source="0qiw1irhd5mmszn8ly59s5j2vppf859vg82za16083jl6is4gd4i";}; mathfont-68241={run="1yh9rlhg8lk4a4haaxlyaa76ij0i6rb4zbk6kryp71ks6hyq7vny";doc="0wsmsimscrkxbyx1mkjlhkiv3xj66q8r2fiwk8bspx6zbdr7fwyq";source="1z7k0x9gcyls65mfgn30dhipqwfhn78hwx51gxvrn7z45w4h52di";}; mathgreeks-71248={run="0407xgzx5wrc1iqw0wpxicyispbx8c33mlfp9clqxvhsdsia416z";doc="0xw39ba7w2g6zj0pngf51va22kvfisbakrvpg4a31sr58c4r3a91";source="19sjginzcsjl27fjh81zxzsjv34r3zfz7cmdnf3kigh2n6m8c8ff";}; mathlig-54244={run="0pyaqwr2h9knxf1axi55vm6wr9xj15d5j5pagb2011k3b830f91b";}; @@ -2532,7 +2566,7 @@ maze-65508={run="139hjw2asv21p0m7qrpi5liikgf68kmk9v214njh107gi3cjl59w";doc="0h1l mcaption-15878={run="0bfcl1swwgz83y4f80a1kydmxhdyqxld0d5cjfgxfhnn9dxp3wc9";doc="1afldwg6dghvkwd8gik8dmag4g2pb6ag3aks26qi0ygph05j9cwz";source="0i6sd9vm1pn9h570am4lkr2br81bhmqqwwvymb8r37xpmmp9yvsk";}; mceinleger-15878={run="1a16g83g9wd5vdx70bq8zbr4hwm8fk46dpsna97r9fgh44n85pv9";doc="09z7srskh57mz055ywyxwg4zcx07vq36jdy8z9w6w74af4icpll9";}; mcexam-60481={run="0ixgrxw0fzaqbkif05lvd3z6zlwhdlyhfb372b98ypyfp7f7v1mf";doc="0wi7zjiw93hv74scwz4w4prmy00x6n3ncwfrxjyxn2p7i2hkws6x";}; -mcf2graph-70154={doc="1xy1f4cmf2w9p0wpdapig6jc4bwwmqqiy7981ja3kcx6g6id1r95";}; +mcf2graph-74041={run="0fiig0j9pm9pb6ds3kfq0847xk9vn09nnmgg503al6m2607gxx1j";doc="0kwcflplykfw849ciifmkw8zh6n05isrhgv2bg44zvrwnbhv32r8";}; mcite-18173={run="18did9achsp32k7wq4q75a9q43jxdm8k40q41j242gndnkn8axw1";doc="1gdsa91a4snk3f22mh06mr811b1kb0vpi30ss84d3mrnsvd1p0ha";source="0q1bv5nx9xf6r1fvgnxb1x720dm0xqrqg3kya0504q8qb0kgxqfj";}; mciteplus-31648={run="0xbk5zrd9mbk4xid03j7a0c96s311rb1vjawhvk5waqw9y6dn476";doc="15aldir7viryb2f8vi0a83vgbdwbp5gcdg0slhp6j6ka6xv7ayhs";}; mcmthesis-69538={run="1pz460nrypf05knd6lbk6sggpwsn6cssv71x7mpaz4557na9xg1j";doc="1mzfhkpahw0gc1q3b9yr4p4ya82y0y57ij3n12i1sqk7h4m3m1vq";source="1g7i751plyf1v4561z827xkk586zn8f364xapcfvky54lyw7v9ny";}; @@ -2543,15 +2577,15 @@ mdwtools-15878={run="0l40ydzljgydp8qfq1lm9v8nz0mrz4zxpjxicypn2hx7bxs2b9rq";doc=" mecaso-60346={run="1hsgs52844fv3yfzhylb47hpgjdfkx5wvgx1ihslkg9xm432z18c";doc="066zg20m9hnm2h0bdbzfbxcjsgpbm52l6xwrszbl2ycinqf4rwdx";}; media4svg-64686={run="1l8ncn14k3khzq4pvy0var7j7nr78vll42bfz1m3cxi5i144ygn9";doc="1ws9j415nkj68ypgmvsc3384dqzjrfab0bb8khz2rqq98sv6129l";}; media9-72299={run="0lnjnc1xz32p0rkwliipczhs74pcs934d9k7m2i7d5m4167mzs8v";doc="1s9rdjd0qxqk6axmh2ybinx63sjln6pdha6bzb5k69rq6ql6gj48";source="1h3p9v4p4kr35ixpwwv7g8fwgy3ky3haa2ypjlpzbci7jcb0ix5f";}; -medmath-69510={run="17i7sanjgagb303q608b86a77k1p6zc393mrvkcyrr8cjwviy9wx";doc="1306k93xy0sky7lkysikiz2zvd7a4lkpv99spifyi31y4jxzlqrp";}; +medmath-74214={run="0z7j7f2wc37kh82vyv734qs6dhb20gmp11gqbzglr0ps05jp4irb";doc="0r105cr1f00drkmwpw9rfjlsxkp6hpd39h1r2cjbk2zgna4wv2fh";}; medstarbeamer-38828={run="1cndcpdvkdvjx07rfan5dd7yg6sv532b6vvd97cm7ag2g1aqcilq";doc="0i995yaqv91h4iv3h7r5m73vb7xvpjkzrh6nddcjjcsv2gvpjcxi";}; meetingmins-31878={run="0za2aqj7gbmxxdm3hqkq2sqkhl3c1q8a3s778hw164dfpi8jx85r";doc="13kqp3561k9pcz7lmh7izmxw8iqq0s1jlhvq12dh00wvr7vwr8dr";source="0fkgaqldjdry08wl8al8d0kppbsqqhig83mgwfk20rzpji298b5x";}; membranecomputing-64627={run="0k8kgr6rlrgpmmylf3vjjjiyis49lm1r1hnvb2m2k3481gfj7zfz";doc="14hk6rw8fj040vwpqhqajlbzlp7g3c7szprssxx148j816fgi95c";}; memdesign-48664={doc="0aij1b7l1kb2x44qn33m39k0kbhdrclmr25nmvzfn6yw42lh9fz7";}; memexsupp-15878={run="0h3n1bnvyxr0ylg05fm819lzhzd7kbip5p5mr9kc5af8pd6yci9k";doc="04zwmw6varldbg5cxzk4bv8mbh80i9gdysfxpn1i4xb1la38b0bf";}; -memoir-69600={run="0zfab6dc435zy8cad1zi3f6d29vv02ns9cpgl3z14cx7qcm62c3g";doc="1bz0x9ph9l665rsmbhdwzgvfm1y1nxwm2mqbxlz4gjaqz7wf2k0l";source="09c78l1akvc3x98v47hwsky52wrx81y3dd6v765s14jjr1qahsx3";}; +memoir-74490={run="0cnc3dfpn1bdss9m0mivf8k1cp1aimmgb1w4vlbbhmhf3lcvnrbv";doc="1n495x5q9x2zydy3c3862bkivm6n0c53wi7w8irry0i45zv5nzqw";source="0bffrarixx9pi44l1bgmvbc63dkxlwyqz3kbwphfw39na5z0vp2i";}; memoirchapterstyles-59766={doc="0jxd7sbh5vc3j5d5jd3zmyg58kwhy550l5z8q14b4msm00fp6z0a";}; -memoize-70841={run="1qzflpzcyfrnj3dldqngx3g99sm57z4zg0x7vswbmvzjsa70aaip";doc="0a4am2nli06a76594ps9ag1fw06pp4w9y7hjxk09l8ic7i1irmli";source="13b67lk78jl2shxxcihyfcid6bsrw9wh94qjpx3562ql1qm9mlr4";}; +memoize-73025={run="164nd8lyy8yz57w691620fw1ahp4bh8ngs62ysm5ih12mlabzmrr";doc="0lw00d33nv1hrjqllnx1qkwwk8v4qpc71vgw7mdj62jaw44alaq3";source="09229j002qyrv3hsmd0m6j0k03l9pvydi72rrhjw704bl1fs1bkb";}; memory-30452={run="1zgfjz995jbji8hycizbp614dn0g13rimh9csgrga86f1ivgcpmx";doc="164nnsi25jk25p3kh54w2l8zk0rri50p0s9g4r5f50c3wzxi1g4h";source="0mhxxhiqq5miqskb6c4hmjdjki280yyin2dh0md59ai1aprgd4p7";}; memorygraphs-49631={run="1ph43wp3h3pz5hh6dp3n6dzmmbn0fw11w3v2fjf6d07a73jqh97j";doc="1k8gppgv5kkx7i799mwc9iclp2rv9hgdk2bwnqcyc3j3rmnpyiwa";}; mendex-doc-62914={run="0ab3hrln124gwvgsszd4l4jjrc705x3wbnmrrf27rx8p6fcwwrmw";doc="00m35j5wkcsyrgp0h8mf6cx30bjlhv23szmclpls70af2shcmzba";source="0sqp5s98lzdjnvpvw3hkvclrz98xzx6v7zrlag9m1im7k2ljlcvy";}; @@ -2567,7 +2601,7 @@ metafont-70015={run="1kw37drhnk7qajmivvjwdrh5awns571wclv8b354zk71axf6cr35";doc=" metafont-beginners-29803={doc="12hhvlnvh8dj1396242m6yi0341cina7sxrv7pwzqxzzahwdvmgm";}; metago-15878={run="0km18bf69rf3rs42b0azc7i8bypy14201vk13yf5ahsypcjcgqns";doc="1bx240q75pq9v23gz82i26vrp7z4cb00f9nb3cvvknbndk8y7hy2";}; metalogo-18611={run="03crm3sswv7mz5akghqvkq1zpiy9jdpy32ivwwmf14sfrrri2cz7";doc="08vgbmjhynb4ramaj68i27hpgijg51j80lm0qf1jrfpapz7lrzij";source="1ak8qbcbqgirljfwhq7ylxk1w2frxfkjvadjq00cclj007idr3x8";}; -metalogox-70491={run="11q1i8cmfjw521xzqgw27vn8bds5var36nacik8ffflgb3f6j36g";doc="0d5zsshzj575y5ry0zvm39dhigcjf8mfh4ficj084ss5xgmf2qyr";source="0pkbi2f6zsx4c0wv501kkia2mz6cgbcnln9zbvlnrq9lk21jsd1d";}; +metalogox-73571={run="1a0bm3w75mmjm7zmqf97qs1zibrxhgllfh1gpdqpykwqphm451my";doc="15hkprc5grdvz2chh1garmdp138lc67qa12zpdf9k0jkzcl7d502";source="09bmjci70bdk7r2v51pivhs5xia24y3b94vknas5j462mippaj2n";}; metanorma-55010={run="17vg55m4yj3xcfgvmm2kw8a81fblwykgnbcn65drll10b89wx6xp";doc="0z3mr4aw6gqdj4621dlghb4bsc5i44mlg81w81by98783fn4xdyl";}; metaobj-15878={run="07p2r8975ps1ricqralyw2qz1zq5lmaaf50xqd68qwxmgrs3541z";doc="17kqa3h13p9vba6sa5s29v29gkm0zbm5wngb0zx1lxwkpkgqaqv5";}; metaplot-15878={run="01blkf01b89a2f1c7fw6dbp49iw9qw94krv1hiqg7ckkj8j06sp8";doc="1fm27sy0zz3ppzz95bngipkq4m498g409igx4xcbkmqaghci1pin";}; @@ -2598,8 +2632,8 @@ mgltex-63255={run="11xl6nw76hana2mdcq7m4h6kx6zx91apxcqkgjczcw9f7ip6m3cl";doc="19 mhchem-69639={run="1mvml2z30q09rw24laybbkacf57jav8459nb6qfj4z068r9bpifq";doc="1f4nmg09mg2nykrrynaaijkn7xjlk3szccw375kam6b7ps37srgv";}; mhequ-64978={run="0zyp8x8qxjq3z6b8dm3pgls4z9cr03qiqxlf6d55ylnqmdd68w68";doc="081mavy3495k4ciqvxd3hzkb2bs7m0s5jm8lx01z85p568bw5268";}; mi-solns-49651={run="1bv7gr2wa11cbsznz414x35n5yy5jw7q9kngnb2h5y73v8bnzvc6";doc="1byfb723572whq315zwybwm1bcvcn49km80gn5bi081gy81r75hw";source="12xrddxlrngjnk0yk35spk886yd9p3nnz6jrp51dfzw1xz6pkivr";}; -miama-54512={run="0138r1yrv1880nmcpgcgb80nzd29xchm09s8wxb53j71q0vvdswh";doc="0dd32q8clxgkd7cdk0699fzplnib4waydx9y9i33lxxwjkfnfsbl";source="14d7ryxz6q17jn94wlj5vf2hzif6i08yjbxh5z7pdcgrnl035gxj";}; -microtype-70805={run="0wxl904a3xi34l920fa7g2fi6z0i4c5axq6fk7zbrn7hkiiynidl";doc="0m7vl3w2jskcv4203r45qx1hm5616z7p42dlag0pz2g0n6jwvk07";source="0sj5j0j9clqx1525mzbiq9gc93cczaaqi9v3xflr0fc3d86rswsi";}; +miama-73481={run="132ryciiqrjc0kxkx9hm4wblrbnf6v17lwx35jmzkpxhmw7rljb3";doc="14ar5fr392lnbcsdf433n74sfnm2yzply7a0yawyninjwfi2l67z";source="0nd06fky39j5prhj76nzsv4s4crvjkbzvpz78qphgxqi8shxh1ky";}; +microtype-73935={run="16lw0mmjk50nqwilm96k4g9anij33f6ajdvdpfxn40zyqjby5l8c";doc="0kzmdq8fvmw3qkksp2i4ps5p5fydn5a0n2cp8fzgbkrl182q30fh";source="1x5lf79cmqxj5238wp0cil60iix880bz7w4qhjh894z264np7dmv";}; microtype-de-54080={doc="069d2f0jcg9m4fv8dli2dr9ags9gz6mkwy6fzz37ns4jzrqfsvwi";}; midnight-15878={run="05hzxlzr19snz16sddzpyh5f7vvs6jcdsqyqvqga17rr8y04sdwz";doc="1ky8k2ys88n6hn2q9v9gr71g772gm5zvxlbzmibvajq0hhqm41l8";}; midpage-17484={run="0hh4r2sgdgzm0nryzqymd66a7hr74rvcsn58y7dc7di6mhikrysn";doc="0jfw5wd6qbxhf90mpi8fmv0nbazkbg9h65z91613j1ynqqf0087y";}; @@ -2610,23 +2644,23 @@ mindflow-65236={run="1i5a3jnyi07sp6zz3cyyyyp8gbimy7ypvxsg9220cyws2z65d7zm";doc=" minibox-30914={run="0r94l5sy4n97p895xk33ir3dli1ngy3p67w2d3i7f6hi6czvykm2";doc="0bzd55wkdxw8spw4706nj0sk478zbnvq9cnkpid638cwb6csb21c";source="1dm8p6rjivm0xxa7px5dvsnrqs48zwn2kiq3vr6gdqmiy0ld1v93";}; minidocument-43752={run="1mrzcxa59kpmrkhnnv08z7h48bj74gk2b0q3bvhmvddd6047yxwy";doc="0dl4l8skhz7fm23mpmgmy593f34w78mm5qwab5bc41sg0xc0lyy3";source="1n0qf2r1mjp8vx3s750fw5h2q51pp3qxf90gds8bzq2cv6mi61sv";}; minifp-32559={run="1vpq8mh443hhmnf5cgj37jm362m90zdhm55jzqh1x84dadqpmivf";doc="08f3hp3knyc37a2fy87i11q62dlb35ri197gxm3ghl5h28zvzpfb";source="1l837v8c70s8x1xn4xhag6nkfpayamgzk95fb23qw23xpf6zp2wv";}; -minim-70885={run="0518yi9my7fs00b61pmyah1ljxf3lyjb5a80c3044dsfgl8rissi";doc="0yjzn947myqrcy7gm5z0v1fink42h8065x76zn89z30k5ai137f8";}; +minim-73817={run="1mfmjdgmrvcjwd9mbzgkmw2az0gbigj0fn7l26swhld5r43bg55n";doc="0hsls4w1zq2yg5ar0yiz8klwir5b8jf0llpiij4lv3a81z5dhrz9";}; minim-hatching-70885={run="0raih3zsaxpas4myf4m0bmdxqm1av62cldjs4z768nndkv6xl1iw";doc="0bngn9d24w77dxi1s7ad87gi27m48d4jr2j51cpmmagfdvlqnfsi";}; -minim-math-70885={run="1fa8a3jq51wm23ivmb5n6hrcbyxcmhb95x08n4lmhw6x6qsr0hj7";doc="1dpilbyr9hdik1lp5lm860hjk7ni9adwn3dw82pasiipqvy8qzcf";}; -minim-mp-70885={run="1gil8b42afyiyjwx71qh7f4vkp8w0i8vcjsphhgz443dddd9llgd";doc="0n91yvfxq2nx4477sxy7rw8k16zrh52vcfl2yzb8nklfsrwc8x90";}; -minim-pdf-70885={run="14zl2sxajxs3qgb5bv7lrraww3ci4kdvnflhlnmgi4dca5vnfh61";doc="11wd9vir4ph5hlj2hfr49qf3w77piv7dccwnqm6w7c5w661b9i7z";}; -minim-xmp-70885={run="1pyf6qisnkh1600ha6605if690715qprhwrakygq71gl0ak9xl00";doc="0vyhvy71ajr2d4dii4kp2inyihra85xvmqjs1fzz1am5hbqqmc7l";}; +minim-math-73817={run="0a6mlh7cpn9x4alkqis47dmgszy4xrigj1rkgw1qn17xkgh58p89";doc="1q0zf21gp2k44ddz6010x17avpp0zdab8ia9frdlrdsswmz0q9ki";}; +minim-mp-73817={run="19hgfv4ww13zrav3i2vk0qvhdzhdq51chdmdq04prc0yfwr0r7pd";doc="168g34n5xhs1nnn7hgqwz130ky8fdrwr38ldpxnvzh88kz4hfrqy";}; +minim-pdf-74215={run="0r057wzsjy6p3r3hfv8wkac2y70mki20y187dxbd60yaygxx1ijy";doc="0rd3x2ck86nknq76xk8qh9vysfymmanksjsb09l5hl6ikrh30z3p";}; +minim-xmp-73817={run="0jin8mwkgl6wkl0yr72vdafk07r53arakaqqswa661v1k83znya3";doc="0i1an0xcfbxhqa7njyqg0ax3nzrz6xrq6kpmf47l1wyxrbby5dsb";}; minimalist-70302={run="15zd2zj5v97mpsczk7qw8nnk7fbnxscjwii1bf2ry0f7707n8if5";doc="0870smwh2sqs7qfkxpmwrbl2ahq916kq3cl0qfmjqlcsjmy2plmd";}; minipage-marginpar-15878={run="1qpymibkrwdbyf2rlvfjj0g8agxisd2ym3xi7lzx3g953g5whg5r";doc="06rivjd4x8mdpzv9h1yzkjbs317jvxa78zbv1kzyia7fps74wi1b";source="13k27b7avz3v2jadjh84w74rsyh4gz2x22b8j5lv6yvrjnwv09f6";}; miniplot-17483={run="1hl5nd6p9c1xhm1kpw9sh1s81ymdy8lxfn7wh1sdvildcvclvd4q";doc="068s76gnva6rsnd7gfwswxfam56dbiw9s9ymqr2hcqx7i4dl87x4";}; minitoc-61719={run="0v80ga66rg4cgifmyfa5vq52v5wz48lj4js0ym9197x2w98ra6ry";doc="07dah8lz54ccvrgigrvgcmbj76ppxaismbllfwyxcgkrkvqzxqkj";}; minorrevision-32165={run="1mcgql832xmgpcwha6l0d282mhyva6xmyf75gbb6inwbgg6qkv9m";doc="0x9lw8xzmnn015n9hyzajnl9gicafj06gr2msk6vxwk136ayqfiy";}; -minted-72494={run="0f3x28j3c4dw81aymchhaj5r7b24hayb6m5ra3yq6dvvq0isr5gl";doc="1ads80gd13f9sj012igz7xylb3l3fdyaix6gwq7560vd9zkgr34p";source="1ipq8wm3121mhwmbv68rn4nl452gb9sclsxdq8gbnmcg3wmh762j";}; +minted-74490={run="1047rfnp2c8shj1kvwa1g04ivjmdywvlva76qhnmigxpgpjrp7ln";doc="12qgd0rp3qx5x5vm8vkwar3gdq4mnkvawnyzkgdial6xnzw44sj8";source="11y6pzcyzghx86fsk8i02cp9dg95ky42pdyy2jf1b2jlpk7sg932";}; mintspirit-64461={run="19jvqcydiwwq3kv5bq6524wsynj52b8mqm3j3wn108z7rhnampg5";doc="0mwrnf6q3h82qnxk9gy9ns12k9lr61z92vmlyx2x745i8ra7b551";}; minutes-42186={run="0yc7dkvbn0g7gm07h9r62ma3aagbgparrlamh462a9ckdc7jzivp";doc="1m8blswmxhcm2ya966ajknx9arz3yh1sn62wnyxls220af3401ss";source="12qvfyiscs3y1wk3r2mdq7vgkmz1ldsbg3wz4agib97lc30qqmif";}; mismath-71549={run="05nd8ny9x9czcfi0l72ni4yfz8y3n3xymw5sw6kiv23vf48dnxzx";doc="073pzmj1xa31hwb4cym0g6cjm0hqlddwj22bzxy6cagaw7845sx4";source="01mx235j051df8kmscw14awbch3cp83kiczjg52v6gzsgxmiacxv";}; missaali-61719={run="13y2dm6phd9c77j3rajvz4qma2h2k4nwhb520j3mm98bgmbkphf7";doc="16487s0ijkk6va22rhhyhxdqik863n1i25p0f67gcb8xp1s5l1wk";}; -mitthesis-72223={run="1miyry6hi3j8ls3njrd10zgh3id95bw44hgqg2bibgb44gqsnac0";doc="189vvhwk8if13wkvb1acy93v9v98kx0jxg0v2jinb5jsb43gq43c";}; +mitthesis-73622={run="1xlifrlrz79ljd2biq7qzdis2yqcnvm5gz7b2dpxl02c408as6wn";doc="0a7iwk5bh1kf91v5644q22w6m3s07ib6m21wkbynprbnn3wnkfdz";}; mkgrkindex-26313={run="01db35xmg9583hkr9bpflr6rj8bmvidaqahpvkr38bks21466sxz";doc="04p2xaycwszq5dp8s2h6gdm36l800ipvigblkm8m58bgycm553fw";}; mkjobtexmf-29725={run="19nxq3k9jf4bypk2al38n6igpca369lxqcn3da8cm8c3m511nsmm";doc="042a29h6sq9mpy6chfkl6893zcpb3gd3gsl60xfwglivib706qwz";source="0q2i2xgpnjcx8qdkk47q7v0lmjdv88jjvl7zcybnhcaa9km8f9na";}; mkpattern-15878={run="061y05sa0a12x23f68g7rinllkggjfghgmrq2qnan34f1ind1g36";doc="0b3ahrhxmm6lwijc7kgvn0k17fm9rkp7i754zrhfj7w4xgq6i50f";}; @@ -2654,14 +2688,14 @@ modref-15878={run="0pd0qd9yjhvdl3icrgl40lgyjsgahjw1jgc2ah75bfcwj02qm4v1";doc="0c modroman-29803={run="17ijrx7f87pbkwbyjwigz3jr85fwzq6rr0pz1591fk9i36jhjaal";doc="044v0nkz0h1c7xsb66kmpqvr5gg4lg1qkx1x2qm9ijdpsbc4zsng";source="15xy8jpp2ac07qq0nl3nskpv62c59xb8qkl51irvpb0m01d97y39";}; modular-44142={run="0khqcm28cq8cr51wmyv954zy85k9dxvmiszz5w4izxvyk14d56sq";doc="08qhmna1mbra9395gvaqbaqi3rmyhhckx781x4zw5439z2bpmg39";}; modulus-47599={run="03sssw7yg7pa7i3l29l049qavwxphih5jvc86nysdzzng4a4dd7n";doc="1ylrs9705mgb8ijj9fq5w1yyd2fi4ykx8gpf4ckdr78h6rvzkr1h";source="0gm8vwidnls0z31zxcd348xyc4rrvcffncnwmazi9p1zplhg9ggk";}; -moloch-71883={run="1ffmx3ixfkgj6my4cn8f1yllzg8hc8q785phzkf561xbp3r26gkw";doc="0x304yisighw5xd3r9k05crxwkbp7gf2h1ligfmrv7fhzmcdbdil";source="1iing6qy1a9m2l2iddglfv0b22lwwfdjkf1vwd1iyi3s0d04qdzh";}; +moloch-73490={run="0pb0mvp2ns2j86kzqpkpqmgsxq922f0hx51789bp63g29psbxfjs";doc="1h8nkgri7cdzlz3dxd8yrb85x7vq5dvcrmr5mr87m63zyfmdrwyc";source="1p1p392jf5ci442pd6kyn4xmhzcl4ikx8mrxw7ch53rj304a4xd2";}; mongolian-babel-15878={run="0qv413sx05pz5ri4p9znb020nhb8m2ybapcdgnxvkdamgbfvi17s";doc="1zprq4x55rbd667ll7a1rcscbqvg3i4wafmxnv4bksdm8p512w5z";source="0qf83v7iphfavxh7kh1zav95r6q3k0aiilzwnc0mm607bkjzc2x5";}; monofill-28140={run="0kpzszxph3bx34flvhz746xkdpcc9mj0srifki9y8fa6vgsk2rz1";doc="0czdlvrwav8n3p9afa40icddh37md6g39kmy02vcnwmn9k3izp4p";source="1x5raychfhcjibln59x01fay8r25fwxba4lwi0bnd51drvzs76pn";}; montex-29349={run="0rgf1rflrf98jayyhj1gxz0mkw74qhd88b4i2ccf3mm0kzwlvw0a";doc="0w9izkjmb90d4x5j1azhlskhgfmxh67jq1awsdv2s52psgscpfm9";}; montserrat-54512={run="1blgdkfjjjhzk41myfp7bb7x5wf3arwapas4mm1770d46nab1wwr";doc="0blk6jxz1xrascrdalssqd9pdrvpai3k9bqbvgkyngqhp4rzndv9";}; moodle-65672={run="1yr7laz12x1z76aik10dsl6rpqgwbfvy65k5yhbik5iq9z7wrv1q";doc="166489dmj7ysl0z7f6whnkk8ndv5bmb9hh7pjmp6lprvr9vvqxm6";source="00n02k6hskbj8rb6krcv7b681lx24sfyxy8i28rf4c78x4ds0420";}; moreenum-24479={run="0cjq1a222c813l93yzf9757dcai55vh24r17cv6awv0d1xf6jggf";doc="1g71dcnbcjb2x8ilhyfbkbb55x8740pz6n9gzdd8h6kyxm879zvl";}; -morefloats-37927={run="0zdlkd53zl0y69d3manicnd8ch8qls6jxgr4mncqg5r57lqp10kd";doc="09xmhl2zaxzyvys63n6r71g6qp281f6y69gy4zbkjwb1n68js1i1";source="109wx7axxf1pgpxq34pz9i1cg357il0rbz8h0xqacn2yykh9q565";}; +morefloats-73637={run="0jb1ljp86cn9yddg9inv24i8zzhw0kyp8f8y0797yr8nd8ijrbd1";doc="0fsgjqqqan7rs6bav2a34r1z59n4dackx5h59i9l02zwp4fa3gjk";source="1qvza7xd7pich4mlrrq878f8fxdg3pyi6aakzg912kcd8zdqnrv6";}; morehype-38815={run="1yssb0c3l0sqyv775mjnbba3wv1h6497x125li68q8iwjc529wdr";doc="14s0bvxj2fjrkcrdp576c0ka1appg9g4ri4mc2isfb73yc6bmgh0";source="1sljhzy05akipng9lfajapvdm8jf2jf50v1awl38ld0wfkdqvcdq";}; moremath-72072={run="1rhqx33a2z06pm7d5x7ffx4qsc1rp3amif5d1jnwkvxp3cqhh9fq";doc="1y3vyk6lz73frik5779wx5ppa16vinxgzg9v2jkp8bximcq94s06";source="1zmsigxswqhv2v6lf0h62rmmrqna47a2y9qf77asrd3k4s1qsbg6";}; moresize-17513={run="07vq0wf250ixhrg70vdvaz7zh33zaq5sm32ka8qh1ab590c8w7h8";doc="1qa9y7q1wi7f9klziwgj6dw9c7bh453srljsx9m106nbyd1cvnpr";source="1gzj5bh16afgl8dg5z44h7d4m79i5naj4wl09m17x6snvfz7ifah";}; @@ -2670,12 +2704,13 @@ morewrites-69679={run="18r8ja3xw77kn4jhhyyrcrfqhqwa7bzbsvmkllvlfpmrfziaxq3j";doc morisawa-46946={run="19b8nzkwdnqk61p1fc7yygjlrdimawmbam18akphcm70qx2h01dj";doc="1y218bablhn06njs5zqmsl6jvvsgyihm4il1x9722pqvvyxxf9q0";source="1flrf2c2jxpq33g26i0m2h63yd5jfy9bdh80idpx1m6bi6hhq7ac";}; movement-arrows-67270={run="01kbaxy2wyzxla01gbxlwj5i28ahak3xgm7f8myv5d6p0s6by0cz";doc="00v14fnh2crcmnnkdj7dxjidlxl16iq3nfygx8igas1nbyni7xfj";}; movie15-26473={run="1x48h56mw1pzllzz5b8fx5ikhp08gx9jybdn7qk3jvfy13a4r5yr";doc="0bhyfgsjwmvvl7lnam0k254w2rzn01wf5gzn38ymmlcbw4ajkkxl";}; -mp-geom2d-72638={run="107miwh6v3zhm563km8xycicawdlpm7rqai0q1vhsa19zk8hnvjn";doc="03maccl7302vq3dmqsajyzv96ia3rym5zx2p92azmplg6b4pb1d0";}; +mp-geom2d-74173={run="0q94v32i3fgj01dgw60wvqignz82zlf7vrlhbm3r92c7dys9d5pf";doc="1hzvb8g1g1xvqnsjhd4l5q15pxc27vnqfhnhpv7dphkk6kh08hn6";}; +mp-neuralnetwork-73627={run="09y9fqvqqjgbzx69ivdviw26ds4s7cyi06c8znhaaz2xgvizibd7";doc="0s1m3rr9d3c6gzpy687bkmsbj6db8p56si5720bjaz81rrx5d8aw";}; mp3d-29349={run="18wgwwvh2vj1adbvbl1q6lh0wy0cynfvrx6cgq0m5nqps7b3idra";doc="032ywwjrv21ypnlidvn95dcnq179pdiail86s4nxxllkjrryc2db";}; mparhack-59066={run="068wp9vk6ablq8mhj165k2r6lg1llk1i8gyj71ha2kcsq62v4a0x";doc="1cs2ypwz4wkb3rs71wichmd8zc89vj4r58srqzmriwkjplhaw3p3";source="17c1pq9mqn0gaffawg66wwd2n9cd31gghlvmrpn9m9z6xcdm0ipa";}; mparrows-39729={run="1hmbpfw1wn13zp8dksnlc86vb19zs0dbwx9hy0sbiyfmb7hidznc";doc="0ly0sw1c6i3k5nh26a260qw27x6rmv5p2zs11yh5076ziwdxnnlj";}; mpattern-15878={run="045sji1qqwalvmiinqkfm3x4rk2jc7m9nya48brcc0rc5icq7xqn";doc="05b9pr86yy3hl14jymk4g4mf6f5v85b4nv2bc68m02dflvm4wnsj";}; -mpchess-72664={run="1zlh30w14a8g2wnsvibs2cylb6za17y87qmhjllaq6qs25xc2ykh";doc="1dhlqmc2kf8f911mrwqbj4ndkaa3sf98497mhz0gfhw6p7n0414s";}; +mpchess-73149={run="1sxivq1wchihy83s420j33qmgj5xip0gxcyi6w1cc8gkhiimbr1p";doc="0wkxmmhcihcki7xbpjk20vwvl91v40qvrg5mm6kjyc9a3cg57qjl";}; mpcolornames-23252={run="0bg59x762rfsl3whzqdpajakjnnx5jbh55m73dw23id1g7cs5rsx";doc="1n78abrsj5xj1gd2psgph7x4dm8nscvwmlp6ijz5p6xgphgqs5bf";source="0q74zsx3ni8bzl0k1iwrr19k7f9vkwqfm0bp24m91wlzvh4vlk7r";}; mpfonts-54512={run="1z5ws1kr5s07xwcs39w049yvhfwadybjxb32kf9qd8818pgd4zkc";doc="1hjy2jqm8mlrwiipl4f1rp10nya3zcy2vsyibhs7f280h4zhdwxz";}; mpgraphics-29776={run="0ymwcn16n44y47ngdsyb0vvfp9vjnwixhxk67z6ni5d19f23jqli";doc="0q04yj9j9f9j9rndqn9k95jwjm41g1rf5raqlrr1cn14bax0lr4p";source="1hacfhb2dbflvmg0c1lif1hmhxkj3g6j1mdlb3wm43zczgaavnmm";}; @@ -2707,7 +2742,7 @@ multifootnote-70745={run="00bcpp3cnvf98qyvdb2514zr7s4bndg6anay5p6syszxbijhlbdw"; multilang-49065={run="0zkkfvkybq5hxbdwkwy5n7gal1ir7ixg8342wynk3ga9z6lb9shw";doc="026d5yxli87f2svfyqmfzbhydwd4c929n2v11wk5prg4zc3vp08k";source="1v4ql5jxlmpc6458qcqvbsrb9pf3dss60z3i3ylmyp6mx0kjmchr";}; multiobjective-15878={run="072zpfc1achwj0b1dv8yskdcbg92a2imnmn9z492l7xxyz889n5x";doc="161nkl1q2kc91is8y6h2j71hnbly6hv1fjfmlhb50xypjgrv1ibs";source="1nps6rl8di10mr5r1hd71svlj0dxd51bk0plszk094a3r3l6z4z4";}; multiple-choice-63722={run="17w8sc4gki7zlwkg1vqrmqrd9id6hdjf3kcvyavbmnrisri95hl5";doc="1cjvs2zwcgj7w34p3w9cvv4dln0q0468cz0j4vdchqjdmhqkwxhp";}; -multirow-58396={run="0bsn4xzliq9gllmac4wqqsnws9slywc0d94abh81awpzv6vy8jwj";doc="070q5s39pfdq5wiq7crhdqhcyjalpd8kydig4djgji975b0xn0bk";source="08q074bixnkvn7hsi1n8vx0r6pqwwkdjsjnxz0n3lam30x4j1jib";}; +multirow-72833={run="1ck0jwkf5vvgxc2mc0yskl8dwjvjh1ywvhq9sy7mdb8f8g3x8djb";doc="06mbh16bjqnwfrn4dqb4ab2yjw6mg7b071gpgh6px912m758n4rr";source="06sw23wqldvpk2ipnqxr8x9xdh0c5cqlwrl57vxvsvpndrkklxsq";}; multitoc-71520={run="0yl6jmkalw2sfs4mz70w1za42xi97qrwl86jq2ik2ggmcz7cywh2";doc="1k91hfzg3qx1damxy121d32sibqrdy8k2gsbcz3y8ml2lyrgkcn8";source="0zmhvbv76hzdizvspgva2ln4l6npm29nwj7nkqbk834ykdvgs1bm";}; munich-15878={run="1dns8n2xybkf1m3j82adid2nr8ngvg5nnlxr5ky8ha706bmz1lra";doc="0dzwmrv636nca34b39mpxyhh99sr3s5k2rkj7jwms2knlfn81djm";}; musical-54758={run="0rn4b1m1c58phyj9zzvyxdxbilma1bnncscwmxc8sdgb9iiwmlzm";doc="022s1z7d5ins4gpklg9hadlp1gqxpr6862i1g4wp036db0457l78";}; @@ -2731,8 +2766,8 @@ mynsfc-60280={run="1zc7lgr1i0g5rszh9gzcv7fs98mk06ms5flb3iv2zww0w9r7iy0i";doc="01 na-box-45130={run="08xixk2hl5w876x6hmp6h044spi0qw1qbgrqklwrmkxkgpa27i3s";doc="0i1p5f2nchl9hyrkc6s3hsqcvmyxsi4dbwyr0mph8slhw2rzl711";}; na-position-55559={run="1amvifgadhq73avh1dq9mj2v4s5r3hlr6a3z4wcbhw32jd31ncbx";doc="0pcn0r0p0z7lxyfsvcnl9skm5aa5xi6362vydpx9kv8m11gl7pjb";}; nag-24741={run="1l31y7mr00s6md7a68cz51yv0qfd26xaj04ax1ph6dqc97r3fv1w";doc="0gc56zgva7kziny3ridswnp8rscqi1mg51d8x580pidb11mp7dw2";source="1fh9nfjbkvw907ra1crqfhm7hl4k703g80w3c8qvd18r86wmn2i4";}; -naive-ebnf-72652={run="1s14w8zsz3lkl50fg4bnisza9qhmgd2a41zpdp9rbyz4qcmybpfb";doc="1wamky1z06kijjwc5vdchb17kj87xpijy1qdigr7mm3amfhvxrgm";source="03fpp4sscw18d2d0vjw2yxxmb1g91jvyxbn12pz01p0xfrk3bg2z";}; -nameauth-69758={run="18p1ca2g164942p15znda23kgxsbfqpvwh8yb8g13m2sv2jr3nwh";doc="141c0575mm1hdik8xw9gzwswv4agj97rwvinpck9a9x2g6kxbwr8";source="1xq9hh74485ck93ifsyg3ci62j5cw89if3wqcd4bcvx2qqxw9lbd";}; +naive-ebnf-72843={run="1p7am089k702rb5jrx7ypf6r0hlvw8i2xjnrf4x3sbgna8bw7n2l";doc="11yl3zqgh477wrkdgaxph3w5zgmwv2967dywl284clirf86sl3rg";source="0ndrfq36c1kadpgi7whlv3zjgns3i63c0iswzrwm9manv3xzsmm4";}; +nameauth-73749={run="0j59igamwyn1mmbfxvm61azpzck5ldk5vkfl6swkmdb1wk20j944";doc="0qd6305i623gvrchqbjq6hq9v12kfl628ipl3jwkhw25b6v7iank";source="0hnkp5bjb5c8mg7yv9hjmfmanl9yksw0va72sgccbnmx3dbi91fz";}; namedef-55881={run="06nr8bwymbc3ps7whpxnsnbnl1fayz36hlgcy5isg0gcx8bdspfh";doc="080m0d24cish4an6p4q7rcrqpr2r1yvwvzk431nszhm39h7d8z80";source="03kg4zv07ch01n0nc7qwk99n32ifwf89z2976wg5k12yq51prplh";}; namedtensor-65346={run="0jvcqdqnvnjm9z1jcdsa86cvv4f4hq94yi6r688j2sny2700q7a4";doc="0cjbz9g2b8cg2wm97vdgwpqby0jbc5l2d7j2cwx0j571hchlijim";}; namespc-15878={run="10sbvwc0r3lm90qdxds13iyfcddq1vjx2p8vvs4g3sav4fk8p02k";doc="1z34xb5s5fgl4rag0fmc5i5j3jb810f543096mxpq46j98rcp5mz";source="0xjcnrrrrw4032sd6wscxvar9y3kd4547rsd79dpkbb0ksmqbqrx";}; @@ -2753,21 +2788,22 @@ nddiss-45107={run="0d1maznv4yqpjzxm90vdl68h6h7zr7m0k24dirq2nc1cky6l0j1z";doc="1a ndsu-thesis-46639={run="1bjrvsdmv68zlm2xd9v4jpkg39zvjhcrd7435r0jh0sffai4pdlc";doc="01jfadx1dcmm3q8pdwpxmxfmmp94xm9y0r77220ffrlf1iczadkg";}; ndsu-thesis-2022-63881={run="0zirxqals86gkjm4429m672a7k9n9nl2hx264javqhmhngcybhcx";doc="0jf3gdjfm1ycbnkp775b7hzr4rqd0alciqjaignrfqhwgdr96gh1";}; needspace-29601={run="0abcqdcykpq4wa5a95c8w1bn6cz90zlsy146186v0s54njc5g3mb";doc="1r9mn0flqdnaca1w2g4lsy0pk5a9l2sjnkpzzg72qgll9dsqqkmq";source="02j2f9wl2ljyi82dxk7qk71dmjvgl17vp1d3hgvlc54gl5qcwqi0";}; +neoschool-73374={run="0nidmar9zvialwhwkkj0m5fwiyq3jyyn5mxdvfasws0dklgvf5ml";doc="0p81a44czkf1xnzqdh304z7a60r16g385fi6rfry6106wvyshinh";}; nestquot-27323={run="0l2glc6aykd492rspxphgscx0ykc8cakvqkm8z99jq7xxi80l1x8";}; neuralnetwork-31500={run="0rhvhk46z3wgz5w7xrbmlmgk2px8mvajbrrj4ygpqa58g37wl0v7";doc="1apv7bhss9ilqcm5fxwg83gxm9i8563671jcsmhkl13gcii1lpv8";}; nevelok-39029={run="0c4zij8ihx3mz615jr4z150d61mj4ln88zrdbsjx9hlnandqkij1";doc="1x7jwmp32f1wph9k03q6ly9nbmdpsrkhyvn5j83n1fj6nj6hmzqf";source="15di74y4h7qgjh7gmmaingbg71jrlaiz1qxf960589k2xshslbi4";}; newcastle-bst-62856={run="1qzr66mjmdkvrgy5lcv0yv82vx4vygxwa7m8lj6crsffwyaxaxkw";doc="0crwyc9r5zqz412j45c7qh43wkdj2z7rfrmmc510746b9nm31l13";}; newcommand-18704={doc="1vlxm26393psl4kjfh533q03sb4klnfq84nld9ggs8l5x08dks58";}; -newcomputermodern-72225={run="0ppgvb7byabvypvmh2m750nlvn4qni5h58bl7j9jbmgpyyxpjkvj";doc="0d4b55aps5v29hf7xcnl2lhrckskin22dckmrqsy1f9rm52a962s";}; +newcomputermodern-73535={run="12r8nxah0afa5hagk7sa9h7p90fhvdxj7967ay964izpfpy4511g";doc="0p3dg8marpq8l4n2153b21vjjcqmhqqgbpgi1d78k7n9kxca6nzs";}; newenviron-29331={run="0vij59qibxvl81r367yxfl4mgp8fjzd99x3aq008hwh3g1d8ciaq";doc="1nvra7lh4zvxy70hf4ndj4nl3ij3ar8g2fxrc0951qvixz9jx7mm";}; newfile-15878={run="0gah9qbkpib651rjfrakzldi4wd7gv74y8j455n1yi6wnr0yq570";doc="0vqlij71kfjzbl08sh38rzs9k714xigjc1cdvvpj2m6bhimazp76";source="0sw9cqids994lscbjif8h7npp4cmzrhrcvccspag2aa78gsvz04i";}; newfloat-68434={run="1jhaccf7ppi5m5jycz77s5nldbmscydzbd2db8bmb0qx3z858m48";doc="11712zqy292xs7i4xvrrv948i6l1bwjxsgax7hph9hjfqs086rmq";source="018msda5vgamyn1lmq63rwv58h9z49q4rd09l7slij14djxwgdb6";}; newlfm-15878={run="12mryj5w7dpn0mdv91grkrd24n2pn68p54bl70bg3pddvz5ab6gy";doc="0afpxw78vijnhx2rwv94ar6x4ivcrgz7873vdc5n4dafgg18z78s";source="0z081mn0zf92ana2v99sdyyqjz4lqnm2ymndp76xwih9p1z8233s";}; newpax-68762={run="0dn36fqqwwa6jzcpznrjd7fk2mkzd37mpvyicif0dc7g125whndc";doc="0jcx3lvc1ay9b2dmj9f1kd7kxmyql95dn4xw4syp45ivqsag3p0a";source="0i7ilsx73lcifvzcffjp3n1swwv1af6l3qwn46mykxyv8c1ygjsr";}; -newpx-69792={run="1n7374jxqmrhnjzbmqlx18l6yazn3n9b9phndfg40va5ig9q6fwl";doc="1ihz42aasyx306kwkfmidi0yhr8cxmfaz3sl42b1g36fyabp5h99";source="0larcp5lk303p8bryaihfdvzacbkzmx4kldira7k42sg31p5hlbj";}; +newpx-73890={run="1473cng3a8rhra6rap31znmy3i9byixrbsab5svccc00z0vmkasj";doc="1p5dlv1rhmvssk1xinixc1wwm6icx78b5fqijds2k2s5ph8sxvvd";source="0larcp5lk303p8bryaihfdvzacbkzmx4kldira7k42sg31p5hlbj";}; newsletr-15878={run="0hl73l6cv94g9k4qnldxad6nl56n9c1r9rkwh2c38sr31d6fn8z5";doc="15bd97zlny5p212naaig42li7ki3f9bfr9b5pqk0vhbf17pik9za";}; newspaper-15878={run="1afj267dlvgcw8028b4c0v9rdj77w47zjgpk0grbapy7wjgpyjb2";doc="12hlji06sd7bvw7r664cg8ijxabc2q1rb7z516ph18ayjl5vca82";source="1h8abnmiai3c66cjndm6xawz00z1pfmgwlp6w43amjrk1rm4r5vm";}; -newtx-72368={run="1id7015p1vx5sxvcc9n6slinkfyaa41wkl7864qfa25cxafiinlg";doc="05lpwhb22852vgfi2qmnbdm9nja7hyp3isa50466mrfjbcpydram";}; +newtx-73393={run="180hrj0z6ag1igzm1ffgq2vs04ppn3rfsxcxj7500flj896rpcmy";doc="0vqi5xdcw3szfbhniy87xzhrz8cc8lk36d3nc07dkvwiklkj67ai";}; newtxsf-69597={run="0nwsbpmw7c96797bxvlmfrqibgnjsy9m8b8mzrbvasj3nlhfdxwf";doc="0zxkhsf5r9kffk2vz1n1nklk48i6x445dzs4swdz9hv6xkhrbmnq";}; newtxtt-70620={run="0d5lxf2pscxhah26rhbjbzhsclwinyxfyf5xd0va72hsgrp98gv0";doc="07iy6xbschb6f2vq9406fikphp032xp3qx54gb32asag327cc1lg";}; newunicodechar-47382={run="1zr5w047xqg9bi6drl2rw414m9bzpa5r7n5270zr8k8jj74xcv7x";doc="11vk77c83xy40i9vclw4v1h5wnr03mb77fa8s2lhi0p4sq0c3vgr";source="060kbd07al8cwns5877ap7irpf3r3bkw0w62cwvl67y03gcmgr70";}; @@ -2778,25 +2814,26 @@ nfssext-cfr-72454={run="1b4gwsirs2fpdny2943gzgj5nl9cjpff0y0anfwy940h96i9wyxz";do nicefilelist-65842={run="1pjpffkhwfrayh6a5l57j0szaz63cn83mw53v17ibxk8dj4ls0d4";doc="0dqpx0kkgj4vcfvlyl96mllpn3kqz8qh2476kpfw0imrp8klsq7b";source="0q740bd8igcdy11nmpn61sb1yy1kfypvif2s62ym80p89qf8v74c";}; niceframe-36086={run="047y9dh0p51lyrrq5fkvp4dpiszvf2nmx53hccl8hzgr2bs3kbwi";doc="14fapa38pffkj1hs58b7r1zkjn3dql9d98jzh13cybyfynd5crjp";source="095frb90nryk4m2iia4sq3kfrcfg2k3nq079770xlp720zqy07rc";}; niceframe-type1-71849={run="153vw1af4p2zxp2r4l3f2pkw6r19mzyf9c80w2p3zd5vb3xi6wan";doc="08dgjdcm294hlpfdnfyjchvyhgwx5kfjp968p7rdi00a7jjnfk6r";}; -nicematrix-72644={run="06i4lbip5509i9qngnp35wscihqkaap369n8y9n9kwjvxy5wkzql";doc="06frg99ha109qy2r2a9mgjizx9xzvb9rr43l89r8gk9ja2nvdpwl";source="0gvay4li7jjc9rb1y9a1gabn20ixkbhw6qng1m32b0n1kvxrh9v0";}; +nicematrix-74466={run="13r7lgvdfdg9fw9lf6dgnffii58x44y50n4yn2wvh1mn4izdcq98";doc="0c9xvmhqk8xj7wagiy24fbib70cxdhlwq0yvkf4vpngi9ik2yih7";source="0mjfkn2svxjcppvv7jckiam41aasih2lg068vaizs7v5lzpmcsyi";}; nicetext-38914={run="0aqfg8phvhlgvyy71flqsaqwmmc6lsl9vsxpxd61v69hp2qhvggh";doc="0c078pfiw1nz11krcgwbdlp2brdy2xmq6rda9yahfjjg54xgdbg5";source="112ji0zwy54nqswil8lvvcrq0ai7jsmdagvf2786zg9n14h5kr75";}; nidanfloat-48295={run="15l4rdj7bk1279xjjkgh9a7scfmm6w88civ48shh7gwx8gsvcscb";doc="06ccf5yhrqvshj3d8ic3pbnvmdpjxq54i57y3141wgqcj5h062dp";source="04q480lddynb2gqz8azmyik8170vl056fhfjsnq8ydqj0rchnnqi";}; nih-15878={run="1rlhnhdz58qqjv563wjpp11ppyqa5smjpzjdzfcra0wd6cxv9384";doc="16klyjxzxj4mipql71admicnzlnasnv9hb5pl52wyk4ic8ggdgwh";}; nihbiosketch-54191={run="17gggbkag8y4fjvj248wc8kqiklsqmilcyisx9lwcf5irngql646";doc="17lfnfkgjdhj8i5zv08v6lgxrrjg8hzbbq9ihnpcbhj2scn96g7s";}; -nimbus15-58839={run="06bir9vnihawgmc8v4cxjfcgk2fahhh9c603b7d9wzl7mi40prl9";doc="1fr7k4vh7726xh03qz5116winps1dkalnskdywvcvbwk18a2m07q";}; +nimbus15-72894={run="0hpl2pdvzr4b7vxq9br9a5psgjl9z305j5nr9x1fsn7sv3qy5w5i";doc="05c815gkg2v18n6fd9p5m8ngs36xa2z2jgb0bz10azm3gjqfxslx";}; nimsticks-64118={run="0h87j3i80slsi5nc5299jvslhr1m3hb8hvs9mwz400b76k4x3ig0";doc="0s2v4941bmgxcsmcwz7x3mybzaydj9qshcxwj42fd855sf1rmis6";source="0lkfhdq9iq9lr3aw5dxs21j5vl9w8xjjjxph79imdx6lcs9cbs9n";}; ninecolors-62006={run="0qvjykxzl9154wbiybwpv4j9da5vyvw2r14hkg9cvyqqd0fn7g3p";doc="14dmp0cm8hbjrd14szkcvkrff3l7shk4k9zlzx6hzkpmjc9qkl0w";}; njurepo-50492={run="070jmqsm9caidgc0n1cmcj2v0x8dlxxwv54hcqkrisaf4nlkyyk1";doc="04hg7gxg0nplqpmmagqynnddxv12qadamjy3rj1sxhwxgjma9c5f";source="08fan5igmdc43s82s1adq7ymxpvahnp08f90p3p4qlqanj41yh65";}; njustthesis-62451={run="1ar359ssgan8pk72bbvd4lp2yg63ww6g2ymbjlxbv63qh6czvqrr";doc="0s7dwmmhpb4qr2nnzr7jjh1zfk5fcvk51nxrf7i7ikq8jss0ic7s";source="12lq39rhj0z6msdpshagqylknn31dd2pl6ymk1lfagm2bq8mvx30";}; -njuthesis-71034={run="0g0g5zrh4ixcyrxw5pb4g0df6p290x8naacj644jby6y842i2dsp";doc="13vvvk86wirw44r0ar5zjbv6pw4k673myfidaihj6zh2d9l7mhiq";source="16f11mblfp1whgi42zli1dlhn1jbzbqsf00rz1c1yi0awx8yazmc";}; +njuthesis-73206={run="16ffwjgfl2lvib70gkjnjf7b2xrd4k3w5hq8mgkffbkhaaj7pda0";doc="1akdv12k6a638fmh2majwymwgk1c2j4aix79fbihjyvg9nsdngr0";source="0ix279qycqnmrikas07xy5sp8biccbscy56blawhn1mhh0hmq14x";}; njuvisual-65261={run="0qgifkahh13dkc07dx32i3hn03rd14pkajg0yw7wx8l0la6nxsy1";doc="15nyzfqsrsvmqg39vidycw3agdy9yhgj7wlfjw649lykbwbqqlif";source="03ywgbapxldv05azn0s5xh9c7a7imq9qwxg90969as3fy5cjbl98";}; nkarta-16437={run="0mhi640hsr7dy7jbvkqq2yl224i9ialf01jkcma0cq527nvrnm3f";doc="0bqix170zf7lgiv11v4mqyq3iva707zv91z154bi71cvnlknbkns";source="0f6m2wz1cd99s4nxppzdq9jm1hg02xzswgm85dmi18jffgrd2chp";}; nl-interval-58328={run="1lrj178yhmd4ajwvpdlbsr97sg39k39b8n30wib0ww2lagyw6rgq";doc="0b439r5r8zzhgd5k0n1bzag3naxs2bjd6hlm3sw60viq8fs5wgy0";}; -nlctdoc-68448={run="0rqlbsfwhan0hnxvadw5m77ny65fn0i12mrhwmvr83fm9ybp9q7p";doc="1yh4il6lq6hawxy00v3bfz6piryawsf7aia101knls0nb1ifrjan";}; +nlctdoc-74447={run="05y7gpv49h1gx6mkcilry15ki6n95549fzwzndq7j3a5ddjp3ang";doc="1g9q8z3aznpdkzw0d0lx86crp2wagcrhfmi2j669d0hlnqld0q4w";}; nmbib-71138={run="08364yvynjayn0mmvwr83al032hzmnz6nsv2jlm97vhqs578pndd";doc="1gycy261lw14x89nrv8r3h5ngdxmak74srg57ccrn8d39x5pxf8q";source="10acy9656gk6pgiac3dv77fmdk7n8430r5sp4izbwk30a3f387hw";}; nndraw-59674={run="0gffz4kfyz81yg1cv7sgs5zr5a5kaay1pmac5q6v7v89w0bf8089";doc="12yj7gym7kzacwxjx5df3ssf97wrrnsm75z2c1j20srr30sz1cwg";source="1y29n03z9gxwy0gjzm6b5da0cqwg0bzm26cxlrz9551qk8nis9sb";}; nnext-56575={run="0vf53wnrjday1q3hrplqklfp5kg57ibyjiijqw0jc074gzhyw0z7";doc="1rxxrnm8vb274c9l6lki1bxd6pij92klryigd40wwwwxzh8fc10r";source="1w3p9ig1jivwyy9rlbzfgcy82h3wlj2ig3rdlaq9k9fx8vd6znah";}; noconflict-30140={run="1flkwyz36xycq4aidj9v6ga29ghbww8ss5dkz4lzsr96nv38q78r";doc="1v3q7xbss5ra1dizg2mz66zq97cfsv5lgnd136xqbbmn5vphl0dj";}; +nodepthtext-73069={run="12wzhmq7x89dwx8i3sa2i2766rgxrcyj27p0snxwnvz4gls328ik";doc="1plakn6xhh361zhfq4plfli06qwdafn9ijhmz879hzflp0lm7r5f";}; nodetree-72318={run="0j49s6jzvhq35axmlba26xasxb7rlczrv187977wqjqa6w4v78vz";doc="1y82gabydc7mv2fx087rybljjisn75n48ph27sa70fm6db75w5rz";source="1b2wqwd7hrzjx3l0jfalfl9pf165hr41szbl7qnfjvgdmiw6z3xi";}; noindentafter-59195={run="1gp4zyqwq07f85qp703iwsa0351yp49zyjrzrhfidw456whhl3a7";doc="0is88wpryqdd179fvhjkvq6qy4inz0sp8a7j1i90iziadkf4rchx";source="145bfg8qz8m64x6p2kzkz6skzkdi9jc82q77zr50xms9565bhf4l";}; noitcrul-15878={run="1whs120vlg4cdjmb1x363g92ira9nc8j2h65qnvwv8qrmh2hrwnp";doc="0y3j12rb8ks8sjs1ikw3sccq7p7zmixc10nhdy9yg9rzwcgmicva";source="1dsjxs73xf79sjq9xynnv78jws1j39l240lvcvpir1k8vnzwfa13";}; @@ -2810,7 +2847,7 @@ nopageno-18128={run="098q0visa9g5lh3vp6bp484fglrq8g21v4cb71cnc30f7avkg1v7";doc=" norasi-c90-60831={run="1bsx31al77ci58p1zavp5q9dl8msdjqilb19fglnkhgg8bjbqh7d";source="1bsivm5im913x336v6qrv31b926lfr8821pzqshq600k4fgk3rj3";}; normalcolor-40125={run="1yvbqc6px76phjgy9cwpqwy035nb61nvcxy32v9xa9wfcp36nw7g";doc="0919aan1qxp5lfqm902ijn6sflkzv1dgxi12hjfixd8d1d7rlfgs";source="13lqp3zjnhm1wmf5id1bbr86l5qi13xgij455l38l55is468sv8j";}; nostarch-67683={run="10gkz055a6j0hnpya1a49ysqqsnf9f85fdnxm1aacjnng5wpshzv";doc="0s06svy9gjvvpjqni59qfzzlwplx12dbgcvpkdi4zj7r9wyh4v3v";source="1vd8r7viglzi00vfxq4wnjdciamhl9yprham3mg0mmrvmp30l52f";}; -notebeamer-72554={run="1a87r862v1r2rqkba1azascraha4fs6ygbm30jwbnny2cr00pid6";doc="1pqby6sjmpphhsxap4q5pmlg9a0m8ianp49dj7l22l2igln2cqav";}; +notebeamer-74397={run="0mll6ldwg8xmmzhnml1kv0glak0bng4r0yl8gicn2v1x5v8j3wif";doc="1mfjls4q2cs16jlx0zy9jijvbi916fhrw1h64601xmh74943rfjw";source="14bmg8m5zr3sq51gzxvw7fg8ramgd96y6j3np6nzyh8mh27nc5s6";}; notes-42428={run="058316ialcra7m56ww7imzqqhk318abwscw5g60hr73x3x7d9dgq";doc="1zq11rygqkbx85cf79ixwcv1w971w4hx8zfsv7z16am4mlxcdz5j";source="1ycxa3m2l13z6a3a4a88wpznvwdb78qyxkh879cvg85apb11rffq";}; notes2bib-52231={run="02iwnpiq918izkssa8j7fiz2jbfjn87xdjh9spwys98q2cvvxd53";doc="1md7zvcnlb2sf8zw0vlnsnia1l22gr69jgksy5yg30jis3zm2gjp";source="1fb70w9y6gj1a0y4w3zd7yfmk5gygx10y8xjmdj06ky7k0r87qlx";}; notespages-41906={run="1zn3ygkiyqax88azc7vcrkfw5hfzbbq3jkacnv50c8z5xllk2nwz";doc="0556azchy0yc8757wcy687vn82q0jmyf7n38vyx3admpawyk1pxk";source="052p17fbdpbdpzaai5xn8r0v6lamv7ps78svd27216p71djsfr66";}; @@ -2824,6 +2861,7 @@ novel-71113={run="0xcyk5ljj3621x7325vvpa30bjslg2vys27wifzgxbjdkjm69h8d";doc="0r6 nowidow-24066={run="1w18i36ynsyldb9gs0yhv6plyrjs4762y7bglncv7bhqjmyy7y3g";doc="1l2zq2ain8nhkaa8aagpm22nvg8p1vk2cdgs6pmrydk0hhmjh01h";source="01qjfpps7ahmrwvg142mspj8gsyx21l3nr75g0v7qsqxbfjjy6gk";}; nox-30991={run="06036p9059x0lzliq9b2pqahnbp8jlkd1gnq300rq0syj37mjk5f";doc="1qfjlzczcnmf3pgqf4qr5v9c6ws6qba9hm28h3xwf2s3099drxjd";}; nrc-29027={run="01pczvyzfc2vnrfsab180fg0nz13cmry0dvdxmq3lxzp75ji5aqj";doc="0l6lpvddg25k8dynqr26gj7fnaq7k6zbzp5p62684sz9351pvz6c";source="0lzfw45m3mw7yd9sx6lya6cvan696p74wrxgvmqa73prc2lhmbv8";}; +nstc-proposal-72795={run="1ymxlqb1iam5vnl706lxv4rgmq51nnzpkzd4q59vpkvpn5qqd251";doc="0dsmk5ryx2zmgm6kbhzvqpa1swrg32ivwnzdq69xw4x1h6k7bqb6";source="058d22s286r1dmlzhlqj8mg3wvbmh3xs7winkynlaag2v8i3aw6z";}; ntgclass-65522={run="0dlm313f7m0cj0fsqv884xi16kq9imrkkiaxg8lszy8idp9vvmhf";doc="1c8kc3q9xqxl28xdyzlnlzwdfixbfra6vi32p6iy353mdhvhx2r5";source="0fhs6v9zkfxfxp2g17h4cxa4k9dm4dfgk2dl76w61ad41wd629d8";}; nth-54252={run="0716sd99xjdkplm7jdmg4lx8lpfnnx6mxjp1l1sp2bfqcg73p4hm";}; ntheorem-27609={run="1mbrpw822ibb7wpzbl3fhnxg4djwy32knn9hqcvw1kpahgfbks66";doc="1f1cridxgv2rwv3f305hsd5pm59im1ik8qmpqhq4rpvwph8ny140";source="1pkrhkl9iq0giyvk6lqjxx5x681rjl9zmc0kmcypwgbqww59hp0i";}; @@ -2835,7 +2873,7 @@ numberpt-51640={run="1f4hmqlkfzqm8c4q9cbcqsh9pkchnylfv6gfzafgn9v3rdksg2dj";doc=" numbersets-72558={run="1hjnwrn6651c0j83fdfvqnrn911l4z5w4lc45w1xgkcjlrx2vpw3";doc="14x5c1cf2bsx5km0xphfh17hbjprnh7bn1yjlbf31rd9jcm9a6d4";}; numerica-68021={run="0x4nx06ppb1blp4012pb6l3fkp3ikw94xy9g3653cam3p6pwlviv";doc="0dhsfbysxrm91hxhgs842yv6cxx0agsj486sibzwsxajbmwxc36g";}; numerica-plus-68019={run="1x4dmzxb4m11kdscmp8n7jd1ihd21h0nh6dx3gx8nmxghzq20160";doc="0h3y8nxw4zdbxzwkfkffkc8p0pjmxd0lh8zcn5cisdjzk2dsjjyq";}; -numerica-tables-68193={run="16zsxbdydwzh460qc69zs54w666qmim5rn0lgf5b9kx2l0x8mvbm";doc="0b1v2a44lzys1qq2c98c22v0i920j07k2ayi8l4kb0z95gzq4y29";}; +numerica-tables-72911={run="11f7x9ljwifahiaim8pixiicqxkln94xsmiqrxy9c5yzbjfgkzyy";doc="14wg3kyv9sn0yap8w740s3m9s5cvdj5lpr7pmdbr8651zpfga00b";}; numericplots-31729={run="1c127aalh7jcx9rxhsyhi2k1qdz6fg8d6qj0kvf564s9c0npgar6";doc="045z6l4dmn3bzfsn7gi6bdhwvp3cbf9nj8fcs6q07vi4by71bk98";}; numname-18130={run="0sj8plvx36i2azwnk9zhxd16x7dxk2419rdzc93pl3f68kxdmy5y";doc="18iarxgxxi5dj0cj1bf0il74ndn5lng3axf7zz0jwqpl5d84pz6b";}; numnameru-44895={run="151c13r8arj094jw3zaymz6i7invgpyqr95p0qnwhj22z418pj1m";doc="1rrargznsmgq1h6a2ixxr9bg57zcrs9zwhxgz0ssbscdyvjqik8n";}; @@ -2869,6 +2907,7 @@ oldstyle-15878={run="14lm3ghfgfqafqivam1dqf3gqgkchnbnc84z5i0whg2p18x9zns5";doc=" olsak-misc-65631={run="1gm01jvlj8vcl9a3v53bcmg604dzf4immd39dj6n6c692r38hhzr";doc="1afxiazmp8pvgfym1i2bj8k5slfqi81d915d7lax59ib0p05w4mi";}; omega-33046={run="047w29bij6g9k9fl7ymap4arhdmm9kvjfsikvjkf9nd7shd6k4kl";doc="0r686ck7z6vxcajrjihp4a4mh3z23xr8ic34dv9yp039dh0kbm71";}; omegaware-70015={doc="04fchy1n6ppi2l2c99mz1x64m8zl741d0z8fkjxapqn266z4bc7k";}; +omgtudoc-asoiu-74196={run="0sbghiypr4m4qg0bgrnnamjawvxqzis5hx1w7py92skz8n75qpsj";doc="1b95a5wck2dghp387hyca70g5qajzgf3cnh69jn0jdpjzx6h1133";source="1a6xkg1cq5lchhfcyj2rqmsqa1bamcq7n4m00vjhif8qbnvfm2z0";}; onedown-69067={run="1hzj2cyyp3zqa2wnw576cjqg6nqziahdn3vijg9y7jr0gc3372ch";doc="0a4hvgsy9i6a26k6n51dv1pdx92d4vk6p3vdrbx8mqwigwa3rijq";source="0kbilw165090a925g1p6z6ayfynv0z7zjzw2c8sca3v0ncyy3cdj";}; onlyamsmath-42927={run="158p92zgnmicfwibiyr5qbkwwkxhvfpvngkbpbw6grbdhlwsn63g";doc="1d2znlhbz509rqzlwqnbz9b64mpbhckh8pv23fqr8058xlbazkh6";source="08znvq2bzapn0dfa7f4sd08gm5k7m3sh6hkwy17zwkc0987wx487";}; onrannual-17474={run="0bj29lk2nlsmky82ablxl0r6k6wl627zrsv9g97hydgdmi5nxasz";doc="08c3xmyiz91623lnps3iahi5ga9941nc6bvxmdihadxhm2lk769z";}; @@ -2878,7 +2917,7 @@ opencolor-66363={run="18a6vha0n4mwgx9lnm3d4j4rkf72qx88fbzgs164arzpx4gp0ypy";doc= opensans-54512={run="0xj7v9lv1ni7mq175l29a039a2ifmdsy1wnv1h0gfni5c34knm1w";doc="178pa2kjvp15la857iblh9qc195z3byd1wxxyn7c5bzmndvypgxn";}; oplotsymbl-44951={run="1x5wqngjdmc4751ci5qaivzgqynmmg00kg2clngxjqf48n4fakdd";doc="0bj6w6h4g991rfddmrxgc02090vay2h2qjx36cb0hfx55gwkmh3b";}; opteng-27331={run="07a6dja6s7c1759i9afgacx4v0fli98s6mcq5zig689hpkw841fg";doc="1125aj55p7n6b03mn6p6845yvx2jbjkwwldgwiixypklndqsf6cm";}; -optex-71642={run="1g0l30qf8vh300vz0wh58ab0y1cpr12m9s3q0b78kawfnmj5vjgj";doc="1qdml7i0gkg9a5rdya30xjd9rqh33n1mjkj6s38swz849jqyjg87";}; +optex-74490={run="1pfc5q9dvsnwd5a1hz0hxyaq8z2dz46x4vw3fshd7dgsc88mqacq";doc="1qdg0yaya33wkwm55zx1bgzn60hj78c7c3jyvrjaq251fpz7rb30";}; optexcount-59817={run="15i48ly8mbhhk0mq4gxwpwbvhpgvk1pb8bfbmfk83sp1liq7xijc";doc="1cvhzkl2lbz939y417ipi22n9alh9j7f06d2r1s0h294692m7bpv";source="0s51426ib070x23d92rgpj247qni42hzaw569z64i7zr3nyx16dh";}; optidef-50941={run="1jvalzi2gid20wn253swvhil05m273x6685n0b5wbrz5kbvzk212";doc="0sdd6rsdfx1fcw1493b12ww5llww6mv0rij3f1ik290c6qbmyr3w";}; optional-18131={run="1mv65cqcrjhykpl565z96s57z05635q513qr440crbh61rp93chs";doc="1ks001q2b1yw87q0frhqq6yv77mskng6v1sm6kd8r22cv5g49xbx";}; @@ -2888,7 +2927,6 @@ ordinalpt-15878={run="0nia32ms50727kn080xm2v0kjzws5sj6jdy7kglp8wkipvc6nw82";doc= orientation-57390={run="0qcqyr76wiks50i1zr3skp7bsnjzi6snsyvsm2za3l08kbdi3ixx";doc="02cmfz42sdd1gr4yaha603rppdh4c4wjj0jbcrmwlfgl9a47rj11";}; orkhun-15878={run="0x78b5d70cxy7binl5iq2jwgsjh9rzs87wc8ib18jxscqick5jgk";doc="0q9hwwf80hq6wffyvd26kq2053vs5czly9zlsclh93hsmzg3vj9g";}; oscola-54328={run="06jgk12q9hmbqcmwb837n8l96f3bafc7mgnv4v9amnh4ajlg6i5x";doc="0qzn7d70vl0lxyql152pzzhi72ivdslmxvfwr70186lh6fjxr4nb";}; -osda-71147={run="0djshvafv1yn464dvhfibfyw2rn9djv7n6hjy8f42b7yh2fxb2zw";doc="1ig77idlhkwnbqdwaynmsw4wa2k8v8c5y5hv9w0r2c4fyhr6r3nf";source="1zhaha79sg0bqsxfck2jg4r6z6z4323p6mrwv4xpzm8ypk8cvycq";}; oststud-67217={run="1yzsibisphck9a6dlbvcs84qz3lhnj6amj6vfzh8rgy40s7vvz3x";doc="1sj2lk6fhx9bdgpxnmw6m25yrjmka6m2ygiapj42jp81n51pvyzn";source="0phykgmzds9bvsblfazg82arwdhzssjc6b9faazi5h57jcmvbss8";}; oswald-60784={run="1dkv4javwj8zfk987grjx00p0p3hnzajm4mgddm1g4z1zfjfdd4n";doc="16pgbws7vf93dwaw8cm4laz09hywp1xigrbdbaq9ngg9g97sn0l0";}; ot-tableau-67813={run="0wrxkvi28a19kdgsms38wgxgygib0iypz0y830gizq339vj72v2l";doc="143rx32hnxnbw61n8w6skcqs8ix411dwcwgn43xzw238almmhidx";}; @@ -2898,19 +2936,20 @@ otibet-45777={run="0fg3gc7614r1b304g78ipq6d84bml2q4mvl2yc49jjnz13nr05js";doc="07 oubraces-21833={run="1rhavggv1c50krafvh7lwnvarh7lh59x7lwkipw24qakq7l2a6mg";doc="1bw3b54cn5dk0j4diq8qxfba0w3p0f78h4kycb2bqd2gq7258vyq";}; oup-authoring-template-64491={run="0cqhrwpylpj0z5gcgx9lyhsh85vam3nfbzzsz9x9laf2rdi0v1qa";doc="118916mwp8zbjdqdwmxzwaf09a16rc2zrll9qmig33q48xszdf1r";}; outerhbox-54254={run="1867xhxlbskiysifmwlr10lay8khragzi36fm552cwc4vjz2ybcz";}; -outilsgeomtikz-72145={run="0pwjl40ndvynbnrvf3hy965jdw3cn11flw46fx7hkrg7lz0r2c4l";doc="05p1hc923p6l4z32rj3ya3hz8vjqrnb3j80s5wmr2v15na63pygb";}; +outilsgeomtikz-73069={run="0pwjl40ndvynbnrvf3hy965jdw3cn11flw46fx7hkrg7lz0r2c4l";doc="05p1hc923p6l4z32rj3ya3hz8vjqrnb3j80s5wmr2v15na63pygb";}; outline-18360={run="1q5dr9xlsn3fz7bcv08biv5cv71qf8brzgg4468mksh8lc8r2kli";doc="103sijg9ib5qfwaxkdgf11zsdg2c46dv00hn08sspl56a08j54sl";}; outliner-21095={run="03j0mshhrchrgpa2z7j7q6n783va5v0w16gp401rzbvvdn0l2qni";doc="0vi80qhq10yy051sfzh6pmn34laghhvx6plnggrwvcmpp4fcw14h";}; outlines-25192={run="0wzrf2fkf9kh0d3jjbc3kxvsmkynwzg622ghwcabaps097r9z45i";doc="1avkpx77sis4hrrs9dqizq2sz4vjzvn19ks8q7l32qyz6lnxwk2b";}; outlining-45601={run="0kc3x4zq24f2dzwzypdi4ysgsfi40l54zxpaxdfgd662wxangrsp";doc="177xwyzq3mha4061dxxshszsyysmb6nl5b2grg4m55mn19qlw2f0";source="029wnd1px0wdgffblxcbs33r1ffv761sgma7bap9g2d1n3dwja2c";}; -overarrows-71774={run="1nwd5mgd23ynfmdks96kn6s57i4jka8lzbrxzpqw8120nf4fvk7p";doc="15jzfks1sxwfx6qqg767kq22m78yij2f9rnf8mnc2ippk44pwsy7";source="1az9sk4pnq2i0ysdvq4xsbkx5mbnp1h387ycq9qdryr1p0mgwqyw";}; +outoruby-74395={run="072nkkpwmvxd3qvkrrcixhm6y2l73w8b8zbfkbf2p9p6qf5mg69f";doc="1v1dndn3gq02q2dg6wgmv8hs617pyis2pm65hamcc174h6k29kbw";source="0vy7iw7bi6wb9n1g5jss0zxjzmgs10kj3dzapbp60z5ywwpjccrc";}; +overarrows-73702={run="05pjz3hs2i798anzkbnc7s9i7yrcn31b4c787bcczfy90s25rqfg";doc="0sl9c2ksqs66yzxfm1jclfj2s2fc1sb861a8aq6lgl51w8phlla1";source="0iwqcji9hkhalamisnf3yir7kc1jpzfd21n1d9x46504qmm38api";}; overlays-57866={run="1xfbb4953ab25dbccfsp9ban67vrq79j443mlglnzqmg1njrckk9";doc="1nm0d47vclan46q0zvigxri5zqmfpv0qkk0arsg836vnv7l53q0g";}; overlock-64495={run="01h1fcgplfbfbkb1wp0gnf6xrqn8l8y1hxrd8gxpjqbg53wr278p";doc="0gl3n6h41fbzi4lcsdra5z3vafh7drm6g04ilmbb5cbkpnsyl3nz";}; overpic-69343={run="17bbk29v6pkrk9igzx4by586jfc997mj07srhgy401mnmxls2jyk";doc="067rq6plcan44h87adj9jlhnnlkk2f4slsid4v6x80423q4gfqll";source="1wi69kgglry5r8wg944x87scqsqx49ynj372y0qfa7n4dajxgzwz";}; pacioli-24947={run="1fc15ygzkdbv5mykgrmzb6filkl3aipk7i9k1syh2ssr37ldxcjz";doc="0pknnd02q244pxyc2vapdx04adz7gwf41swda2xi3039x82pm8fd";source="0zl6l5yc7v5w1xjd83prvfmy8jf3jyblallphyglgb4vkqq6mxxr";}; -padauk-42617={run="1yjqxzqsvk2mdsk837bgwqf3nfm9gh873bnir19wj5kj622zfh4d";doc="0331w1z1b5x15yb3xyxv008l95idv5yq9xb87da5r9p5fzfh1z0y";}; +packdoc-73661={run="0vmsb7lpac89bnf83jxskkv1abj5mpinp7gxnj2irf456kdx09fm";doc="0p3pc4dahahg43jfls5ycc5xd3dmqc19zh7clhac8mhw4maf9qxn";}; padcount-47621={run="15p8g5hjwlm80xnm9py3ss6afl6c8rdq8f92z7518hp0yp7d3zfw";doc="1crpv27a9rfmh4dcliqvi7aa4h4lvkv48k5zk0kx6ahhxa2zkzaa";source="0vkk0c7gvzihlmw3f8ni4awj9r6xrysj9rrsbqk6dkngrg02x4xz";}; -pagecolor-66885={run="0ycmswy7jghmnpkdv6b519yx7ga56aw7yxq6671nlg1iq1k045kx";doc="18xnh0588b95h7fmqwqzb0p2n9fclqy0hxv3a1cci8anpcr6xz0q";source="0qc662yig96f53wdbawgvsg4wx0dikcnf85b2cffwlkr8qzrwlsg";}; +pagecolor-73636={run="0vmj4wyvlwa5i08gri94q1xi1a3nha1308z5997lnj03dyvag448";doc="1gksliiyb0mvvhi6c3nyblg2xg5sbhvjxfwfipndcr9rw5fb22pz";source="0h5i94v2xnhfdaypjwnhg6cp1ai7xx682rrml0h720v2bkmh9b7m";}; pagecont-15878={run="1fh6bplg468dandbyvmwf13sh27r6x4dmrwslldlc9580h8jv02k";doc="1vrcr5l1facyyf9p8977q0i5m7cn7y40dbmiv99314iyawa3rr1g";source="1qc105f5v0jiahk8gpgr77lqfaladba4hmqnfizbblzbjhhgg05p";}; pagegrid-64470={run="054yaxr2q8x82dii8bpy3y1nhc1drvwm98cd3asaddh4lzrpl9vl";doc="10rsrkdl9bp04kxxl2g3rfscf0hcw122py25x2jbq6lgz76780jm";source="0fbzd20z106cgzknj98ryzmwiixmbpvnx5p8v3ns6yjrwrcng3lj";}; pagelayout-71937={run="1gqbc202awmdh5n9mg9jmsf1i9lqpwf8s0lq61dhcw7gdxrjwp6b";doc="0rqwpl40517ybvsl0zrh2cijv57iykjz4lls4y35hyg6vy352rnw";}; @@ -2918,16 +2957,16 @@ pagella-otf-64705={run="1vrzz63la6i270bjqb1nd4rsqqgl13nrqrbmr0l58bmjj7qh95d1";do pagenote-63708={run="0jd80dz0jl2gmfr74lw6jy1x2hj6zlji9az956gkj8bxxc6zir54";doc="1s7imj4fi08487xmcsicsa4cknpsgd10dbcyn6vkggm95qn6119w";source="07ngnfinv2mki203in54l4gx7r4qx9rm8k4x7856gr7jy1wkw16f";}; pagerange-16915={run="1nixc1dn9cbdi3pa5yxajii6c9ljgc2jrnknsa7wb66kj5j1lqch";doc="1vy3c498j95miksm254a1sh7d8bp3g5p7lvncc1xad4g388q6hak";}; pagesel-56105={run="1j6rg25mhaiamlff4j4lw8pbp6x3mcg00biqz2apsbi6kmbiljw8";doc="09s7r6dzv95689ysdw442gyqsd2jpdyr8hkrigmn9c4sx32alq5n";source="177j2s6chsdhhw63q9g6ryc06vn6rsi29n4prrn2w14fgr3wnhcc";}; -pageslts-39164={run="1lm8707bl8a9kxrbbr6sap3p66zwjklqv13invm4gcsg92yf7yhi";doc="163h2h9n4cvap2c369f2yxv3idij6wzjqwf0wd7w5024h1vvj683";source="01nwizj0vlnwzbqyl5dn02vg5xl2aw60wyvp4plm0agg8kxmsi3a";}; +pageslts-73400={run="19fah1iz13mkr71vzzr9qy8w20j44v71h0asxsxlhjdwkl9kvi07";doc="187py3k96z4q1z7dly8yq0l039kz8ygi22k8drmz62a9ll2l74q5";source="0hgf20awdzfw8c7bgann9p3hk917pnyqdcd3badlpa40bn629k1q";}; palatino-61719={run="12jc0av7v99857jigmva47qaxyllhpzsnqis10n0qya2kz44xf22";}; palette-60119={run="0wabk4pw6gr9y309dsh11w6gygayzglh0jabqi0zsvy0ikr7wri0";doc="1dp867fydnxdw82z4gxp1sbz5w5q9jfnls6r9izylrzy242rd52l";source="0iic125v6j1ljgnm7d0qicckxwmgdg7cz568556257js942ldyxx";}; pangram-66300={run="1x8jdn8j3dgzkm7zv23529gr1jdmh15wkwkljzsc1dnviz0ppacg";doc="1y7lakwbh58y7mvwfqp6m4r9ad0kblsls53n7ciq994hfa6gx07z";source="0xq10764gznwqf7nfaqjjqd6s73a9h13970bcrds7jiyq1s8l382";}; -panneauxroute-72287={run="1ysaxjxkacqvha0qhsiv1wyq1icvhv0a051zb9nqia7q58abi2h0";doc="0hc973f9aralvhksn7fjbi5agm3z5r34cmvfppixy8dg5vfavjj3";}; +panneauxroute-73069={run="1ysaxjxkacqvha0qhsiv1wyq1icvhv0a051zb9nqia7q58abi2h0";doc="0hc973f9aralvhksn7fjbi5agm3z5r34cmvfppixy8dg5vfavjj3";}; paper-34521={run="1d8w8aicx5drrgqdcrsb7vdy39xh6xmnnpympy1db5i2mc2nkjca";doc="1r03wy4harxplfhqp0dsqfpp0s4j5gn6k2p43fpw7wndna8lnhyc";source="0c1iv6aynpfi37bg30q235zdpbyhj83rkir4kdg4vl8q27c8gpwg";}; papercdcase-15878={run="0gfkn87avjnfjx2k6hz5k2s9iy2lxwx9x4r0cp1lcwjgjsavf2y3";doc="1hm0i4vvxhxn0wvsrbxd2lkqspqkq7ik3sxxm1nd575p5l3zgl69";source="0mkadgjk395z280220zndpbbks331d5hcsxqnarpjmh00mkhdj7f";}; papermas-66835={run="19i4m31q8jji3chanrbqqxni9x2c4mk0qp1scf0brjaznrcv4dvv";doc="1an36yvg7z1yhb6gn9ppxp24qgdjmpndwy8nwn87cyr4fqmrmgr7";source="1r3cw66snl1dspbr9i6pz8v83x15ylhm2k5nbksrf7f24jrvvxn9";}; papertex-19230={run="144zirbvdpq1q8an6i5rngycmlrgicf9skh6mnwyz45n4zyyzyg1";doc="1aip8lhazpmmvdib6yqivbgjagyyhmava29q9hrlx833385vvnhj";source="0bfkh8vwqh6jx34fmqfqf2qz5wjpmq9bpzbppf0cphs5frbwg10b";}; -papiergurvan-68239={run="1gyf1liq3lv8dbfdpv2ilbwks4k88m2ywnv3qxpbrg3v2l010c75";doc="1mw0sc6svi8rci96wl2273bgn2f3w44gdczaldfflxc7az4mhmvb";}; +papiergurvan-73069={run="1gyf1liq3lv8dbfdpv2ilbwks4k88m2ywnv3qxpbrg3v2l010c75";doc="1mw0sc6svi8rci96wl2273bgn2f3w44gdczaldfflxc7az4mhmvb";}; paracol-72651={run="0g4y0mdkc3g657b9vnn56604fwvvjhh1aq5gys9ydvh5big4x3ax";doc="11ghd036skjal22lbvj9zi6afg204l5dn1mzyna43mhb9jfn0n81";source="0d3fdbgblhvhz9ypyrp4n362dl666f8ww5l4k06fzf336j8744ls";}; parades-40042={run="1vmjda4cvajsqai47wvl0byi552gdcy0j4m36p58gjn3d9bc8818";doc="1lz9dsy94x5cvv55nk975fw7dlg4bm6d8ls0p6gy5b58sjd6vcp8";}; paralist-43021={run="19m0ddw80vjzm8p0z5rrd3jf9kqzq653h3jdqlnjw4g81r0z730p";doc="03kv1n9m1b6r0r5drp81hv2i8dgnlcsz81rhi4h6a3xyxnyhw6bj";source="069mn3mk34rxxhl1c1878zs61pk7asa21iwwk6r2v88yziczkhlm";}; @@ -2975,15 +3014,15 @@ pdfcprot-18735={run="0m4lf1rb2j81ry7v2g9lfqs42rizifd64q7xw9dzhnixp900ldfk";doc=" pdfcrop-66862={run="099j54qmjd40q9mws11sadhzdmi70y27mjy8rpkw2ijhqgfhbiml";doc="1wnx4ci4p77cz7l6yihdbx62w65zd18smqqkb3vniqwr11232nqx";}; pdfescape-53082={run="1vbdjmm9bi9ngzz2z1b8jnf6nzf9xsaj5pvyswg13y4dr00mnz6n";doc="1v81nw121acyv6mvpykgrcdvsgqmby8acpby5lj75ih4zya9gs4d";source="0jk7rnf3z1hlrqlrcx0bzic46v57d8vpm4w5fn4c37q1f4v5zmpi";}; pdfextra-65184={run="11r5ifc28fhngzj6ygzfjk4j03xwri683498gf6zhwq0j3km70jf";doc="1cam2f5byw6l7rk8hb1zsw2l7qk52sv83wkx6qzgkhmzqbsh6wck";}; -pdfjam-71641={run="1faszjfzrfv5y3vpiqpdw03x8q8ns4cb16160l4b6xghqqm3jgyx";doc="1qf293i6c49zjcsjgg2is82pm29m1bm0fqpzjzxjhjj0j3xr9sj9";}; +pdfjam-73677={run="0vsm16b5m5rb6lscwf0zcf2zzizs9zakk76irpbvvj5bf7hfkl38";doc="1kjhiy9pa66609qdyfar32rda18cj7cv6gmwi1ckpvj5hnfbcbwv";}; pdflatexpicscale-72650={run="0hicwwhgaq9dja4fj3a4s0lfx4iy2bar26bpi6zf4vdxpy0wax1r";doc="1gyyskfy9xgm1r66wm9h0klmc9n4ji3wrpdxsk1q3mpz8ykrkflr";}; pdflscape-64851={run="07bmajz9ggwkq7pz49qipy3nmaqd6ypwhpxilsj9qw4bk5asxclw";doc="0s7bv2v7hcs90fvgk12ff3q89nhxp0v8zjv38wc5inhvhk77jvbd";source="1cx870l68mch1hg0va4g3vdjw4d508bw1kw9f3x9b4wfi7dqfwrh";}; -pdfmanagement-testphase-72484={run="0h14qbmy6bs81c82brsa3dyq15fflklfiv3lkhfwlcrc492rzwyv";doc="02l4j3hiclw6lna8lf81k4fcx914jbnzmkhkkr6bc90spy0wi0rc";source="1j0m782vaas4lq7a7av29s4b0w2s8mdsj448x43ibgdflls8wbag";}; +pdfmanagement-testphase-74019={run="152rm0ir9n9d4ag6yghy89sq25a6rsq2di4h188fwz862by1l5ia";doc="1dl849z5drf6c60cwhmm0d8ikvykc5mj97di5kb21w4aidwqfmk8";source="0zj84z7s1gngald1lg65sz1h6bi34glyr1nrdmpbha0myrhxp0gl";}; pdfmarginpar-23492={run="0mhf21dcz4ndhbh1g0h3kcqza4ni6iigrkif0iryyzg1zcx60d19";doc="0arfch7gb07grg0n8ij0wfzbfzc8bv5izvhp3vjz8hl8ha3wyzgd";}; pdfmsym-66618={run="056w6dq5ymm0x71bcya5nq4iiflcmgw4fh6zv3yb8ihpjj3h00y5";doc="1vrgfpg21bzg8xcw6cf43bjc3gh0m3r0s0y8lqh2nmdl00pmybad";}; pdfoverlay-64210={run="03cc0088b0iwjmx5wkcs48nnmygsg7w1xlvbi0pawgmhfvfivis9";doc="0702k1ckh9akj21xvbvn5s18x8s4nwk0m7jybkcl8f481qyhhv26";source="1z8n2a0kwp13iyja45l014jyl8aaw1hhnxgxfib6q8i0qd97xw73";}; pdfpagediff-37946={run="1a4qmaypz1indb2pw4vz0hv8ihanhf9z0azs3zkv2ya6qkc0kphp";doc="12di5a3976bkilcyfg0imx3w8771ky0acgrag7xp9rpcggbi3r08";}; -pdfpages-72174={run="116cyblq6p7qyz0wgx7vy8vz1zd7w71k9swhissqb4f4f8fiy14w";doc="02mmb5qnnniq0z2m6nwd8nziamgmcfkb7iamqb4xf1wnvdlmkghy";source="191x7albbc0nh5j1ri4n0xjzrka7xc1ikd0x4804vyxbp563kh3s";}; +pdfpages-73673={run="13m8019j3cgvd9kk28xn6nhpbgdvr439cgq58zb3drm909s50nlz";doc="1gq8fqw4drxshqv3wpspd5qh8ivlqzlzw1l7hc2d28gqar25szx0";source="0xfzqlllxqzz3d8xxmr3asyppyvjhz6pxsha7v129w99ihccnf96";}; pdfpc-68610={run="00zab5xlcqqvvwfxf1py7m6gslgv4drx8d419wl3zjmc6ww8156a";doc="1fm43d3q5gl8fg9p9n3z1nvcp6cykm271waphnjdkj29nbg7n9wv";}; pdfpc-movie-67201={run="07d7d7h8zfap39dd3nks1bnpnfpgs8nrzzdsmchy6isqfmfrypgn";doc="1la9fvzrlik4ar3fdaxla5gbwpa2v49xrrwc4wy60i7h80vqv80d";source="07lw20wp5cqr0pvjsw3ds75n3hggxgcp9rbvw026lj5k54wik1bv";}; pdfprivacy-45985={run="1l1nqf4ihwfycnb1x44l1dl2h9f3iy1ppvr0l4zb8qcjqhl4j63y";doc="15w8jwhksfiv0h2iixk07xvvmk1g2j322xqid753bcyks48xffjz";source="1nqjj51h0pcrjnybj3cqb8zwi0r1ipzzw8ic2clnf3in88pjzjhs";}; @@ -3003,11 +3042,12 @@ pdfx-71681={run="0szalr9a0r6ghdg6i6qn7bc49xrkmvyw30wgq646nbi9qm0vz2ip";doc="1aim pdfxup-71513={run="1vg27kx9947852n7vv85gssj19650c8d16lkdc3rpkv3kvsxg2mj";doc="0sz40riyx4ri3jydxvb1bca4m4xf9f936qbh5yji0b869g9ymzqj";}; pecha-15878={run="1ia3q7gygbg4scgja2qf5p7wbgd429cj78b8ffjcz68vgdg86jjy";doc="07b7kmf1if59nrqnsws5hklv0idjjxwp37a16dbjpcfdirb4s2m0";}; pedigree-perl-64227={run="0a99nbm95pagcnww7wyxqwdycl1ags7arjnd9spahj1zn7xg1413";doc="0d13qx3al4qa7v9i4frii3vv3n52bln12d2dhp7wyjla3jz6673a";source="1xb778agh5vqbm6r14aff42wvipykjsw9yk3i0hj7ibz4ipcslr2";}; -penlight-72301={run="1qpzid2gvlc0z10wc349f385cfxjryqg568gkhvn1921ay7nil3w";doc="11yb5955xc7h3c3ky6jbhhg013j62vfmh8j802rdw8jd0y1r3xzv";}; -penlightplus-72426={run="1s4pzhx2njda63qcvhgznwvfakdkrml5j0iiv0wfyl7swak2qc28";doc="0qq25mm7w2kkdf4r31y0kxd00gfi23yj4rm2dip713ga1z1raagk";}; +pegmatch-74045={run="18s62hsgk1gfwsjmginp0ciz4lw23a4zjlzc5w066cp8s60qr6z3";doc="07k04hanjsdz3czzmq74gyanm9drws0zj9pc18s6c9a6pcwbv59w";}; +penlight-73362={run="1qpzid2gvlc0z10wc349f385cfxjryqg568gkhvn1921ay7nil3w";doc="11yb5955xc7h3c3ky6jbhhg013j62vfmh8j802rdw8jd0y1r3xzv";}; +penlightplus-74020={run="0jk8jmybjamsk351hpb05jmac74l9kh0rqfasf6c1y3b16xbpzhm";doc="1zjjysr6cg208x590c3vva2qq4mcldzyx7cqda4wnjr9jpnx1mix";}; perception-48861={run="1dqr68wkf70aj11g4ywr56si8g82bxi2xc9zdnw0nm0wbimy5zv3";doc="00g96wswsnpd0smv1s23hqiq4lg407m80nybmig4ibcrafjkrqrf";}; perfectcut-67201={run="1hjppa3dv8a5740nr5jya445y5nb0nb2z1jlkqh386bnvgby8393";doc="1ly3zrrrfb3jihf02p2j5ym3m2gnr18pf2v5qg8rsj2l258xlark";}; -perltex-52162={run="09vc7pbfjl0zjmbra41p5lmr6l6r4gh2x5h9h5hg1i76n4mfkd8d";doc="0sndaglhb92b4jvp0jzpvdiwzc49ijh309aysahrw0pwkdl2lv5d";source="14rv37h9qwgba7dqq8zzvm0dc9y4hmyr6yvvkfbh2il5zs7m8nrn";}; +perltex-73044={run="0gaqahf1j0kyyfvzwya5i8c3nlk741x63fkcmhiwfwxq38vhb8yr";doc="13aliy4xpp6ldgwb2pf3g8rmkni4pbr5w7lh1hlchn98dpdldr9j";source="1n6g292d5xxqx9f8x9gfwmz2555mgr9r5i4yzsbxg58q1smjqvm3";}; permute-15878={run="17ky79fz5pb9xr4gwrfpnpxj16mzj6f3wnh9dfhddzlmbllw1djs";doc="0m83nafyxbixsyg37ia535h3axvf2vp6ky0yg1xcv8ppsl72fd8m";source="0k1h40himliydiqssvmzl18g28w0hfsxc6kv7wn1q41sm54knhay";}; persian-bib-37297={run="1yzbap8fwmlz46ngqcy6hwjw98z1cxlprpzk6vg2qw7wvs57b143";doc="1rn6p3zbfx6vxdjzxavvbf9405cxk1kv56971n6i2bysb5h22w0y";}; petiteannonce-25915={run="0xvpw8lh1zlkc89chbyjsfszr7ix06afh1fajp5iiqiyxb021v7y";doc="0nnf9bw4jdm3w28957bdfsl9z94a3dxz5kvmjrg0jkrp3r3cyrgv";}; @@ -3017,7 +3057,7 @@ pfdicons-60089={run="1pxw1mhm2lmggs67ql176f6csajabhylmlxaxp47irk6mlihiavk";doc=" pgf-71527={run="1xai2x91jf241w03lndpa478dijfm52kyin1ci4s3pwvvqvwvcib";doc="059fvzbpq3nggjc3yddzgj1ci4xs5qrwkqvqshcnk0agn80zpcx2";}; pgf-blur-54512={run="1w9p9l2nw9bf0rhn70y70h6lqqqx3qravgarmmz1z86ara26k49w";doc="0fq1w85wqqrml9jzi7s2n888165pg4ds8ysvgh56kbkd2zzahnw3";source="1pc8x23l6qcq356s843si16yc6yfrvdxg7v821271dndkg7d2vvh";}; pgf-interference-61562={run="1l3gryb96av9zwxn4naxz5vy0y2245fv5zlm1dg31p88lflh2s5d";doc="09vvbnmcv8d6y75hxdln9gqspm35fada4g66w6z4kv1bg7z3vrlj";}; -pgf-periodictable-72236={run="07j5rxnh2npc0xgknxzlf9gjxw94nhz11000g7aa01i7dyipa294";doc="0099fc8bw9rqyinlyk95y8b0vaahlqry1pab0d6f9wzdmq8z40l0";}; +pgf-periodictable-73891={run="015g2hcjya351c3s6bsw6vgyficwxjwc5xx2qdx2rlkkn14z4dsa";doc="09l9xjb3vlw398sw8gxkdii5f6h16g8whmc1zmcijbcw26yynm7y";}; pgf-pie-63603={run="0wr3r2997p8as08d172sr2hxspmi5bgsgvgwvkm27hg6kpi74zsi";doc="13xvia0zbgsrsy50rp3fr07hb1zfj7jfs95ai6cvy9522cw1zb0a";}; pgf-soroban-32269={run="1y1c70a9v9zy8i58j19g5c8nc7f00zcdrdjmdcbm19r8vi2r09fr";doc="1r1rgd313fijmjqy468j25d55p76vxmcrgkp968riknych16y1pl";}; pgf-spectra-71883={run="0x7ry9i2gagd1pbwx05qjp3k8xp9hj29225xfq9pq4rrvy184hbm";doc="1c9w46b6c7qm17f9s3mp7j9lfds2y6jmryzbfrkms2cq5242hrab";}; @@ -3026,7 +3066,7 @@ pgf-umlsd-55342={run="0rs0iskzhmlgydk4i9idql66sk9dyiqrglp429b2sjaw0mbjyxvz";doc= pgfgantt-71565={run="184kp9vmg3pp4pkn2jk58yxqsycl0gr8aq6zdvfzm3y6w26hz2g8";doc="1zskcw5jvdnjr7jsr4n3hdpaxc9ai8y7qhc85db4bj9x64vz22q3";source="1d6jvxglnr2fqpb3l1rmyk4fyybrk9d4wp3vd0qfpyq5b57ah521";}; pgfkeysearch-69385={run="1map2bxnwlj2v6w4h36jfszz858a1zgdlamdjj0jc21xjsfsjvbk";doc="0h5zhzh4k0hbz9gnh6ygzsr8jm5lrhdx0qsm5z55xm18q7gp2ri7";}; pgfkeyx-26093={run="0gh229dsrbxw6brfz5m2zz6x3zfsa03iqps5bgcr4bz0qfjl0a2s";doc="1cbldr5x9n649sk9dfcp143jrzxh6l4ibzndx4yr8f7id5nx3nag";}; -pgfmath-xfp-59268={run="1lfnqkws7gjjbzh0p5i0l94p1fjjsybwf7mzl5d7xzcap9db4x71";doc="07d6kybw6q6igfpn1cgjxdi3n5zz6ic2gazy71gb2mjqbzmhzp88";source="0jvy1qy47r0p3fx5329wqg4fnqlwlqsqs49j58qvz6k7l0n6i82g";}; +pgfmath-xfp-73423={run="0vmj3y45hqaf03v13zs384kkpfh58nspxrfg955hndswb4avlpm5";doc="13ar50pam50kdh4qyyshyd1n0jnnrhcv0ngx5n9lg1qlkn9h9ywi";source="1j0n7q1ggmxjgrxwdl4sqzjyb61d02xghj4bk71ms3506nzxc9lk";}; pgfmolbio-71551={run="1k9mjql2ww3j9h0jmfy8vkg80p4r69cy1nwyy1iw5d2h5qpprls4";doc="0imgdp8qxd1bk8paxnj8946dfpr5dv607dad808vyprwks46ps4n";source="0ghpishldan8r02qgrf694n5s41svmk3phki3c4fvmr0s46ikfv7";}; pgfmorepages-54770={run="0xarflkdk2xvfmmsafv1hhpdrfyddjxlqjjwps9yzzcwblpjnali";doc="1wsa6iqyrcjq7zyanjgaq6a1i5d7lm1bk9y07mz0bjwc2yv359zi";}; pgfopts-56615={run="0g7a22d0ppdzcazrif8yjic19lvz143p6vwflz16p6zh88yhcdm7";doc="17q1mlaql7f510pz86n64sm4m97nii72jghf75qs5yr9h9lqrq6v";source="1mz5nzbhmbgzjkpkglz2w3s9s8kzrigg3wrd91dmdhjsm4d4kczi";}; @@ -3053,7 +3093,8 @@ phonrule-43963={run="0xv49vfvlfjad65gngbk5022vcdi0w86mzqk60nbz3i8npvncplf";doc=" photo-18739={run="0d9mkavi2x4wha1c9zi2fswv7vsi4hr0588gj82vwmwlrb6v8gsa";doc="0xnxkv1rkz4c7wh7dm8rna2g2zf9i97aaajlfqsr6ls1d9by4zn2";source="0vxja102ajrygarqfg0y7bmmhx2my66dlnfp7rsc4kldi1g2fs3j";}; photobook-71843={run="05y47bw06ir5l0354m3d4pbiapz695js24ya60cfwxn6fkpdmf2k";doc="0r6y7sqfxxp49mhahdnjgbp8xawql4a9gxvla40wshwa83v3dhc0";}; physconst-58727={run="0078ggfyyr2vh5ni05la8jaxnyxaz2jn0rlahwkw05ng1h5nwl0s";doc="0d10kzi278b6yf7dvm3j2nsks43jm6jfjql5jyv51l8bq5grkmr8";source="1qvhif2amxfqvwj6vd82f9mjgrk79crnz4sw5v19v02xzxv66fsj";}; -physics-28590={run="06nwz84201w9vky4s877fsiw4pk1kf6iq9yp1jcap7j57nb4l23j";doc="09zmpxkrrv9j2ip034vqwblazl4kyprvp24k0f2k0xgc4fja2pqn";}; +physics-74250={run="06nwz84201w9vky4s877fsiw4pk1kf6iq9yp1jcap7j57nb4l23j";doc="09zmpxkrrv9j2ip034vqwblazl4kyprvp24k0f2k0xgc4fja2pqn";}; +physics-patch-74074={run="1myrz3vzy9hdw6djf15bpk64j51nkwgmpd8glr312srw6lccjfl4";doc="05a5lw5ln1m6iy7ywxa994c73avgc5a42mfn2b5cpw53lr6sl1z1";}; physics2-69369={run="17br2lisl7qyqvjsgyaa7c2fx3hvblj9cx27zfax7v32aly423af";doc="0lwn61jdpzljwlgy1yzllflziwqchq3fwanj6c2yy02rfyi0lxp9";source="1g1psidas3yjknj8nlhrvgjiy6b1b6z42d8260szq8wmmmybi13c";}; physunits-58728={run="0fzx8c7sgd6incgwdbzyd3pb9dmdajb3qdfd3mj8sascilr0c2h4";doc="0ha1zp0lzx2q10m0wp492sf45pw5cfd98s9pnzn2wxx3k970agf8";source="00p7p4hh49i9xwnfd8y7nsgxajjcpdlxw1asyxb8q20x1w1wy2cs";}; piano-21574={run="10gfxklfwf60p54wcbs4l1jpwasxvvbnkjhjpiygnk6mvzjx7dyl";doc="0czqrjlfx1i6k02aa1r1crvkw7k2fl17vzqzrkc97msprrymxwgk";}; @@ -3062,7 +3103,7 @@ pict2e-56504={run="02rhm6a26vgpscasrbz25vjimlnkh9s18pq6a9025k65iwp5f08z";doc="15 pictex-59551={run="0yz4dfnmakv78bc7rlabh8582knr131mrx0rxjai640bdax8as2a";doc="037ljjsnmllkxgp800dj1k9pvabwg4gjsqci84jdmayjcwsjibl1";}; pictex2-15878={run="1qqf08yharknq6csk01jdff62mg011bryqlq5mbmjwqwh7wxs0wy";}; pictexsum-24965={doc="00yd0945qiss5jizkxncg8a9bdsld7mkhaipi92bbn1ghqicsw5a";}; -pictochrono-69855={run="136apjhvd031j0a1jaxwkdm6lhg4vi173wgcdkd61phahc4xzss1";doc="0sybhyczmjjhi47fxqz88y98qq7w8nibxij6ai6k3wzkhg9iy9hp";}; +pictochrono-73069={run="136apjhvd031j0a1jaxwkdm6lhg4vi173wgcdkd61phahc4xzss1";doc="0sybhyczmjjhi47fxqz88y98qq7w8nibxij6ai6k3wzkhg9iy9hp";}; picture-54867={run="1i2775x39n5vxspy555rwn86384yyapl70kcfir96prp1846rfjd";doc="09gid4bb2wbmaqday94qj4r44cpk57rxpzg6grdcjg4y1dkjph0b";source="150wv3jb6hspwhkjnbxff5izskvqfvhvqxbw773qikjjxsaidqgb";}; piechartmp-19440={run="1sl8mz26cglbsqmpd8qz0l9yycxgcimi0yhkgnc04n2iik1xc6b3";doc="0g8sh91ki495mqv7zxxz2q40bk9dl150a9hi7yv0kbpiy45h3af4";}; piff-21894={run="1q0xdl6ip1706wxprpd85vycyksbnn1ws091gvmpdhn6as4fxg9i";doc="1sa2l82yndb9pl8bfmnna20ackv9rxp7y6ljjyix3bpksqp20rwq";}; @@ -3070,10 +3111,10 @@ pigpen-69687={run="1mij57v2cfj9v1mfhxlpb857ipydzffbdbzfw00qmh6iqc36cfn3";doc="0d pinlabel-24769={run="0dlg15b6cjykp481xn03kg3p1zqwccwnm2la710xdwf87p1k4bp6";doc="0jw94fl3awpyla0flmw9f72j3ssrqh1scfrbx34mxlbmnl4z3pfc";}; pinoutikz-55966={run="1kj24i32ql4jfhzfxyrcj0nmyyhf4ipic7zdzcz71za6njqv3gql";doc="15farzmd27gp8ms5vck6xcjs0cx7rp47nww0shs6r0b0l99946m1";}; pitex-24731={run="1g91l1z71481hlwz8vmdac0g4vm5d6940gy1ly44qny626k9j079";doc="070qn9b6bq4szqa9wqfmb3qbfxcgif79dzbb3qqhvs7fh9bivqdv";}; -piton-72587={run="0hkpcvlq7qzmrkdkdmm9mpinrrfbh851hzmbfwp84pxbq4mb9yzb";doc="0ly04ywrm22ja22r05xmymikr9z2mg61xx66q0pf3m9pd620kjz8";source="1c5l0jh8mlfvzwchh9rbsp7pzzzdk69pqxzv21wqdsblsljdlx4i";}; +piton-74448={run="1kvc77c0c6xf0sl50aq4nkvx8qkay2jm7imdc6567bhc4sgridva";doc="0z842s98q26p4s6x220w6fakb1kydsp0fyff896h2w0g68rs2cwz";source="01rsxkwg0lrg3s4p8vi91ydq6r1v01lsbamy0wia84bdf6xz7li6";}; pittetd-15878={run="1s8865g4fv04ha7vls9frkkmx8dyn0l7z1rqvh3dkyy7fdgq4vff";doc="1jkdny3kqljfjnf9ywpz7xqvfka8kwi33jy3z2yiq1fvp8k60ar5";source="07k0ilmwkg3wvgfpqyqc60hn5mlsj8z5lsx8mq8h3igwm4j8krzi";}; pixelart-66012={run="0d41qzn2gsqbgvgaxk9a7cj5r285ayn8amplzv57j5c5azyi6qlz";doc="05mcmy25mdl42wfdd3l64bkkxrvmcj6lw9zb9jypaf2rrdfnpq6l";}; -pixelarttikz-70964={run="13iifhfd2fbv8iyr15zr4g5njb2yqc35z2xlr20lx1pk94vdmfyq";doc="1zsyc5rayia732ccxzk46kacpysv64wa6bqxxnh2d086nc1jng8m";}; +pixelarttikz-73309={run="1n47q4b0cxaczcpdc94sklliij5x51bx9fbh56h8mmvclsmxxkbb";doc="1kpvix1r2x92x08azh76azxi02h6wvi0qsrry3nkhbwv44fvnl90";}; pkfix-26032={run="1sgss755cf1zrpv3x74x5qnqc6w81cvr1x0w7875ijh4c1xxkn9v";doc="0bxijxbbj9v4c5p1rg4gkqnm75rq516vxln6s6174ph7abqrhvys";}; pkfix-helper-56061={run="0hf9hnjw7ws0mx9w5s6ik17zlq27fyc3p9bgya1wxbh8lcvrygn2";doc="0fh59nzzl58fgpkkfzvi603sfsfnqrj8s39k4nn97567gpv4a22a";}; pkgloader-47486={run="1vmpxv6x2dq9b4ddj3xxqzkxz213bvz7qn24jlx04svdrq0cnpjn";doc="064qsri65nyy25sz8y9avpxyg3rzcspjr1cfc5jp0vfd07905zix";}; @@ -3087,7 +3128,7 @@ plain-doc-28424={doc="062d6hg4npy57307avvyd2sdxnmyrh5ia2rdb17p6cx555k8zxwq";}; plainpkg-27765={run="0dq20a8nyyyy1342s8sc1z1i1gdfz49dmv2w9fl5dbnligzxgdfl";doc="145249b9w3jpf9swgc4293r05p7r5ylmxvx1a5qlv3fgni945vms";source="040m08y54xr4966f8b6z38spdhjh197l56am3wpza5qff4nbcj6a";}; plainyr-52783={run="09py8psdqqnxmq2nkczxz092668zscvf9hbr6fcvrnj0blvz3wxy";}; plantslabels-29803={run="16hzr9zavc26mqddsq4yzb2y60r2lh1yjlna1qyaxqrq7fr76g1z";doc="0pvy9gaarrwr4f0bzdhj3xgisfmpd73rfcv9mlw87k3l9y2vly0f";}; -plantuml-72315={run="1yrwsbkk76mfvqdxfn6mgnn0zgnp530rdns1sbgb9rhlv8qggn69";doc="1d9l6b0b82x1qg0f36p47z29q6py04bwwqrgyqf4d26fwwkhzh8l";}; +plantuml-73377={run="14s57xsql72pli84s3hdjxfb1zay3yqwpxvfxbkm70ksjihjw600";doc="14nn12yxbpyavcrpik9kpmrzfdni1gszvlpn99n6rinmdd080naq";}; plari-15878={run="0jybi5dvl6ksjpgfqfrdnx5q25gl5xgqhwax4dk1shf6rbafkgyg";doc="1js29imppwx2jny1hcvjbkz7cc9qrafgniy9qd11bvjyp3n1vly8";source="0br0vm2ncrdyqgazdr2p1kvgl6lq124b8h82245jc8yz7mnrz2nw";}; plates-15878={run="1238w5267spw6liidzxd550hjdjxsg3d1231l9vf5fmcifllsnmg";doc="0w1jn22gd938zqifhbiikgggbly2fjhiwjdh2jq66yax7p76pjc3";}; platex-71363={run="1qddfffw7w3l0zgf1dq4376fx5m76jys8c95wwibxdh20vydf0bk";doc="0jiz2hnlr6xxlm8r0kc1xsi5si84kngfrp51y8gb8psw2nmq8jj2";source="1pa7yg6369fh72y1wxj635kv63ba3c0bdhlg3ws202r6zl7ffmab";}; @@ -3097,8 +3138,8 @@ plautopatch-64072={run="16m2dsqws4z0i04wfman4m7d5p9y5dij8rl6bs0vphq4n0hcqhh1";do play-15878={run="0gs6iibb9jkmynhvwldwrh8rvalayv8vk8ziyx9qyqsdsgh53bz1";doc="1dvi29x0fdnb83bkqfsv6l2jp9rvvnqpf1paznx9pli8gvgwa1rz";source="0nlyi6ra8v3pgk5lhhvar848mcd5zqbnc6mbqnbxsj409jczd0rw";}; playcards-67342={run="1bqk76g9mg86rkhjl12g41dph95zrdby9pddp7lac6bjwvyjg6rg";doc="0m9yvn6bxz3w6l0vfn9ycllj50az3631v5xabk3cjrnlhdq97qcz";}; playfair-64857={run="1yy8c8aks9c37a18ynilrag254ffcx8fj1xydsi1a58gnifmhi0f";doc="18axmajlbgll8cdjw7v13n0rq9dsbpnm4sa13mf46dq4fhy1i8s0";}; -plex-69154={run="0q8x2358prmrlh3zyqymiyq7i2rpzdhv2gw7zvnzjzx7s3kwdjq5";doc="1bpj5qh46d4n6ymfx500p44vj0qn5bqkz8379x3pn5dcy7ia8kja";}; -plex-otf-68238={run="1vzscj27j18km0cjjbfjnls4ylr1b067cynxi71f7wv99s29fw0b";doc="1nyhqvwax36xkcvwd68yb7y5mlainwdw0czyyvl2yd0f0r7m15g0";}; +plex-73028={run="0g46lddhs3ahvvcica9w274f8cjlkzk9k7vn4p5xbxrmpd3kgdcv";doc="1hm9wl193iwsasqbq9j0sbj1g627g0k2h2lg5qyfqpns56pzh9vw";}; +plex-otf-73766={run="14q7qc5sjmzcykvgrz4w8bsjymzfd74g8w5nznbx2q33bniy4xqn";doc="1qkarwqqf0prargp30c0lvmkmynh7czqxkq9x5hzqqfqqni2h11v";}; plimsoll-56605={run="0x39p7fhfyxnz95g44ci8xdiwiq0w2n7z3vq2vm26l9ia9q9m6d6";doc="0rjjk5l0zvqmj32m1xcyrawzzllbs11bzb4i4cvzmnakzlwkwcrr";source="1b703r0ssg8q021z9dc8n7p1w7hk5b548icc269gjrpad622acmk";}; plipsum-30353={run="1byjqmx68gb2xcb4nw429z7wnagv5l0pi3v13dlwp57sgfkxrz0j";doc="0gmq7rc2r3r50b7w5kqglaqmrqnxv6wav8gz09a2skkir6v1mpgl";}; plnfss-15878={run="0l4kjidsxzp14ii850m23q3yz1z8my9svqrpd5hi6v7qnv73vdnw";doc="0iw938rnvcfly3z5v5gikd3svx4mxwfhw0gsyv26m37l5slqvf1w";}; @@ -3106,9 +3147,9 @@ plstmary-31088={run="0cda8irxd0gxa18x47v6d1wiwwwh6w30fl9ipxdz112h67l342k0";doc=" plweb-15878={run="0yimmz965gsb0ddvq3ck28x73p9fn08c42f4331088130l43dkx5";doc="0ad3z41r1a3wkwr7lr9hf7n4bcas10fdjky7f9ykam0244r5q4pw";source="1zpnyzxf125qqz6j3m2182yn71nkrlaan1qfwl98v020iia6vyv1";}; pm-isomath-60368={run="0kl56njrcs2qklkr49bnkx17qd8csa5bcanc4ypxxv883895qg66";doc="0glkk1l2gkqzkjg4vwi9qd3yfv3xsm4ssi03jizy9dxrxbgl60z7";source="1ly3bh0b1xl5wf3gxvzrwwg2kglvqmaj3mb7alq5x8q2wn1sxyrz";}; pmboxdraw-53046={run="0a1mp38f2562yq3nzv39ffwhnzwpamy74pvqnigg7hv2v7blkijh";doc="07f1n2wpfqrd62agh0ddw67fnl5qczw16640h3v5x7yw31dx4n29";source="0mqg8xkhqy18m2sbp2i2sv58n2hxf05qr215kbmh0b53lbp16pzc";}; -pmdraw-72486={run="0ybzcr51n36lmfcg7v67m6b1rkq20k4a9rs8jmlmd27am8xw7swg";doc="1yq57ch4di1phd73g3cdk56fnr43ps3lrpsv5z4s7yy3nbyi9021";}; +pmdraw-73626={run="0sh655g8xrfj6fgj8ng7sjqxhg8mv2mi5h5imaayfnm2rndwkhxx";doc="1zy8g9z0lyns6hn7h345919yrhhbzd0d0gm9v52p0cycizzzxf51";}; pmgraph-15878={run="0mrvf2r4bv4qa9pzv90ardy5ncq2kgy3y89pgr1acsm5cspgryr5";doc="1pizlqyb0n20apwb6rvh6yfncyxnh6vfhnvc10il9j4894rii6mw";}; -pmhanguljamo-71464={run="1xppwjgzq2w0mwdvkiax7yj93kzhjg3jlaqg7ld4imdbgfcrldqz";doc="17bisxl752f2aw8j21rwnc3arw7px58r7cghcnrjmx7ij14dgm62";}; +pmhanguljamo-73892={run="0scgpvaciq2419qh27jci6aclcb49718lkpv9a9wxkm130rdm81y";doc="02chm350d64i0xx7d48dwz6igw285qbbnfcfvc8gjl2jbqsrwagd";}; pmx-65926={run="0brg4xinn6sg8c9jvh3cvznqhlg0l8hfqv5whsh3yaajc5pn40rc";doc="0pd78a36zwhbn7054fgknpa56jli5hqssbhz0qh8fmqxn6kvs8r7";}; pmxchords-39249={run="0yv1c0s3zjy5w65cpv9gmdr13wkfg04jc0g7b1f0mh8ychhdab1a";doc="0n6g5f4szxsr6zqqp2czi29m1dncfgib1pd90mbrjprvwh0filf2";}; pnas2009-16287={run="0yl475rlfhlnd9d0pyzm1gj2gixrdzyn6858j1ndvkhr8vc055ns";}; @@ -3119,7 +3160,7 @@ poiretone-64856={run="0dc8ll3xk7yrf3irrgl5bh4dwvi6mvgp3iqvzfi26jv12m3fwr8f";doc= polexpr-63337={run="1dml5b7zb2w4cawqgvqld63wlny45vnz7p8y2pc7b5h86p51a0cr";doc="198dhv2wlclrs5sqdiqk26llyhjk4l4zr0hlcr1cw56dnhdh2j75";}; polski-60322={run="0y66zqxb87i8wymryd19hjws7y9snks73030r287lbifb77kyx4c";doc="169z3y419d3afhmhk22d0h045pysdrkhyvsgrs951ah3vgf8n5cv";source="1m8pysaiynxb64n81b8zj3cly6g81w2fa1nrknqnxm27bjzn2jrf";}; poltawski-67718={run="018iqwz4apkj8pwc3ws7k00zldnz4k02h1hv0ry9d83z34xswfsn";doc="1kx83mgwkxd0sv2xjzvn6wdsbdng6skw71z2xc3xk16lk356q8hc";}; -polyglossia-72368={run="1r9kxd2864abk0vkm0k1iz8068bf79nac85mhgfcpklwxdn2sc96";doc="0p0kpi4cvb9297z62pipx9pfjk62iwyzyfg4ajqh0m9223yjnmb8";}; +polyglossia-73666={run="13sfli8jlidvhx026m55zbpscpj6xwafwra7107z1zskkiykwlyq";doc="00qgxrnz6sp0jy5rklk449m1pa0hf75h4dhi63n69kjjwf2waqjr";}; polyhedra-68770={run="034zv3j4ga0xqkqn504fdwrcbzjh63v8zzfchjwcsbb2qn1x2rix";doc="1a01r85nliax7zll3qz212pkz2yix2xzh15hlbpqgqslh564fkxr";}; polynom-44832={run="0vn9k3vci15lq0f6r2354ag4bs55jcq6571wvz3k4daym5ka57s1";doc="1cxsw0b5vxy191xy5clf15hb2cpyyqj5ipvgcw9n0hm8ka3g9l1i";source="0qh4w6q9qch3r41ps38yzlv850wcqvf6b0b6vqirk9lq978k387i";}; polynomial-15878={run="10w1vq7101hnp2ifaa0j9mfccg9y4s3cyms4m63sx54lbpj6rc1r";doc="1vn0i77hzr72xkj6ka4r8n0g0nbz382z729v269x6p5j9qqmiz21";source="0hsb8yyk6ssih7fpc6qiwaf40cwn8xx4jgwqgpmfgkc0x1qkpri2";}; @@ -3129,12 +3170,12 @@ poormanlog-63400={run="134qh7xsn7yxa9zx98gpd2hqx3lkd6sqc4rzcandvzi6prsjkip8";doc postage-55920={run="10s3lcypskq2qmlyqcgldkg4i4a4qbbqn27v6cr6h3j4z93zir3x";doc="1zy7hrrwmdlr3vib8i8vliznri4p8dhfgkz0fx5qgc3ji15ks095";source="0h89r91diqwc1z9wzvbsynazv5k9spg2rfvg39kzb83lipxiqwjf";}; postcards-21641={run="1glfwj94drccwmmsx6icc9vyzq7w8kvq6flkkbg1bp0rrkjf448j";doc="0cvhgz34mplpjzzdpy2bxblmz6qxxlshadj8in810g3y22v39khl";}; poster-mac-18305={run="1b1zq9ay8fxqn9593f8n10zlkirw2b0piic71b9fx6s9a7x82w7a";doc="0wc0194ixbrl722a0djm704fmbf49p7vxk5fyv6d3gyznja54fxz";}; -postit-67344={run="032zhdciqwyfng7ll8bpnyl0wndwpm3q4alh7qmsgj978ga97q4s";doc="13j5ygc86v2nkcv5g18j4nacpckciyr641qknpb9mw3i4k39rly4";}; -postnotes-72568={run="1r7k58z1q05zmfyfmv3ra3r9kdkli9wb8z3v9pd1kh73l5nf6431";doc="0pwj49ff880jgm0zswiif8smk087kf2nxhcvdzjka9lssv2j9k9s";source="1kj8rbd9s4zh650f9vccjrwzgw805af0l21vy7ad6z9mjmc7qzi4";}; +postit-74291={run="01dbqvfap68hkprs8wpsfc7lbwn5xn9wbq10pbcs3b303mfax9kb";doc="1yxrvdhkky12jhh2s7q18sdvbyndymmvc28gj5hwybff91h354rc";}; +postnotes-73045={run="01zfbs9n19n5gdlpizbc747i91r6c9rzc3rl316kcj661y7sdjfc";doc="1p08xb95h45aajr8ss3h8b8b6vq7qhvcm18wd379nk16lzr045yq";source="00bbskic0ns80n7lcjsqip1l9ivjxm0kw03pya3ril7wgp9aqif5";}; powerdot-59272={run="18ii2qxz7c0wal5xqddyzd2j933lg4z7xglxsxn3vgp8ffq5kr3n";doc="0zpwjmvlckp46ycdldf049s7qvgbpx8cx5zlvzh81qhgdlgximhl";source="1v7pxr134kndndk542f7bs34c5kj85xy0cwvwlhnav89ff2mh5hg";}; powerdot-fuberlin-52922={run="1gx04y9ysvwzghy38k6izhs9gm1hzssnb5zh8qjjh8v99mk6cqwa";doc="03ci0lcgw777kfmnzas13q75n03z8v2im1wzrd8hpbcwq18mmn2v";}; powerdot-tuliplab-47963={run="08f25qa5fdacsd8i0bs8y0p3k0zjgja0qp4ak0x3bixz7yivg5nx";doc="04b546i32k1cs6armmnvr8aqbfvs0ysarlsjmsci9xdrz3clm5w5";}; -ppmcheckpdf-69527={run="04xr6c4niy53s63d7dw7fvd00j9i6k0fjfg19knai2l9bnqji5nf";doc="0l0q4qswcijs94pk8qgb74b96df1l8l980bvrrqhp8d071b19xdw";}; +ppmcheckpdf-74170={run="0ma7bl27wxbpyvsr0wsk1b9kx3a01w9g6zi04wlpzs2m2pc3x665";doc="1vbn2kfskbhpzzpqmkhnjfs4sspnyi9fdnb42lprxjh8916x1phg";}; ppr-prv-15878={run="05xs41xfm5hjpx9dzrngaj824rr8cpwcpvzxsyp1xpzlsv3gk1m4";doc="0rfrxzfm34kn4sgj1dzvdyjx7s7nkyjc785j7pgb609svld6jvyk";source="0miijdgcsn709kpp0zjyqxyxfgk0f798v748brmqshb6mfxbryzn";}; ppt-slides-72584={run="081rihq1b4vmxlv4nwpb5n8a4jxqv9h5vl00fxqj6irwbacvyfis";doc="02l48ac53fniv0iwc9nfsmjwk38gc32k2c8rbimg9cq88r2bqzq0";source="0f8sdl2x6i2py4xkh2yx5n46sr4s2npspzzcygdymdxjqa3x689i";}; pracjourn-61719={run="1idcncspb2dcmrfsr8bf1ar413mc51lliq9xgpv0ybsiv91yd4lj";doc="1hks8p9vksn88daqyn7rnsaza4i05dgfb3ngd5yrvvw0v40s3acj";source="1jbicfqvvyi4nnmpqafzlzlx459v5cyv62wmq67c2692am8a04v8";}; @@ -3149,8 +3190,9 @@ prettyref-15878={run="0akbp6wsxn4swk0kwxw27x3lpf5anwk49bb8pvssaj4xy68hyq1h";doc= prettytok-66884={run="09lrfza86v4haac2h4pg68vqjdx60h79f3p7my59mwdk67sgbxwj";doc="0n6w3d8fbm7pidh7iga8vmlvx8qvql90k14hahy4q0i2b8dpg2bv";}; preview-71662={run="0yffni9nlfagr7zy7lc0h4wcf7k9r2lzn7qc6m51l519mb3v7848";doc="1pc97s354cbd629y0nlhwikbz79nq582p8i10x1qvc8ja22fa1qh";source="1mg22abhgrjv9fffcgn8kn15phsvd559n1z64ggi85v13phb592q";}; prftree-54080={run="1sdb56cvlfrys3f884hg6qpv1nwd6ywfyiq8168bs78g4q2ah4by";doc="137f5nbcm6p428an3v20j5cx5djvdri12ph07czj13877pjy9ccf";}; -principia-66625={run="17vkriwbkwjb2ksxbv9glz11i3dczj8hh4a4mfb3signj2dwyaf8";doc="1d7fbkmjbi6ym7kik631219fa4c1cs80k7f3kzzzsrwkmnhrq6qv";}; +principia-73662={run="12cah25vq98s5gxa8q5amivddfa0sdqchhvnfq9mqpyj4k5fap8q";doc="0gjd7v5pc8r3pqaw4f6zwb3jrkznigqb6hqkqrnz2398m3f07rn5";}; printlen-19847={run="1h6q95dvpldmrfbpdv9v19p34iwq3jzz7vs0z7b6fnijyybjxnpm";doc="08p9zwkgjpkh7ip3i54qjdazgnwq79v15hvz4j4y2dvh294nmrgn";}; +prisma-flow-diagram-73530={run="0lmxa2m5jfs7524fgbxdr81cas5bw66aqx6gq7krhxngp7i6ymdv";doc="1d6kd4fc4f4gpzvp9dw3k62yz3j18yrlsk4cjs586djz1q4lksf0";}; proba-15878={run="15d8n2ik6m5sc4vlp3k2w3h5h8h5s4agijgcnlkmklw3qv172vii";doc="1m2mbbn1fa616dfxkb7x8azqsvczyifygjmbblsyfkd5kl6f8dwp";source="0wbnfa1i6vbpbq2a4yhsvpyifiw1pirz72qasxm1nwmgfg5dndx7";}; probsoln-44783={run="15zsh16v5rs0baqvy9jwn59d95qj6glvc5h054ldb8sy5nwkl3sk";doc="1l5mq047bpdg21mjdjwfs6ghdh1cb19bf9y5939nlw1wyy1flcfk";source="1lzai2ynjnfinf38jdqb0bdccrh58jbhnwnpm9ikskxpzy7v262d";}; prociagssymp-70888={run="0538c6acsjrwfqx5gfn9aijmin1f21za45vmbm8iwsfnphpdk876";doc="0q4hiz2h2id4fhc90z5022nqv7k84wpqps3dj3i3wf79rfd6vcvj";source="0xvbsq734nl41k0bzryxlkm64cmnmmchdnc8xi2s3gjgs0qml5kv";}; @@ -3158,13 +3200,14 @@ prodint-21893={run="06s9qbfy0rkfby9ff3dylykl81yb3fxpwxrwa8hn1aa2gd9bj2n9";doc="0 productbox-20886={run="1idarj7sxqkqzlnwaqv9f192r228fclilz01fjy444ly765k0cbk";doc="1pzba2ymna70gflrnw6hs35dgkv17qfjs8gh4g6van44wjykhfvg";source="1fnqp2sx0wmyd9130j5zbqw2dk1nkajp4qs46qm47b90wga8pkkj";}; profcollege-72198={run="1xdjc37chfnpxbl11rkwg0nyypri8gdc2f3lgiaqqi79diajys0a";doc="1rlfbmapcc0xxhkldc5py1knfn6r06dbkcfdi4byafvaifvdyshk";}; proflabo-63147={run="0rj7x6s9afn5yid3pqd2vz9qn21z6n6m5cahq92ygn1ix5xbw3dg";doc="0z56g41bw3lwi32z0imja6a4nls406ck3ic4pibyi5ajcb8317w4";}; -proflycee-72645={run="09v3xjddxc4cyv6v3wkl9h46cw31jrghyhhyna6xdhw8b69f57pc";doc="0n6fn5c54svpfivacl3mcrc74rv42hqz3fd44dm73ynyiiryygas";}; -profmaquette-72622={run="1byk1xbndxz28ahxl0ca9g3n1dm3h8zn5shjag8njndl7lz7nlys";doc="04lpq1w8h9i5wva0lhc8fzyshgxcwvg3yz0vrlgn4zy7w3djlfsi";}; -profsio-71302={run="1ximv9p03jmm326g4b2fvb6wmd6h983vcmcx2f30gna28hm2r5zd";doc="0yv21a0l8zl6059jkrnpznx9pl56nz29fk8kfiy207hsxxv3np6z";}; +proflycee-73860={run="0dx2w98cvnhv2yi28nb0c5gcvkwdh0df78gfx07zfjpa3m39k0jg";doc="1k1fvz16qbhmkhvq2sysg266blcz6kl62xa1kn85l7lhyqyq1sqj";}; +profmaquette-73827={run="06l8l8ygxc96rv4y69zl1f0886r0zyk3cdbp56x6dabgppjg9mcd";doc="1vl5xci8fvjgl4jsh5wpl9vwc1hbkv9k8zwmy5jns08qmzl89vjn";}; +profsio-73718={run="0q4ssicc33g7x26nmsvfhwadpldqcr2xjgb73mn9za49ly9i9lmv";doc="0rymqj4bzp648061fxblf09mqdv737y66himb3xkmqmfc6m0rg4k";}; program-44214={run="0ay2z8ga10zr5p453ss0w5qqqyknsgqd2hifa7lq0gih4rml14pa";doc="102c9fir3hn0m7y3lkj9j0vwf0srbv6inq87lcxwfkvc7yw0rr2m";}; progress-19519={run="0wgkyvyf24666kg79h7wq1piq6yq2nkw6k5g0ydk3y4gwzzkfhlz";doc="0r303dr6yf1r5kk38c1njjra7vgvp9qrblxj7zd8fw1vlq2sc7fg";}; progressbar-33822={run="1d0d6dy9ssiij19s259d2ns2k5v2ccc45anhz1qm7iqli12ij0m3";doc="0bxsgvql8hqv4qw1pv18vdxcshphdpbb29mqp3pbbsd4crp4qb5z";}; -projlib-70305={run="0ld45nn6sal1fyrfdahadvsb3jyrb5ylglva3rh5fcxr6fl1ywih";doc="1l2dbwqhpc18nq8xkwg5f8l9mcg59f9isvqd53kx3avr903wggf7";source="1667xlm00573al2aqrfmfhlksw4hvdcfzr5qa0mz17ci5fcy47rm";}; +projlib-72789={run="17qn543lnins5y53wp849xh1grb0y61q77pjk08nzxwpin5dj92n";doc="0f4c7cixdr0a65p8hiafzis3gnqs5aqh869pi1m9vwbv2ap07c9l";source="0dj72rr6vi832nrzib28yjjnzd1n3r7w998mmzfh4mn7nyvc4pm0";}; +pronunciation-73701={run="0n8kjjwyx2dsvsjdlphnq8fg4390dqy9fsb4h771s0fbz1py5vsl";doc="1j8p0b8gmqs3n5kspli9ycys08ha77i2n65zhsfxji16jv1702dz";}; proof-at-the-end-69602={run="0nxba2ck41yhjl5cfjhjj34l5srkh1y47h0byx61wqzphdr2y9zg";doc="0k1zfg59sdknh6az19821n5qvpcxvlr1wr4qz0wrghah8h6zjggg";source="0y5r6vzzvi7my8qs90kg8pvb267z6ly3nf4ski14yxa2fgr6ab1l";}; proofread-61719={run="0gnn7zkzrszglcqcwz8c4i13apildg7s93rkp1z3h5m2gr9w9v42";doc="05g3k77vczdqk19gigs9b6w8rccvcr0d382ysqn0yg6cgd70bi43";source="1mggrm4cfji364ylra3ffdhwbx6phcxwfzw2mwls00msk7jdzpsg";}; prooftrees-72665={run="12jrvxvr1idvh3gwag657jxjh3hnd23w5kdanlm6m436q957icgd";doc="050vdg89lmp6y2qg3bf0nq49ja2aj2aphxmgckz00lshi1l48d25";}; @@ -3225,7 +3268,7 @@ pst-fractal-64714={run="142i9wf39v31wzvalh41v5bjf1l91x6kib1rpk6fqyhfxx44ibn0";do pst-fun-17909={run="1r1zvnyg5m16fifi5xbzn5iypr4n4d9vbnqi42h6a4m4y1wb3qdh";doc="1gb9rz3kz13xzflr7r00dalqri10lbn830v3xcpmb4n29a2bf0qv";source="07kpm9irvp7dn0hd1wh08p7lfbgn78jj63yqzzxn1jb4wrb4qkx3";}; pst-func-70822={run="05jklcckixdv3yal7ihzsacf2mha20a7z6xnjajkh98mm9wnglyv";doc="1sy62sny0znas7vcnkd6ch6amsid0hc6sfd2xc80p98dilxc9a19";}; pst-gantt-35832={run="1hkrmdwg7kc4xiif4fvhjwbj2ryxlrbyqb7h2n3rk2jmmky4hv7p";doc="1fqkwzsliv1mg3lyidgcsy652l5d2qy7x1rjix9swvk4vblx4fjs";}; -pst-geo-60387={run="09br33z2vdr2dlsfyqf8rya3qj7bila8r2xwqbc6g96yhn1c3r19";doc="1xxyazg51s4nj8hz8adzv3lvpr2dc1ji0sfm46xr763srwxpjjd8";}; +pst-geo-74250={run="0dc8ip7qmb3wamr89xb0xwksfrxcmr5bqpnpi83q1qvgk7kmw7b8";doc="1x6v25jh4wxyhqgys87bsj45p8yp6salapkkncaa21s0amp908ap";}; pst-geometrictools-70953={run="1jlrqfbvdca6bz1z7ix7ihziy7db7ndli8kclz4q7zl8x73fmhh6";doc="1a6k5pha1c8h1r24vgwrmzqy8dmd7jmcbzz3qsq36ydb4g3a4xzv";}; pst-gr3d-15878={run="10jn2wdc908z2imnpcv03ffm83228fam0cqgmgmcss1774r2nc18";doc="0985ydi7jfsvlynjs5ddjhyhbh11nficfphy6qnvbv0jj367rabq";source="1z981d54aclpbq9ggy28qgnsspgwkavalm0j68pj69jxbcfxrpby";}; pst-grad-15878={run="0bzq77vj333dsgilfw9k7lslhpmk67id6p1z14aw7nfrhyc80082";doc="03v585i28dc65xrydsp5jj9nd6kfpmhrjkwm3w89dv0p32xyzh11";}; @@ -3249,7 +3292,7 @@ pst-node-71773={run="0v7vnmxy1jjw7p3ij35zvnkfpy9x8xzczvfz636jsjvmj46kqd0k";doc=" pst-ob3d-54514={run="0pglxl2prdi347qqrjpyk6hr3arhfc4rrcz1mnyz7q5jyamlskp5";doc="0s0jyb1s21pkmdnz4wdz793lbvidl9qdfh9cfqa0bwx9mmjvhpnb";source="0v9kih4gxk7aqwynihipm1595iswwkv5y6qj262aikhr6bz8v0sa";}; pst-ode-69296={run="1ga14sfia3w8pr8shxwf5231l0s2wd91yzn8lqvb6k9i5g5qcc5r";doc="15pyk4ahpccaxkwrg2kygnlsxryw7x9y74d0hgq234618jdc9fib";}; pst-optexp-62977={run="194g5i604i33bvnprfyjab50smag094lv4gx2skd2h16zfzmg9lg";doc="1dgcb3fax1n15hz15fr0pzihyn3yyzvidw6nacysc4qxq2l6b56d";source="1cw69vk791rr15dc3z6ivv5lbcziab0bwiar8cr767fpm0w4rrfb";}; -pst-optic-71545={run="0difr3slzrwwk4wkwi669vgn7qxipybsqb3bm4lkdwnmi23cq7h7";doc="0dk2wgxcd89bnhzw8k43z9i3gzi6yrh4i6kl6mgrvvszdi5s2nc5";}; +pst-optic-72694={run="1db3jawgbh1dr11b6aa75dfrnwx3z67hgz106p2knzsbws6lw5l0";doc="1n1q5368hrw225bis1v64ybkg7ra35zj1x7x6vs0qiijk2b3hj4s";}; pst-osci-68781={run="1frp9pmwngklkwyicr04aph29ljjpgcgagnk5r6dxb0c8bp3209k";doc="1669300lfawksl65nx7x7g3kzzhf8qpj08isxcba40ac6lwkfkp8";}; pst-ovl-54963={run="0p4yyrvagfjamwd1f81qyfhz6wwjpqi6nfazyl8ml1fd7qjv1g18";doc="0pqh9sz0l0j0bzvsva6kba6gm7cssy36i17px2zrr3lc9k6yajf4";}; pst-pad-15878={run="09z2dkb2h8hmf46b0h1b235d1yjv42dgx55pj5s4dbpxzgam7ljz";doc="1c597riwdggb0fli4w4ay2iwkqhaiwxy3mcl9diz8lijy0h4fpk8";source="0b2w0pgp8njbndx6x3hq0rwxsr1gwf848l6gk3vrkksq419j2506";}; @@ -3287,7 +3330,7 @@ pst-venn-49316={run="1i9frqc6b4wg3pb0ks4v0xxsfzs348ddhncr31mhfs39nbj6029d";doc=" pst-vowel-25228={run="1p1adlrg62jsqzkjkl8avb79w26kkd5jdssmkcsd65dg5qfa9x50";doc="0wyl0mvx2d0zd8q0sdmyrqgr72i2igv0669ajv0gz8miv04vr41k";}; pst2pdf-56172={run="1rm0frzi52i3irfy5703kw38d3f1grby27nryjpb4ziiw6n5yizb";doc="1sll10kps82b47npv2g2r1l3kkm5y75mp2p2pzqsnxxivgl5kp2l";}; pstool-46393={run="1g8pmd13f73v8bsrcpf4a6hh00pww6isz00gj8cxnj0xnd4p9xwf";doc="0vwxrcm29w8fiw4mmr5jcxrlc122k4s1wg1sqvmzqypwpvyls59c";}; -pstricks-71883={run="15dmpiqf8nn5bp5l90wjhc1s7ns9990qklxc2p6l09cj8j1yccq0";doc="1ds7cz9sdmc182a2d5kn8kficb8qiax3r2xwywiwr03dhy7sf91c";}; +pstricks-72868={run="00jp87cg6mijrphaig058sxqj4xwkc8g3mla8zczk0pd3vcrq43j";doc="0jlm3ammxign4slah7hqw2h3afi7sqcb97mn0p6blj6c62x6061b";}; pstricks-add-66887={run="1h1y2r0y3vypygcczkqi8xpxc0mdcgqm1xfscspqw9ifndx0rwrm";doc="0bd3rwcdmxnazq86c6wwbjkajzd75knja1fc7s3svhn0hxy4jcza";}; pstricks_calcnotes-34363={doc="00vgcdf73p4143dfjcvs4b5v4phvisv76ink3iiijl6s6f9zbmy3";}; pstring-42857={run="1f7a26xxxzwfgprhzxq4ay597sln18hjk8cmlzjy342jy45g6dpj";doc="0ngxd95s8lzpsgirgrq4dg0p1dwh4l0gs99nhich12v6l19jd29b";}; @@ -3310,7 +3353,7 @@ puyotikz-57254={run="04s6878wblhz3m7xc7zgqv0ziwx76r22c4sa974ismfqjbdh6xdc";doc=" pwebmac-72015={run="1asrlnybhfcfa5qdc70pwvizpq03vlnkllr81ly62k3blmqw9chg";doc="0j1rxg6zf15ffpd9axj372akwsrv2ikpila4y9s6l0y9jcxy2i8d";}; pxbase-66187={run="0nlnlzpbd2dd397lxxg97pgaagfyb00ygrd6dz0v3gkmpwllnkvf";doc="1kjkqsbrsiwzz6szjm2irz6ijy9q5xnjimdhhv52xk0j46hyiphf";}; pxchfon-72097={run="17jdngs0mx78mqg2kkx6aihfd4jk7yp40l5fvmvdgyzf7nvpbd69";doc="1pxlfdpn1bdk8hs4v3hhadcrkhw0zxb6dgnxw9y7v38jjx3wk7qh";}; -pxcjkcat-63967={run="0pg6rh8yf6mnd047br0rwiyjyzb7g8qknwzx7v9r77rxgpvy4baq";doc="0jfm9ln4k0iwvk1ddxma3yjvfrzkhxv63nn76d6xi8gqj1vm1kl8";}; +pxcjkcat-74250={run="0pg6rh8yf6mnd047br0rwiyjyzb7g8qknwzx7v9r77rxgpvy4baq";doc="0jfm9ln4k0iwvk1ddxma3yjvfrzkhxv63nn76d6xi8gqj1vm1kl8";}; pxfonts-15878={run="0vkhx82ywv17rflmq119jxs3ib08rfw6lkjgr3mp9vf6vplgqzki";doc="1afcy7c1n63zi5czbpnajrrgwfp9xdymkgwf5h9865adjbb3lm82";}; pxgreeks-21838={run="1j93gwgk66k3fwkhraapis7ddj8a4bliqh783psdv1054j5fspqi";doc="1md7q2q0b2lhffjm39cxzxf86rw8759zxwj5sbgavzdhyc70ssli";source="04vdi4wf7lw15v05jqycm66j1iiy6g13qrc1ynrnq0df8b0zfs1g";}; pxjahyper-72114={run="1ka0s7gdg2csz9jxh4ynsd8l6bniaslnc8hs5145iza4g5cghqry";doc="0zdlzp0pw1xa0dispqm9idywhrrcdwn83rr368v56pg7lz427k4p";}; @@ -3323,7 +3366,7 @@ pxtxalfa-60847={run="0fanfh1gb1fmp7binmhks4l90s6925pki6gwyzlaa7vy7za1l3ck";doc=" pxufont-67573={run="0vvnhghcdlyqhl8244c76wd411cd9cjmjsrhic47rjs9sis1ilci";doc="088a02dfk2n6lgyfri74p2lnbp7mp4vn96qqkby0qjfnj6956hb7";}; pygmentex-64131={run="1kd9jqmbxhkd7gijghd8wi0q5sxqf5dpf22z96wwr29kvv7jxm64";doc="1ppayblsdpmrd9sxfpf0kqhbsxfd1fgq69g48zj9jzbhncwx0lhp";}; pyluatex-69372={run="171ahvh5ii2gimcx0a2g0dn7s87a58yff7g2dwbw5hi8vyqksfi5";doc="14sxmfsk3lrzcv0k8rkrq7d5dirxmy58i3km6bkahigk5iryq38p";}; -pynotebook-70818={run="047gvfm3z7bn20qr2f50ppi1k0wchhcmlri9z4hihzanrs8rc6pm";doc="07vnzf06sc3kjrqrjla4x9i9d5hsy5is4k52k690msq29xl98dpi";}; +pynotebook-73069={run="047gvfm3z7bn20qr2f50ppi1k0wchhcmlri9z4hihzanrs8rc6pm";doc="07vnzf06sc3kjrqrjla4x9i9d5hsy5is4k52k690msq29xl98dpi";}; python-60162={run="0brs0hydf9vqwlvxipfrfxqjblazgb8ziy4brp2bi16bnsz59ykm";doc="0x1nfbv7fmyhzhgy6xsndhd9nja8xbip436kg7ygscjxml6gibgh";}; pythonhighlight-70698={run="1j24mgc1s27vckmlpgcp6v96gcc9g2fc2sngzy8bmj2i4ihl0163";doc="1ifrp3rixa4qm5nfl2x9c1x34fjbil9y4dpl8sin191ri10fa14v";}; pythonimmediate-69487={run="0qml1nlmkqq4gj4cmhx2bpy3105wv56r5z4an1dvxkh6xpi8xbz9";doc="184lkbmyfm3rw0zhl79pk62sdnaashihvbhkar1pbnjv5jsl7646";}; @@ -3336,7 +3379,7 @@ qpxqtx-45797={run="123dfaqzpl8h5ia08swjmj4h05ncz3ishsh6rbcm5px35ccrgjld";doc="0n qrbill-67724={run="19wl8p36crfgyzad9v20n3j8ad33r7yww9gn3z3yvvggdqpsda0k";doc="14hfgxl7rl026cmbh2cxnj51fslm1zzfnc5pv33gqzd3nzmbs1mr";source="0g3aii3fdjp3ps788b108jj7ggks4ndzhg071jqca0q5xhydnvph";}; qrcode-36065={run="0vs5sg5hch0c2rxy27yiy1c543l2fnqinr8nvsyr288fja0pfrig";doc="1rmwz89yxlgrypmki8xanqc3xxm10m9zc2shh5r0fzwmsfssri9r";source="115wlgvpxx0vkb9d4gfwbqamk7sfmcfd11hxbfr8khd5hv8asvpi";}; qsharp-49722={run="1lrnzvlalznyxmkwrn9nh3x2zz74bakiq09dg374js5yni36igf5";doc="091kiiicfinn5cxpfhhb66j3hkmv80gsqd1b66xcz4ghxan43ywk";source="13923qlhbx52x7h3v0iv6y8q0dz8g2ikvfz9m0lh9zwjcwv4mpxy";}; -qstest-15878={run="1xk4vqqics2iwzxck416za70cksx836qrsm4v8idyg9kscvjr1jp";doc="19ddnrz4wjd51h8g0z40db53wh0zlr6m1nfczghc5b26vvcj14y0";source="198xvadvk9fb36kxzv1wpis5qb38dqaxsqva6l7l23kz3sb6k849";}; +qstest-73069={run="1xk4vqqics2iwzxck416za70cksx836qrsm4v8idyg9kscvjr1jp";doc="19ddnrz4wjd51h8g0z40db53wh0zlr6m1nfczghc5b26vvcj14y0";source="198xvadvk9fb36kxzv1wpis5qb38dqaxsqva6l7l23kz3sb6k849";}; qsymbols-15878={run="11jlwr2pwrxck0xcw2szql0rdynjr2pk4jgzlqkpcardibfr385x";doc="078qxbmv1zgg73a923sbfqnwmdwg1qkfxra5r8dzi8wlq1cv29ii";source="01lmlclv9rlkga19mw4ikngdpkxhmhq77kylln8kjhcpa1cylk5c";}; qtree-15878={run="10a9v90yspc1pq3ja9bzixdq6wxl6q4jxz5na7x9yw9g44z3xaf3";doc="0ja3xpng871h96q220nrlq2iypk2spjs4qr5vpmri89b5nvngf6m";}; qualitype-54512={run="1r59cbk6rmdy0zhljcfqxksf101rkzib8ll20ak0sshc3f1jj64y";doc="1jxcqd48v11b74drv0lh2gv65aqsjv5zziph2s9g5ldd1733fgl5";}; @@ -3347,7 +3390,7 @@ quickreaction-66867={run="1jcqsgvsa886hw3ldf2xx915jll8glfdd7vmc04plgvvvfavghjj"; quicktype-42183={run="16qy6rxxkdkkli1knibhbm28jg80l0qjsn9lsb36b7z5xwxj9f21";doc="0ic0lkhj3rdpwfsrysm5qidw0gby11kmfnzbh5k2fpkfarwfhxxb";}; quiver-67779={run="1nakig6vyj6fmzpxr7xv79wx75f2dq42k5q80fg90krxm65bmbn0";doc="1jbxdisyxla5s8qkn19ayj0iyqdym7n6xlspr0vjmbz0nmh0nxd7";}; quiz2socrative-52276={run="1s6g0svlkg503r5mqn3iw90qyw5lwpv7dj92yck7ymziv9p59qkz";doc="0v9x0jxrgiscblh8w9wip07di78glgzd0rn2fp1hpzabi8x94dvc";}; -quizztex-72256={run="052shpprnc6w1a1gsyfb2326bbfyqsc0gbga9cl7grfasyaz2j79";doc="0q3asdraymvzams680wck0p5mhli17znz5sgv5zm590lsifcg9vd";}; +quizztex-73069={run="052shpprnc6w1a1gsyfb2326bbfyqsc0gbga9cl7grfasyaz2j79";doc="0q3asdraymvzams680wck0p5mhli17znz5sgv5zm590lsifcg9vd";}; quotchap-56926={run="1284ldj6pfqq6mz2a62pi81k1jca8xkc6wa1wbrv3kqwfdcc8cwa";doc="1bnhvp91adi4bhzwddzl16qw6d74in94jq2h16lk06aakcwr72hd";source="1g2cfb5j1qjqads2m9ad9a8n0j7ihrvd55q9b56jd141a23layb6";}; quoting-32818={run="1sghajwgfdc1p0gifii8wz1rvzsiy38f4jpfmh5pys9w6nr9a8bj";doc="0aknicilv5rn3claf77l5br5mr21yg1dhdc1j1yxigz9k8pljzm6";source="1h01p11ahr4ykqnhgl0kwc5i68mw9wznswrxy9ab5rpma1agjkzp";}; quotmark-15878={run="1v48482b57w6f1cx0b5av9cq26zhgcqkwi8yllnl9p8pnrjngc9x";doc="1jmdv5i67hsbmybjr8j2sv7f7z8bm3a30yy0ycyp6b5c3ycqx04n";source="02bg50nj945gycxf8kb7s9c87xwszprq3zynrxxpzixrxqd06pf3";}; @@ -3365,7 +3408,7 @@ raleway-42629={run="1d8zv0x1j2c996ql8g7zc38s7fpc61ibk5zdixhj7kbfrz5cbc1b";doc="1 ran_toks-59515={run="1k31qcvbdfx5xknykv9zlsijgzxcw53amb03avwbqm3kly5d30r4";doc="1jri3cb862m8984awdshlqc9wwcq0hbjw6cf2yqgb9wn186gjfyd";source="04ix834glql0yprygm5s2354q62cwsz39lfk871n8s9mxjd2f1c2";}; randbild-15878={run="07ix44c2zm185byn868bmm6fcbwq9q37h31brfa4839hpklg41pp";doc="1cpyzrmswxawxk6x2vfjy7y8qj3mjrxgmr9lgjvz11f5fvvdb0i0";source="0yzz5awhhw52zg877nl76410a4q6gy7mrri0hccicj529kk0d1x5";}; randexam-71883={run="080381hzibayh4xjsvf3g4yw82s1rsag2vls21g31lmp2kn5y4p4";doc="1rn6byn896p3l5pb8yjyrhc6x3m34bn0llqb5x6whdsd35g5j7ib";}; -randintlist-72646={run="10raypmsjqaj3hvhpmpqkzfi15n8599h4zgdrr43i564yymhfrif";doc="0dh5q3ip5q2sd14n38dpq9xqlsr81lapwxwznx6750d26ikp5mi1";}; +randintlist-73304={run="0nrmi0lvks35iz2wmyjg9739873nslq8xmd6lbyswdfac6xfygaj";doc="01m4wpmj4dy9yghjip2rczihx3bls4awnimqwfxgmjcj4sznl44k";}; random-54723={run="1y4dn1i3kmd99b5br7a2j6ppf0ikzp744si5p6m5rmvg4vh1jh69";doc="1gfcswp2krrfswyjbyhck4pb0lq03jh2mfwzm2iwvd3zlndvccbz";}; randomlist-45281={run="1kwbg73d8hk4wh69fajl1zqyvkfyfxzyv5xykknpa5s67pxkh9c5";doc="0r8i0ywq21c1h317b3yx5ixr4b1fllgwams4yy5z13alda4wxqdx";source="1s86m5hcncfqkwlr8mwdyh3fsnyzisiw5dlg52r499wr77r5z56j";}; randomwalk-49513={run="10ivivbyrxm50svqdhv9lm623pvmnifpwpnbhpmx2nvf4crxxbcm";doc="1lvff00h8c2fxyf7if1d2xqkk87lb6396w6mb4yfxwsk0j8j2jhf";source="169x0wy0k91kmfbisqh4ciz8n4knhkxmz2d227gzwbf80sr2a80y";}; @@ -3382,11 +3425,12 @@ realboxes-64967={run="0xyp6w8kbycaqmrkkrl8701c7shvd9i16vvgs28cvr61nkv3mv4s";doc= realhats-66924={run="0v8pc4b8ls0xyfbji9m7dw728dni8bsggq2pjf9bi2vzmq8825m6";doc="085nfwsfvmbwv7zlfg849ywyqswi011278gmws01sv3q5y6ypfxq";source="0rp15pryn8zyq668pxapwg0imbn76m9fclwh6qd2jj48bqrlsq06";}; realscripts-56594={run="0ph678nf5k03xl63z66gkmg5f8agxy201y6bvabhdnb1zhvfrfmm";doc="1kmlaym3vxb9mx0jp7wvmsk13i30wyyazhny5zzk14bwx8rk3kf4";source="1qzqr2q2bkq4pchin1xivg8gwx5qkgip4kq74rswfz5a5iimyh0n";}; realtranspose-56623={run="1m3gmj9bay3a1b7fidjs6rs2077m7csaszz11g6y5i2sjpjyx2aa";doc="08w4ad33pycaaiwhrnmx3sfx2c6kv417ijhqgxdsja1mrhcp0nxw";source="0s4lbg2jg5fa4x8f9cnp5zcb4yi92g4981dwdksqsilcd0in4ksh";}; +rebuttal-72851={run="1j1b784rmff7148fazl50vk4v6bm0gama7wnmjr8fd6l3ywafvxh";doc="13mxdj05rraw5kj194pbb57fn0dgkqnrv3p498a261igd382y798";source="03jvdbs603pg2579vfmnn74kf20w8jf9nik0zghsfldiy2bb6279";}; rec-thy-70806={run="10pbpnw1c0f7lgmzs4cy2x3yvn5kg0pqaw7534hsr5q1sk5hf91i";doc="1d5l9ldfpdg8ljvih3r9cj8blis0k193qbvrg28jsnlav9hzxl36";}; recipe-54080={run="1pnyia45nx32r1ng711k2l3g2h4r6n67nfxvg193z4mz1i20hq85";doc="0hhm5l89naj8vzjnvf2ambpawq7scp9bgpfjzszgb6069c486bvp";}; recipebook-37026={run="0ianmda3ji60acckagmlsmrsvi4sxp3prznvzqkkkvv88w1xbm8n";doc="0fmc59fddgfs4v6lsba04g334xlkhsl1liph7v3yx4qj6l9dxlkp";}; recipecard-15878={run="195lg2kvww7amwls014s21l2pnyp24c8cfyb3glrxphcvcdhhr6q";doc="1h13vn2zw880gvzi1pc8j41wa21ygja43hrjmyav4zxziiisrnwq";source="0fkwvjxjhaywk61j750a05x0s5fgb96q5n3afcq056yf01jbvsxi";}; -recorder-fingering-68595={run="02wxkvcwh8j3iv6dm9ms3nn09kb8lz97xx0jq7p0w2i95is472bc";doc="0nh52w97xi8p2wgqrpz4svipi8fcam815a340zlsphxsx31c8lg5";}; +recorder-fingering-73711={run="17wpyvg1x955hn156spr4p5bk9qxwkfjk6p7ffa749lw3fscgpnh";doc="0vc2fav8iwrgx5bnnc75ddd2yhcn4769vhkabcjkknybla1sssfa";}; rectopma-70885={run="181s34q723rqz37v95d0a10i1qy2fbw4nk49ilm5mw5q20zipmpn";doc="1p59yg3hwjkdq8vh9hlyy9ndbndpp0iqv2chkmqgax3qcmxvks9j";source="10kmv06r1ym6lwm864lqnl97xwhb6hcl9jkjig3b73b3rwph7hrn";}; recycle-15878={run="0pj6xvdd30b4y1fa01vmhczinw48d6psfd8iy0rpzpaq89rbjrvq";doc="0sylgv7viy4qgl0krhsf8q1gkxiz91wpn0l5jyq5y1zg92x8jk1b";}; refcheck-29128={run="0v82jjddvis01n2ngw7yngv4kh2impw77s1yq360sxqjym2m34ng";doc="0ckmd4wnjl0zbyqr5q18whb927sjbz1xgdg1hg5w4ih0g36sra63";}; @@ -3398,9 +3442,9 @@ refstyle-69680={run="1jfnb5vcsdj5wxbl8cpiv0bym8n62pqhqz96vy6hd7cnib85k3c5";doc=" regcount-19979={run="19n0gwvh87pb2fanw52rc5j540v9yw10h2r8svczim9sdginy56r";doc="0qnxcyh2vhkylaav056lc2vg24y5h11svzy6hrk6rr3sza9k6z2k";source="1xfk7qs4x302lfi93a1n8nzpsmzmypyb34d8hd7h8y6nm7q2g4y3";}; regexpatch-58668={run="0i8dfsr32f4w3lfh88z45sdhvwzqgh52xqfqgj53fvynblpz9msw";doc="0qh2g9sdj971a75dv3jfxi3ga3mf6fmb4azphkdgxmm690dblx35";source="1iq45q093v1n421r37w42815yxjb7iby426a48mvgzyc1c82rd37";}; register-54485={run="0i084dij80m292c9f57hb0y3gs870520l8awl3wb21ss76vs5501";doc="0zi950xii9qbscbv5030aw02arc77c8inwxmzkslcmapdqxq5wr4";source="1jz02c2c5xpinxninb1a2bkgan21gijs48rks4xv17y7k6z9h00v";}; -regstats-66795={run="022l63bc3g31479byh1350fl4wpfw9pq9jbqy3xzhrrl35psvqpm";doc="1l54lb8g97gib5al38k98gnahrpl4sc0kr6wrabagq70cbbpnc50";source="1px681bkciakl41cyblk72v5kh83hyqf7bn3s0hjax9alszk29pa";}; +regstats-73635={run="1g6r24jlcddziccbwcilmcg6jlr3whb6qvi6v695ijf5f9jfpr9x";doc="1yzbn42rx5c4rljs9ivya5g08mm53xdnzg9z63218bryigj4s9ai";source="0f4xwgqacnl6sqlmsnjrk86q9ymjnl2w3ikmhs75p3rssxjmzmmc";}; regulatory-72197={run="0lwlkrsvx7iry83044nkfl017qzcnk6my66i0lvd5zs2z7i9fir3";doc="0sd99jb28jivk723b7qrlwxzx7bjgh1s2xhnxy3w4sq102r7pk6d";}; -reledmac-71890={run="0sfdplyddggkx0jbn168yhqpjvzb9p1h3dh120y9jgyvixfn99d3";doc="1m02isa220ag4lyyfi526xsnn2hgqnpasiny0gjm46cbvrf90y92";source="1gd5z9gpd3lh36218yddbgpf0zn4bj8bimsjbhywibr67s6v6gj9";}; +reledmac-73819={run="1ffqnfp37h68p6v6p41rangjs7winn0y0s04ha45kp90bq612i98";doc="1wyz10xn7zkqr4d6j2pjadvk2yy6y8730fxfnk5amajb8cw64izb";source="07l25ax983ldn71axr1fqzdql35w8ld9pqwpk1rkqnpnmvdz27lc";}; relenc-22050={run="13ym795q37rmxhmr0d8834y272si11f0qh7lmhffrpsf4d3bhf74";doc="1hb2sdm9lgzfkj2kkbrlb3alnfjq4rw3islgdzkqbcgqp9s06f67";source="1gk7nbczw9b897idmsgqx6i8xdmi7wizhb3dyc0hir7qmivaqv6s";}; relsize-30707={run="06sy6v0jscrj2qs7axm770xv8fkiivvj5lwb8mkf58gd5jwc5bgb";doc="1sgv3x3dky3i7xivh6pzqh3lrqjhb62g0ji0hdgmy9blfrdf3api";}; reotex-34924={run="113nfw6md0v4522n54q63smd2g2iwm89qsqld237f32r3rdkbcl0";doc="0lapzgfp019a7qihfhf1cp2szwq98j8kmcy80c3gf1fa1x0c3x1q";}; @@ -3411,7 +3455,7 @@ reptheorem-72495={run="0x1j50cp73z02bzikq8cm5b3ndl1xcygxs2p0g47c6d73bs7bq3z";doc rerunfilecheck-63869={run="0i06ypv9hgdgmsv2idx8bfpi9xfrl1m17ly6cg8a1x0v6ns50fwr";doc="16ryk4k490pxdli58j36bgrbmfi4gfc5jm8y0pnv9fcj07da7wpy";source="17m0dig8vddgga28j5raavq8aysy3kdgzapyrciajj0j90q14sss";}; rescansync-63856={run="1qdcw7zi965khz3n3xrwg9x84hi58iv8sg9b3dwn36cjdrxvvx83";doc="0szxkc0bpj0in2mlms1m381hhrajvwhp4yk17daihnyyxx6m78i9";}; resmes-65375={run="1g0gqmx21s3y5h8ll5ymgd2k78mdhw3nrzc3xnpihdvh4gjqg9zv";doc="1qpmlhw6rxc8jmp44349x428f7mrs6dr07l5q20v2qj3xnnicjzx";source="0s5w0cf3a3106v029yndv5hmx5nrdk27dwbw18wb5q8m49gn6pz2";}; -resolsysteme-71707={run="0nw9g8bn4i57ws9xk954dw5qwzcc48mz4dbwk71vzc00i6r3gxwn";doc="1iv3jqyg74nlsm5ahk780bidrdkg8jbvmfmzgd7yxw5fy5qifxa6";}; +resolsysteme-73069={run="0nw9g8bn4i57ws9xk954dw5qwzcc48mz4dbwk71vzc00i6r3gxwn";doc="1iv3jqyg74nlsm5ahk780bidrdkg8jbvmfmzgd7yxw5fy5qifxa6";}; resphilosophica-50935={run="00qqwp5n5a8hpz4zpcmh3avbm0wh2csdwdf450hmqnhpv2hn2z18";doc="1s5r4s8ja16vsz3ssqk0klfm1vfxrxbcj45mlszq5r3k5gsa1y5b";source="0nkxh1yc6nnjlh5bmf9w5k6hzg62f4i7x7nbf2019vlwvqn7r4yp";}; responsive-71800={run="1d3n31jdxh4ndfrzcmxz8sx6pm109liik42k9k5jm7axc0brl31c";doc="1shb19zbjsmh2na4g0hf0g5372ad0hgs6wzwbb53hsg60f7l6rjm";}; rest-api-57068={run="04y8xai39hlhj6y78cxq2fqy7fis7mbpwzyk4jmgqd3365738615";doc="1w33inmwr66p81g66zxqiqccks965060034sx8rmjnjfgwqqgcgn";source="06c06pbqa8m58r0lcr2xc6zahf6gjdc1r2zfgs3q1b6czy6rns34";}; @@ -3438,7 +3482,7 @@ robustcommand-15878={run="1vxsxdg6122psbplm22l7f193fv7rd3dadcg6ys4ngzy957acvig"; robustindex-49877={run="1fl9vr5mynjg8w74sk2jh8vgj5yjpmyhyr107iblmcicgwv1sd9y";doc="0xf592xvmh6xmw08zwwcsn9xyadd9637vicnz95fbfpp03p9qjnq";}; roex-45818={run="06mry55hqrakkc7yb7b174cx45n0frk3isxw96p4v77n9pyvlffk";source="0fwcb1fgz4kxbgcqm34s5glswj43wzg5j56ak5an39lsw0wirs94";}; rojud-56895={run="1cmpg4w2pqwvr624kc4rv7kvnf45c2ffqrryh0i7kbqgc22xly08";doc="12y4cph62b8rag4dxajpzy7y29kvnb3n0z99s2vcq1hfscyijn12";}; -romanbar-25005={run="0p4a1g1s22s7jq4ahvpqspx5gkd6nhwifbf1shjp53f38myy0bm5";doc="157glkgzh4c5zv15akrlvfl2m03i99hfrm952x919137jkvjbpkd";source="0w70p08k9k1bwf9ls4wgnclp4iqj4hzn132ny4s11lzcaj4v8p5l";}; +romanbar-73634={run="0wzc25x8bskkpakdd2y8spmgr2mgaz0jms3l3cw4w07g0wswcga2";doc="03nrjdprcrpcwy2r7qj7782r60h07fli4xpkv1zsh0vv754cg7mx";source="168fkzd7d9f4sny9h41drx3c1c2yz4xxmdwdswf3vgracjfv70n0";}; romanbarpagenumber-36236={run="0m2772qfl5862l6m81rrx4xcbj1s7vhk9x0ywsqnr8qxl1kmv3h3";doc="0mj7kh8jvhscc4clf2199594994xdx557q0nnsk95srwmncq8f50";source="0hq151qq6wb0q1xhbq6jqzxfh3zss9iyya5wxv883a8pd79rancj";}; romandeadf-72484={run="1l4w14rbpp2s9znwyxnyqfbbllywcsmw9aan4nqqh07vx3fagp9y";doc="1821fqp9w4qsjfpqyc4284xb72dis2d5nv78fkzzgb1bzdmckg8x";source="1jpf4cvgpynkw64sjjakasgvvj73025prvhw0jzggywicgqhml1r";}; romanneg-20087={run="0y9nlxbjyiwivw9jkc0vz0lj3b0nvj9dcd4sj0gxgxa1dg853rlp";doc="0bi3b9991x1pvh8s8yrw5031jkvvwkrwah78qfd5rlywh2ylnrr4";}; @@ -3450,7 +3494,7 @@ rotpages-18740={run="1pqfkyqs8ymfqsvq35cpv438g8a3az6sajh2bszxncl7m3rqa10d";doc=" rouequestions-67670={run="15265sdg56vrc9i7jl55rqwmhjzg27x46qinmzr51jws1wls9l5v";doc="0gj9w2yv7nvjjr50jwaagp6ccqr537h268sakms9fvd3hx8awmd2";}; roundbox-29675={run="0607rknc69dnzwajmgaq1n8ixv884bqp5n9m1g6n2d9frmmh057i";doc="1vyna8wndg79vman54sv24hbdlv2jnrdkiwyxgzcwc2zv29asxs9";}; roundrect-39796={run="1xjfigxkgcszkcja58jd2w1rhhnccsl665p0k20lssb97wmdzjxg";doc="0sg1ck97k8pbg2fjf99mhpvd251plphr5pk1dywmjniy9vmhv1ih";source="02kk3h77drvkqanc04bjlfzg0scprcs78z3m2zf8gs6q8w95k7pv";}; -rpgicons-71994={run="1hl0sg90clv4hrv5cdwm0w4mbcprll9y8jjbavdd4qpdy97jksqd";doc="1vcwpsbazlncc0irjjw4l8lzwj74p4hql2vi67axmkm6vv7p7k82";}; +rpgicons-73609={run="064y5ksaz7d0rxddm50hpn687v95wl9y0gw7xa022v0adisnydqn";doc="03jn5hacnl5hmppncz9gf7hp6m4ijwdry99bxaw6xags3zzzspav";}; rrgtrees-27322={run="0jihs23929pzbgpgnb2v9i16fcil9kxkggdv1dvg6xq9f2fh21md";doc="1skw79hvvh0xkjff4bfl0nqdd8znwhhwpdx33v8ns43xxamzmnwy";source="1q7y5mbvnrykrp87kljcxw7zdglh08cqz92iahdsaac4xffnz6bc";}; rsc-41923={run="1ljdc1qyy9ziqsq2z6p13jlspjpalbkk9i5xmqrjwhbqz88fa1d9";doc="0ckvfgw88jhfr91ii6zahrziigwsxfaz4f9rmc7ca2a5vk5yqc90";source="01v5zc947vqa8xpsam5pyg8vxm4yygphyv5hji0r5dmplak0q5gx";}; rsfs-15878={run="0q1iqlkq6swy905jh73y42ya9zb55xvg9w991x7lsmdxc0bzdf8z";doc="069cpd747d6bk7jmmn1im7jvfb00bd597l34p87vdjcwbk3bzfvh";}; @@ -3458,13 +3502,13 @@ rsfso-60849={run="1h1hzsf74jll793qs51pq03b2l9szbqagn2p03bcg0f3lgx0cxx2";doc="11v rterface-30084={run="0wlscg6lhqar791sz1d63mnprxvaqvjx0mfk1pi1c2zsk0lnpghs";doc="1ghwg489y801j2c1s5c7qpv9yyh4g6higapzjw95nmmyf32aka0h";}; rtkinenc-20003={run="0q024qcai2slxd0ral92pzzl4apqn5gr8gj3vw7whz7432m4z7gj";doc="0kr27a2294bj80f3qria15bjpsvgifgaj27zv9wj11rqr5g4zm7g";source="1kwg3qbk2ldq5mirpvg0cmhd3nyz79jfdbw7y37s2c86g3c5j0i1";}; rtklage-15878={run="0wrvj1d1dmdff3kqph59jbyg22gvz3bhpnyvjd7ih7vzfi4b8861";doc="0nc926q2arbszwsq88dd96spaj5xzkrfng34m84x0l8wbiidbvlh";}; -rub-kunstgeschichte-72213={run="18w90ygzfxbh27g4xb385l7c02wni5zb5xjd888zpz5a7gxjwnhr";doc="16bqvr74mwdclrcnlzy446fj7m4hryqvmlraj1q2yhv4vh79q6gy";source="193ww8n0vcxylg8ad6mxa6fjwvn7p1jh8h38fvl3w545j25l4llq";}; +rub-kunstgeschichte-73739={run="1dnm0d4f064j99ddkbxnqpgx67jir8x0hagf1m71gxqx2a97vcg1";doc="1yc7fbs5f10j2d1zhhci1kcj5xk0g12rh83fdrspd7d3yx7fm43g";source="1vhhpfprv9y6daf9k88nrirx2nmr28xk6cbgvvm7g4c9adcv0l9c";}; rubik-46791={run="03qnnbqas5qrf6jmj90kgdn9kkliq8ap70z2b9jyr4rzq8m19ryw";doc="16jzhkbh8m8v8cb0jyifhz6dcdn0sxzi898dcyjrvf245zfwk618";source="1cnkay6vn88p5l5jzhf5lzzfd39p7pbmz9psc814jvlpqlzx90fy";}; ruhyphen-21081={run="0pizl8szphgyq12sbpgsw25x88svj6vmf8j7ry23hvc9bvjibck7";source="1s0wscvjg6hj9f8arjsp7b9m7nqszqxh2wyjrx9i2qb60n2kaaac";}; ruler-54251={run="1ikap9dkdw9lzpda0f2krizqbfkyjxvyddils7clim9nhg77aq71";}; rulerbox-50984={run="0srxrij0sxvm04n6zk4vq4qqmxbjz3v425nx191z96fpjcssx2cn";doc="030wrw1ry800yixlgb11xbm5834njv3ad9gl4jv08x1pxkj29vcp";}; rulercompass-32392={run="0ky611n65rvaii9b5ic498p7divfm71h843bv9h70v363mki9a0q";doc="0wqgnb9czbmymzmv7j48lgdv8s280id5sh8mwv6p0jqn69zcpdd8";source="19943zfp2rm3gdm6w5db01w6r1nl0kn4zkrnnxg4ic4n3gvv76px";}; -runcode-69471={run="14kg5vn2a3p75fqdz0qm1xjg1nyvhmyab6zp0dw57qxxnzbpf1sx";doc="1s421jdwwvpbi7qkgdv7y6y697d7wfg8d95y78113z2p2582zhrd";}; +runcode-73500={run="0bf038afig93a1bh3fb1v3sjr51n97hw1bk0rkn3b7ir77n546w2";doc="021lijdyxz1jix4h6930m1mvmv8wskmvxyh8cp81pydzkjcw3sih";}; runtexshebang-68882={run="0c4rsadkk9vxcax1r0c0mz30krw387da9ildvjnh88ll7zgxv7xx";doc="1j72plplkdlazbqhpnykwl5fbszr3lil3zg9a91aih9nzr662vrk";}; ruscap-71123={run="1h9zj5q683jlj7rgxk2nflpp1b38c2b6g15w0flgqsh6rxk59dq8";doc="1045svwp1xrn64m29yjhn4848b3m9j2r64qj17app2a9ndy2jvgl";}; russ-25209={run="0jr0x81xc1zi9vhgvqy0hcga48nhkj9z2n4rd5303b8h68n92yfd";doc="02dl5mh45z9n2b59clcqnaj9fsv79jw46ph3303mlx7plyvdqj8z";}; @@ -3477,7 +3521,7 @@ sa-tikz-32815={run="1hmxifd6zkq4scfwybz0j4za911r76v56pczgym1shx8lqadsjcx";doc="1 sacsymb-65768={run="0s1w8975ihjffw4mi44x91m8z5cmv7vpwvbai0n5sm9f21mwgvmq";doc="14mnvqqpac30qwjld1vsa6ky1qni968a9kxlvi8nqhn2n12ng3bf";}; sageep-15878={run="0yavixnkhy1y69l38xj6pbihzm83ncvnsl6pyr3l310hif6r0wcg";doc="0z2n1511lr2m39vn4bdamw8xbxlw92p5hrsxzrnjlrg39ysymsyd";source="19547avrh6yv2v86w8f7b0pbvh8xvwa5z8q69bxcvhwj0jqjicps";}; sanitize-umlaut-67126={run="1hif269aigbfg3j1f579c6ipvlqqgs0swlzamxdmplbdxc55i9b9";doc="0nh23n1yhjyf21l9sr8y6yw7v1mil403idqa08prvrmnqhp1d215";}; -sankey-61874={run="0njrbv0wghzsyhhxlahy6gc4jbgyz4q43qzqc3jb8lln6s6yn6bj";doc="0v7pfxj823fxl8w8v8khgnd64g0wr7198071ai7s6bpd9byq3pkj";source="1qr7nfgh8zigjj2hhwsvhnd3dl6933dfaqjidbraid3l93af8ynz";}; +sankey-73396={run="05gpdv1di6wkyz4kwbc8vnzs9i2ij9azgwcqiyyrmqz5h710r258";doc="121ak8m8njbd92zm2hrbwf03ir7c0xaba1isrs9gdgvkf887mxl0";source="1z10rqgh7nmivp1dz6kmc998rnf4h5wvm8rxkanfbqmjxida40ks";}; sanskrit-64502={run="1w2qni1pgzj2mafglzyvwfk11csfwz83gbcq1ihqabxsy3wqvpqw";doc="1ss9shgz8q2mdhs2q5128pjgcl9ldw0bz97xwf74346625n4wgxf";source="1sg4dzb24q477cp83wn3wb0w5srj373llhx3fnqc9cmxfb0rs7ag";}; sanskrit-t1-55475={run="17mqm0iapkf04z5wlj3qpk9qlz8nnq50bfbibikacdanv3852m8i";doc="14g53969gw2azpn7z81kdwc1m1hz8mafrz15kzrfiw9w6hh7s6jk";}; sansmath-17997={run="09zi9xps6pv6pjwp8pjiz6w4zqa9d3rwqn38167k2dlwnc3ij6g8";doc="103h78a075lh094slfwlh2yk4dbl0wryzmsksvbp80gbv8w7llpv";}; @@ -3495,23 +3539,24 @@ savetrees-40525={run="0bzr06y314xa1r105vrc9nd37akqcsq58j0qxzlyhc8jvbji9ajc";doc= scale-15878={run="0al9axcipchrzc9a3dscmv3yvzwz2388w8knr4vw51mn72ws12jj";doc="1fbbdksmcrd91sixwkkgljnbk08i9jfhc751vzggrj87l38ym67c";source="19nfy1dcq5bd23dnl9aa8jimyif5sil9lf8b4hspyq7cvzcjcplm";}; scalebar-15878={run="1q9jqf46j12f9rav2j4ngr52pqfyrc4h9xj66cgb3mcc7nqgmc4w";doc="042xgbjlibp1273400sg7p6fzdzbnv344dgnrs3y93gk6g7vf8k6";source="088k5a86279b7iwci0wzxv5wnqifqiwc5kc85701987x5qiaajhm";}; scalerel-42809={run="0b4ppffs7zcg3y6i3c6dnjb2rl1xm5rz7k5mxm08qj4dpdhyjfpi";doc="1js1z2fkxy7ixh069hmg5cxm33xjwwg002y64m32wj4ldb7shfk8";}; +scaletextbullet-73937={run="1cjnz1dzwqmcjmc44hq4w846pxf28gibsymwrk4r3j95wjmlyhcm";doc="0gzy3pmhpwdycd3jppjhl4kpj2a4vyfs70cqjsya1wfwbh07ghfm";}; scanpages-42633={run="15q22kfwbw6scnx8q9dj3p0hr0m86lj2asy9fp9s0a15xsbhq1is";doc="03lpz3836rwk5nk2sbbyv9s0kvjbw5ld9cvw1n40b5hggivc2sgf";}; schedule-51805={run="1p36glmixr7qadjj91j9rlzph03rp8hfrrfdqcg1ayyzkinr9a6i";doc="198yxgq4255q9bqjj141d5rvzjxq4rw1363gcwy40yagqs4xhxs1";source="1gc4zpw7ylnnv9k9kbqjf8r83srxbiqmqyy10xnp8gx7xrnbmnyx";}; schemabloc-68445={run="0vc9hfg5gn0xs9gjv3c4dlrxpsqwp370y1b9v9iqlncglmjcglfy";doc="1l9hqsa743lanyxp4y2p6ifgwrdaxycwnmvdjzdl6ylzv3n4qm6c";}; schemata-58020={run="1idrxgfzwcy31cdw07f1axv9qxiy2m2j039rj7m6gqqjwnzpdyfw";doc="0wc4vcn0gbwwgf5c7cxcb66w66yl4s815d6m1cj3dv2mcm83cjyd";source="1qblgn5msrnnaap7w1r6szdzphf7dgij48g0h7cyj12dxy8gm9a3";}; schola-otf-64734={run="01i19k0xhha76zz34ccpq83lgnjw4x7p511ssrbdqmfgrx5q0gbq";doc="1znflqa3myy4x0m7ayg3sk4z7pja5df1jm7lkashrcrr1gjqcdbf";}; scholax-61836={run="0is3py7zig7whp0hzga4d4a7kfs4h32w1irw4gmrjb3cqndg8w8s";doc="0m73qqh86cpgrrxw8v2nz5al0x850danniqyw8359bl26r8cj6wl";}; -schooldocs-69659={run="0b5cr9r7wsd00xih7ldgif98qxgw73swis6m4k8a7mx7xa94qll9";doc="0qk4iv7jd5ww6dk2n4wnwp7jg9s1ka0xfi3g9qc6y52f9h4blnkd";source="00w72nbz74plnbfkmhw08xwfxnkdxazr5vdrp61phh5vrk9lg9gw";}; +schooldocs-73466={run="0k9x5g8yhbdvcq9mq2bs283xmg9k4l76zxsn9bqyd5ls8qcxhwg4";doc="07rwv4dz4sh0ikjqvz9pkrxsv8invngv8vfmc7r2rnx3504jiz77";source="1h57i44gxk5ic64qbapgzjxv8q769jg39zxnwiyx1z1pml8xgwp4";}; schule-70846={run="0f2qrrk2xp6g1rb4r45vdvs0gc21hcqnd2cvc15hzv5ij6fxyyb5";doc="15z08p5m3ygl9q8y2pq7r33d5x6hdhndpazplyjwj5qsdc1l9b7w";}; schulmathematik-69244={run="1dw6six3530vyb4ym05yzx1f7mh14kk9pd7187rlqzn9n28vzqy6";doc="04y8fyn8plnq1q01qg3l2i5hw1rdycsfhr6i170kxdishq7zavy1";}; schulschriften-59388={run="08dsnba3p8nz3hnzh1sd5cd09ngg73vl8yq1h5l8qcnynwwbrcdc";doc="0vaqj4m0yxbbmqf51s107k28l2wms68w3km801lph4nfz8khaybs";}; -schwalbe-chess-63708={run="08aym55g3r9nn20xrc4m576q03lgdfxdwhgaac6j29b9jzac5wxz";doc="1s36x2mnj4ijn2785jvgk7mby9xpamh5ar5kz4ghpw64czsx85a7";source="0ls4xpj78311d2q1vacg4h5257wdf11as6x4k83g3m4dx30hxcvx";}; +schwalbe-chess-73582={run="1s4dbcrny1qc0r1i43s7frjfd5i4j6cb554v0mmghzmqch48nqrp";doc="1qsz9lin27qpv6dadsszycr09wrnq7m01qyg2n5ypsl6ip4viwa6";source="0sidlm4qba6sq552yhj8zxqrg94hg75dy7dsa98q7aa1hkcajpih";}; scientific-thesis-cover-47923={run="1ggghh7w9grb1l1r7xg1igdw79jswcanyn49rpnwiq5rj4a09r2j";doc="1slsn30sbhxlvr73fk9infwjkw66p5sgv0ydkmarkp1ncybqzr6s";source="1qlxpsy3rdb10xxv1nsn817srdfywq6z1zgb4vb0hy3qnbd2rjwv";}; scikgtex-66764={run="1hxldpgmp0k6ygry8pni0sz1bkz2mpcifnr7zrsabsx899np0rps";doc="0x73pwz3mwa7gpq9gmmdw6j7mksyknwbaihqfar5hidcg7n45k4b";}; sciposter-15878={run="1pihppjlynvdlsin8brrhl2mg2jif3fa1mvsard686m4ar6id25f";doc="0cpyz5n70hsp5hjdja3pl1lal1i2akn7xawwcp983mqfgnp8jm7c";}; sclang-prettifier-35087={run="164sdqd7msilg6jk1ivjzvv49amji4hb5r6wg51vcxmg069apcr5";doc="07s0y5dfmp26j0ayz2bhksdybpqb4cn439cvyifxillkq277dqk2";source="1y67y73f2whg663hw56fwrn6jhhpdpm81w32kzwc7r6sk79bnq3a";}; scontents-71533={run="17iqydx75fhmsaqy9q7q7rdh911l1bksp2960w5jghvbg60p3x32";doc="0y2qxmiy7s226k0m9c9aqig80x1fln2y9vka2r2wdip5na5maggz";source="0wa77z7f03h38rcawa8r8lwwpbk48lb4p1dapggy497dnnsi0fv1";}; -scrabble-69599={run="1r5nb64rsc0fp0l0x813f5d1b88f3jm2n8mf0f5scxpgmqg5d5qr";doc="1ixmz4z7h2lin80yr2f8kdq3c7y40amflwbydy8459yk25m70pxj";}; +scrabble-73069={run="1r5nb64rsc0fp0l0x813f5d1b88f3jm2n8mf0f5scxpgmqg5d5qr";doc="1ixmz4z7h2lin80yr2f8kdq3c7y40amflwbydy8459yk25m70pxj";}; scrambledenvs-60615={run="1r6a2k4n1h8n8svp40yraxjxy8xbrrj8d5srgz081n2fb7g6qdqx";doc="0ql4avpcccx92n4mqb6cn8g6zbq73238c4ilr4jj5x18afsg5f98";source="04xrips1nk27apwgfgr0qzn29h5nzs1810q66vlfk1qlmka2gszy";}; scratch-66655={run="1gd2yq2w2v7n3kfsid71qv2v5q1rvpfm49rsk4815pk4k16kxhg9";doc="0jhy08h2v2qf3p8dvh8mz5yqqrdzxnzlx1p50ng7xn88d9ihpqdb";}; scratch3-61921={run="1in71jxpq9mljn7gvaslsnaji21d43yj6ckzim42fyd9zk48waz5";doc="0yr18cyzdfrdz6vs0slbgzgp82gklrmxh34k1p135g7255gw8k0w";}; @@ -3519,9 +3564,9 @@ scratchx-44906={run="1rhqiix6dmdf9i8wan5xh0sw9ynawzb080b4izlp06d8vkfzx6rb";doc=" screenplay-27223={run="14p99gph5jvm0h9x8irh0c4mxb7q4208j5q0d8pd1dpmlvxvzsh8";doc="18i460n3p05mx325nh7br1fl3i1lfviy7jgl24yc5hwqyx3wwdpk";source="1fdw0bpf4q294yqnc4svbpyiza9bq7x2m0x5rc0x709c1wylqsyr";}; screenplay-pkg-44965={run="1xzwvnf16djzsif7ff8b51dq98h2844nzkj2f9y6c75g6rhnyls1";doc="0hkxa7gz3sammjdvglvafwczn54m6vcywz6rwqng8qa2hlvb2c3k";}; scrhack-72608={run="1m4j034mv3z2aa0f4xgc123ivmkihlqg4nasg75rraxsnzs9qmn3";doc="0n9yvzihk8wra47yjnwhdvzlpvq7g9df22sdv3aj82mvb1b9pm70";source="12w68rs1z5yag8cjlbdhdhhkz9pwgv9z5kg6z1sk81hf2k315mxz";}; -scripture-69232={run="098jk1s4xdvyh5pr90rysmxjhvk26135xfaxq985sazaz6lhm5yh";doc="02q96z886ijc0ipz2gi3dxnr14a67lhffajiqxq1s203m5rbrard";source="1pbdxbmar62z4drqyr31d703lg9yv5rscg2sw493bkym3lw1v2cf";}; +scripture-73276={run="183a0303ac8xvb2kwzm0r2bxw07v2dvs8h69x1nsm3nik8cxmh6v";doc="07if9k1m9dqrnsqxmprsmm1p26v6k198ri8jsls3sv2sjjy5dn1w";source="1zg1n7qbqgkmj4msi6rv9dsnwb1h095bqs94qyslba0rjxgnwgbk";}; scrjrnl-27810={run="1p858dfbqas8x4ddpw81mf59p47iqj30yban2g70rims1wqy4f45";doc="1rfx2x3kir9qxp74halcwrn9zg8c4lm72jljspw040gpvjpiydm0";source="0b48zv36kn7bg2n94yl2dzwh9ba1fx7phpzljqpn44ybj1ng966w";}; -scrlayer-fancyhdr-63844={run="04cq94rm8jkkncb4g3dy5d0b7c3h8bahby4rsd028i0iiimaqnf6";doc="15xy198pn5illwsphn7x2hdh2x3d3ydqa3rqkiwjj4srq5japbw3";source="1b60i58229yc8mv07fls6an4br8p897sdg18lz6b4a56z73020x6";}; +scrlayer-fancyhdr-73859={run="06w9mmd3690amx960rgv196sb1ldkx96fa5y05rkkr7d77y97ypa";doc="04j221wm1hq981alpnj8ghx1qgbrq2v7gxhm9jszh3a7n9babjk4";source="0brfpw5l2gavm9vh0c5in9f6y9c2bgdvjzx6x218hlbyfxjm8qcc";}; scrlttr2copy-56733={run="1as8ipxhssfx4hqa4s246gfim09nl35dx1wanfc6p0yk79nm5lz1";doc="0hsyiicb359blk6m4kj5gddlzwphxr12hbrwbp34cjfzkbh5ib5m";}; scrwfile-66872={run="0mvrg5vqhswmvnpf74ifld6fk2dyczknjf21hwmy7lyca6vn9fak";doc="0jhagc6ab9rfnb3shkn17dhfgklwmz6lg2ln77vskngxia5g9wzr";source="08dv79i1cm699rxpv2h2acnq53ghngc3cf98r7rcgmxvszgqlm8f";}; scsnowman-66115={run="0xzi49kpfq3n37ryn8p0z8h86x1328az401pmv6iviyw3l4ri0ap";doc="1h472n0ajfc9my3y6ggnihd0kjpiqhw65c7442aidmkwmxqi5lln";}; @@ -3561,7 +3606,7 @@ sesamanuel-36613={run="1a6673xpr0q8v7wr1rrq3n6acydsfsc3q6kmj0qg6hm7lzqc1f2r";doc sesstime-49750={run="0nrwgky0rh7lazd41h3jxlb0kgpk5q7hhbgkfdab41zrawjp9y86";doc="1a353bn7z135bnk2a8q57x4z8d03aimyjfqx3w9x0r81rwzns605";source="0vrwbbmfwfqpvsfz31yid9rxzdc19749fwhlpimx30arqpd88jhg";}; setdeck-40613={run="149m9s33isx98vkl3498ywjy6f9q31jkw8schc16hxxm1z0jadnh";doc="1rp64i0nrrxn7l2g6dlcmfvwbq3rg62h2ifxrzfp3k5ifnlkhpz1";}; setspace-65206={run="1h2cwbh7kb2hf3s399x78ij2mxj4b9pjyxrc7jjsr4ldx8hvf2by";doc="01v5nwbkap93zf90vx4a2whwxa0hbnscqqgcd8r865xfnzgc8a49";}; -setspaceenhanced-68493={run="0jqlpgv868qvcl5v3kgzi9dl2r99fx7k8frbzd3fj1yfmjvzb1vh";doc="15ln2969hhaic7zk6g7j66b5iqpw1css0qgwnppwfvydyx1ln6yj";source="068z20knb02jccvh3qm9a3rzpaki5r41is38v6ax9a2mxmv36y4y";}; +setspaceenhanced-72852={run="10zzh6vwi8qsb2b36gmsky3w9kdvj8z6hf6f1a1wb7wljlx4d5q1";doc="1g2fdixln6qyspsqpkwg7q54gfm5bjks843xpf11arhs691w1ai3";source="00nncsxrmmmmm1fwa6rs751gkaim0p60hrnw1chkn0s8h0cjsj0g";}; seu-ml-assign-62933={run="1cz01iy83gvgg3mk54vkc373smz4r47i8084jgcnr24c0gwr4h3v";doc="0f780ydm3ww7q2rar32lxadzda4mz8bccgman9j5ibwfsdnc1jch";}; seuthesis-33042={run="0yfan3cpx7h7hrnqncn152ccawlrsaccj0c53kzza0wnkr3hc9rc";doc="1hnrl455lz61y9ybhmrvxjb66y5816sq3yqb76zszrscxh5a8h5f";source="0dw7ipk6l0mwgrwrj9sxg8vidwmmy22vmpwm6j2ksnznz0238yf7";}; seuthesix-40088={run="07vjbiycd00r1daqg8m0b6g9k97ja0wn3s4zx7774av6p2hdhllj";doc="0j1vphdi9z6anvw7d3a20nasrdfgg8vrn9jh9wi787f9vy2xzdlz";source="09qpilk53k37c8dzc3q3pgvm6yf7i7a09ln0yn586wslvm2dmmhr";}; @@ -3596,18 +3641,18 @@ shtthesis-62441={run="09g79h7dwc0v06h06svj3h43q1xf31fli33xxlqnckz28i1a4y95";doc= shuffle-15878={run="0laiw8v6izp53c8y0jf4k1nb8brvs36gd937nz2i2cvnpghz98if";doc="1wd46l86h8vlxpasvhnvjimsfrhrbs56i767v2h7bdl8yp751ycl";source="13qz2jc0f084acxdsf99fj22kbsjkr6i3y7pqzh1g2jd4d8bbw8m";}; sidecap-65618={run="0g6j4mh0nxvdvqyaz0b0756y1xx55zxwrn761xz39mmw3sca3yzz";doc="0yynp2qmq6df47fzns8jq5hkbhkj8p3il3prq4l7pg1129278my0";source="0h0s7hpmx4ha318zkz6caxq2ckvwxxv2fbkjy7a3pfs7q2x9fal4";}; sidenotes-72264={run="0zvbzghm2g6a91n5w7x831g8qml2cym3vlfggic0xi67jlirwlgj";doc="1nj2lm33vn7y86kzmirzqppydka5lfnsdkksjmqk527zdab24vbg";source="1qm87llv4hwn43sf3297pik7azpwqw7ibdg2lzqcscqh6ah5lmzd";}; -sidenotesplus-69176={run="147si778pbc8vj4jmclsp1qkjn68qli97b2jz8c5ij3znjaxk42v";doc="0vb5r7bxj9xn1nkzmqnxh32ar87fy385rf2zpggahld9v6l7phbg";source="056mv9jqp9lgysgk89hh9wwbnwi4q477zc3cw6c7hkm5wn0xcx7w";}; +sidenotesplus-74147={run="1z62ybw81lfvf030s1cz7wv3qwkmn6j7r10955y2n8ar33zskj9r";doc="073p2v9f5xk7bs63gdmmqn002nm42154z61fnd8nq6ygcbwgjfjh";source="1787aqcb5p2va8zvprzmzzr7pqc6p4ahynzbm553lx3g9fy40v3k";}; sides-15878={run="11anl2mfkzkdv5qb0rfw7940z7hy5i43d8hh9nsvzgwfsw0x1qkr";doc="0gsqb1hzhy1qk29lhq57arzivkwxw1achz08ms1q8q9vxwcsf0sz";}; signchart-39707={run="1qg1r76v1llj68iqk5imp7f63774ky68sv64xa6j4w52jkkswn1v";doc="0scpaw7l26fcqylcqspd0g5va331yf88a8wc69diw78haywwgp4f";source="1lx77qldn3d23dvs11giircs2pafm54094h6ipxlc4g39g7xc0zl";}; silence-27028={run="1zixww8d87jymdvxjzjhvhjjr5f8fxhbjwqyzivki2rhw6dpsp2v";doc="01qb2z62da0ji751i3wbhq10rfin23q20r7wr0fzvqv163niy93v";source="1m5xiy5j8l0xy9731mf0jvk4f6bh7d22vbsgpjpvy5r0vxafgxwv";}; sillypage-71889={run="1nh5lch6h502vcmf0xvb2kaf8wgkjk05kgzybc74w73jlzqzfnnd";doc="0qvvg8jn40nxb7qdlnx29q07g3yda83czw3p5fr45x5yr54b62l7";source="1ircfzngyi7bwgbsvdwv66xz695gni9fyivsn9p7qq9ai9606g5w";}; -sim-os-menus-72484={run="1jdq4sibjmxwy4wpsqbi1fhaaxjy766nfxr5dfhgkjb8lsrk7ckf";doc="0bgmk0pjhkq6ixmysv8w9hfzcqca7979h75pzp59w5ax233a6vgb";}; +sim-os-menus-73969={run="0q88kri069a5yl9zgsf4xymcx5dw9zcyd6jjiar5458j22m62yx5";doc="13krwn8y4ajapna1agsy3wmsv4d79b6zi4db8j7myv6q01cj0ai1";}; simple-resume-cv-43057={run="09xsryzpnq33wja6fkrxy4ajrci6xcn0bx0mbsw37h0q0h65rp9z";doc="0gbf0rg3v1ivw631yl133iamh7kadclr089rby72al50xwnbi559";}; simple-thesis-dissertation-43058={run="16byfnhfd1j14911xs1448yampvvplxy8l54by4qwq01wp7pjjmf";doc="1wrxjkgbvps1wyicwlhkx59xwb3vcy1n0wf7r7dllw11r7hdg6f4";}; simplebnf-68959={run="1bcg213dww4ngpafy873ralbhp901c6xrsnvryzpgk5jrqw2d2bj";doc="1450ri57ci113csq9z54zj6284s8bn8rsl5y2xidl76rz9hdidgv";}; simplecd-29260={run="0d6gw59xd1mqc991yy6k5jva88j66pd69k5sl5jrysl4rw1mxxng";doc="11fzk8p911v1myphghzpmkj7k62vk4sdicirys1jh8rd2cpnnwcl";source="16g6fcsr0nw7isqimjq29g0zyf72z11qx9xz36zq8z4khxsl09ln";}; simplecv-35537={run="0b7p6d8y7xa8xs9i2qyljk2s992gprsr3a5pjalkkssa5kiz3371";doc="02x3nwmxdk9spx5crlaw1xdqlwah04m88zrrw4wdg0qjnhvv4mvr";source="05ikxmvflqz5m3qallwgyncda49dzq4fibllgc1j77pdh99cy3vq";}; -simpleicons-72659={run="19sklxmm19k07mmm8axkc3shjcwqjrxmsdd0l3vflk990ql211al";doc="1rn9ysss0wqpjkdj7sqbiqq8bc02jmhh99i0a2gmwb1gpy12j9gf";}; +simpleicons-74515={run="1869iygml5czmwksaqvgvm7m8zpqpw2ahlwdxyk0q8xqn30d5hz1";doc="194qnp9f5dcijhwwdpgbiqzqfm3k12ij7pmcg00458j1wii7zlhf";}; simpleinvoice-45673={run="1mdc6aij1id1jxlbkwfdvdv87yh55v5qyazfciffpbf91qm87z0s";doc="0lvk87l3xafl4s303rhmksfajnw77qd90yvzhdk126dp1prh7i6p";}; simplekv-68439={run="0cw7n0skxgxgar8ks5nlcn70pyi60zi7n2crdbamfw3kgzdqhqsl";doc="1hqyfflwjdxmq289ngc25gbjm2mcvwxzm9sbfp06xszk2vhbjd4i";}; simplenodes-62888={run="0rdmcmj583i81349m2hwdf0wl4glsfkg5vkmhlvzndh0n55ivj3a";doc="0sg5xs96agly3r917fvbs8mxii7b3l9hsqf2cpfpx5gwdlmwf0d3";}; @@ -3621,13 +3666,13 @@ simurgh-31719={run="1nhdmdi6qbvx1nd92hxl8vkly82a9nxi7ghj0zpm31c15z5pb7rq";doc="1 sistyle-59682={run="146493bgh2ghbscq69bxsngjfkl3k8g68cy5j28v07lxi3ywr6n0";doc="05hs1wd3wj8szj16wnmjfiy0g0hxgy2cc9ai7q6ys77kgjb0dpfp";source="0sb6vbhnqlixrfy9484d8im3vmgk58y7nqad9hm2gkd4p560cxj9";}; sitem-22136={run="19z6zmwriwrlcpgdgn5yl2bzbz0fkn3p8g5hrwd368bq7wyfc8mi";doc="1wwnqhl3ffqnp5qxddicqwsr7515g6j53rx1rgi9b5z3cv42f5qj";source="0y249krv2h241wy8xbi5xjrxypa56zipi8fbmqbziw9cjjnz993v";}; siunits-59702={run="06x797504p5lzb3xlkri1sc9whyjjz6a95gk8kvpympglm8fmpxz";doc="06saapj9rh5gbrj0npb9rm60xrww8rl1y5brvx97gj4qvc3i2pic";source="1clhfsmydg2xjajak0ssa9v5sd3id957si5zvyq3njgl9cpjwi9r";}; -siunitx-72484={run="07axdnikzghhs1ah61xj2kx2gaal853xhnzxv2dv4rdz9xjrrf9i";doc="04g95n93sppm7hc4ps1b5zn2dx9v4fsd3wwyiibq5rbrvxx65d3y";source="0a5z3sdnh6s6slpdqggawj1lba3zm0d2j3sf933yhnq68vx8f8w2";}; -sjtutex-72606={run="1n0w9qpg2b1dn88jh53baiwivyqi5yw967spg0ml806npczn9b5l";doc="103v83xa9d70grbk4qb6dg0j5vh8yw2x9jskvqv9q11alhglb9xk";source="05shn4zzn1i6cg58ykfw7914133386zz37x0z41iv9k4iihj7mp6";}; +siunitx-74329={run="0ls4mrhn4pqssy717wmma7sqvg0sr80m0ki7r86jfxf0p0i1i2l4";doc="021sffp4s94myh0qg57gyq6clkmyiaqmv888fzxwj01b2jrrwgra";source="1d8nzyfv895s8kjj39kxmz1wx26nmfk6k17ajp7i7n3f4crayvh3";}; +sjtutex-73938={run="19ccbkki82dvkkkm8n0a5x79ljpj5dkh18q1xajlx57k631adqq7";doc="0ad69af2fix994cagxa0i7555kbkzng1s81ha3p6asclxxqh4nfv";source="1ykw778psknzl9pz5jmkk1z3qi9p3kfjja88qjz0a8xkq43g3rab";}; skak-61719={run="1lh97kc1hmz3ybb67zr7vr74z1zngwl2cppkhmp9cagm48j24am1";doc="0abiardppn7hx6l5h4zh92b9m2yf3w16y15rcvsspv1cb9sf4lfw";}; skaknew-20031={run="14j42hifh60p6glfp24c2f5k9k34vcm0l3alqfqhvv68l31i05rx";doc="0i144akq7sgs6kwayl8c2yir0kc7czjs49vj6l5lwdcwbyryhh21";}; skb-22781={run="0k441znw2bn13aiyc6b5hskl76hbhcpilc1xg4jw837dbj2v6qiv";doc="0qi7l9ky0y65cmcp32j93lhwlvflvz8didq9c77faq7ffgzz51s8";source="1rnraidwhkxlhk09ppa5k0ndqhrra4asbpjwv2j5dgf70wfm5vmh";}; -skdoc-56950={run="1bqgnqqv5806f375xjny7vjd831ymdnhra2rbgh5hwls7v9hwp4j";doc="08g7qrmasrl302pxq94dk13y2bdbg6ipxg4f774kzbp8zwqa2xwv";source="1qnyh8gqbk6dhkga2v9gg97q0cbbv8hpcc7nwjskwckc4jxplqwy";}; -skeldoc-57922={run="0fnkq85bidvd6m14m90w428ndx54fj2855sxsajfzyid63jrfa9h";doc="1jgg6h4cdz6ir7ks61lyq9ixczmhdcs34mi4llh767baffvb8340";}; +skdoc-73385={run="0iabgzm63f7sb0qg7qbi0gz210jbbawa91v7amb0rlfk77g8iplg";doc="0q3vbn8rkngr08fcws4rn7nb6kaklh75716yilbf5wg2randvip2";source="1wr1md08zwdiak37xrvjl2rymjfywkf50sq6znpqc5r9di9004y2";}; +skeldoc-73465={run="1x19iwgx72p9b5f2kjriwf0f8jjlqxa52w2vkxj47gjylfpbmz4h";doc="1j72ibmlnfzbmf96jm3dl6kzsvk9gmi8h1mj7p0qfxkdjgrpmj6j";}; skeycommand-24652={run="0z5jpznmx09vc5klsvp4hldmlgyp4bwz25gp775kbmad8azad1x2";doc="09gmmakvxhvrh7k06vjh6ly1hmax1z5x7vqxyqdwi90ajh2zkmgc";}; skeyval-30560={run="1an6ghhsq5nibwas1csypz9vmrmsj7jviamig1r9zzjrb5kzs65a";doc="107higin87d7kca6753f8f61yk3ypk5hkidrbckm1vzn2ci515w9";}; skills-56734={run="15ra36iiz7i9qb4669j32b26hzmjyx0hann3kd12769f2khb3ial";doc="03j6cj9xg2fhab2a048hb2cs2ddqac6x7zfcf7p9s8zgzyqqi8s5";}; @@ -3662,11 +3707,11 @@ spalign-42225={run="0wy2kliv3mrcqvandk3qbbqjbri6xq69d5jsi80l7qdiij86z3g2";doc="0 spark-otf-62481={run="1z9k0dnahkq2nfqs3plpyb3fdj48x8vcav0ahykd554fygv5h4x3";doc="07pq90xx911rdjdyr0sxg4zqfg1yb5kn43xc5l6hn0y81m9j151d";}; sparklines-42821={run="1mb6c3mial9ashhvmjhynczjpb462j18qyy2an4ckgwgc46pwhp3";doc="03j6xdkvsv5p71bifmggf69w3s1n7758yii1caz9p9bcqmqbnrk9";}; spath3-71396={run="02hhf693lmw3dg6p74yk44g0db2n4l76fxkbvyaqvzrqvwn3im9p";doc="04rd4gy3b8dfrwmkp2k22dprhzqpg9j0mqj88cmq4d56kjs257zw";source="1k84ra0f54wkf8jdmnjviz5288j7yw8i49ngndibxapm8pfflf0h";}; -spbmark-72647={run="0jd0am83yhzpdvyfp3a151zlf196zsrvr50xb47q3jvlijk5acfb";doc="10366369jxb578bhiyp7byx133zji4qslxgs7zj2ryn189cxfpdz";}; +spbmark-73790={run="0s9snd3v0vcv0bnckisc9q10j1ki8m0r1n2ixvy7n1qlv2q2ak85";doc="0pvqiz7sa5n1hsdw9ms6xi4wvv5h0w48j504w7il0wy147cx7410";}; spectral-64528={run="1qjvxyjxm81j3cyajki6jv59k6y2m8nv9kzhj45d7i56za9klkf2";doc="1x6sixvjk4sk5r6x3pgppynsgp139jm3cc7bv83bk55757jjd8j5";}; spectralsequences-65667={run="06v0sb1xa28biv5ak6nprdcjzjdm0106rmlgm4if0jgmax0hiqpb";doc="10limf15cp1bv933m45s3vdvxwzbpd5hard4lqff2x8ay1h0n1wd";}; -spelatex-72638={run="0f5fwsqj4p8ga777xmhz02a80ysj1i21a4vyjlsfvvcipp70x70i";doc="03vqvh3k3nwk64zlj835sfipijhzzdliakvcw2vyyvhnfj1ki644";source="07z1pq79f9zgv42q6ppxj31j8dxkhlwlx6mi35jvzgvxmgwl1z6r";}; -spelling-30715={run="08zkbw4fdfmfz1pxcr96xjhrs8lfbf6sydp8crp8110fikksjv9i";doc="1wm6r4rhkmxmc66zx9nvvdmjaarx789c33vzm26mbd6ylv5qs1is";}; +spelatex-73664={run="1j2z84ay2fzprjf7xclbrs0hizd9789jrbghahng1m18663fglh9";doc="0s172rf8q3mzmgnbkagq3c3zrkl9c7215ddcljkw41y6l9kzgk38";source="1ai16r8jr3djymh64hrxmnxakv51yvh5cha1z3nivzjj7ydvy88c";}; +spelling-73571={run="08zkbw4fdfmfz1pxcr96xjhrs8lfbf6sydp8crp8110fikksjv9i";doc="1wm6r4rhkmxmc66zx9nvvdmjaarx789c33vzm26mbd6ylv5qs1is";}; sphack-20842={run="18vav5d5846hzn6ry7ypnbj9vmxxxxjxm8wpxah9mlml6kjy5hc0";doc="0caz10cwphajhni7rq8klh7x9m46hynbrgyr0c7fjqs8jfdva4k7";}; sphdthesis-34374={run="1a0a4mwf14f4076gwiqhgdq436l5fxw588rigif0mcpnmmmlkxwz";doc="0b6cgkwb4v4v78nvwg2n1zgc3ww9fnkh43s4qb3g3pdjc399dj3s";}; spie-15878={run="11s8phbfna7wwx1gji1mpl93arvxlgfpxif4c46xia5spn4i44ji";doc="05myxi72wcagb55fk8p8461vag4yl79ilyhfri8il4i72419ip22";}; @@ -3676,7 +3721,7 @@ splitbib-15878={run="0z2vnb51ksqp3i11903mvgaknvxl1azwqsch5aaq14y7fp9kcrah";doc=" splitindex-39766={run="03x58nb9bqd1fn3k9fqq5rdafsna9rbxjhp44dwzig8kp81f0g0i";doc="1v2wwls8fgb1rhk91hrjsabxj6plx2bq7h07fyqxvl3982am9wm5";source="06ksmac3dxacfq7j4ad7vy9kls2rnay1hww3kgbp2sgadqvwmz0z";}; spot-22408={run="18ich1w6d68xa2p65lh22yfwdkvgbl9zz9qmd4yx84ljzby49zhg";doc="1flizmkafy77g30ffsispr2m4yaqyfw5hvynf7ppph1q07jqdy0v";source="01sx1j1sxr1bgi5h48ij02nwawg2wgg1c7mx22q9r4sbn9mprlbr";}; spotcolor-15878={run="19xicma97v309pbwgdyizrjwwnlas95wq0d2qlyw7m9wrq295lpb";doc="1qsdgagx45z4gha0y7z37687jxrc121pr592b1xcy8bhf86nimhm";}; -spreadtab-68256={run="1jkc9h4a3cn5k7p87hdib2jk8kkmcn98cx7b8p7p9fm3pjac807r";doc="1xgy9b81am6pl835sf04hf0srpdpd7bwvxdl5cd4pr784xgfvdb8";}; +spreadtab-74330={run="1461i8jmb1jk32ai8m7dxdkgzq2mh9anda9rpwh84pccajpw11n7";doc="0xz7chlaahhl7a3ayifagxsdjyqfzg6b02sldz332awviq734kxs";}; spverbatim-15878={run="0s7042ln9l7jvb0vyrmg4h4fdgzy6vaabr62n7zlkr8pf7zd8nvh";doc="1rb6gyq7j5m14d8707gkqv1n5ifk1y497mwflhigqgyi9lgcvgxc";source="0f3spbpb6icwm84v4lq0skkx53nw3i0b90ik0svd9dhg31y24c43";}; sqltex-72396={run="117qcnbcqzvg49wsva8x3icj7lvi333zcahmv42ahxp4gqih6vxl";doc="1k7j20n5p41ris7224rcs3nk1m8w4m6i58czjg3w7153qzfp0j65";source="16b6wsy20kkg3bx7da3mj6i0wbkxnqymp34raq5s145hiw6igx38";}; sr-vorl-59333={run="0a87b640qdc7bysxlgr0y63znls4ryjgibi3ablnw9q3rhzbbr7c";doc="05zpxq3qjhziidiq8i30hj295yh2qa3g79lx9ywlldbkyhq928cy";source="1ddwga4af9k70c05v2a8frn3q779d2pw43h5bpfks5w889ss6rr2";}; @@ -3684,18 +3729,18 @@ srbook-mem-45818={run="0znvycl1land17f2c9cq09hhhg4b677rixzjc0hsq34c91s3xdq5";doc srbtiks-63308={run="0bghfl9fix95nxb8zvsylb8040msfwk0vazqkwvc75v08idigijx";doc="1z9fyz7kjqis1rblrdb2hmj2507bifg07yrigqkn2cgm4wsg0cfg";}; srcltx-15878={run="054b8g0vvhbzazxs8913dzir7qb6x5q5pfsiwdp1z1awkpafwkmv";doc="0fidv12pgqck21fffgrrz2a0pfsb01fsyld8qhf5r00915aai6h3";source="1sj23lc6k8kwd11q3sq6wbslwl4fsc3wzp45w4by3mw5k1q5xqcf";}; srcredact-38710={run="1rqmgpxcvvcmzxdj6k15v8z4i4iq4wv95whddpi93l3n0zv2ihmq";doc="082ff60lfnapb570ps3g6vjy2xn0gjjih6y4nm3ry9i0k1isbk0w";}; -srdp-mathematik-70807={run="12jap349m0cvzq3nxblj6z0fk74702kf5ry6fgnn7isib4ifpbf2";doc="1cxl480a3jgj7bkzl7hwpi9q8qgw4syjffb4i9ln1w71w4f0rmn9";}; +srdp-mathematik-74490={run="14hi0zx8vy617w0173jnn4r4icbjjn055881br2vcp6krcx75ji5";doc="0i945sw2kx0ba3vljkkga3a41mn738av94jidygr8xiqhccmsnja";}; sseq-31585={run="01vqjmi5vpd2s00sqqj6nlwgqvz9c43igg09w282khlca471253l";doc="08xq5fjn951hdpbrvzx6p09a173radfh8a4wzhmifd5rca9l7asy";source="0a1rh7s1fjxn3bblqz4lzhd9812d9p71wwww5hg9nnpn3gjvdr6n";}; sshrc-insight-72623={run="13qnpc4q85zks6b890qwdiq7mn8k084mbhlknlq98n3vsklsir03";doc="10lqpjnc9b4pvn15fj7c57dkx69mrjyjgwh018d66m6m3x41h3hd";source="18fsq33habf6yl6mn7djqvfiay9nv99vpm3mzcn1zp8jwfj3lgcx";}; sslides-32293={run="12vg8fdv0di8vgnw8wj1y6rad6izmczfqzy5pr6gpflzmn14fbq4";doc="1dssqc7f6260hl527hhqq8zbiyszb13z3bny3rwjblscl9ia29yf";}; stack-15878={run="1wadfhja3yji011aawrp3jgiqdxil7lzvkd1pzy9c9y63lzknfg5";source="1qv2bvjs01lk9b86rzb7n0lk2a4gr870qsnahyrd9dqdnvvz4n9n";}; stackengine-60019={run="0m0c3sgajlzb7y598y0rpm29mrlsxmks6a0hi1b56vpafsi906n4";doc="1ga71wrnd8ykhw9x3a3yxqicqaarzxncass1lmyrh1kndim79pyi";}; stage-62929={run="1wdvq1izp0y8b7mzbqql3fc9q8j7jkrmm4ynnk3h2zlg24lgi3gv";doc="1jamw0i9nwmk50j5xiq4pznyjiqc2px2s5993gyjs6hwxb28c423";source="18mw8338ls16klvx7zbdr1qc0z64xgnilr79zfldvsw10fp73apg";}; -standalone-64677={run="13bp2iyfnpyflps370mzrxk1vkrybamam1f47ws4cafpz99nvvyr";doc="0waw4vqxh6nclh6kp17nhb4i1hpckwraf5clksxvzgiv25cxkada";source="0a4k7lx74w035fvj5q6mnzpx18jzlghz3lavhsl9ssqjb3zqmar2";}; +standalone-74250={run="0pdhvg0f34f8r3inphn2czymq5zna92y5p5yx45byly64daa56z0";doc="1g7dl0bw0zwmb4z4jskgrh2bcvhl01f1nzgyr527rvac30rd5ys6";source="1pckjcvqp1ygx10vghlrib2wd0h2qkkgr96wjg1d1i12cc5nwh67";}; standardsectioning-71479={run="1wl8ghxppagpzqkad8j00zg5wbr9if02yx0qgjlkr3is3hcqhhbr";doc="18lz7927fg1nq5d565hwpn28jgizbwp94az8bbp5jpd7ggi1j80w";source="01b9f74q69mj39f5q14dv15wlxnvaizm6b1y32z9g0gg67znnjl8";}; stanli-54512={run="05mq6zhs6x5qjqk58gwws9lw3p876bd1f8a5c2jvb2azjl7d9r4f";doc="091knxhx7jsjiv4ip0z2jbazvv3xmbvandbraxbipp4zqqakb8bj";}; starfont-19982={run="1bf89j0qqyzih5w9ban03k85v8ih0d16sil1sf7smzmqk3nhmrz8";doc="0rjx4wj021ri26zxdlhkh71q3d0ygf3hvcqghq9fwkbi0gnig1r1";}; -starray-70796={run="0b56n9fiv6lm9yzm86qq6pbmnzgywwy5fw9zhl33bfhz6wqkz7xm";doc="0yz4zsnvq770rwfn61v5g6q33lcgx054hcz6hn8nnc6ln71ljg05";}; +starray-73989={run="1jizi0ka179dlq1g7i4pv9m3h40k2sysd1qagm626apcv3zgppcy";doc="0axhx1lvygkqn7xb0rbmzfnq59baijbnglbwj85cffs0g555l0b6";}; startex-69742={run="1d6c54hm9jdi882srj87drkcxm7lldb4g60lbic9wwzn9kpa0ynk";doc="0ikmb30ndmj0yhzxy9mba3kqxdc5f8i66sji51ihjcrlplj3jk73";source="0304dzv4nzlcqi5k1gbfnx823xaxq84ja4gwh7qg941q152y7w9n";}; statex-20306={run="11qpdrcszbsrasbasmk6h9wg5r2a11pm116i16h7mvw73vjaq76f";doc="0dkb7c7wavn3qgndl0g8jpkx1qr00c3iwp6d0r72znggl4cznhsd";}; statex2-23961={run="1949zszdv000dw1dx1jjznbd79q73fjiqnkq2axdbxffh47ls1dp";doc="0fkzbs76yfyygscazn4dgphs8g1byzg9n3fbdg6pizzncirbgh6c";}; @@ -3717,6 +3762,7 @@ stix-54512={run="1jqrvkx444hvfh7246g22k02jm00m2cnc6ffj36k8qdi1s5m9dkj";doc="0vmi stix2-otf-58735={run="03ilzmkskp2fj3jwyvlwz8b2ryvb1rfj08ciqhkhi9ddygzjk8xx";doc="18cqnpabka16kfq09rspzgwmyh0fva77i8676myf4wg805953zgh";}; stix2-type1-57448={run="0xrpb3y7wbpxdc627gn9h6s3sjymczbhxqqi0dbicrcrd4065kp7";doc="0kqh52jkqgsfdwj83wks80h9v326hxz1zqh2ls346kc6gz0r2p9n";source="0ajs9ri4v4jw3hp64hflxwqd9sw75sk2a56lv57qjzzjzkc51243";}; stmaryrd-22027={run="1vvnhyk7fq6kh1jb2zd19r6qq1j8zzp14gyrqvw7yqm5amjff7fp";doc="0dvcn4yw7qlb7gh3b3z9vk4rx12b1086glkk0x21cks87kphdxib";source="1wmn7bwahn28lwipkpsla74wn3a018808rmh7yvxdkbxfbzcwqcz";}; +stocksize-72957={run="00d6qhzlv1da6bvic616dj5hdcqkwpxwdccb7q1sqnhcg0b0hrvv";doc="0j5x0k9jh1ah628pw22r8dg00kf8vq0cyf0cslqpcgdg4fqp1m3l";}; storebox-64967={run="0vy7iavq6qqxpmwhm9cz4gxp67nriq230kcf1mr1gq2w0ncy7kjc";doc="1crb1bkra0y2gjzf9wndr5c3nvc83v57lkdglxb8v1pzpy7halmx";source="1ybpjfrria57fwvr9kriiw6y76ivwvsyb6ayp0bi750smsv8k5n1";}; storecmd-24431={run="00xk8l8l99qpsmkdxcpccf8g7av2asa26qrh3bi0kkmapm7agk8x";doc="1n5vw689y9y2kakhkyqv47d5cin7f3xqfz8bc3yncdrmgh4kq82j";}; strands-59906={run="0i2k3b3kb570k5h7yag83gchk9ss971v8w1xqr2kb448f1yqkjr3";doc="1clpm1i4a0477zbrixscwpg6qyli0y5vp61lblgn4iqgw0sndhlz";source="0ckf9ipirn8m795df5za2qd5w96cxzxmmv1kcn0gl4aj3ypia6b9";}; @@ -3748,7 +3794,7 @@ subsupscripts-16080={run="14v5a89iwm2ykjsm3jxgbqsm5nba444yh8mzqf23s23z7fmcmsqb"; subtext-51273={run="030f7sq37qjn99l1z6nx7qbivhczpzhjm7drxhhhsssw4n3mci7k";doc="1m6zyy09a3193w0p91y8g66n8bnm80awzg2g8l195n4p41l8vnkw";}; sudoku-67189={run="1nyh5rv8fgs0lgmsjgkfx24s3lh8pph6jcp7dx8nb8q2ij8ia4pi";doc="0hdvzb1vcrlbis4xsgzdnbidapqp7kdaqdskdha5szjw53xz77ys";source="1rwwqpqvmwvq26ycj2glk0k4m1vlbjrxjp0l20qnh5vad98a1x7p";}; sudokubundle-15878={run="18y4x1g050ircqh3nd95m45scb8zgjzi03cj3n7whn207dvapsdw";doc="17mdxysiwjp3ii1qhknrxw07dcds57qbm986583xh69bhq08c4sr";source="17g96rhis66gvgbm1857ck4ri8nz3isdlqshfx9rdbpgs8x58i0h";}; -suftesi-68204={run="12cis5ynr5ddhqis0i5501sbxznpcv7i4rh172c7jm5dww2vank8";doc="1bmnzdnmzn4j3fpbfax4m9xd8gpk2vd1xqf5z3ypza46vh7nggxw";source="1x001l06wnfkky2vng3vpkj0cwv0z9f29h09jpf4yc5i1nn2s9rh";}; +suftesi-73055={run="0sn0m3awkf1m7jp6yzv40amh0bfs7vshrs3qpzcz1yy2xz9rsg5n";doc="1cj70xy8841f3473i1fzp4hp8z8s3548amvajw5kkcqy3sx98qdc";source="1pi35r3964vw40sjz2d9ccbfj7ph5rirl09m834nkxn0rfi881v2";}; sugconf-58752={run="1x2nrvqnl65jk3amclgwrk2x1dscncxajdf074a2d410w1vikrck";doc="16w8nfyixsr7l2dn1lbwcscbs6m4mczql9gmg9wi16nr8d7pm8si";}; sunpath-72604={run="1h8qv7rl6n9f0n8h1wyn4l88c6iq1a8j6dfaa9mbpgjx91707kkb";doc="1574qpqf2bc2jzr9dcjqrm5hc6p59cpp3i7yqa648wi9ns9c657y";source="0hm4drchfwrydxr28wlpv0hx5xbycdgsnqcdishqzdy4kxidc6cq";}; superiors-69387={run="1kj12xhd0psdz08mx7k2kz2maaaam29s3lway19gcawr156jp60m";doc="0vg6sk9ad181y4g53shj1j0mdrcqny4hjdfv3kdn5csm7h5kqq72";}; @@ -3771,7 +3817,7 @@ swungdash-64204={run="1mr1x0g86qdh5nw39b56da3pyw7p4cq1x783rcqqw2rmvszp6zqd";doc= syllogism-15878={run="01x5kjyfm5ksqig5h2b8sgmn05ws0a65idv1xh5l709yp2i35120";doc="1zqljwv03f755lzc9fhps5xh2dy6r0jdsvp6a21ka11kqq696vjw";}; symbats3-63833={run="1rkc00q12f8ysw3vcn15hk626wzmy5j6gisvyzss924482pp54dv";doc="1cs9vdddpv7ymgicx005r50ilwjharqvszykf35lram9d2n7f40v";}; symbol-61719={run="1pdkpr86bhia5hcmf7q3nhvklnsga4mqqrrirgl8a7al7x6q3ivs";}; -sympycalc-67087={run="0nr281r9f5d68kqsg2psvhdzgy24sdghyd9h395q666mp05z787f";doc="1ik7h5bwvnbv8zqq4pppprqwkrb2fjd68l5fhj10yznx38hh5x47";}; +sympycalc-73069={run="0nr281r9f5d68kqsg2psvhdzgy24sdghyd9h395q666mp05z787f";doc="1ik7h5bwvnbv8zqq4pppprqwkrb2fjd68l5fhj10yznx38hh5x47";}; sympytexpackage-57090={run="0d77xd1xl9wc6qbd335kvhq8gbvvqzgqxblhcmyd5khhg3azk6sk";doc="1y743lffzk65wl5nwi490wnmf4xaxcnkpicmhadcvjcadvhrnlxn";source="0q3cl06b2mcpn5an1m7c68c4c0swmgacj3afqb38984dcvap5abv";}; synctex-66203={doc="1a2nlmbib8723jjhf6xxh5rpmnd5jv3cd69br4ihchbq5ipzircp";}; synproof-15878={run="01bx52ckyg4abigyzfcxi83jqdkczvsj9b80rznqz8vm9yrbv951";doc="1kvd3vvj6yx1bfqbi858qglc31dx03ish49q0lai0mp1814n6fqh";}; @@ -3780,7 +3826,7 @@ syntaxdi-56685={run="11l8609xj9gz2zkd6b0ah41lgw4qhrvdjj47vwpzb4sb1sirsfgw";doc=" synthslant-71883={run="12qb1pr3lxhz3pmgi1bm2hi1wl0l9hpjj67mp6l4srilgar90s49";doc="10h64551x4n2hrl0w7w2r1ai6q38q8if5x6w6djdw1lxv9dq4fgj";source="0bw16xvq6k12865lgjil8zp6d2gdd11bgkhj0jbsy9jqwd56xybx";}; syntrace-15878={run="19vx1iz2zxv49znddhcsl7aw4i267fmxhxpszzg2i9z0klm9b3nq";doc="1dzy8pazcp3lfc009g0n1h0a6q3v99ii43pza3m2gkjvbrb5sk00";source="0hb5iklz2c7zqrl8zrhkn8k7dj1zgk5gvf4wpr7h32sa83ajqrdr";}; synttree-16252={run="1n2n1q2pwx3fi0dhh3h5dj7s5wrz2r5zpx77fmxjk0c3d45c8wan";doc="0rnghg1459nlliwbcy8r60rc9si3ya35c7sl5zqh67sfwla2ixps";source="022b2sn42mfdnska1cvqjsafakah9a908rvyw0d326d7lxx8wrx3";}; -systeme-66655={run="0agy0h2zq8n6723w27psm3azigf2bsw4s80701xr0zz6kmlyrfg2";doc="1xxycz86kxljxg1np3zd6jzwanvp3f67la1k267z3w39f5i63x1z";}; +systeme-74043={run="1fc98m6ibd6qjx849fd2xgs0xvh6s51lv3ldmfy8b9bbayy96g9q";doc="0f66d2vcgpd9sw2ni1pw5h6s8hkmnzkxbxhikq827amyjw13zpdp";}; t-angles-71991={run="1p1h0gz1k4lr7rmadhdgb7l3gp55w12m3p88hy9d4d0ryzld299q";doc="1n01pg82p0yz0b7ph82k5ha7a9j0a4hc0489xq9pf4kbizh7ap4d";}; t1utils-57972={doc="0hdk57179nn57wnmvr3jasjavkvmrn6ryph6jvjhsfqprn7bhf1y";}; t2-47870={run="0s6zn41dp7vzilfyk92yy5mbb74lcrpnmhrwl9xcj1dbadi97nm6";doc="0wfm1gy3dyhfv2xzjfsky2fvdhki5r2ndgvzliq2n0kvfxf1sgna";}; @@ -3803,18 +3849,19 @@ tabularborder-17885={run="1p7iwpalamif71mrznbmsig5g9lxs3l16dcpwj2kzhiixsh78vfv"; tabularcalc-15878={run="057720z8l7ss0kpkg7l16fc2v82xr0wqlxzxbcak5m3hl5k03g7a";doc="0539rar83mprammyilmclcbjxr657z6q2xmmwmlik990imf78lqc";}; tabularew-15878={run="0g9pbr0vhhjj2lz9bbgwvm49wl8bdwvv1jjggq2dnwwqbr4vc4p8";doc="1ff62dxvnhi4q1gy8f7qhc0zz1jiayl6f8j96dp0rz38l2is7m86";source="0sfpx5w61xrmmgip0c746mghhj06r2mn2jmj56zingymm2djiad1";}; tabularray-69906={run="1mh0f8klal4i4wcj2gq4zg7kfq61q3hhnd6myw1wfm4ig5gmx4sd";doc="1xz171qjrsb4dld25haa8l8phxv9rxfjplr8gbdi2ypch8v86g58";}; +tabularray-abnt-73487={run="1p8jahm9p3vw0k567l1g98ha0pn6plglrvql4xljn6c8rq1sp8sy";doc="1rlv65f36y1s44qw9y0l5ngdyq9kzbw1nlaaazxchmm8ynnsrldh";}; tabulary-71463={run="0l0iibf5ycpds4j47ad1zhvywqpjaljsbiqqj49xqi6n2a6wlshv";doc="1bslhgd6iq5d8w2gp75x3a6098mv5vk4pxvmqqrb1b5q9zfvcbz6";source="14a9xxkpsxdrf5sraqpc4pw44wa0az153jk0jl7l0lq4906l8yzd";}; tabvar-63921={run="09pbsqa0a492j6ijvi25zdv4ic69wc8ngdxll2gr7wgh6m9hsrq8";doc="0iv8w8jvq05f6a1z7n29c9cldk499fd9igryv3c93g6bgq2hkzks";source="0bw2a9rgij2xvz3lhz6gya4vfsjn41cn7mg9mkg728q4vbhg19ms";}; tagging-52064={run="0sws4x1h52cd313apfzydqpj6c8xrb8x5881cfhwir000n48crb6";doc="1pv7savkzm6jhaliw5ilb7qmhlj3iyiz2w6kxchanwrg4pnqabx7";}; tagpair-42138={run="08qjcwyjs90sg8agmpmm3122h20898hy6dwkm0lk3dba1j3w5drj";doc="1dkn4gq6zxfqw9h64h7ggkbyrk9vzyax8gmnk9qk8dccdvf5n2sv";}; -tagpdf-72314={run="0kwisahhmq77vv16kisnczvhpxjh721cwsikkd4a19bg90mdf66d";doc="1vp04qs5877cfza465piflldnbm8dhymsjwf4lfkbqsndxvjs1v4";source="1rxjfjxkpsdwwvkpp0vqmkczwcqc70ac6aw6x1bzq9nqg67bvl2b";}; +tagpdf-74470={run="04fxl394j8cqjv64r01axxm3zvqci843sqfzb2d82hpy02pa90yx";doc="01xlas1wdn3xyhjrx1jrz0jr0ss3sqhpidpywq3kdkq4r848956p";source="0p6rjmpz9vkgsv7lvdarrn0a1f8d8526l499qgm8jf7jimk8qyzq";}; talk-42428={run="0i9whk49bahsm2kbj53pjdh3fpg1ixfyxmfvcp563ylr8j2ibimb";doc="0rgil00i39p2agz9fybg0h3xmpq0wxcpjcqpbpzjw5lcf4mpcni5";source="0kdrknwwivyxiyn8xqappf3k5l1brkwkkhjqa0l5n0abzafkjcy9";}; talos-61820={run="0pffvqdkhmc0adl7g1sfckgwwjsfgbnf03jfry3yfq6za6mk05d0";doc="1narnqgf3221fpf66w2vlw95cr17swbap35lvb7dzviyad0ailcf";}; tamefloats-27345={run="0mhiz5lxz0szi8ygmajjmldz1bjf6f1lpyxj3b9zb17h9aw8gr4x";doc="0s5cy9m8jpxh81c10fgdvn8wy7pnv7sa25hy8wbv6qkr1qwz8dss";}; tamethebeast-15878={doc="13shw7hcimckn7pp8pj0cr1zsi1wq6r400x1v6akpmwwjxkw09g5";}; tango-71825={run="16pnzibhhi185yx59fyk1hhxjivkc18gpzawakxb4rkr1ycvypr9";doc="0h74c3siqknncaqhxdzz8nh86wbs3hj5mhar0a3qmifwp5g7z9yf";}; tangocolors-66733={run="1i0a42sdqgm7sraxaq246fk1w8ql4hn00y2r1rndyd9v3828x8yq";doc="16x99xbhwnibsbw364kb9yxzfcws3d65n0sdj2wflz2v7qbyk986";source="03kpykm57favngm16669ylkh7jh1q92c2zhb9sx1qy1wd5li7ix2";}; -tangramtikz-66183={run="1c9in9zdw7ixanhj7kgrdsrv6iwvjy02b12lgq0k3wwllnaakv24";doc="15979bzhc22d2pzc8v8ml9220b0sqz4f2nh0nkxibm8hg9pq3prr";}; +tangramtikz-73592={run="1gfc2yswjxqy2mjdbr5cmc56kqdry9284v8lpnm83d3y1yn38k1v";doc="1k9wgi95bv4gnmdhnqcngjwfxh8fyvnvx033qpyis3sbwijxqv6z";}; tap-31731={run="1ci65i2k6n0h9lklgk41sdq4acp5655mps77j9gcb65yk4mdl6c5";doc="0r8y4jzri83qypvnmgchnhrd0yi7j0k753zmnwhzxqg4bvki10gp";}; tapir-20484={run="0ad1qkbvvswq7msx9889sz8n7wf8iszigd0vmk2yycykbf0axzii";doc="1m5g6bsijqris8r7z2dw3cj74ajcny2wjysq8ql26531z61hj9ss";}; tasks-61541={run="1gwl8g4a2x3sbvqg91ry577hmpxdc4dgcj9ixhsla25h23jl414b";doc="1pavbpzm6z6najh72z52j089mdg6gqzsa8sb9qyfsql7mndnxznz";}; @@ -3842,7 +3889,7 @@ termes-otf-64733={run="0vwm8qrbp9r3bbz2a5sbkkpmkmhb4zh4hbxd37hngx1pd576lasj";doc termlist-18923={run="00dw7p9623kxpsvqs1yqk6n95hfl0b166l09djibybxx43fbk6dw";doc="05rbr62rvl0shhdxvscsgqci6b6n60pfzbsmikan6v2bh31d8mbn";source="0dl6bl28wvg9fcdlfqhchcxg98s3d668pm0sp7rmxzz97nf4fi9k";}; termmenu-37700={run="0rw7a9ydsckjv6lc8q8yc5c4lq45bwczy98c6g6mzdcdl2dnhh81";doc="1r4901slsjhg0kzcy07qkm730g1bax1p2410mhh9ly8cix0hcxr4";source="0fvv10j1s49swvif5prjiqvk699l82js29n09scv0x1ixcy40h14";}; termsim-61414={run="1b263hwbplgxw8ca03dx11vp3ar4dh1avf5r1r02qa8b1zax4b20";doc="0qzqwdc7wiwir2lzrsig76v0j8766hszzsh2y51bk2b7vns4psgm";source="0jidnimy5imwzcz0wl45v2p0wpi0xijqzsy94j517q00sgpnz0pp";}; -testhyphens-38928={run="1sqq2rf8amsn6zdp8l1vg5v5jxcn7ipp78qbzzkikiamlxv89nkv";doc="1nzimg7bz6h9dm7hb9r9fzs130dw5y7cjzmb4rc5dp5a5xhiliv5";source="0s92imbkb4p70fd629bbg2cma72ys853qby1nwk6rvdw8gp47pgg";}; +testhyphens-73486={run="11jr8545g920zbdb4w7rspfwq1vaxcacc56ijz72gv4vx7hni7p5";doc="1zf7zagxaiz1qpj2l2l3ri3vh7762i8h62qh9kaafkrqi51i0x55";source="13b4p7wksfai9glsv0jjf0rkbd1s21z41svkyr4zmwpi6zrbga36";}; testidx-60966={run="02zkg2kffwh95nxn602ara915jihj59af4hrgv6cb6916m9fv0r1";doc="1pz2p3fdzdv4n1dabh81yl3b3iaywmbjvgxi6zklli6jbbx5h708";source="0h88x6mmid6nmhl4pw9p4p9nlh90p86g1k44a6bbcyzdlxc8n6ac";}; tetragonos-49732={run="0l8b3kjk0jk70mmmv37zrdb16id6yrjvgsgsmji7pzdqiixy7jh5";doc="1g2zcx3b1pfc9dh76p5iprdgsxp0yndp7rn5ksbq4s9k4m7ikpzp";}; teubner-68074={run="06xxypkdzmxs0m6bl99p9hggic3zaxqgfxg8ljq2wad0k7mwn0i6";doc="05vj8877g8ndya6p2kvhipxa61504sa6p80j1zwjdr732n7bg218";source="1nqs8cxfi1rgiab8kvzdi9fcwbpgaw51fjy1kzzpszydf6qxgqjg";}; @@ -3857,50 +3904,49 @@ tex-locale-48500={run="05l4frsxpdmsrbn50q87db878bwpi076wagj5r8kdnmdwmcanr6l";doc tex-nutshell-70375={doc="01nmw2lj7dvylfypgyr7lsw1i2b4vlmhd56jyy1grv8hx1rfl0yh";}; tex-overview-41403={doc="1agfya9rwvyjvip0alvibimz75jivpf19hp4jvlv7z0n9m26m9jd";}; tex-ps-15878={run="0i35b4pp38d1l5rac059znlkazrcqa62qm8brhdmx7zzkbhyysi7";doc="0kgf7y3nxkw8x42wpc1g5mmmbz28n73vgwd9d6rf6fjpzrycc2zx";}; -tex-refs-57349={doc="1w7hcd3qsdhmb2siakjg2hm3h6kxa90ncsaif9spr4xkxs03ib6l";}; tex-virtual-academy-pl-67718={doc="1kb86nn5vp1b0sy21aw9wlla1dwlaijppzq7728bmfs5nk1dnbjv";}; tex-vpat-72067={doc="0f747dc6qb6bia3jalr0wf0g51aqqf7jwix7wnn207nks6kh69bp";}; -tex4ebook-70112={run="1c6bynhvlhil4a9kfqx1rwhh42rdcphi0jl8f6qj0k98xk5g6sjz";doc="0q3la7n6jmry2aw9a5hpi00f40r0i235zgk90qyw66h8qd1pnsf4";}; -tex4ht-72661={run="1mcix4dp8y6cacix5qpnbc47x9kx2ybdgf3js0j7y266ng1wg7g6";doc="04z1bsgy3lisx7ifskxzna5jcbjkbwwjlqfwbfppnmjp5rwphxdv";source="0aqnf8swmm4n7czrkkg7zxpkndaab1zc9jw2qipfx0n3w8fmi6d5";}; +tex4ebook-74151={run="1fsfagdsw541q0hgbszg91xvb112g1zw5jznjrgk0vzbgpqc95w9";doc="1bdrl5kxv5vr29xr5mbbfjyjwji88xmgxyf5fhqj740myx5x02r8";}; +tex4ht-74473={run="1mvy2r55vj29ahlpkj03hnpjwdax3pijsdw6df3c7kgp8gzr7gyj";doc="04z1bsgy3lisx7ifskxzna5jcbjkbwwjlqfwbfppnmjp5rwphxdv";source="14c92zpfx0dr27w65gv17y9065bhvw0l1jkhffqqcf79a92d6nhy";}; texaccents-64447={run="0xai85qn9isnrvijw9shhljlkcnvmygni18kw02gsmij0dp9c1jp";doc="02185jla4hffra1wf3mgiaq8lyxh4gxgcjrb5dv3mkrw709iidcz";source="1wqbdmfly54sb8q1y6ms2wg8n62w34xpbfvxvwmg5i4as4a1ycmy";}; texapi-54080={run="09cnhqn4gxf0alkx0276jkpcsd0myypbn94jzsavnjq8jknp6850";doc="0529cncxbw53km02pymj57iphgziri3d9cj54pqmjqjx9qmgwfmm";}; texblend-68961={run="12lfkp9qykcvmrafwilyz2vj0yk0ghvkxmmnkhlac57q3hjy12k2";doc="1sahpz1bh883crlr4qicgmx96ncij5zz1dqrm23q4qlg88yn8y3k";}; texbytopic-68950={doc="0pnh1hsd6k434c8i1xdjq3ywrwylmryrsl86d6h7i1cnmzz4pwlx";}; texcount-49013={run="1bi484kbrcfx3hyflr4f2w0plhz58p2206rz4r1wjllhhhwzc7pl";doc="12a3j0sk7nysd3bd7mwnbifyrcvjjkfjy3b8f1caf6k0pf1mz8b0";}; texdate-49362={run="06bqyfl1vnj4gadqsx94lj8cm1ia3w3bmlsfjwwfaad0al3ncxdp";doc="0kks8hswbwhp8dpjdbwr4nm55md4wgabl5ypzpx5arj41x8halhl";source="0mbcap5nfj5ap8gxn4pyv8w37hcfnq4bm5m6jx43cwkzf2hiwar5";}; -texdef-64967={run="0wi60appvgs0h5690h8qqvcmsq2r6fcxais2jqps92ryy41s2v68";doc="124azfh1332lq18g40d291gczx2agh2b1cxq07ldmizi8pmvjaza";source="0hanvqdj2dgpgl3wa6sz3qa542882h3mv9709spl8q2glmyip5b1";}; +texdef-74068={run="0vw25wccvwb077hfg9qa3jik8rp8rgwn9wf07bxp36zxf0add14n";doc="0g4mz1v6wv6cb4prk8wc16kpgr48jr2vqigvwcmprhfmmb8gc6v3";}; texdiff-29752={run="1jjzd4grr3ip6gd8xmhlawhdcjfj1sqfsa06rxrpziklwirw6bq4";doc="0f7q7cszy6ca6fmwzi7fn6p72szgzyj9fldvzz1rk3ywkhsnpakr";}; texdimens-61070={run="0fny36zd88qkcz7k3hdxq2qr41dmk9j88skihls4vwf350fy8j98";doc="1qls1hqs6ypmsg4rqa26dp98m6h7zq18wdg9n6g6895jrmj10qdz";}; texdirflatten-55064={run="0q2m138gpk9cvfp19jvsw746mkxa613c2204qfxw1bxw8b454d7m";doc="19iiznql82a34d2yhzqcp339zszbhfz9fh0h4mb11696mj8rx3v7";}; -texdoc-70579-tlpdb72673={run="06a10img9k1z2bdim3f0j6qhcd0dppsf04zs2ff8yp1cb9i8hfp6";doc="13acxggglacnf75n0n2vj7nkix2jnxm6p1j7arby8bkzxpzhs8i1";}; +texdoc-73900-tlpdb74525={run="1d5ifz7gxj93g4fqsz6ah64whj36py3wig9vdhki78smkjmxjqwx";doc="1l7m7zskwhl16xlzykbrkw3rw7k4jl19qd1ky8bdd5l13cy18jyr";}; texdoctk-62186={run="13j0c5m12if8jx8sp7hlirz33y6l2jk8lvnms7dalz52mxz8kq4h";doc="1k41z2lbfjsar5rl47xnk1adbcnnb4w97bzbgf2rnjhimd1gn9hq";}; texdraw-64477={run="14vg45kci5pffvwdqnnb0dv3fznfaay3rg0fjiwfill24ifms14s";doc="0lw37yi82ir8zn2ii2x88f871843y2was3xwp7p06wjanr1jwc6h";}; -texfindpkg-67027={run="04igpv1y8gw945z4abb0wi959wq9y0xwzk7ymlr09qs8zcm0xv6q";doc="0gddmzndg4cc69173ssp4ncz0mmcw575fffanmdxp7y5w7ggrxb7";source="1vjbmin6jqv4k7qc0l8gd27z8gk6p87pw35rgqp0f3h0pf3r62b5";}; +texfindpkg-72937={run="0xc4hd05xdhlmgxj0b0xq6dhi7j1cmjdbads1mba08gqj9pw84lc";doc="11wg1jaacfhha76k986c93nr3izqnh1vk44b02c2x7516n4i2xj1";source="09i5fp1jlih98dvkirlibl6p7pmg67i44iv7cwf2if1qwqi96hfd";}; texfot-70969={run="0banwyyka7qapq5f4acl93l6i83v51mri1h1hh0yx6xdhaqhif0v";doc="030h798jiw3ll3gxw73lb37i2a5k1jw43bf38v1ny8rxvgny95lr";}; texilikechaps-28553={run="1z9nvv2y2nzpkpxyf18p426wcl0g6gbg7qppq70b285kdbczbijd";}; texilikecover-15878={run="04bljvhvmrxh1a4sfqw57yysaw03c5ldi1bq63mlqqvd9p3hmyck";}; -texinfo-69809={run="1ds5vf98gzfqxafil4gsfqwyrxaha0cd1fx5mg76bw9y9xjzpzsl";}; -texlive-common-71543={doc="1dmhv2ws8xhvx1wx8qrr8m9gyw8p1dadicpickb8a3ydgh6l2v4s";}; +texinfo-73706={run="0fqwwj136np01mijiwxk51j0si62mf6hh54i06i6k439678bpca8";}; +texlive-common-73495={doc="19rkyafccwpzmbz3pbb9iqzqcm5ghs93vi7d2jfgarnbg8m84zlh";}; texlive-cz-72437={doc="1gj6b3wg9nrd3arqqas7zayvz09mkybadqk7k6a5nc36zd18n5lk";}; texlive-de-71542={doc="1zf177gcilzsd96mpi2198isighpkkblppkwi3ajr6xdjg88k662";}; -texlive-en-71152={doc="1pkfx8sky9jwbjkgjj12bny8ibspx821lgn1wsmif0bjnnzak5fp";}; +texlive-en-73024={doc="19z0i7d56izhn1x7vzj59kiknvbfw3q7yka827wkfm9b48z0b1bc";}; texlive-es-70417={doc="17mqlsvaxddrdmn9nhc1sq44rqamvmck6db4kc0zvknhiyy9ccph";}; texlive-fr-70783={doc="160cnc3znq63ka0nbmhhk7m7csyrf4i803wvn36wgvvwrc3ziwj8";}; texlive-it-58653={doc="0vmwn6n8bxpzcfrzic5qg5k2vklbm6rhl9861zxsli0rd9396qn6";}; texlive-ja-70587={doc="1dshzcwb1xs7ghnlc6154cq5pg2604jd96hrc3bhk7bmf0fis1ir";}; -texlive-msg-translations-71858={tlpkg="1zq0pvs62vdd2kb1i95pzhs205ff9iz5iglpns8s91kd733wygwi";}; +texlive-msg-translations-73789={tlpkg="0apl41c6x3dkchwdl0ydwkdwwkz8f515z3wnj74f7a4bmjvylbal";}; texlive-pl-66576={doc="1id4kngpwqs53zn3pqj0hp85yf6rvha17dyb4s0m8l66cj2rzyn0";}; texlive-ru-58426={doc="0c77yyfj87fajran8jppj0x8krk6b5195iscpn8z2n94spz2fcc9";}; -texlive-scripts-72673={run="1ay2yqkxx9cyzm89k899ikdplqdr4iajg3ck8izcdll7nr52zcqv";doc="1ajrkv2pxwyfbp2jnw14qyiw79lq1qv6b2mn3kkkc2vkq0yhlm68";tlpkg="0dy3wi5gk5xkfnahpsgrryccsi7mqi5v606gaw6z98c6s8kbc13k";}; +texlive-scripts-74525={run="09lsh9w0a7prcn40i6d77rx4wb5agbmpblrnj42006hqvndxcxfi";doc="1awfxxv5liqrpbzvsz7if6gjm7bqfczqblm6mzjc3jaq6z0nlj9l";tlpkg="1psphlasvijwfrcpp4zhdyfjvh3px1f6klw277y3l5jhsjlyczba";}; texlive-scripts-extra-71746={run="029ha9bkayfhxypgq0ld3psrf0ha80xvhf5n0jxdgz5hisx3bjqy";doc="1izzy295pmxrg0sf2szxxahxm6s8bfi960mbs9z6vy7m5j1szxwl";}; texlive-sr-54594={doc="0icavs9jkcr5b5cx5kv202k95j0ydgby9lqrw8wm9h936mbn9bkj";}; texlive-zh-cn-71700={doc="1yabp3nkz4h03fxj8w4v0kgf7bibvrw25cygdbhvi13rfkw090j7";}; -"texlive.infra-71593.tlpdb72673"={run="0i4jsv20dwrh40jj4y22b6hzbf57gn36g2rvfnr88vyr8vlb0pwl";doc="01la1slyjniksaz7kpacpfiaixr1fpishbzgymfzy6aiywmhkp8y";tlpkg="02s83nh7zbgv3dkasapxc9936nddpdy8vzvrb0dl05swjhxgx7vf";}; +"texlive.infra-73495.tlpdb74525"={run="0j45kwgwzqm7lq74slk48yd7703nsbasgci0wkmar1f6cmd7vx2k";doc="15vqig9yp7fqyn73zx7pivw7lgxh3p4ycgkcmz7r0zfmbd25q0vj";tlpkg="17fmn7fkf5d845x9mgywfs0lg20gvak8cydw01nc4ymvrapalpzy";}; texliveonfly-55777={run="03i9pzqv2dz4z9nlq60kzwiyfvzhhaalhczqa9146jp4wvcib9l3";doc="1fsabzkbcrk42rsp8ssx0kvap31y1rqnkq582129946q3njvmylx";}; texloganalyser-54526={run="0icav63nll0lj85cqlbg1lx1r6ysjf1lyv5bydxr3flr1c7yqx2r";doc="1s7952n2brrz3s1qca9r5qk8fnjlmrmrn8b06dhjxdb7wdqis6g0";}; texlogfilter-71525={run="0qwh6sc4991mhjipq0vcj85ka0i1dk223bmh1f7ys31gmw9cx98j";doc="1h7y1al2rfsfrxxiiii7nnvxfn9w41v5k1zv0i0cmcsl161lhnf3";}; texlogos-19083={run="0rp4l8da3dn6djdjajavxqr5mmi3fsyadcqrpmd9cfggdvb9i8qz";}; -texlogsieve-69436={run="0sn9p9l89867mvwc5n9z4i3rxybm3dy5xws47q99563j1hvc1bnk";doc="0a87y350dxx22ll41i7y7wsdgabvdf0f6pgs08vr583jhzd6ks7r";}; +texlogsieve-74449={run="0rfwnhifh9n6hdc0mylsg9m3x1ki4s0g39nvhnl95c59d5nvl3id";doc="07s5as0b8fmghhk4r0avwbd2agpyjbrg8rx7gls7zmw1jjxjfdg6";}; texmate-15878={run="06hnwj11ify60gx92zqky28spdhppgai5v08l73kiabrryzdn8w5";doc="13d6rlazx3qx9zwbb60z1f6dk64n6rph610s97hha5kpc0v2vkm9";source="0faabcm8lyfvzn5jb7vbpkpa31gjb1czkr0g391vbdmx9lrllxar";}; texments-15878={run="0vhwraxncqx74akzmjcww4akisn3zjgi5b6ac8c350flhl0nsh5p";doc="0xn17gjnb7n3ryc28p8vg2hshcwa660482pzm9byq8k6s3a78yny";source="1kq5zw31sv0i87h30ahyasqy1qh4m36f0j37f8532s20n5llcq0z";}; texnegar-57692={run="0qrnysss751vsbgd794gwh8lwrq6gq09p55qkkfngc5ly29icx9c";doc="0jidhqlklr8yd48san5iyy3i5pxg8lygf4xi0gcp3ps7xcb0m5g1";source="1bayaa5vffnkmvdmg64q5rsnh69grr8qirwd41mlfi9symh9gm2j";}; @@ -3912,7 +3958,7 @@ texproposal-43151={doc="1yxb3yagljsdp4s07fzd6498889i7cscch68fb77jbfc2z4srvsy";}; texshade-69371={run="0d5panq1z0fpi7rvwp9p2pahd7vlb3skgsw9zq4rhb9pirawv3v7";doc="0bvxfpc2v8hph04kn8a8rf5995awp8c3zc5r3ddnghcidn83xsny";source="0ib9fs5391pjxh8p0c6bzvxmgv03y73qgdpjdzyadbhkqj4kkdxw";}; texsis-69742={run="08sn35x8wab41mdv67ra3hahrsf4v4brp9n5z0l4bk3k27rl4q0m";doc="1bgngwqj3kkr196sp8i59yrkqpambijr4a54jfrgxb6595hiadsj";}; texsurgery-59885={run="1f2m8b4xjq38j6q86pfa4m8f7z4sqyfblxpkkljppiz66cq9gnpy";doc="1zpilg11flz7z6pk7zhpm5ck39avh24na2jpl4asnnznaf5bzfjz";}; -textcase-67755={run="0rkhw4rai08n52ak4acix224cwj9fzpl1m4qcxzql9cq0h51rn2f";doc="0hw7q77pn8nx80qqvfz333sn1dpx4srf5xsv8vpl6q1akhrk5f84";source="1bxkagbkl6pnlnf9ibs0ics3p5nm9dghyfq97bn32fv38jywlswl";}; +textcase-74071={run="19jg174pjclhaj7wr5r40bddflypfc489wkl56bliz0fd8hcpidk";doc="0775mi8v7i7w94y08qvck7bblfw9lf4zw4dyfkjh0i71wz7da1yg";source="1zbxf88w6b6bipyp76k7qmlhav3yypk696c664s63g5id6jrzhzi";}; textcsc-67193={run="1zx7890vdwghxl7g9rm9fcj0v4h06sdbhsscwyp7wjmf35k6awm6";doc="04gh3w1a7pnw1zja7gg01xda0f15s1918v5m289ax22j4x9g472a";}; textfit-20591={run="0vmffs1a9zspg3hcnd7p0mffa0cw4nnbx8s4vari3n8npmdxrf26";doc="0dcb63v0yhlhvjmcbsfnw3px6qizmq95rq67i64dgks85d4dhi6m";source="1h2yql1gy6hvwv0rirm9v996j3clrywsg9dzgnvrkrvnkf1b6dqi";}; textglos-30788={run="08932gszahdc5q6pckg9q8bdxs39gacjw9cljjlvghs8vn7jjwjj";doc="1c88my4j07b7ihn07bcii9xxckdv04g3c6jycm0ffhjffw4p7609";source="19hc7lalmbr85pbz3pd3dm696fsbdl7y8v9g1c4l2k7b0i5mc8zf";}; @@ -3933,7 +3979,7 @@ theanodidot-64518={run="1f1ixiqb6mn875rahrcl157y3bc6dv2i7vks7vbnchppjbfgk757";do theanomodern-64520={run="0w1ybshhj3y22ysymxg27apmblqxwwp193q81vkykxjrf4qn357p";doc="1a99wqmfr3adqm7rhq58kjg10q9bvf0gj44ly21nvmdl7wa0qjjl";}; theanooldstyle-64519={run="1v5hkpspzjizpbcgbr5wjikwpvslq02fahqbdjpycrpl2q3zlc4m";doc="1wfqvav0k9vz7bs7wdh6fppijq904r76r6cwg8x5ffcv029l75ir";}; theatre-45363={doc="1nhm56spqvryhmhwmzly939mzv5yv3398lh2lyfhf40rr02mzgi5";}; -thematicpuzzle-69356={run="0cxgvzld08bmyl89qvnkqf285qfgyhdmkq6aq8sk19acr9lljrzj";doc="1c693zjh4n4gjpkbrvw5s29r55b350mchby88l7pakhzzk81xxfx";}; +thematicpuzzle-73069={run="0cxgvzld08bmyl89qvnkqf285qfgyhdmkq6aq8sk19acr9lljrzj";doc="1c693zjh4n4gjpkbrvw5s29r55b350mchby88l7pakhzzk81xxfx";}; theoremref-54512={run="1dfv3pz7pjkazp0czzpzhga9j201gwvx785v3qvqasrvpa0vwyyq";doc="0zs8q0xzinp2ih68c75yj9mbjh1pmpqc77xg9hmj8n3gpf1kmmi5";}; thermodynamics-71522={run="076df9jhfn6cijqxx4skfmv13aha5asf4r2vyg3gamzdsnfpw5mk";doc="19pk7n3ma12qrr4jamqb8p4j8vh9ddh00b2v32kjh8bj0xvz10k9";source="0lvamx5s4pdq25lrcmn7i72higgnhgv0f2f189v71hshxwqiss4j";}; thesis-ekf-70980={run="0ryj08pc5wh5bjvbwqd6qmh10qf7vj9jrwqar6g7ljlf47xm6h6b";doc="1jgnagkl4jnhhps4r16mfr4zjqnp87agqfi5l1y850mqp51w2mqk";source="17fakzbs8dmsrrkafh52vipwi7pm10yvq9h5mqxm5rj3zrwhxhw3";}; @@ -3942,7 +3988,6 @@ thesis-qom-63524={run="0lsi7xy3grxmwcj55s2m0cnkqr6544qn40k5jrj6himi7l1p82b9";doc thesis-titlepage-fhac-15878={run="1s9g6h020ahv404mxsfvqic2im68qnvb425cyvz0bj2rwn1fwnc8";doc="0pjvm3d2l9715q50nbbza5l6vzhj6zaf9payimk1lr6k94357v1s";source="0bhf68pc8c41ih92sajva48m9fq7a05x4y9qqanbidvmb6jmvhbn";}; thinsp-39669={run="19d23nm17nybk0dda4l05dsbs1695fk0kl86vc713l19mzw4l7fw";doc="139v4dmnbhsd3nqlp9qknml0glfmh1f9dg0nnixggf19lsayn27p";}; thmbox-15878={run="16c6p3n4zc2726adj8z131h03gbzyhmh5bj8hzc286p96131swdw";doc="15mkfzmy0141k5wgspngbwnnldf0i1rvbmq2bkzcpb72v9vcj8fd";source="0lv5mr23wwhig6r9fyy7rlv2cqxlr35y3g89i938w35s9q25xx08";}; -thmlist-70780={run="1rv8fxd2yxw1rkxghw914imh4a0nn53j3vhqkyh86fb9yfnhkf9k";doc="03976dqpfpvh25n5hnv20aal65ac64rg4w7lzxwjpx27jggw7q13";}; thmtools-67018={run="0msngnpdpqpw0skchd629v72wnd9pn8s1jijcyvqzwy88k8i8f2m";doc="1lyc17i46x1v7xhxl7qf8hpjn3y9r7da4lycpsfijmlscp9q3c3y";source="13zd5sx1nh9f61jwr2raxkli2y42w2dr23j5yjjfwfk65pd8bfq9";}; threadcol-28754={run="1whvgb3901wciijafawy5pgnr4adpix2a6ph2v52kwglg68s2ixa";doc="0dky94vqbqrba5hsvgs1sllwy6cxmr6mlr6zv6qgn1yrrmjxs0by";source="1qd96xl0h8bnp5mqbh8mprdfbw1bhvp60dhj46hqyl4w7f61jj20";}; threeddice-20675={run="1r5cssaj6qxv17n04pgvib12a7b7fnxfk3qbf87mhs1xpxsh6v1s";doc="0w7f2dfy6sbircp8dbw8s28s4bxbqnmz469c71v3qcaw6hgw3y2y";}; @@ -3966,8 +4011,9 @@ tikz-among-us-60880={run="047mfp3z4m63wc4f7psrsi77qpc55drl1wdrk2dlzfykkh4mna3p"; tikz-bagua-64103={run="14cycyq0lshr61n83jdzdyjhr20b26fsrp1ximyh1phk958yxmbj";doc="167pi758hdi7chys2rbs1v1lqd5gi2nb1fq244igjr77v1775ifb";}; tikz-bayesnet-38295={run="1sdal5mq1s3xkklj09hy0j41xymprmh78z3923f55bg0kzdc2i0v";doc="0kwlqx1bys43hzwpwj8snrn5693grfih18fcw3d74a6x7s5k0h8m";}; tikz-bbox-57444={run="023xrf65s1c4g63ggpmsdyckp6zspgjz1ad7pk7jf56zdnhqaxb1";doc="0ilj988mh0w1ws8ancnxsz0ig4s5k0yi3ywihn6vsk3z94k51yfm";}; +tikz-bpmn-73368={run="1wwd6ig6hcpi3749nmia8xzjzifcgz3d9lrwyfw7fb1i1h95cnq8";doc="0gyp1kz7r5sl8c19g4baad7bhk0mf1mzqhhn4qx70xnic0hizlmr";}; tikz-cd-59133={run="0xv75gvwlhax08mp1nlyy2kgi0br7wy7aahbaf9rfbj0idpcl5ip";doc="0dxsixn2n0irfqrgcp63h74fss1ldqlcvfv6d9v61asxsjdrzf0v";}; -tikz-decofonts-72545={run="02mvvjgc9nnld7s9kyd2s5jyfqsxrg06p22sh8x10g3l8w4flzkn";doc="18ad3qygvfymq07dhzyg1aqbad5a6d3qskjq9yrcf1hiwwi3x3qr";}; +tikz-decofonts-73717={run="0njq525z1m1mf2kp2q0rvgm1dx9rngy9k7yqx6adl2z87is53wrb";doc="0bzq9q1bd6nhgfi3q9g8y6294lc7lpfj6m5i97dds7yk8a606qd4";}; tikz-dependency-54512={run="0v471rprwnqlhwvx0lqxvpsgh8ph16lbvrpcrynx2hx71n9daqla";doc="0h3mnxwcb1k1ilw9pi1xcwmryjpci0kwlaqfxx2i8lcggsdrxfxi";}; tikz-dimline-35805={run="0mp6xg317m0dkrw73609xdn7r9hbf8bdmyp0bdj2xzpynpvxisxd";doc="05rikgrm1f0f0rx7ir1nn4cy3a93bwrck2xqnms26dg4dqddnrbk";}; tikz-ext-66737={run="04ar5xpvxsihcv50n8z49dd76s4vlw401y106yi37x3fsbgfzshl";doc="0aigvf2a0b9lh6gj66gp75iag3ipd1kjf6wv5safpn2v1jfhadcg";}; @@ -3996,34 +4042,38 @@ tikz-sfc-49424={run="0kkfds07qskfbd7yxfyc6spylnd0nnhjyfa8s7i44y4d2x1skik5";doc=" tikz-swigs-59889={run="0cpmk783m9qf4wq1qsw4hy3azjlx0r47ya5ijw4ss3l4nr8i710x";doc="02carafyvhv0nv29n9x0k8ij8adiwf2xqr8bw43k4imj690360li";}; tikz-timing-64967={run="145r878hxqfx1sdn4hdagmcnfx8xqcihfz775zabn5sbzki87ywq";doc="0na0rjgnala2lyww8chnkqyp26c1y2siaj7gqh6h8fjpi5bpamdf";source="17wzwm58194p5jlwb74z30864q7nzg9fi4q4dbcp26b3p6kn5cxs";}; tikz-trackschematic-63480={run="1jbji8zkqjwpf1bn25p415n7cwz0a5q2606imyj8bbxdzp0r8y23";doc="1pvp3a9pgszgb2013gkh1z1fm8hpxa4z6ssmr1hwvwj7y48399bv";}; +tikz-triminos-73533={run="0142p0ffvwphfyb5qn3zv7qdc9l3jwk1ciir9cpz1x33xqvyl8av";doc="0dqvch20ka5s589q1mwnmk95kknd2yqgxydyc2xy9fs808pilz5f";}; tikz-truchet-50020={run="00yf9044lpsazd8wnmcz39lnazrxpqd7lpyr8ss24gk9gm33b563";doc="1vlsyyh7xj1fn6wkafh7ps4ys439n1lmvmgk63pya18laxkphxxk";source="1zbp1xb9sbbnr4iiqgg352ymn9ybfmkwmwd49r1ws3w7iy3qdvrz";}; -tikz2d-fr-67239={run="13mzq1azxi34lrkm4rycsfhbcm8cap8pzam8gwc3vfa5sygkczhd";doc="10lv2v9j65bq9fj3yin86hbbj4bvlygqc1b2sszjabsdnmzbw0yd";}; -tikz3d-fr-72297={run="15066pcsb0mznhd0bldz9c5dcwsxi4yq94imzg6mfhm8da88bvhd";doc="0wn9pnwxfis4jn1106x90j1h7kk1j17gq1a14l9hx8mj3p66iwac";}; -tikzbricks-71933={run="08x0q9732svy15lkricm5qnixx3c2ayi847zzjc96mhpx25w75lb";doc="181dabii8y5jydjc6bz74yvpkh1avyzzj0gl7zqd1n7icbf8s4pm";}; +tikz2d-fr-73069={run="13mzq1azxi34lrkm4rycsfhbcm8cap8pzam8gwc3vfa5sygkczhd";doc="10lv2v9j65bq9fj3yin86hbbj4bvlygqc1b2sszjabsdnmzbw0yd";}; +tikz3d-fr-73199={run="15066pcsb0mznhd0bldz9c5dcwsxi4yq94imzg6mfhm8da88bvhd";doc="0wn9pnwxfis4jn1106x90j1h7kk1j17gq1a14l9hx8mj3p66iwac";}; +tikzbricks-73140={run="1yc11zg5q65qrdh13fbpdqnz93ic4dgpka204bfx5zriyky1682w";doc="02ycxv4j3b4imq111snv30826qycshwqha8blvkadv1s4kbqcjir";}; +tikzcalendarnotes-74419={run="1y2rrnvppyqvn9ga1py2c5p78c77812ays7d1gwxrdgqi37h459i";doc="0z183l285dcfy89l131sjix2imjn9qxkbzq5mnxwd5dzgw48c80k";}; tikzcodeblocks-54758={run="0q10q8gfbdw20ysv40pj9c1ks4mnb4dqvvz39fvyji3f4s4xd60n";doc="1imd5qf95ykqs89zqb32yg7p61in242vkjx5wv6r2xh2dkjpvv9h";}; -tikzdotncross-72638={run="1ddalxg3sg1qr688y40v583rvi5xk07dkmq1nwjyqqa3dpinksj6";doc="0j9abkqhhpaf0cmd71idsxxvr0hxvbish519ngvxj6pvv169iwpv";}; -tikzducks-71098={run="1h07bmacysh5qx6f1fx1s2j23g66dr4n0gk9xm0vqw042rcv7s5q";doc="03r65z14wdr6c6hhb7hjm5d6wbcnhazrz49i3lf71bwfph7idwc0";}; +tikzdotncross-73605={run="06rwig8ipzd312sgyri48j3q1069wm0ax8v2k2sy3qx1rfa3pvf9";doc="0draksn2h7f02apay4f46psynznf3l3vpflpqy83h5h7whgr99wi";}; +tikzducks-73659={run="03wfmz61mm79kdr3f0gkkgxa5q3ziy1dkhw4ab6g28kjsk4k5iqx";doc="1qh1r9adys049avxdvbf5f9kq7zh87ygrripgbf586rz7gsx33fx";}; tikzfill-67847={run="1igbzzpx6rwqklhnalzpsb1rpj7l4mkrhwblp8k732nfqvj1fn0x";doc="1dl033xf2waf0j40c4whci5qsyxk4346353j43vsrqy7lgsh557b";}; tikzinclude-28715={run="0s0mhfshfzl28z6lgwn7f540pbmdxl51gqf7nw1s88738mx3m4z1";doc="11jj75nnzw9m3i6nndbfscllfxzn5bd636s85q17gds03jbqkhfc";source="1v1bvpfqhvn3hp3zjx3sqv4kg288aviy1b9zl3s8r64zmai86bfy";}; -tikzlings-63628={run="17wgali1pawsb6kz2w41a27i7gj1sm4h8ay8i8q967s8s07kxv5p";doc="043sia2hyynbwpgh10dfca9gyih97z8hlxpi1390a28wnmyvcbwb";}; +tikzlings-73322={run="0xpyysykayfs3mxvrqnw0mbdi6biz3kc5xa0l00x675lwnalhygh";doc="0g8836gazqprjb303yc03gxccwakday6c5a69sz3hl2hzlxs9dsa";}; tikzmark-64819={run="1p73c3ivn3aamrzzzw5y4fmkfy7s9qnvw4q64jn01qxzzs1vbhdl";doc="10fwszi7wsqrh6kql40s6w4y0jji8v0q41bd684cravhgg0yjc1p";source="0mbk2xvqjpn44skvdgjq43s1j4814sfn57xc1ishcwrrmidy5pra";}; -tikzmarmots-71076={run="1h56fyd8862s85yaxmp6479sfk44ily771bjsg6g710naj82d31d";doc="162n1y42rwhlflfk80laapr0wmpjbjcfg9dd2n94mg7f2j0av8lm";}; +tikzmarmots-73100={run="0n1z4lvh06d6q7yj1m1fv9b7f5w4f1qfmaq0smb8cd2a0g28ri6d";doc="13sdqbk7y6k087anrnhrlix72q2857k76anglsn42k2b921da2kq";}; tikzorbital-36439={run="17g4bd556kkhrxir4c2q6f7qxa8rigkf41dj979nb5k3a7w4k3b4";doc="0h1s5dnyv8n4hv608c5rspdgy2h10ilqknddai779h9biwhfzh3m";}; tikzpackets-55827={run="1kidqyd1d7wvs1f3cp6ixp397ipaj7jd19djhy3q4dvbnzq1xm4b";doc="0rlpz3m4vsyin6ckyjkxjp9a40gxhhi44z18hrw2blmp0mg011v5";}; tikzpagenodes-64967={run="197sijaabaa3sf5syasf4ciwz8hkgy2pyr7lp78gzhlv950drghh";doc="0y9ik1r203inp74hx4xznkypw0p88zhg9fq6b9205i053vvla239";source="01bjvk944nlld4zbrld35n45dzljqf1rng83y14ipn3wcdxa0plx";}; tikzpeople-67840={run="12i0m8jilbl8ldji9xmxm5hgsl0bd5vkjly1ykmj6w2rzgmjfbbp";doc="1a3cjadvnrv9hslwgihxv8z16awkikinv44zcj4fd5drnqjsvcrq";}; tikzpfeile-25777={run="1rwv1i6yb0jd5gw16db3kqar4ykzbwcyw51hv781iz358hgww5mc";doc="1530vkp14lpv0hnv8qcxalibsi1pkcj9xp1pa87lisrillxs7kwb";source="180cp8vp26shmnjxg9qs9n28v4xy0qhqgm1bvbkqrpagykzzhsrf";}; -tikzpingus-68310={run="058v2b6scnz31p0jzk4i1i8v6a1vb10fd4kgi0izd4pw58cjj31f";doc="08fi2mlzwvdx8i4r2hf8l2lx7j6b4phpm8ihwklfi49ha5i0z2n8";}; +tikzpingus-72990={run="1wr1kg4i45ac4daydh8qizb3rx0y2wkibn102xs2v52kvfkdy95s";doc="0v0amg6nsxn2157y2iyavdkib3xi190zg4gw1x2l0r03bqc5sbyf";}; tikzposter-32732={run="1r6pia3sjl9xcixnsr5pk8cma4f18mvpn60dxmpzpn2nn1sk4p26";doc="06vy5vmzrqhl6zk6z9a4kyqfvjqc4s9pslvl9zfl17cdqsfvbdf6";source="1idiz8izn9m9h7kyiavw836v9x1vzg58vap42wpj7yd74izwvf1d";}; tikzquads-72580={run="1l6mka68snnbnmwabrr2rw34lr96rvsrs26lpxyf0xdhj48sx18g";doc="0q3drgkk0vxhq1wbgl226z5dql1hnyl93ycjvnlza4fpypip9p0g";}; -tikzquests-69388={run="1l1d23ky7pvcj6j1g52p5qsdy060qbjws4fp4i7j38k6dvyrw2pl";doc="1bvjy5ghc0arx48gxc3sz7z1fz02vigg5cxc1g75b6pcn1l5x9lf";}; +tikzquests-73386={run="04fk8yarvliy6hr87n6d9j8j7h36w89h0ydjshi0amnw60fdk8r0";doc="14rqbwk267pnspn9h1dfnz9admv6r0w6jsx2qqj6yzdh6z26rbg7";}; tikzscale-30637={run="0h8hpk0nv712vydxrzyhvqxrrqb34hw5qjgq9baagqj42ka06qfg";doc="02sz63v9zxr58417jn00ypm3myga7x29q31xbnz7p7mmq5q1r94h";source="0rf6rsrcpapmhz3q5wkgcivhvswy1kb3mql94xs372qc08bxsi3h";}; tikzsymbols-61300={run="05a3szm1xgsqj766cwwf8ssg1s2jd0kbvgzv6m0hlkvnpig13y7k";doc="06wkvldkiym2xlz47rr4f0nhlbygdqisczn66d41lsf59v8036lx";source="19jcl91qn62hr4j6fcw6a6dc0qhpqqfpzqb1d8mwibn91dzad00z";}; tikztosvg-60289={run="1gpkypg9j6iz0i0f77drk0p373x2vx8z5v6j9wsb3bggnf00f0yi";doc="03f324pxiwyxgnsvw83wi8sh5ya633a1d6833kq2zl8z1f51vvfd";}; -tikzviolinplots-66659={run="185hmygifmnydjfsg01mwshzjx6d80r92j7bh3djpkslxwp8pdyz";doc="0asisvkbf7gfwqn6wzyjl574kysjz4z088ph4pqggy4znd0yqljr";}; +tikzviolinplots-74311={run="1vzfl8j9hnyh3xsznqps9ym4x7mmbn11i9r3a508z0giq7hqxmwi";doc="0igyywanpy0kg728bs7i2mfinjlyrvr9wvmqjzjdnxxcpyh51r4g";}; tile-graphic-55325={run="1l87pqfzgyr8apcs9f2gssf5rh1mvknkr5jim98zj5f93ca5mjpq";doc="0rq35cpk9l7rc30l1hk55r7x07f96ishr3dzdi7x4d50gv7675ah";source="01xqc704g5pqwmlfifzvv61nypgvnabxv6xw7ljgv9vvpyvfh0ni";}; tilings-67292={run="124gj42waa50pv8qm4zkal8xxr5d0kvi9wf9qlrz0chhm1xk4v15";doc="02bz0wpvzwf4f97g14rkv25x0ifxxfwdkgi3nbv6x2djbm79xjd0";source="03zb3sfygc8bbdl5z4hz7gy7wfnl54sbka9b8w7ywkx9wgymvkz9";}; timbreicmc-49740={run="0inffnb824kv9lswj46b8p0zb36f4s3pfix4m7x7v0d216xa75pw";doc="05x699cyrkfnygbwfifzz4ih0g5nm7pzlj6ygkh6pysyzxkb5w94";source="0hznll8725wbjmayxilg0hvjw2vf63wj4cxmznvfly9lk8z5zh5m";}; +timechart-74011={run="1s5vik1iqmqb57whxklbs1kqajzhcmq2zikjqwvb6qfgac8i0f0m";doc="0r90lcb54mz2v5sjhp5p7ac8s8k2536nf9npw49iz3vd7lv8vj7b";source="0zlc5a51cx706ks74i5g61pk8mkdifqri3ciwnpb85kyxgbbh4sc";}; +timeop-73069={run="126z3z8kq451d65a6ncd1rx9i79qicf39iq96rd4drjr271aizcp";doc="157lq0pa4gdk8nw1zkyn5wr8cnhf7b1sx1mzz9i088nhw5npsmb2";}; times-61719={run="13g41a7vbkvsf7ki9dgl7qm100w382mnlqkcngwgl3axp6s5s8l0";}; timetable-15878={run="1lnl8gi2rrzcy688qb8b1ff9yivwxdqmbcfx2ph49aymkxfym97b";}; timing-diagrams-31491={run="04yal5fdbwwdq5i7frmvxm0z7zy379gpwbc5383xn0nfdyzrq91b";doc="1w3qzl1j3viaj6qi50qcyx51w2ms23j27p17h526iz11x39w0gw7";}; @@ -4038,17 +4088,17 @@ titlefoot-15878={run="0c0nhhxhb3hmvg3a64lr5npbqsmrmprqqj9pic91j007k4s1in4y";}; titlepages-19457={doc="17ib7rpb2dhb2m724x66fdzddv8cqd808wxy5kkvx0vb3rl27hyh";}; titlepic-43497={run="1pj4mavc06r5ghcvyjjhvn7x2xrccgdfjr3961al7420ymaqb726";doc="06s1r8xy54129y7fvzaym2vkfbyw2x31r91i8cyxyra0chzh8ngl";}; titleref-18729={run="1y2aw2m7jg7l9vcr35nd2qpbafyff1bc8acy2cm9k7fcjm4rcr17";doc="0rv9hsx5p460pa3ry50fnrcb0kf08rzdl7bq47n5nhm8frpmczad";}; -titlesec-68677={run="0y27npwraxaryl2z7mv0fzkdci8whq8jz7b2xlk2n31slbfvksb8";doc="1yz5s63bbpkiziwggqcal266444nm03fnr7kwan14gswmqqbkav5";}; +titlesec-73302={run="0k5593mc0899v8q1kcr17817py24b7bvqfz7iy0krb5gl7d88ymi";doc="15yyh7pxqmkvl9xirkw84691sp35l4wabw4392y63add6hjzx5vc";}; titling-15878={run="15iw3giwxg658pzb6basjkp4v92m3qvzk1fcarnzikc649bjcbch";doc="1r75nwakbkwf32qva6icp3pq3y8bgfl6cqw304lcw8p6bih74y5j";source="1jdgyn9zyf5rwbaz004g85rr2jpd5gi5iyn111s0r22ml41ci3hk";}; tkz-base-69460={run="0zp2020wa30yqk0b5iyzyjpm09kndnw7ng3lr547qcfgqr2q6iym";doc="0218bq4ma7dxshk4mvh3i40qdhh4b3i0i9yp034jjnn366wxk039";}; tkz-berge-57485={run="1c9kgzsagh5ww0zlwywpddwn3mx0wrf8yc627gjap3f7nyyvixn4";doc="07bsfmh9qyn8q9z4brd4si1clmw7sn2vh2nr8idqnm1z1jqdnq40";}; -tkz-bernoulli-68780={run="0ifjig10clmd3402y9kdpyw1vlwk9vjakanjzkzablm5zzdr0qgs";doc="1iv94xglrk07kg3jkdci5nixrz96gwasgg5h0fl345ph9rdalwx1";}; +tkz-bernoulli-73069={run="0ifjig10clmd3402y9kdpyw1vlwk9vjakanjzkzablm5zzdr0qgs";doc="1iv94xglrk07kg3jkdci5nixrz96gwasgg5h0fl345ph9rdalwx1";}; tkz-doc-68665={run="0gf3zjnqng90kn9341xdchm1diav93qlv2910mrl1cc7vqfp47wf";doc="10p4i3xnbpyhzj32j3mi59pzaisjhj066m9np4ankzizgwv9x5in";}; -tkz-elements-71827={run="11llkw03hkn9jch97z5pdk3xwdkh4b2fgydbq4qks7zya8z7r5kc";doc="1x6mqh8s6ljwj57m78mbrdf0048vrb3rwbjwrjrca08p8r0r2s9s";}; +tkz-elements-74468={run="10981nkp644vjn5ai7kg4sbq30rwcvih1lzzf9xmapgfqv061qcx";doc="1sfpvl8wb8jvflc0gicy0f46mmflk07bhcfyc9wzfvn6vyj3qdjn";}; tkz-euclide-71131={run="06wsyz2lq7hiflgdmz1ig3jnmfl8avp98pmmv8p4dbcwaxxivb0a";doc="0zc617vc2jwp4zcawzd2ba23bbpv65xiwcdrpswjgdc19skhv7rg";}; tkz-fct-61949={run="0hlcxnllmkhmxl5dwap1sb2jg822bz4glllqcv59dx7jqab5bv8k";doc="1bjkya9ssr6m4aw6rd64nniwffgz57ikz16ciba2x149f39pkcx3";}; tkz-graph-57484={run="08kfjaniwrlw23vmz24yq9gbdks9fwcf0g4jyy98ikfqh9phhhs9";doc="1drk9va3bgq62qfkcvp5z30gvnscl7mbjz66m27wmgagb2ki2f0q";}; -tkz-grapheur-72526={run="1489fs00khpp3v19vmrc7255r1m9dja2xvzp7rgkqy0jc3yf7vgq";doc="12vamlh3kmrbn5ncgzx22mxsspvng3gdlvc587zdscw8f4173a7j";}; +tkz-grapheur-72701={run="1g4myj39x94jm9r22shxmdmn0djjpw9p4bf2an930f7r1fvlwnnr";doc="1d17ra8cyvh6bcgg89bkrcy2irvka2fsyvfnsbg0yvjdlp37yrzg";}; tkz-orm-61719={run="020bi7dgjipd2ancqji6fa1zcf9lh9d8n4zbacy5l5nclxfiphcl";doc="1zgmsl11cf4fgkfilflw8c4wrcfwnvk1f88l90hwgclfj5q0ashr";}; tkz-tab-66115={run="142fjk2kdv02b7whr2m5a53z6b7rhh2zfv2fi55q1sy4xaa1wia1";doc="1p0h1l1jca83j27wa79ncjarczissgp1jh9f9ylqhbi7y5mk8abw";}; tkzexample-63908={run="1cs6x5v0f4dbwrsmdq6wjcggc87hc132bp0faxd1fqfhgapd00mc";doc="03cn9q2qq04ni6f6kvrcyy0js718bpc3di37znr47vhh419vpc5h";}; @@ -4058,7 +4108,7 @@ tlc3-examples-65496={doc="01ny6r3ycji0af0cdywn2fmxd0fyz3y7afdnn983a5gy1j9rza7v"; tlcockpit-54857={run="0sm882jxczx8q4dvqaxnyb2wzlpxd249ayv77gj9vgq4lx9v0l27";doc="0zd8hx3f6jhm5rklhr5dxb84y17p4rbgwa7wh95ab5f6n8i5pgwb";source="0kldzbbyjvj0n60jgff8y6y27nxnzihjyq10gnx2gi62qn9bia7i";}; tlmgr-intro-zh-cn-59100={doc="127fad3aq66rnn4jkccyw7qc8pdcwapyjb6lj9kn49nqcy3jm6nk";}; tlmgrbasics-70175={doc="0mgncnr778i5s310zp7bfcdcilsxlf63cis7iy4hbf9y8qzvjx0h";}; -tlshell-70419={run="1syhl9s2r3xpmgz0hz09mqxvi0ndw2ivaxgyhr5kabx3zfpc2h7a";doc="1h5mk09sakbmgsppl9fnry28xnzqya3bmp3r1nkzg44cv7kl98vz";tlpkg="1dvb7jjnmdh0k4dfkm4f89zapkjb31z2364m0vapmvfq4z84vpyq";}; +tlshell-73297={run="1ppmz52377vpad74jb7ny9nyr2p7lk9c5bw2zsg70amm600gh9s6";doc="1h5mk09sakbmgsppl9fnry28xnzqya3bmp3r1nkzg44cv7kl98vz";tlpkg="06lb0a26mm4qjq8dr9cwn3yy0nh81dv50jmrndxvcp7py6z3c721";}; to-be-determined-72527={run="0agddlgk9a1zisnyd0qr8cvbrczvzi4kwxwmfqlrmqzssyndjazq";doc="1wf7zzl2s13bqkpfkcpj984fk4glmkpjwyb1pwlmw11vsb7n5g18";source="08x1fbgg7vkxq1j3jvkkx8aqg2r2371i1kg1brks0w1m1rdgabqg";}; tocbibind-20085={run="1swxyai6gqlz8zjah2qnz9c5dkd1smpk163b56rba0kx7zcmvzc5";doc="189qi2qyp1nasg9w902ydk7rlzxl2qww9w3p5s3p9ywchvm1l9cf";source="08sr335sgs7hrhd6cbdc4dh3f8m9fpplv72fk54y57rx59l8wxbs";}; tocdata-69512={run="0vj012pdzwbss6h96l8a539vdwihm9f58d6yazsfc74ia4k0x3yk";doc="14hy1z419gb6n4zw27xv1qi3gc3krg83xpnr5lw40yd92i99i8q2";source="0wg9d1nay4cr52g4ird3cgb7lndlyvmx6hcf6d29j5hfdaafkdg2";}; @@ -4070,18 +4120,18 @@ tokcycle-60320={run="0cl2m00pl40pi6ycw1c1kndaqinrqml5gl88kh5d00dr7g9p50rd";doc=" tokenizer-15878={run="04b3jy76qdvbq9c6yc0lmq99jqcprmcfd602zm6xsr0lwmxrp1cd";doc="0lpbfdvmib9ykdcwrcd5inpibgkm99avqyn94zadbasr54k62gna";}; tonevalue-60058={run="12jvvfppr9zqaqkqm1g1nqvxikqqg493a1p10z0k123cw11877xq";doc="04gvjaxqhqixs13x9y805dgsxr62zb4i1xmcgwr42n2a5qa4dv2y";}; toolbox-32260={run="1qpbidjji1rj056700iyrbhgmqvw8is5kp2mmm5r9f455dmgm390";doc="17n7dxi0j8razw5s12s4drz22wd63xffx1x6w0a4jhiq87na4jq0";source="0l9w43kp3h1mbas4pab9qk6b18ny5r1k8vmm9nq2j95gm7z5p77f";}; -tools-71523={run="1i3xpw448hkyck82vhhsjy13760d67i03v233vi8if1nz0w56m9p";doc="0a29q0sn9lj2ad0156j96igjh9pxc3clj4img48lq450q30m5597";source="0v5sar9x2vyfa0mnf03vwd4bxnz24zcl9xza5cpkbcv14nk9p5yr";}; +tools-72739={run="092qvkm6y0dc59djv2kdd417ask4cg36zbbyy1jqk5lvhzyg61rx";doc="06ybnfh2qj1pfs8b0ky9437zslmfhb6lc8sgamkwrp3m6kqiw816";source="15vbvqjq2jk8k78yfrfl6iwlkf5ymvpwc78fydx6pax3vlkjnxxq";}; topfloat-19084={run="0md1db8a7ifx2vg269y2dhcf4l07qa35jg57x4q9nsn8ac9gy4v0";doc="1q7fssdrg5r2i51b722mw6wydd17qd8b41iv9rqa7s8r9brf8f8i";}; topiclongtable-54758={run="1p71kg4882rjzlbq9rfgvppz532s227xs2jmg8zbgplfd3j96mnj";doc="1q12jsaxs9d15qc19wjca7xhq6qajdp7573lv9dc6y9il84r1izs";}; topletter-48182={run="13ggrw7s7k476sp8fzbj5if20wa1x75m68ip17f1srihnfks3903";doc="0f45rz9n6fsg2c429n3hmzqx4cqv9jvrhwgmbfhznn6zrlip3qy8";source="0p6gvk4xj7bsazb7ipfgp6by60br9lyha53lj0z7rz16f7f2ar0w";}; -toptesi-56276={run="00qd8ap3dgrj16g831458m2kp0jivvbvmya2xzcyp560njsvqqca";doc="09hnbj0g7x76m9lnn47z3cjjnlbbfmapmln3hi6ykb6lh534c4wa";source="1nr54n7hsij9rjn54wgnij16xgay0dda2h6vl2qc44s8yz892jc2";}; +toptesi-73464={run="1vw4vs2vqbbaczrvqzg85gkkh4jl3jcznlx77f4lnqz9ac0z2ky5";doc="01ybb6hjbqkzyfhrhq1qhjz97lmwdiz6s7q2rqn4bjjz22mkvd89";source="0wvdm5lp90713rirqbchvzi99kz6mjp9wzni3nc9ynrbz2nkxzqv";}; totalcount-67201={run="0zd8h2sanc98qzhgkzgaxjyzfh969lb2935778c80n0w8g53ipn7";doc="1cwk1dnpin4zz0zc4rbf7a1spz5wzvza3nc9d4jrpxqbzgs36nb9";source="1cp1fkvs1gbif9brdwxd1dyx81ylshayq6gad4fw6npzqynppk6f";}; totcount-21178={run="1mj04hqxi81i1pwjrn10ipm6b0xwv2081paa4kvq7yma8g2kmi9p";doc="1c1941vfi2pf0wsbfhhzpahyxjzb4jx4lr85k7g6r8vk64qahy9i";source="1f6r2ci4dqri4fxd5mwmfmqmw2k5jfr5vzf2mazynixxp809mjwq";}; totpages-15878={run="1z6brrn4kb6w6an8iz6das0yykwj2cbaswa9wy2p3rfc0w95x0ms";doc="0nm7x3rv5rxg40k0xls5d3s5dqrpc8vw9g93sa3jkdn18xkxh2zs";source="1b0glns220jsmn1607d5f44k2lijjp95cd0dkxabdc3p576ipmmv";}; tpic2pdftex-52851={doc="02nf2fg4xzh8lbbddvm44qyvcvfn5b7kzcyg729a58l29gd88pbs";}; tpslifonts-42428={run="14cpw6n2j16mq1742lyjb09zynyjhq1wcljhpbb4c6brwnqvb05q";doc="1wwmxwb2y6zyp1h5hskl7b6bb58ydasv3gq2bj0jcnqhdphgii9l";source="158innbi79r298sj1r4qk9c0g4gv1wzdkcmxf511sdb8ipar6xk5";}; tqft-71401={run="1pg9nmhmc79ngffg6iqhn0ff0vgcd0pc30p2s7p5ysf144y7jfj1";doc="0mzmdfbrrwl2v6mvhcirb7b6lvipvxsi4d49a9x5abixqibjh4d8";source="17969haz7fambbwiv1cr8ndxqjsgi550qjxszcvw9v812adll5w0";}; -tracklang-65263={run="125bpgp39bvp1g3601y3lbwzvq7s64c6zghva1m7yqv2jfkx2rmc";doc="0qncvbpqc693iy5id0fa175jqwyyfvj4bjpn6zwsy5njlh4dixzn";source="1gpp2kpj9lckbc33ldv91svq9snsyk92praghhfn7lhjn897mv5n";}; +tracklang-74443={run="1msh22dasl9nw5i3x28v3bk3ny4wp34r3wkinvzgvvmhrsvzkgxr";doc="0gl032mwk4pl4ky3dnvlfylrbnkw4s6rj37yl2y85izgiz0fsgvs";source="0b80z73l33b29jdwh2i82bqgclfpd23mx8hk96253im2lhv27y21";}; trajan-15878={run="1hnk1qb46hihc3ga6klxghqf7yvn6zschp6w36a08mz1hfsdb8sj";doc="017v3bmngyh8wydjl7hmxqh2rz61dg2imcl0gabsfs98l8fnwsfb";source="01qgax96y0sklbbb8mdfv5yc0i2k90i23yg75vhjmb7xlwx60q7k";}; tram-29803={run="1bk233y9pin9r76vsbkg5j2wadp3c6p2x3mgqchnmlz2ip54x336";doc="17b0vw6r2ijgxs3dix1ff9r342vkz1gsa603mxixxxik62j5crk5";}; tramlines-71842={run="1bcb6d54w56lbphr6rglq4i0qgiigvl08pgz65sm1gmwmx7z6rr3";doc="1cm0mzq7x5y64bbwb39dq5v3qy8cizwy2z6dj1ps28gqa2nb54am";}; @@ -4108,7 +4158,7 @@ trfsigns-15878={run="0g1xdyhin39sqbgi7x5m5r5786x2822sf49271arhnv58md7ns76";doc=" trigonometry-43006={run="1z4sk50nzdplwarbv7ha3gi5v6g2sh2nf85ipdz2rbj3cnz0j53n";doc="12pm2720vyk1c79qbgk935nridg3z48cbzmzbx9ak66araz9y901";}; trimspaces-15878={run="10rx6pcvwn1lzyivn312j76lsrw3lb40jgzyj861gl3r3pcls0nw";doc="13zf5bz4pp0lwp44kxdj1zw44h978bdpaiskbma752603jlznaqs";source="0nfwqm4a7c1ks5sqypkwmffqasjaw008pxjb5spr49h3sv7sp04w";}; trivfloat-15878={run="0s74sisq1bg9n593az435chspj55ysx9b0vqywl30mk60hray6zm";doc="09szjgdcy2fc4ddkw09vsa2am5m98mgm606i6s2nrkjgldm0x4ap";source="067ab9d2vc3m950587iqcfismjnl8fp0jxw0ssdsz3gqxys6vgz8";}; -trivialpursuit-72615={run="1mciimlb18pirxmrbf7zqj90a5z2s306d14h2igd3xyn3jni4z07";doc="0jg6ash0amnvm377sbidf9psbx8krmzcn0qaxs77k7hlpf07vqd1";}; +trivialpursuit-73069={run="1mciimlb18pirxmrbf7zqj90a5z2s306d14h2igd3xyn3jni4z07";doc="0jg6ash0amnvm377sbidf9psbx8krmzcn0qaxs77k7hlpf07vqd1";}; trsym-18732={run="0crl9ik3bd9jwvy6x9sl102bvp5pgj2rq9mywlrcpbxrvvffw1ab";doc="1pd0r5j26xj63qvj7mrifcxjrzazdi702ang8k6npq0cc8v29iar";source="06aavqqczg63yc0s1mwry4nd2ml94424a2qxswcz60y57m68yq61";}; truncate-18921={run="13hzrndx2myazl7f30i736zs8vk12203hv9rskwncl77hxrqqqpm";doc="0l5hgx3207h54s4n5193zc6ssj6l49xwx2hd9jfpqh1f73kpn6hf";}; truthtable-68300={run="0cas4lh1n7y9z7b0bvi3yv6xhm3klp4bqdmqz42gh0n2vz9clrvd";doc="1s3ff2pjyls5z1ll8m3x5m0h6gf2is4pnlagiv3y87nbs9sx359d";}; @@ -4116,18 +4166,19 @@ tsemlines-23440={run="1c7sjdrgqbjw6f2s3185k5rlkig643pkkahjisx16h0akbbdm4k3";}; tsvtemplate-65333={run="02v9b1jvkynz0gl4czzizs3kj68bkwx7m5xfh5abffcy74f9b96r";doc="06ph8853hvm6xmn6zcycim7qrmr2a4vk702sicg6bh1bzcw14cvj";}; ttfutils-70015={run="188gcwglfgl7yi4026n9l3zkpgwx034vfr4damxpfr6n630rixw1";doc="07jbp0ll02rww5vwa0qah0dlycb5s73h6qjs6k2sc2cakgv4q58l";}; tucv-20680={run="08m364pqd2imqfi5jalxjrwbjnphjihnmlpnpqg8vaz2rsmddlh7";doc="0rfpmrlh7wbpmpqp5j6iai3g9x1zkhqvwfnwjfskknx5an1ad79c";source="1s0shpwhb7q4zhn6kq2010a4d3jwck3liir5jn5h0gzqbsafai11";}; -tuda-ci-71696={run="004r4z9qqsa5km4z37pjj7rfr009yslakzpg35r8macycaf2m9y8";doc="1mgrywk2089f4w1ssvdvayd912fq0nl83gcbvy97scjpg9wz6ls3";}; +tuda-ci-74426={run="12sck4arvvna6njdh4x5if0gd7l3xf9dzb5dr3lp6bl18in3ycd8";doc="00paphbzgxrw82d0nwnsxaw4yznx9967ip4nppz16fr8kl2smnzy";source="1z036bpkji3dcf5c86z4nrkiw7lzz9dkn2pnlnkkwvwj58jvv4z5";}; tudscr-64085={run="0l7m9n8n6ikd9f47jc1xp8b1ik2vq58samd3g1v0m7f48jvf36f9";doc="06g1h7l2bbabg87y97zifxn6401hf0j7ia86scgjkpjbx7p2dj2w";source="1s4y8cvn1iw77b2qklbbnpm1jkjc0sjnkvsa3savvcb7zhw4asa0";}; tufte-latex-37649={run="1azsqa3qa1w2k0r4sp83xp9b7g1xjw47wv9l0sk065zq0bdjr9yy";doc="10h41jbfmjg7p8k3m98l2jyhl7365qym844y8f38g0f9sr1pyxvn";}; -tugboat-70959={run="1q0w74cx5i10jpxrlf38sw5ncpp5s929i9dadjzmqghcyq94gcgr";doc="0n7wr8v4334aafpjxcn0bdmdbbk24l50mg93b2p0m3x4cgyjj8m1";source="1fmab458w41s7n1a2sk9g4gvd469hw1rj63i5s0kn5w5igvxjd6j";}; -tugboat-plain-70960={run="1hgxd1gzbjaw8lxxzcd0d592jb6wpv66d1r7gj9ri11bql0ml52q";doc="14xmqfldlypl9cvzk7d944l9xmqqhkx1d8772xzlpwldpclnrmcq";}; +tugboat-72711={run="0mhz9qmhgw9r68yrn0r2b1r0wm0iyjsbzcvfj0xcj5c8m21chw97";doc="18znxra3hhdqvn0ik06nb8az352jzcnv01p6g1y7rj29swakg0vv";source="16zvpl8rwhx722vj40v4rpcg97m0yyj2rhpw1371ba42zryvlr3p";}; +tugboat-plain-72675={run="0q40fyv52vqa4g58431j8x16131q28zcvpgbb6km3xw9xp12ia71";doc="0f6vhnv6vrpqq55rwr7csvq71yb7zbbbi2fgg13albfpq5l79lr2";}; tui-27253={run="0liczx2jcdks6r5040r7dqcyrcj225xq0035ccdb9kjmp0rmc90b";doc="1m73fc2nj7qsy144fmbqhld3hx431ry64jv5p7h0r4p0giadwxgc";}; +tuple-73174={run="0yfrvwbjp6g234zibhapiicw0nm3cig6sd81cljmfkhmnhjqwbkm";doc="0yyjm4yamn1b5bh0kwf4grg0m5bbvx2gwc7dxc6vv7b1p03yqfh5";}; turabian-36298={run="0fjqr88a51699p57d9mpkpf2hn9rrmdchsxhpjng8hkx3yjl647g";doc="193qbhcgh63kfnrivzjyyk8vp66wb5k4791qdii7brp59xsy6l7a";}; turabian-formatting-58561={run="0bfl9fgj0adpcm405a9b1819463nrzqplzzdlvwy6yanyqfqcp3i";doc="1dam5fm94hdyzi4ai0wq03pkarb6lbrykych3ixcsz8r2z04g7nx";}; turkmen-17748={run="0jhg6nd47y8igsn10m3bcsn61zydlwk3g1qfqpy8snz80rkyn9d7";doc="1rs4jmqy5zrgk2awvvw8lsvdkzjwbfq65bm3m9c02158q63bw2i9";source="1kz5qhyjax82mv74qxhsiwj83jijnfhgijdl2w8ic8lwc31q5ihl";}; turnstile-64967={run="1br0ny72qsv5fpfw4x0v7q3dqy2jgicyd97ibzpxc04mp967njjr";doc="1iv8ysamcqzc7lavhskf8kwi29jn9xcda0am0ak9s1c7nz7pb3ly";source="0aadq0w193hl3rlb1d8xv60yy0fam4aprz4j96dphnanbb9g27ll";}; -turnthepage-29803={run="0zsgmi4akjkhwqas45r7ppbx5c8i5fyvpmk6a8wmpk99ib58pipq";doc="0jkv2zs1m6bggjhf3g71g9cyvrnmgmr549fqsvc4lf8fp9kp3ayn";}; -tutodoc-72596={run="1p15ylmmi4rxiixjwzma00mzzjz3kr0q0jwr6xcbhrbjcva1hdym";doc="1z9cf9is1i687cprlyif434b4rswp3b0wsxrrr4wnkn7cyhs0zs3";}; +turnthepage-72902={run="0z8blhvgay38q2rck23yjzxjl7q90s3yq3xq87cdibyxsaak7di4";doc="1z6y7vgwh3jy06f2a0892zln6vbwdckdi1dpvjnz3cld52s82fjh";}; +tutodoc-73166={run="15iwwcw0nz87rprl864c6nhwxzvqc31kdnr5x88483xn1yrfrsx0";doc="0s3rkzh1v8jwibsgqa7knxkbgimnrm7qdjcjm7ahgxlbnwaa5360";}; twemoji-colr-71991={run="10k7gl7jp9l41mj6jamz26wndf3casx1qyy1dz1rscgqyvgjgh9w";doc="1d0kaq2k3svm7609x3nfm8lcd1d41rzp8vcr3wxwrl1dadjv180c";}; twemojis-62930={run="1k58rnl12pj54g5r9rc7dcf1n33p0hw233wckrpn0dh287gf5ffy";doc="022i152bp2r8fnkwb0mpz1nhs54qxpy57f51j1mkb5rc1dqgcxqh";source="08jxkcjb95yb7pc7jlf2rcz9b2yibpi5ygi48d2ni79i5382mizh";}; twoinone-17024={run="02na16ki3n7gcbzi45dk6nwna3dqzgxwc73aha1zncm05bnj3n4q";doc="15ldj27nb6pp90abilsybzg7hn0z8xfv7mmwrmwdq20qw8ss75ay";}; @@ -4142,7 +4193,7 @@ typed-checklist-63445={run="0yrl1vlsly2k71svaziblbnd3jl9jpnpvpg942gg31dsj9vvsb2q typeface-27046={run="06i3zhnc42zbzb5lk0pqgiwq0y7wgds4hs27jybizw9y3yhv9nf6";doc="0z9q8q87iybb4b6g1xnnryr5aihic0vdsjq5xv55i3gbgrd15kr2";source="15igfb6xy0g7jykb50086as2drjr76jcprj3kafcf347427026dv";}; typehtml-17134={run="1lv5bl9bq1413bbbsjvh8gz1p3qd075y7asi9x0nja36rmcags11";doc="1cgx2prk9ggw3wkbabrm0sbsfb4ablglzh2ckvg5s0chgkilcnyf";source="1ihc1dq38rklrmw8h4k4i6pq3qy9dlwn7nwzmjblpsghszfivxqb";}; typeoutfileinfo-67526={run="1006mxdn6gdmm0ssmnqnw1ay8wi0549qs7a6vyv1nrvis4v7nys7";doc="0dvglz9jw5ig3xy61syy6yghf3xjnynvkxnwqdmkfz7fgy74hb15";}; -typewriter-46641={run="1cgyi8q0w8j6xywby39g4nprg7p7p2dpgfdb58qr5nsppa2i31m8";doc="0lz81r7jv8frdgb1aglxlr98cngacacjvsa4wjzwr9cvahc1q5r0";}; +typewriter-73899={run="1d77d910w52qjif43f65fjppglnz6mjw3593c88dgs0wjxgs9svw";doc="0cddn90jdlnhqn9j661s8inqhh56q0wkcjyakzz4nkqzlbmadk4j";}; typicons-37623={run="0acmp2zpg1734c6719jpmcccyq4325h2023bc87xmj7jxqq0xlp6";doc="1r9wabmkqvzdj6dcxl9syymp0rzz8kj0lfmqn9j4njghclndkfdf";}; typoaid-44238={run="0m7nvdni7nsmbmlbpf51cb3s4s5qaszbn7mw62dfvvawgd2d1y0j";doc="1b24irgw2779j43pc15cwpazx0mdjy2zla9n6lqvmwyhl5xnaswz";}; typog-71883={run="0804bfljf84137p7169nrajq0k43l0jdqgd2mbv33bvdpyjiqkcn";doc="0y1v0yprg556xv76vdx06c6xm95zh60zw4y2p6fcp5zi1sd738dd";source="1489kgzx0lpqdadwi3yyfd51d3vwqil6pw11iq9h20yzy06mgb5p";}; @@ -4151,6 +4202,7 @@ typstfun-70018={doc="0d3wid4bsy78l2z1zg6fn9v56ibvh5x2pc8i7g0my03nb4wcymbx";}; tzplot-64537={run="166wxyqcd55y55ql1p7wvrb2x4mhavz7byax2sq43bqsz2h6689y";doc="027pg77h4p7vavy1s25awa355id6i2ngsb9spmj3bapr6bknsajw";}; uaclasses-15878={run="015wxmrjfykv7j2bvmb42491i137h513q826f5czmcf1c8gk8bl9";doc="0x6krd94wrdwc1zkyvqzznwvnvxx4agwinr5fhshav6r8jfsn4rg";source="06nsdpmp8qqsrcbbcdpm82gcc3z8y5dlhv2lgwr4i01srwkd91r6";}; uafthesis-57349={run="0fj2rfdzldav8m1ac7wv8n1k8pcgj4yy4zxx0g8sg1mb5i7if0k6";doc="0g096y6dvxfzbjrvvwpb92z4hrxp1p9jvbgkap5gra61msacqawq";}; +ualberta-73818={run="13ksa5ln0pcglr222ijrd6qcbgvqvq496igpf9ay9apjq4g298av";doc="0fcdb40m0s79s2z64wjy5n4m41mmpafcq049lmgbaavbyziv6xx2";}; uantwerpendocs-72118={run="0xf62ij6jprxv4l0xq2qzgnn5pwfb1i4mk52cy5wxw0722gib8kj";doc="0flkkpwrgab08v6ilgjw9435ydp8bl5s1y58dlbyc1q32cyjpvhi";source="0is9vy3af3p1131kd0kp8bgim6ywzizlmza4g9l3d5n39xkfw8b4";}; uassign-38459={run="1xwinmh3a8scfgxm40505zn85r0052pcykcs0lcvazn91007dl8i";doc="1b89rvsspkgs60rkmqjad7n2pwwmviiizpqr2si02kwnsqfspqdw";}; ucalgmthesis-66602={run="1n8g3blw71qrrkrjjq867qimn58w5a2l4lnfyqdw77wa67qzxb08";doc="0jkxxfnc9npmvvxyqk3zw5csapmhgfqhzm0rssijw4d46b7w1lcp";}; @@ -4158,7 +4210,7 @@ ucbthesis-51690={run="19g7wv3iypbkcxhlybizkis6yivgn6z0mvz4rgsi72zaahpxmg7y";doc= ucdavisthesis-40772={run="0kdrwdk7mg3yd7hm2xmq63kgikr2p2izibfgw1whai921za4wlm4";doc="1chajx1i2zmfh4ypnf8jspwr8kjwbfv7z07qrfasrf73r775yxnh";source="08525i86hrv1387jn9ayz3mpwnh4z8kvjvb590y7gqv3cdvrsa2b";}; ucharcat-38907={run="0xiryrx3pjx2nq01f4f0x3anx3zvkdarp87103z9zvpf6aa27slw";doc="0k1aqic1ljafdk8xralygdyjapkqa0qiainrbf982233kjqclpvd";source="08xxmm2rrpyi9a601bzxka226fnhmyqfv8cfbc1qdivn8658785y";}; ucharclasses-64782={run="0d5rr5w322pr4bsmcp09vsldydxxm69mcpvpaf9j7z5rwhic9biv";doc="1l6pv743lzdhnxpd8bv1y40xhfg82421jyri2c5h7j4ahlcnnvic";}; -ucph-revy-72484={run="1n9qif95n1c5jd5cvhqm8k8jq8njlrgjpnyc5ximcs5naxj6cla5";doc="01hhj3dbi5f42v8fmz5apsbxcvvwacjz6afjk8mzb1nrb28904js";source="05ndlibjnj812m29ai2aidlbkiy6pny1cgqiy9gz6hfz9h9424vf";}; +ucph-revy-73167={run="0vv7cbvs1bvvm5rbl177r01kw7aa5wyi25fqrmygm6nwpa9xsf9f";doc="1n1jbm71hncyh01mgcnfm1k52mlw9m248vs8j36djfkagi0qpx67";source="0fy7qladw3ala29y8py1apyqhhxyliqqy2qyi1f3gr2cxnqjbdxr";}; ucs-68759={run="07xgqkjhks344r0d9c8rvw2gvy0kwhx5kvyzkf2ymw1hiix8w48s";doc="0icaq9irpb67mipfpv55kfbdy5m7dw83h5qqq98f5d1x14h3gxbn";source="07pasmgx62jjdq8wgqgk10wkykzljj7v52xhl1ncma4idmd7l97q";}; ucsmonograph-52698={run="1jkcyhrh5zf8p205xgs10azhp69vrz613ln9ssrb4485b7a25b3d";doc="1hhr0z3sy8vn6cv2i7g8nfpnsdpyrsbqrclc8j8g6qidh83x2y5q";source="0x465kyz3chdcj705v9gc8s0w3pmawaza93pcm8nxy3k7dwx920j";}; ucthesis-15878={run="1mqj65aps995issvi1vgn7f7pvxq39pwxaqqwh7pxnki26k8czrv";doc="1hv02nxak4laz9az2kr5lvd97l4mcnixdmpysiz6xqvc13ivkjl7";}; @@ -4189,21 +4241,22 @@ umtypewriter-64443={run="1xn06vz5lxr58xi6y2qv5wa5h2r0g1xnba43x5qh5ag6bz5ym1wh";d unam-thesis-51207={run="05lb63wclgxqr7jn7c38plhg3r806b7888zyifcivv85q143j191";doc="0kxdr723xvg0lzhmzwpyik9vxy584y41pmwy8bi7197gz1hgdlzz";}; unamth-template-68681={doc="1ydaxzcwxq1rjkawlapnfipjzlyzvbvijrx98pi9yd4zk2nnqjfv";}; unamthesis-43639={run="0wqi46mdjsl06q7hyvy4wpihvrr040f5g23bgc6lm6lq11jadj6l";doc="1l71n80psc2hzjs1lnfgpfpg13355sk9ld86104dkyrl645qx07r";}; -unbtex-72488={run="1xl8pzf8k0f7pi2qqc4isk1d73mhmhrwkyx6nhmlr63r69hxdh51";doc="1va1gldddiwmsvlrslrp7bykkcz68a07hlr2i68dqpicw2nz389n";}; +unbtex-73390={run="1r4l60y6lzzzqs8415m4x3nvlbpyh7vby7rii268in4y2gmqmgdi";doc="19wy9bsb0lyghhmwfwgiclm2w8qmymk96r2wsnynjgh0r52i54c1";}; undar-digitacion-69742={run="1bvfr0zb2jh0q75sr6lrkyxqkh15r15lrdsapy73vxcm1s34i96x";doc="100h0pzwawnv2c2f2q9f2incb8arl3jxrhaj5vra700c6i6lva1z";source="0z40wjd915w64zyazfj2bpykq6x6sq6c3xmfh4wc5m91qp45wd25";}; undergradmath-57286={doc="1z8my3fwqc8rfc1843j7lcmfka2023z9k0js4ygh1m8kilc2nrr7";}; underlin-15878={run="0gm9cikysz83sdkhhwd6x9zbs278gwfw8mxh7z22l3c0nvfkxbfa";doc="1rvryx13hyif7hw2wgb88n95qycip95xh92jdy1jm2l6pl3c5q3i";source="1mczvxrhlipisffdi9jv5m3d2i7h34jpm6vi4dbl58cg9sasc4a4";}; underoverlap-29019={run="14cknh021b4qsymflf0mnv8q2vvhgsf2088s1g6pm8ckpx7diq0r";doc="1h1qvk9m04sp0nm4acj7kfib5cfpch1mkpvs55mnqqsgasgnymjn";}; underscore-18261={run="0a93sgddm7xy8iby50yficparkr6hnzj46w70madbwpjkpnfya78";doc="1lqg7j0hnnhqnfzdv0zzgpnmbysypdind3fmr6axkw0czix1pz5n";}; -undolabl-65846={run="0arfny56vh389m89jz17mr0xbdlmf3mf0wiilmkdia4sbnbv3g7z";doc="0802sqkxir6gdkxkaxh867wjc12m8apvlhycl19fmlbivg6pfla6";source="16ymhmx7by5pi36z6l4l27z1x8pkpz314jfibpc5azjmcphqhjq5";}; +undolabl-73633={run="12s54rq1w137y91xq5wzlpdkdzw18c5y65w9hh4yqxhk94hrmb55";doc="0ccqp046q5h81qhxd13777pdzkj1lp07jkgdz2h3jhgyqla3kd08";source="00bgqn5ykbc3ym35ijfgkp9wnnl9i6w3xdzcbb9n49zpjxjp054g";}; unfonts-core-56291={run="0pyrnydswlqhxacwqpbc1m3bzm8v4gcl3ka7w2mppp77l8a70drl";doc="0225vsqaj8l0g1igc4h8m94cfk6wv17vlnappdgxwws1fknz0x5m";}; unfonts-extra-56291={run="1i7skyjqlprf6m1pnz5l2hn67f1cix4n3pai6v1a8adrrx7vcfdx";doc="0d3cxfm110lg12n3c9hc88lqmx77rcsil1s6yph384scxadlg3bn";}; uni-titlepage-68917={run="18s5vidaarmpppdw12ynb6fjc52sn5i5zr5lglvgfqmxnwx5i3d7";doc="0djb52kfbp3nn4prj7x613g58qqjf1lnmcxg1rq2y3kam4g63r37";source="1jhvh4aj2z3qzf85wq3isfvkwlf5cghrkhqq82q371zxaks2fd0c";}; uni-wtal-ger-31541={run="1jyba7g6qmngn4lx7mrmk0j190zkjv8lw775w13hxr2yky31cf1z";doc="0kncfbrs663qcpc0nsfhf0asjri8103laj9zpaayk3by612lfgj4";}; uni-wtal-lin-31409={run="1rc0dc1g1fwhz8qa550ykc8azzc4i748jh37a8ppgrf4x2lgxzjq";doc="1ja9a6fjrlh1lbjkcsal7ahw24w1gs1mzma6jiiw5p5kbmc4zpz1";}; +unibidi-lua-73554={run="0b83ijlci4bi3bgz989l5v1xdxihl1dl6gqna27bry39v0bp25qf";doc="0k3sbdc3qvm69q3f0n9zhnrmqxcgrx5mf2c7ky2n2gmh4yfmhpmk";}; unicode-alphabets-66225={run="10zmjmbrlxsvq7snzm3p89afj4xy4ad0ni06fi9dkqjmi9l5nph4";doc="18l3zd0q5ixwpvbcx2glldp75anqkgm3ifnf3lha2iqapk03jsm8";}; unicode-bidi-42482={run="1prl0i2a9dg5yc2yl1x1k0zmz9lww051w1zwy8cbyvk3rd765a72";doc="0ab0gym9sjllmqdclkjfbc4fh9n20999mv7z2gylfybirm0n7i7c";}; -unicode-data-68311={run="1ra75819cglkd1gdv96wzflx65bc73v46k2hmn1bxjachz3cd7fr";doc="1b8zpwd0vr238may4wv68xj77w7fiq757jv3i45yz0gir1as9piz";}; +unicode-data-73362={run="1v80dar4nx0s282zvi84204mkx02c2ia8p38gz0nvzgnl1rrg1ry";doc="1f9kz2f9h814w48vcsyvkbgvpfspdzjv75d9b5fq0z8aki0m8kvy";}; unicode-math-67919={run="12xc969s6x742a3aay28354cpvam2x9ack1396q2hk1wdhg846fl";doc="0y0sacc4rd4ilzjfw10v058wv626wlva1kzrbrbqxsclq3xcm2fy";source="1wr1hrxd63z5iisdw6k95qjknl3i917y2dmnrflyn0afvl2pxjg8";}; unicode-math-input-69591={run="1bz4f905r178kkdbbx9c56d0l63a3gzaqia20qj0q0zhqvakln18";doc="1lh4qx0lz50j2j69m62330snq5wsg7vw5847z3jk4kpliqa9ybm9";}; unicodefonttable-71477={run="1n2dma054r4prbq4qb98fkw3fsj34k2gir5xkjqk31m32hnkxbx0";doc="0hs6193g2ixwfg3hfpb7fqxay3bcpkaac33ll90fnk9majm7qr5p";source="1daqadmrmpfpw38hjlk97ickn62lvy8fdcc8rqcvhs6iaa5pvin6";}; @@ -4232,12 +4285,12 @@ uowthesistitlepage-54512={run="17xh2myc3xj2zwbc7jjdmnfqhmhzkqj3dwwn2q04hcyr4bm7v upca-22511={run="1px88kyvr7jkzzcbd32pi7zlak9wwzf3b55yhnh9bi03pk0il33s";doc="07gsza0vhs52qjj8im4i1fg2v2lch9iwk424ik9c1xak1v7s9d23";}; updatemarks-72489={run="01wsaacgdc030zxsh1m9mzqc3771nxm4k660il8cf9r9ybbx3v04";doc="1cdzxpinix1cabky6arm80296zmjs4gxwzf3qxw7qkf9sw0hnx7w";}; uplatex-71363={run="0kmw51xvg44jrzn6r1w2biz2d0m3j533qadi4bfjhf2dzi4jdg61";doc="08dvnk6m1ygmmki53zfshkvblvfrgay1fbmi3nrl73qxhyxhcjmh";source="01gpwxp81hz8824y1hffq6b035l0pxa8wyfkjm9kh5m58j52s50w";}; -upmendex-66381={doc="0mj8nmqr3z7b802kvjmnkckq89l694an7s639yghf3b9b5v7xihx";}; +upmendex-74250={doc="0mj8nmqr3z7b802kvjmnkckq89l694an7s639yghf3b9b5v7xihx";}; upmethodology-64613={run="0r7k223ypavdbywq5fwffyysn68pg12dgp842jd22b866ffm13pj";doc="1vw9azpz8vwanfg60vr1a9bbx39k8v6jhvn505pvmf8fqgkqd9ch";}; uppunctlm-42334={run="1a71nsc5dnaa8gb4xmnlhvdsvid2h9gwmxr0xa8blh4xd0vwi2d9";doc="0d1qs7krblmnf9r2afvzx5ir94aqgxv8p2d9sf9p18nlz9f5h06q";}; upquote-26059={run="1zglh6pb1fq0ipsivhj0knhcwcg04mjkxca5s2adbbfk2xs1iqgy";doc="125756iaikya3v0wk9a712klp39ndw7i68bybnrif2klm4c695lm";source="137lbzacpmkm1fdmp548m6r83mnhclsrcyqk1s0rkp558fpnqpp1";}; uptex-66381={doc="14hn2n6jbibbqbdr72j74z5bz003jnlabi3kja0f0waxhas680gd";}; -uptex-base-72534={run="0g1ihpqi9im0k7zg8vmwzz8mz3qpy2nfgsq5r7kidsar4yrqcj1m";doc="17bcxsq5bq8nd85vxf49s1b5pb2b7cfw071apb9l9vpprxbi1rq9";}; +uptex-base-73291={run="0g1ihpqi9im0k7zg8vmwzz8mz3qpy2nfgsq5r7kidsar4yrqcj1m";doc="1i5y1g30hj6rhj0zrvw6pihzrmdzvbaljbn40dwfkck4lcinl09g";}; uptex-fonts-68297={run="1306b0nq975iskifmbj0ah66dh969sbwydblhv2gywy0yddkg8x9";doc="14m7l415n7ywh0k4k6pnq1kf9iw7x0xv11qvi2n1azs5r9nyw302";}; upzhkinsoku-47354={run="13fm9r3s01003n8ykbq8plx3xzj7p9bz958ylkl9f10kd9favr57";doc="0hd55x231kpcl1rmds601a2k1yzvhvfks7sg0424gzw7wirhns75";}; urcls-49903={run="15hnqy2fxqblr9db4h2r38v1h4iwhk5kcm8qm9war1c1pgwg2a6l";doc="0axb3cpbqbksrixhksdhbjyqyic0176lyxxk5di268jbr58203xp";}; @@ -4274,7 +4327,7 @@ varwidth-24104={run="032izb0vpcwiydg7lli6hnawij95s5ygkwdp4bfk1c9j17d749cr";doc=" vaucanson-g-15878={run="10dk1ff3swbnx6l6c30s1ryn2dbyx9harmrcg7whmqdys1mahsbq";doc="1dlf50f0hpislqkcbr685y5xg7iz2y6zvlzjdkjq3af4qv7ncf5n";}; vcell-59039={run="0m9r0wldir0g8y32aikm2il8qsygsc3zyv2zkg4wn7jqlidk6f2i";doc="1zrhf70s70zxm5ck22vbi88vpdjn6ba6iay88f41x21f11l536q5";}; vdmlisting-56905={run="10fzab1jn6hk6ah7h9kyv9cyrv2l0gvlmask1c90njhvgqi2526s";doc="0b0vrxv5mlf721mfdvw46ixidgzh0bq88sgrvxb10y05wjcjqiwc";}; -vectorlogos-70819={run="1jvvj26sr19jijd992xaz9lh4f3rm3kqlaszzwydpgin7hgiryy9";doc="0p41njfpv8m6zfa68w9vmvp3wn28qsxhiyswr5w68m7pzlzrqba4";}; +vectorlogos-73069={run="1jvvj26sr19jijd992xaz9lh4f3rm3kqlaszzwydpgin7hgiryy9";doc="0p41njfpv8m6zfa68w9vmvp3wn28qsxhiyswr5w68m7pzlzrqba4";}; velthuis-66186={run="1ki27wimj82h2dgw6c1f6hs93yg794j711x1w3vmgiwz3mdqkzdf";doc="0af9p3rq7d6g0549sj74vl3scww6ia88vwzfv84fmkysa6ph9n2g";}; venn-15878={run="0kfq2wnjsbvk0ciwrm4923fpr7whmzyv240r4zps41vzpc4mykiy";doc="0izj8qsnxj9jgslwzz37xwr9n812y3cxmfs52yd7p4638qid50im";}; venndiagram-47952={run="1v4hbkc214fjh5wc2myqxa6jcvr6sa31c7nz9avzj2kf40kp3ip0";doc="0as35w7fd9xjqhrr3v3nzld9bnhz6xg7rqgs2hyzx150xndy6cb9";source="0ci3ajx316b6iin315z1xkdfmxbbflnj8sf2ww7gkxf853qakwlc";}; @@ -4285,8 +4338,8 @@ verbatimcopy-15878={run="07syldn58zwnwxwdsmq63qgr2nb0bkl9di09knska9jk0c50ql1j";d verbdef-17177={run="1dy1h0vcknnizm2f3zggga85slga5p77aw3ll5ca3kx5qxp1xqhl";doc="06zh9v72ywrg84wlb96p0y28sn9919pn2xjgqhaii6irdf3hmlma";}; verbments-23670={run="1iv716hb41cy7bc7bk2420lwdykpccyg6wxvbxb8vk904fsgdk2a";doc="0hzrzb6m8iakip93in80x6k15b08z9xwjrbki12d28xdadqkpqcc";}; verifica-56625={run="0i5bh8j5yjvql6mywfs617mh3pywnqd7z1m6158r3jpwyn6ki25g";doc="0sinc5ha8k3nk307q0piqwj56r2bh4pbxxyww29ygalfqjr755bb";source="1zn10fr9kv131w4id0djycy7492ch7gis27gbr5r02ydwm7nny1c";}; -verifiche-69726={run="0c706gskzpr0a379a3liwad2d1bavpj2zpacdkdm5vw6vxnb2y4s";doc="0rahx5d5gkfq8vyshhknvfb410wc8kbmphmnm0h7b46c0f1r8x8h";source="0sgxdki79pm9933gp8zd8gbklfqa4574g1if48b3y4jh2ayb03g7";}; -verifycommand-72180={run="1acn4k2jnvl2b30qv1gh2mbk91dxi6lpqsa2zf4hdp1khhlbg020";doc="05nmymh13vq7icrrnp3xr1v0qlk41lyic7fy97rfkp83kn9dqd57";source="1632f0yq6zzzmx01mp7pssv8ygv0zrps0ibn2905xy4ppa9fn5nw";}; +verifiche-72983={run="0qfgrpgahcfhlgvr4wyfsxy7dr94q3h1xx2p6y0pdny050vnqk5m";doc="0lz263j20130ifjx7k6n29mim00knsdkrgz7j6nq95q5nc87bsxk";source="0by98rfpahcpgvw71qkf774fa25maw6lmz0r23v64kaw96bkna1j";}; +verifycommand-74515={run="01v45sc9lgi2vylv6gmdqi9qsszvs2177ypa8gd1gm083bhh2dap";doc="11xyfymms3bhqm5smb3i8j411iy7byr9jxcxjciq916wyi4xgsyv";source="1v1z51sji2adrq9mpf01chw3kj4lcdkrg87ln2205khk2h9133y3";}; verse-69835={run="108qi1600f5q9im9vdbhnh0yalpjcx7qy90x7xqxnjyqh7116c3m";doc="0zqw1zrpm3hzv21gmscm9b3bfyxadw9svd6hxp0gf1virb5nlyhv";source="09rj2vkc7l4l79w97iycyw31lqwr946rdcrvwzv8nargpp0ynw8m";}; version-21920={run="19b4h22lqvgzqqm0pivjjhmpxmijrr5rfy0xc9g9y7czsrp810hb";doc="17bsgyjvnna790nz3x94wbwslxkkz3958vj2l3jbyphm5vv92fxz";}; versions-21921={run="07bxhbpsqgdbpwph2w7gam699605m181xmj8jhpcsf4rwcpnjik7";doc="0pjz8nk7dnf2jp6yixhi55zbrlmhv477qsx6p52dwkf74vxgv5ki";}; @@ -4311,8 +4364,8 @@ vwcol-36254={run="1wfqcin8xmxrby5mxn9s5j32zmr4ka4k0h9ps4kdddpq238db89n";doc="1zy wadalab-42428={run="01lf8nlga2nycr23xpzl6xas2nlgajjmia4lk4zvjdgcxqnipfrq";doc="0m8x6plkry0p3jabvhgkccb2rvlsz941di4ihfc8schkq7iyjlxq";}; wallcalendar-45568={run="04rck2mzvzpm2f934iz4nni9s5w9g7a0qcp3kvp3bsqa6nhhcf6v";doc="1b2nn4cwsb6vi29a49cnnazpzffwbpyw48wffklv11frbmk74dnj";}; wallpaper-15878={run="00cixdnwr4vpfpqfdcbra4gwz0i36kddak8ywv8l4q4d4yd567c9";doc="0ngsn8an7gqzkw96sdxb4q24h7bvbjw0gsqk6dzrdphclvsjy8w4";}; -wargame-69692={run="0v7mc3hfzjissd16f4l5fmv0gx5dsba9rmgmbsmn5ny0y0b5jkgl";doc="10nh98h13fip08k15wc1105cw7zi0ihb614nz12aynhligi667c2";source="0n6gg94s02c026ca13lmg36f5djdnn88xnf8yvv9k4h4v73qaxl3";}; -warning-66616={run="1rsqy10fghs5n2zb3g378csxykrlympd40g74wsz9v4aqb5a9xf1";doc="1fsqznifd2fj3czhhhii1j1z79f3vdkjhf46sdhc67y2izqmg8rj";}; +wargame-72903={run="02yg03gvwr0g4f3xsngizd888p2b51vpmrzsh0anlwvm2lly0c76";doc="10cjqzv3hpr4nmvv469rzg3iymp5y3xn0p80is6cnlpkf3iwpgfx";source="11bfshpllv9cb93k8qnrgmkpmq59wrbhck89bbr5wsisjrww7qmg";}; +warning-73265={run="17gdvknlxs61vgsbbgl367nbs9q0g66gfz7mdmccjjbwdc8b7r8r";doc="17c32c5k2ybshdc7ih1l22x1sn0jlpmwv9alfl2yin3z4lxqw6bx";}; warpcol-15878={run="1dr0ic0pskvw6397q1yy1ibbpl1c1kndqaw5y72zzzy52x4l4j71";doc="1jc7rilhf61irh8kgc437mp45ryz0yr63z11r9ixbsj04dmfk2xr";source="1lnd9b42xyzfnrz94x10vxrmfy6r2l4wlxbfc1c02fmnchj2wq6c";}; was-64691={run="18yszyvcv57im6qk8kyck21mzyzwmlzn4s64jlzz0pdzpjhn7sxa";doc="1dv6d27zlvpb1kc8qlj1jxbq08czxqrfq9l0ahqdcrl3fawdgiv2";source="0ylf9h95ig7vy64hai9skl7dxvkf0rj85syhcpf9a2p301hchs35";}; wasy-53533={run="1gvk9gdx32sm4q2f2k4i6yj45c6zyf0hjkq7r6ysygmd2zsvf9lh";doc="1ah93bb5gr4di1jbq316cm4d5iaijj4f06vcjj4x44jajirlaq6m";}; @@ -4322,6 +4375,7 @@ web-70015={doc="1i8lvhz9k777c8wwqn8mh51w896d0ql7zxy9zbv9fpp0137n5bnj";}; webguide-25813={doc="0wid2sxrif3mm3lrs0s6pil949byviq4d7924yzvmf9hkrs5f03v";}; webquiz-58808={run="1bl334im0jvsyx78g6jq9m8623xyr4xz0avzfaymhs39dv17wsyr";doc="0lwc3r3w2d7lzz39ilncbckmvx536z3wvz84jlnv3flm2dll2z7s";}; weiqi-70178={run="0rwysz41acvsw8hjsxa5rb3nhq9cd096kgc05rf3zk6rdiy0smhr";doc="0s3g2ymfqz8acrqgb1d375bvxmb21sxw16j9a25xaap7wz27xry4";source="0fzj1cyxj505vf82kzjg7jy6ifk3m5pwsvmh5m6jvr2s7d2m079d";}; +whatsnote-72966={run="1pb221hzij46c4nw89vxjv6n8vsr0jcfpfkczn4jncsjkqkw870w";doc="1ry5p7sjnj2b1dnp4p07zpylw1ar712yyl57rsy4hym9mhnasgfd";}; wheelchart-71928={run="0sbc668dp2fnvk0aw6x6nvgl4qhaypnmfhv07z0vakzy3xp3f35q";doc="0k2v1fyjlakynikf1fnx1fcrr3n1vxz9kkbhlcl9226vnp1frfhc";}; widetable-53409={run="1k1jnl3jbrbcc55cl34wj3znfay2wnf8k8sgdslicvnan2j717zm";doc="1giy0gvhngsmfwc87j9k2p820j6bm2mc2r1kbcl4ci0c3383mify";source="0krkcnxzjrn7lqd0qh8lgjixfpd3c5glvj1ilqhak9ifd3lq8r4s";}; widows-and-orphans-66753={run="189ch6wprsw4xsyk79pm03kkn19h5rkqpfs0g0p6kj5jg39x78xv";doc="0vzcyzcf8fh83llravv0iz739ilr15qpjkgyjmb95r0a9zwx044i";source="0sf8picg17x58baw36s0z41p7ck26439wjra4mbc6kl6gh11jqmz";}; @@ -4339,10 +4393,10 @@ wordlike-15878={run="1mdgcdiwnqcsrqrzbl27v56xpnzvxb7gg7a8vass31srk8n10ssq";doc=" worksheet-48423={run="1rsh38fx4ayai0mlakqgpzxpnwp6ckzjcpiwy7aqlpia0504jgpc";doc="1hagdjrf472ip4jjkrjv6mgycwjlhbggval7kkk449i0xd9kiz39";}; worldflags-68827={run="170wypqn7mmfj4s8gbm363l4hqmmjhsziv22z9hyfhrdh0lprip6";doc="165ny43vh389qqi7rzw7mhfyn04awr397i67kkc20jiqxl6v64r9";}; wrapfig-61719={run="1axad52pzzsx9d32rivasl5d49dj51adk5kcnb1rr8mz59421rk3";doc="1c3xd0ja4063qzag0v07mxkk52yczlcwdbwn84gsfp5hdmd5cibr";}; -wrapfig2-70838={run="0b34ppncrnrm4pd75l7gjpc1ci0q8r2667fwyfqggskkvlwmnm0s";doc="0v08c237ydmg9ss7vrwsb9sbzbp3acqv4ldfzrk63zc1mbp8qs7j";source="0avc8afvv3mmmxfkz3kq9lxgl5frny5z7w7zi9c9wblx2qagqb6x";}; +wrapfig2-74396={run="0x5lpa8jri4ggn48hdx4m5jd4pjd54drfgclds59hsmcd1ywi581";doc="080i8yp4z5mf11g13x5jbjzck7458l14xnzqh19a44ypj6y3p7mv";source="0nnyy9xmr3l78spwcnk3wwm3y1588ygc0qmzrbgv6kdig52837q6";}; wrapstuff-64058={run="1w5bnl5w2shar2qg2lm7768n8h4qvgzhxaacphjhqbx9zb1r20w3";doc="14npfsqr8wp1bgq9az4x23rmkkgpn37w4cr6c43wyqs7cvizz0yl";source="1x34kkbv8n8c89x21ikv2lyzlk24qbwcpcxwgv13lqqlcqxfz2ix";}; wrapstuff-doc-en-71835={doc="11jcin4561cn148pjdmlas5nrzxyj0l1g6laa1va9kzj41q2ra78";}; -writeongrid-72162={run="07ng0wc3r31hcms2s6hla14xj6fxdb23px5igfmjqbiy6hrvyr46";doc="1zw67xa4g8slcayqwdn5wclnqcxccn5p7q6zbccdx3k9c4iqf2jk";}; +writeongrid-73069={run="1grm7xgdqbkd66lysrpn5hfxw3flhq7nhd0p69i3pw6gzzwkca25";doc="1wi82qgvvrwq550zgsalrnnhgf12wzskr74kbvpiyg11w3n2pgbr";}; wsemclassic-31532={run="0zpqx8gi2yf8cm5rmvchz0jprfwcc0gjkwcrygrvlqhqqn7qmc07";doc="0h7vz6pza8bv8y8ihfplbsq8ip9ds2z63s7j7qh84vf325ci5chm";source="1522cvwkw0ryvhgdqqd7k8lrbrayrmm3h31c77v7x8a81cry2bj9";}; wsuipa-25469={run="1grz4s0zi7dlgbks7rx0h0rkjvchilhjabs59h81f92f835lafm4";doc="1zw7ibbqc75k4hplbvqpdmnqg5ks9bw75mrwcg14q1rb1807sp8w";}; wtref-69214={run="05zfj6b59m0ic977w31fi4i86l7214xixws7yidvnr35fa7wm75z";doc="0g4fsbhhsvszvpnf1vn701c8kr8lpq01lcd2g8nnmknvrpd56v5z";}; @@ -4350,19 +4404,19 @@ xargs-15878={run="1r4giz5gp4pcnxw12lr8hnsa45yv1lm1ddq6g33rkgs1qjzkhv02";doc="06k xassoccnt-61112={run="1z25b0dps2qf1lsvmbq462ljyyakkicg92d3l1pz254n2mqzvwjb";doc="0057kfclqs5n04ghsz6ad0pvgzwp4hlpk21c66922nscyl4qrfnv";}; xbmks-53448={run="0pv35b38frgwbi4ijn1x8w5mx48fcy709adlrkzhy641bw4isv86";doc="1nr1m8mhqwkjl9l9pw72ls8xrvg8w2gi8rar4chk3xmh6kphi7ra";source="0waizijqrvg7qigh317vr56bi2b795p5k3h779p0kbl53k3f9f6i";}; xcharter-71564={run="1abg7lvplcaxmqdf76w1lyzqb842ak348l0mni7h9z6ibdpn5ldx";doc="19gwk10pj3hfi35dk2wxr3dadd1713232x9r4xywdr5vng05sz5l";}; -xcharter-math-72658={run="1n3g346zn0fdd6qhaq884chcdc571dp1jgnysx96mi9bidv0zk6n";doc="0qmgpj57g88chl74z2yp6hlnfy3mh0sad59vai0a35x5zy2sxcry";}; +xcharter-math-74016={run="1cq9297in3s1jjml3w5wj7mmqfcmwn3vdssspw47f1q6grj43fpw";doc="1y5xbr1zdd52cd56xlql26j3vzjmczz1833ac903ahvblbybn13c";}; xcite-53486={run="0zsfyaxs0w2xy6fa1s6hlrcnzw1q9n4n676bv6j80cwp5cw7nnhg";doc="1sfziwn05dii3gviiahvmg67kb04hzhz4cd1cwjsrrvnjii0dqb5";source="0j5blcycs86vgmi54z0b06il06zzyjp4v15lmdwfnx0amb9y8jr9";}; xcjk2uni-54958={run="1x77gmg738r2zbyd0mc7q079hz5wbvabyszmwizfdj6vflm86w3y";doc="0xig1w251dsn2qd9iywcdc20plibadiw8hl1iwygpzfa3187djjf";source="12hbjjdypk0s5k5iaac80n2n4z1zlkg5lp59y58dwnn4y1dx6m6z";}; xcntperchap-54080={run="0hqagjlxphvfqmslg91fpxngbm15i3kmawglszj8z585i0j570di";doc="0yf5ak4xr07jzlh8s087c7g8rfa71isziy1z13qy8ifv2882p9qa";}; xcolor-72484={run="0n6khjw6lsy2hbpxy4rqa5ac79b6zrs4nb24cxparsf1wikdphf4";doc="1rg6gm3517ixgmir6zmc7fm056rlaqbbay42x9p7si7qgprfhfln";source="1zj0zx1mx889pn3k4gdnidar6w5cklc4chggzlp71jzq3lc22pz4";}; xcolor-material-42289={run="0sa38kjyy4iywgd9lwhd1aqw48laqj9h2crcarvjd8hr4xwhrbcw";doc="00jfvs4r7hsclvy49r6waanq1q9vszdi5fhlnbg5arhkf53lzii6";source="1jiyl9vry12fl3y2c6l8z5ic8jaahshbvaha8c98h1h2d8mqk6vx";}; xcolor-solarized-61719={run="0ggm9s8vqw80jfsmw5jn143xcbrx226rwkarjkfqhnlzx85k2d36";doc="1vmr5y6c5mi7hgkb33daamag2y4j6vpiyxnh0cpya824l6miichq";source="06f2x0w9k87wd75vm6gjxg2pdrcv3g6406nraq2mnlf9sial9mnh";}; -xcomment-20031={run="0hxbf6hid76d1gm7ngjbrrcb0x7faxsqa44560f93n6arhj1nmwm";doc="11zcprsby27n8dh78658r6xmmkpqzmx28f6sqc7jhg403jq0j27f";}; +xcomment-72759={run="18hgrrva0702xsw6kgg5a1bl18il0vf0lpqdkkvmvivn7r2rmv0p";doc="1pfd7fly2l2vbc0sy48p2fawq5l90a9hn298gmv2njdr81mig8b9";}; xcookybooky-36435={run="0hx5n7rz2aw460m9cqk2f2p4d3v7fhr02cjf8wk471fp8jwn5bx9";doc="0x9aa92w7b43n49d6m0rlac86f3hsgsrhvq82g3zixvffypyvm1i";source="1z951i4sad1i8bjmw7bgbkanzg04icjj0qfjrshr3m8a67wlxgjz";}; xcpdftips-50449={run="02g4rm81gf314ds6yzrgasj1ighbyvka7p0vb8mrl78m1ybqjab0";doc="0wcbx6qx288448h2rffv87xgzfj8i30z1v2j6qcp8nlqq21lmw38";source="1h60va01gkm2m9jz521wx93libahh9fi3a8pyb67l6zgjd8dllxi";}; xdoc-15878={run="18nqhig2kiwa1yzk06v65hzriq6la8c31j6f7caxzjrhjkzx0rvm";doc="09i5zcp7qisgf5rj6ys4rqvj8v8lxcxr16ddmzzvibgdc8kpc3za";source="0vxkqg2jl0qfnahfs82764z7npvsyc0ys3qlz6xk61ylhyqvycns";}; xduthesis-63116={run="08cxhw5lhklv7vxl30fhwmlgq4kmv53a8qppcmsap1v8jc8vjrdk";doc="1j8pqz4l85qiziry85w7a23i6s577nb2cpbq4v5jgvp5l8x8lhzk";source="0zdlq46z2l3y5zydal9nsawv7nhhp113hdia15d9fd23j8gq4jdp";}; -xduts-66661={run="0l0p1xmnphgsfqq0q4si38zbrzxgmwzw3mqq7lyd48vwq8m8sqad";doc="0l1v9a1c6bhd3k9r272y64lyqpgn1vi6hflz8cg90ybxqxwrgb3d";source="0zaxm3rv20ijh6pmcas69hc3m2x3355gn8g1z06ihn8fnz77wl68";}; +xduts-74069={run="12dp4w7fqasr7g70s9wy198k3nl4n5xr89gplapp3ff6z0l8yimj";doc="0l58q5jgd5iv8w9nbdaslb3r21sr7k3nx675vpgx11f87haar773";source="1skwhhl8ymqzd6fmjncryvzcd9kqhyk4065m57maq8mz46jrrkja";}; xdvi-62387={run="10aldzxy02d9phqr9qwpxxwci7vf5q9z7sgxcz50kf44asa28fcm";doc="0n4v45wnzba23qpv5nmx87rdd09wl74jjfgpy6z66xp9jsdlja4w";}; xebaposter-63513={run="1kdrjvdzsn9jwb6awcj2g2cr5csrhzds4w0anb8wm9q3532hcw58";doc="1k2cv0b1l4bn229rjvwcfjivkvgdifjgs5mlp5s27jpq9m5jvpph";}; xechangebar-54080={run="03d1wmvldpfk6y52sd2pvw3ipglbl8cc851rqlz5jgk82c2frxg0";doc="0cnc62nff1vljwkk6gb6r0cwxq17b2yl4v9ilb7kxapaa6apbp14";}; @@ -4372,7 +4426,7 @@ xecyr-54308={run="1qqfdi6pxlkx6pxi2q61i0diwmsy9n95x4bvj9r3pgaf851p7cjx";doc="08b xecyrmongolian-53160={run="1m20p5x1s92cwhsixaz3s0y00r8n0j6172bi8vpyzcpf8mc886br";doc="0kiyjcqlajmpj80n8wkk0ziri83811ivl380i3cyz7rxmsh1hqhg";source="0dj2191iqcm9qpi45h45r3cp4nz5gdviw6xf9iz261b3pn515prp";}; xeindex-35756={run="06ipq7m9mnal497j3awdspqim3fs7v695pf2x7v4l92vqz3hh1sa";doc="1pa1fa8vjgbzmgphx3fmm93dd5wr3adxrrld5xibk2qrp7fgkbsr";}; xellipsis-47546={run="1slakkdjh4c88caxcdznir5gkw0v7aahfpqksp4l9as9bsl52980";doc="1jlndanic0xc16ba1hg1lswcxa2b20hibd25bs65wyag04rbh8lb";source="0768vqhmxgra190g0k3k4hhzgkhkxwwnvwmdpymphsqm9lvxbl95";}; -xepersian-68117={run="1i461pl3hdqd2p02d1xnmzpxfc8bxcip3c61bfjf30cnsa184zvc";doc="0b04na4c83ly2r8jv5d1mpjvhnc7i46kzhbgkh5kxzvjrpmqwnws";source="1409w2mfp50mihwn7vg3krhg7mrijxjc09sgqhxa1fgv1c3yqisq";}; +xepersian-73697={run="1afv56vc3pr8l70r4a4rhsm87qhnqsnrb4nzq4a26zyp1143rlqb";doc="0a5704zysfpvf2afxrpxs2mw1gjm9qq18l932az42djxfjn84sdp";source="0dfx3a026z5jndy6nbnwq3h4nhw4fkvlr15q4ch554dd7z68zkhc";}; xepersian-hm-56272={run="0qj98xrbnh9bam0a6c6vy7ffaia3iqsx5s71bjlmbnyl6y2h8lwp";doc="16f5x8jv8mqf5a32gvrzqwh1xz4s5nxwqsq4q8sg1za6micqniyg";source="0zcq75xzkr0bgpf1xdsphrkcv70q17vs8jkhzxvjrfzilh9h3iqr";}; xesearch-51908={run="1rszh3svj87vw5lskxv8bvnkzzj6k9rbikl6rr87ry9apmymsklg";doc="0cb73d981aa0s0hg2ynrg3zybsaw28f5b29zmqgvzqidi8vxfbhl";}; xespotcolor-58212={run="0w7nns136gfz1dvq6iplk0jbza85lpzlpvsxf1bzjhqw5sk6v4p9";doc="1fai2v8x4g9cmda5m6nvf6g8w6qg64qfdq1rvjlz1qiqmy71c8jy";source="14yachqawnmpldkwc3f3q4krj2sr1kad7wzy1lfxwqggvpbdcjkh";}; @@ -4383,19 +4437,19 @@ xetex-pstricks-17055={run="0i37r4lk1l36cch6kjz12mfzgpg6hd7n903fzbj9h7mwmjwnrylk" xetex-tibetan-28847={run="0r8xgnagsqrkxr0ij0mcv30vhf7c3amyf9lk895lgwsvz6cysmma";doc="0p5l36zb8l3h4x8sjk8cwxj5psvfa4j0kg6jb93sj1ln3yfrwfr2";}; xetexconfig-45845={run="1253njshiwdayzq0xir9cmbi8syhjb3sc4pyrw9p6kzyqvckkcxm";}; xetexfontinfo-15878={run="1sc0lm5w94320f5abv2hw2bzqprhk73fjv2lkv380fgkpdfi7pdv";doc="14mc9snykdwzcmq013bs8vzn5w80lblpg05jk57g7fl2z9x6xl38";}; -xetexko-70315={run="0h689k5qdggf82pm3ccwpypgh25q7nk74m40h4cl3iywlqnixvy7";doc="1x5wc5sgf56j3cm825avjr2bwp54ncingq7qxc95x4w0qpxwwwvw";}; +xetexko-74270={run="01b5iayv3j449fn382m58laj4yvrf00xv7qyykyyc6i5ddz6lbjw";doc="0bljsrx10axl94vgz3h4ci875iinvdym57q2qbyz3kaqj8snyn4c";}; xetexref-70299={doc="1m2cf5l7q8djsifz3xj4s99ad6j7xxfndvm9v7h6cg3jxv083yrg";}; xevlna-43864={run="16ayk70kxk2s23r6nxva1hkb1z7aw7zz1zhmcis1bsijx657kw25";doc="09aaf3mpbh07mix5xvr20zybbbrbgbwcmkd5q0rfsd0ac8cm72fh";}; xfakebold-68929={run="1xmw5mm5r2r0bvqga95lvcyf5y0jf7hc40sgzdnc2dx9n8sizwgf";doc="06a3znvv53c3ymfh53f37anlgj8878n5mzcw0mdjszlg8q4bl914";}; xfor-15878={run="0m4y0caa22fps0r6735kb9pr2f89z5a8wflzrvpbms4nh3a61zgc";doc="0c0qg60h631d3m9rqr0nwj9772zjv3ch0d2p1ksnqnjf30idydl1";source="16xp7hziirlnd507g9bjvszm90wk9iv6ankq8bx27qkyk1shhjfq";}; xfrac-71430={run="1rq20zj8z2cg1q9ia0dzhrr3ylpd7cb3zw5dx736skgp61caxmkl";doc="0l6qs8qsd36ipnabihzks2k5bi5spgpsycvd5srhc78b7m2ynlbi";source="0b6r3mwpk2lm3bgxs9w0rjjzyfkxxq2qdj6j9mis5l4sbpa820sc";}; -xgreek-69652={run="0gbhvh3rk466d81g9zw984bfx6mflzgd1wai8i0j2rgkghzm611g";doc="1507kgwd7509m5lyd9mzaj94rk6fcbi6cnngcndwynbrdmkd9l3p";source="1cpkh63qfk4m8766x8p6rq0bkc9nz7d7rldwynf8wzd6lkzyn9hl";}; +xgreek-73620={run="1jwpx3s4i1jcpk80swf1dgmrdgg5irl4d1nj42zqmcj2v4ng9znw";doc="1jifkzd1631a72mnl3bda89b4vf9lfrplp3kphk0ghjgp13fhnrk";source="1g23q8x57f916vq39fvyr50gx2gy0g1p5mi6rmxy77j116xxw7zy";}; xhfill-22575={run="00lb01b27h1bg8h37rcm7wmqh5pc3gz7rkw0l6xrfai0mb8ypq2k";doc="0alaqaiz2dfk4sh4xgrxfrwxgisv2p0bfdz7ppiqmli10al1h2gd";}; xifthen-38929={run="0ys8yq13vhval5jg9a4n4pv7b3v11w1yh63ssvyx3pnr767ay5r8";doc="1miqc1bfwi2ssl6yp9aqw7ygnars27vks0grpyfns494yimy8nc0";}; xii-45804={doc="19jhzv5hqzj59wrfcr1dsj6z56qfckax694idgf8arri5lnbkdd8";}; xii-lat-45805={doc="1nn54xv71kcmn9jbkcslz6a64cvjcay9x96rrxnakdj9qcqd27r5";}; ximera-71243={run="010g14dwf8mgi85yi4gpphzpigjarnjp9fz8gz5df6g9y8bskcxn";doc="18157hsjjigq53f05akh40y389n8jmazn5wl3pr6a8w071a4vdz3";source="0wghff88xg218q3f6xfwqgz4kqa88qj35p785a7d1rarjc0fa69m";}; -xindex-72605={run="151a2my5x11kdm6wlynirnlip25sjc0cvaa3989hakim6ckizdw4";doc="18gbnmamg0y3rmpbzmm8yhkx8np0sji8kbx80yicggzkfma8ni2n";}; +xindex-73644={run="01a6n0dfjla4as4n59zb31zcdp7awqads5ic2kz5bf7psm4116a7";doc="048nf6995knnhq7b85klan2wydzbr376fs73y0q2ds5lbx9kfd5a";}; xindy-65958={run="1jm8gi2pq4rw60p8bh7hp5xw1kyhy9r02zy5s2p2xyqh5c6di7jn";doc="119lq9mqczsh1np0876fz4gdfyq1rxmc0ghaqyriwl4fzj6lka1n";}; xindy-persian-59013={doc="04w3h65215slnakk5w19m94xmj9cjx01izbk9xijifv5l6dqh447";}; xint-63562={run="1nhf2g00742yzjzl6hnc52cbp1y97l60grgjhjc7j80w91g7vv35";doc="1340cagm5hxif3qmfwvhy6izkhg1awazg971a9ww8xlnxk70gmp9";source="183llw3pmalq4ylndhnvbfc74h57xl9q6pcbr9bnrazlxkjmfpq8";}; @@ -4407,7 +4461,7 @@ xkcdcolors-67895={run="0nhg0b4zv1xszx2sl61nyhfc5z5caw5bhi16ia119j3kb2lwr26h";doc xkeymask-69223={run="14ll2mzc3sa1271yvq417a03g4ky4fvmb8zhmb9bqvw15vz7v53l";doc="0a9n4l2ffd358cvyc2xqvvmrd3zjq6nz7d99b490ap2734y21q1k";}; xkeyval-63616={run="03m4skbhpv0l8cg3v50650k3h75x8rzk873hnqry0frb3qphjycs";doc="00xayhdwcwb6nq093v65pp1vzx2icn1xpkrbl7vllls4viq861s9";source="00ljf3z3017jdyifxhvls0j4l4jvdg8wi7sh56ij9qlx5jmjjzdm";}; xlop-56910={run="1clpl22vxgqjpzs0ypgak0d6z0sr6hw3gj18r7sgs2q0jf5m6715";doc="1acnr4yfcakpnr8pb8g26qh7z9xr4dms4nfy50ig7r7azmdpz9py";}; -xltabular-56855={run="12skn3ld5cjd8jvh32l1h86mcqmx03v2w04189rkxh2q90kyjmfw";doc="1lps5w6p2j0c1bszyrbwdfn9r7mii9k9k6ap9s2ssb2rrfzf291f";}; +xltabular-74358={run="1x7v5hzx0zddjr3vicid7ba3ydvbgby5i8821la128hcg8v65fvc";doc="07r9408x5g42lwlyzdzvhf65g8r6n1qkkjvbryvsdyanxpr38gls";}; xltxtra-56594={run="0zpvlsdsrn6pnlfd3aa23hcrjfnnrjivi7r61g25j9sqcx7cmkym";doc="12wp6zwqa5mi5i5ridd2amnr48xrkqmi92xdhh95ydijpzyslhli";source="0vwlj6f7z7fh1vx257v0gnxj29rp3xqjpxlnn156xp9i8i29v0hn";}; xml2pmx-57972={doc="1d3ralqh0b71scd59b4hmm707yfrz1rj28ni2lzkhbb1ql73bvah";}; xmltex-71362={run="06rhg0mgxsv4061w8k6parag7fkhrja81aj900mi65bdwmxqxxql";doc="0zjaf8nvsid88nrvzgprwjcm6nirs6glyy25xws57fa9yhza8di2";}; @@ -4442,26 +4496,26 @@ xytree-15878={run="14f3vxkfmv2s944qpdhxpvbrpxq2p259bnk5sxlcv8lbsk2fvvcx";doc="1a yafoot-48568={run="05b2niwqs6c43gl4ag811ljdd0nasmbdinz6dx2d488nl4jiifaj";doc="0mbg6y7qsdsq5nwgdh32kd9x3ghvf8qlbrm84rg6269ff0b5achv";source="1p3zwyg1pf3ad35w25ahlk1r4c18k6vvllcv8ccm952mjg79mj83";}; yagusylo-29803={run="12p2kxrqa4479wrwcbbxsn5hknr1ai9rf1x76psfs43k9fh1pnn7";doc="0g0vx5zjrfxrf595c0kz378n2h9hrlaf9sx1ypw3iv90zns1sp35";source="1js0slg00sr0bc0gysxvlp3jwlfa57lldi6q7a8fvqjfg9bkclvm";}; yaletter-42830={run="13xizdiq8dj7iyjw7a9srhr24c1z6g50r44a7hjz0909z3b58j65";doc="1jgv50mssx6g94fh5fcysi884w1iah2qdwb0vrkg6952266gdkvw";source="0byfxy8h76m0jwgd4q0s1ar08sr9ys9jhvsz2l44id321w5276dj";}; -yamlvars-72052={run="1ld12c5qn6bfzwphrq931sjr1al1qx5qj6ar4wyp3rf8nnhrj0ri";doc="0ma6w7cckqd0y62ip7s2433g3c8kafms961ahq2wbg9sc4mzxzk7";}; +yamlvars-73941={run="0kalbhydw9d48xc82riq53nsp6ybzl9vyl5z3ci9fxfh6kbfs8r7";doc="0dmiy2yqnrhgly4662l4p4ssqbsg6d1sra38qc1js02ciy536r94";}; yannisgr-22613={run="0h61qn97l6k97zbgk0ghqgr4bf8fhbrb037gdskg2sgxb7zsl5wl";doc="1vw8p9xk3aj3lfsq8a2qv7qd00aqx22fs3427j31wnl1iymwycag";}; yathesis-70511={run="010vlialskv4wsjx76d0z9d36g3qj185zs6raw0j8mgh3npqbr6n";doc="0hgs94kzl83h0c5971ga2iw30gkr6jhnv4p92lmcz7lp8wvjd12b";source="1zl69x9gy36ac5b73vrrdp084v7m3j8dqs8018grxq3jha6m03nz";}; yax-54080={run="058i478l85ilq0asix6mkdn1kfzh2abqn9ngar6s339db4h81lxy";doc="06i376649jszpwgvb0bq8wxchjmhwjfvc78pl5q6q1ic2jpkq5pj";}; yazd-thesis-61719={run="1bhjqd6k4lqk4sypssmrsjl9lqrbha9d0n42qbaq1mg5whpl2b8x";doc="0krsm9s3ym6f3d323scvxn8cf1wjqppglhmzbxwn0cpjq5nl01pg";}; -yb-book-70740={run="02qm5w1yjib1pc579bb85rqgqz9kbwi3lkjn214zq6y7h07zyri0";doc="11ckvhn9y38r6slnd6g83ywm5vrhcjaw9ih97ra1lc3y73va7h60";source="1cx7w70y0xm1v1g6xkh9rwyzmiwm06r78v8n3yfnnwqisidmf22v";}; +yb-book-73700={run="04c0zvix25pqladg9b3iyq7j3mj4y6fyff3yn7vslkgyl7vvrhs9";doc="1jxrivibm1c8f9k8qspxvd162p2zj0w4pp4rxfb0qdkkq7hy3awi";source="1in15mcx7v6r47h0a9sjxvq1xklgx4bklkrzyjxj7mpfhzvaffw5";}; ycbook-46201={run="1ajhl8vkd94yajib69s3jw6v2jbbn7h6g92m0yc86gfri3qcff2r";doc="0zf71gmxj1hwywlw5h8klgyrn9mww12hc4bic0l0gmwixvn6k56k";}; ydoc-64887={run="19njcgsdhz094w6c7hxp20kcj8b9kvcx4y6zg0rzsxs3h4fr2f21";doc="1dpjwv7m10413dxvhqgxsw2rp9n2gw8s0jghshgmbfm6x46a4db6";source="0y7cc2sl9yia5ldp2la1wy4d53jgxgcpi0v5wkc4m554jl9am4z9";}; -yet-another-guide-latex2e-68564={doc="1a4z4ni7327jd1r4n0w2lh7bb8ag7dfdgr6xwl4q5hf2jbdv8mmy";}; +yet-another-guide-latex2e-73469={doc="1zsj22fwvs1xin5hh3jqq83dhl8ira87lb5xy2lzxq68bbjpbccr";}; yfonts-50755={run="1k7b78fr6x8kp6354viqfni3k77d96qmx9r76249m5j140hi6fk1";doc="0a7fy4z790fr6q4z5qnzv578x48kqs128wl5znd5bn3mbg0n0cq0";source="1ph8vc09vg0zxc9x1xydrm9wn6q5vml2bc3wln15v69p8nm52d7z";}; -yfonts-otf-65030={run="0rhym2lw9jk2aj73ndyvr32ryz58krmmfbm28cpgaia06crjl4jp";doc="02ghwiqnws03wfhg3sim6xm1ifdpmi4x5yz5azssxnxfwbndp62n";}; +yfonts-otf-73612={run="1qz1zkdmzy3vbszagwj4h974pa21brri6szkb3y1kaij28111jx5";doc="055kbv3qyixkj3x2al18pbwfvfg74j0qg9z9ram556plabfhvpjp";}; yfonts-t1-36013={run="08fbdd97n2h649kvks6q03zrsjvb1f7qwys3955g6iznf4y8pyv6";doc="0h0gi1j5fcn1nkvf0abf2aimj2q3h6bw4rx7kzg5xra735fqpl4n";}; yhmath-54377={run="02p5rzh9n92pjznrqia9b6jnlwmn14189m7fiabvinjakaxmwxwn";doc="024p61b5i55m6n8fmk4j9r3q7dprp3lcyzkhag0wch6vgjkrajzq";source="0y74zwc1pkw3dp56jnzzy4zx1ilw5qx9msm1bf55mvdfc045a17s";}; yinit-otf-40207={run="1yjz72nixv6di0ifsimbnc34wlw6s8nqkwflkag2p75q0jw52qrg";doc="15yjqa1s4zrpz8cj199ak9dgriys76q8iccspw3909g2ci4xyyfv";}; york-thesis-23348={run="04c8g1wkl795caadm8kqfy6kdqqgwlk46lijpmyiiykbb8z54wq7";doc="0zp6pfr3giqm4nbsidg06q0c3x9gr4bk3g8qq7wxl9a2pgk3z45p";source="0105amrybkm78pwb9hrd7n8r69sj6lkh1zm7c9sskibb13lqrk9p";}; -youngtab-56500={run="18h6a4b4psbm0hjxq2xnk4bkmsa1wd2fvarrzfkhcj01hgn8bz17";doc="00jkdw02iary6s5szh7hf4qjlr7r8y9lfmvlnrpqkhh6pdhsy3jh";source="1hjqkj12jx9imfqm7y1mqdvp1knhf69kbixr88varbh09d6r9p66";}; +youngtab-73766={run="18h6a4b4psbm0hjxq2xnk4bkmsa1wd2fvarrzfkhcj01hgn8bz17";doc="00jkdw02iary6s5szh7hf4qjlr7r8y9lfmvlnrpqkhh6pdhsy3jh";source="1hjqkj12jx9imfqm7y1mqdvp1knhf69kbixr88varbh09d6r9p66";}; yplan-34398={run="1f2kxbb32hxwgin5bn7b78r8sqdj4v1q80sh1c87425zw8jyd73z";doc="1ls02mng1jwihz8s505brmaqcjn4abqys6bwl22dy855bw5rgr5k";}; yquant-68997={run="0xlwjgc0lwls7zpgbd0v85cij3a66vsv2vwlr6a73s0bjyjy9akh";doc="043yq765f23rdhn3pmdwzy0q3x91hwaawfwakq93acwbx4mqjz8h";}; -ysabeau-72638={run="1283zx800ypxcllw6sz4805qrjzaqyxsxblb3bq43n902jim8jyh";doc="1zzh65nmzd0bi4260f6mwavsisczw4g9y95agqydbjkhwga2kij1";}; -ytableau-59580={run="0gfpxbvar3m21pj74j19qnj8qakbknhvssyvfyw61jwdd8ygdxkd";doc="00k10759qihk3330bwfpzmrm9bfb8513w3sak9jlfy5inay59rbd";source="05pxlbj3rdgr15cqfdxviyp2698b7l44rzgssx18yv2a8qnaxylh";}; +ysabeau-72800={run="1kc7sxh3lh1adfcgw9khcbf0r3pxlzr0vs2prh0nywrwfafbfwfq";doc="0mqlrqdqv4zys0gsy3qsq14irhj1fdym0zg206ilb8jnqmw1wvmh";}; +ytableau-73766={run="0gfpxbvar3m21pj74j19qnj8qakbknhvssyvfyw61jwdd8ygdxkd";doc="00k10759qihk3330bwfpzmrm9bfb8513w3sak9jlfy5inay59rbd";source="05pxlbj3rdgr15cqfdxviyp2698b7l44rzgssx18yv2a8qnaxylh";}; zapfchan-61719={run="1753lvv2bq29g43s4chc884n742695agvgal0b99gsrvlkyfp8gn";}; zapfding-61719={run="17mls8wilz9api9ivsbcczpiqp1f39qy8wa6ajssi8zhnc5lq7zn";}; zbmath-review-template-59693={run="1zyll0lpd3d2cjizq6f2zxnb1pmdl2qkhd1fcm9f9l6i5fqmjk15";doc="0ymvngll5znvw0i4y65imidy21fzfzsdcz22i2i8369k1n15x6yh";}; @@ -4479,10 +4533,10 @@ zitie-60676={run="131kiycj7q9javr3xs7maa2qjczmva7vj98bw36pv7znwchspcca";doc="00d zlmtt-64076={run="1krv8frabpvnx00xwdx058f9y2mip3bblpix05yxpfspx6aarhcw";doc="1xiirzbgh1x34zih8xbf7whl5f994lx9bc4qrirc58rlccnqgbgr";}; zootaxa-bst-50619={run="0lwin7dfd3nk0r3drznmhkqd7fhfvizxqy3z2xv616spg1jh9sgj";doc="1s4v9azi1pvvh1fizp2azkbwh35xvqh8qcnnn1xwi0g1xhcp38pa";}; zref-68278={run="1292p3hmhlngwnhl9lnppbvn4fqblphxmpmbh1vij23v64acv3lk";doc="1xnyvhrhcnganvdzilljdn6x5yh7srijhdd63fc0p5d7zn5hccc1";source="1dbzxl0rc3xwcn2bwaghywsry8q2q34npax5zrv9xak24gplv72y";}; -zref-check-68846={run="13syzhmzvd537gdvwkzvlnbrf9as2yl0id3z7fmj35vjwf9z12al";doc="17f344gzq68c9v2glz24pwxal72aa7mmyi5lvgqx9dkkpzlmghfc";source="1lnnx5fb23pkkzwdl82j765canbm9bbnmmpwwxh9yg9dcz4gwhkp";}; -zref-clever-72484={run="1hy8wja5pjlzlsqz95cx2p0jw09hxxqk1di28mlnds22djdqgdwv";doc="1bw19r1zqr547sfbcxm8rdibvh4fnn94d329cz20s5pgqsmiqw1r";source="0bgwn0xyx9mn4xf4bhjsy5pphxz2xn6gsnb4bzy614j10rcpzamq";}; -zref-vario-68846={run="0p7b9pqldlliwshm2xfm6c69is878nj52dgchx26dqhi8lx8l8dy";doc="0ck4h0wdm7rkhcb7bp0cksy2krpziyjykp15p0l02180c79mnp3z";source="12qsz4fn6d3gpxhi5ppfvzqcj04r9f88a5hj9691kqjwh0507zn4";}; -zugferd-72638={run="15mlpa3m5gy8vkmlz7az256bg4r9mha8p304sbhyl1g55j4swn67";doc="01rn8f7zvriw99wcsvj4ajhfbprmlaz51pa210xswf3aavf93qa8";source="1m0kvgc6j2n8cbm3rwfyxj8qp13pwjhbfb1cw79rx8nrjmqs92xn";}; +zref-check-72994={run="16h8k4b97m5rvi5y9dsx81mj0qlpk35dz7qjkqii8wld7mpmkjvg";doc="0jna8w0mv7ycjmpa8m0p69mw2lpxzsgq0b85n009h4sawrjjr77l";source="0ha4dxnp7i8zf8alr3jwavlw0rhsn4wz2dvw0dlglp5d8dm0xkp2";}; +zref-clever-73000={run="1jm7arz7kgap0zmsqlfqanhi0qs0h7i6khk1fmhlfx7sppg4f7qm";doc="1xnck9mnhjyshkgkmsyvfphgy539sjc5j09hzcc1cw1ybkhscb4j";source="016aawjxjr6a5v443yyq9csm8nr35z5smq9rgckym2crpim2gkmp";}; +zref-vario-72978={run="1dv1grn02mr6j14mhqxbdqdydhw9xkbr9yf3mlp3rfkyrlbv21k8";doc="0vzvrgirkasqcxax9jqjz2pkxn9qykps89nbf28z35pqcydwgykz";source="0b77m4qki4qzq6cvl2lxcpc23vzlb3zjn3p7rd8l0xq119z3q3wg";}; +zugferd-73286={run="0ckr53rcjiypc212i65krp688wvm9m5xcrij7n1bar0vxgm6q9m4";doc="0gxah5ggr2afgj0wcn7nx3kshdkgzyy7vhjrj45gil0ggx7y8jhm";source="13m2ly60wn0yi7dijz579pw0hz5xsdwciwah9jrln3svjr2nkzdx";}; zwgetfdate-15878={run="1fgz3z1f9ifcbrwiq166hnff23gmlgp5vn0djm2znci26bcip4s9";doc="0gda7xd1sbiaaspb253xgl47jm6bcn8hj101m6ih69mxrka6sz60";}; zwpagelayout-63074={run="0xl2qyq9037fjxwc6v9hz9gbb5fggqb2x93bibvhdb0bik6iw5md";doc="010120lcnx9d9jj116y6vskch3025jfi4v7xh6nyqlvirsjr4hk1";}; zx-calculus-70647={run="18da90bhdmfbjalnm1qvc5vy0ajkgiwzrll55108p74pcxdcdpfj";doc="0mnwarf3ls8w3jj9p6piyl3z9kci8a5sabq5m6dq8xvm58f2h14s";}; diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index 78c2716b8856..535fd5d9637f 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -1,5 +1,6 @@ { stdenv, + fetchpatch, lib, tlpdb, bin, @@ -77,6 +78,13 @@ lib.recursiveUpdate orig rec { texlogsieve.extraBuildInputs = [ bin.luatex ]; #### perl packages + bundledoc.extraBuildInputs = [ + (perl.withPackages ( + ps: with ps; [ + StringShellQuote + ] + )) + ]; crossrefware.extraBuildInputs = [ (perl.withPackages ( ps: with ps; [ @@ -248,6 +256,12 @@ lib.recursiveUpdate orig rec { texmfstart = tl.context-legacy.tex + "/scripts/context/ruby/texmfstart.rb"; }; + dvipdfmx.binlinks = { + # even though 'ebb' was removed from the Makefile, this symlink is still + # part of the binary container of dvipdfmx + ebb = "xdvipdfmx"; + }; + epstopdf.binlinks.repstopdf = "epstopdf"; pdfcrop.binlinks.rpdfcrop = "pdfcrop"; @@ -417,6 +431,22 @@ lib.recursiveUpdate orig rec { sed -Ei 's/import sre/import re/; s/file\(/open(/g; s/\t/ /g; s/print +(.*)$/print(\1)/g' "$out"/bin/ebong ''; + # readd functions moved to 'tools.pm' not shipped to CTAN + eolang.postUnpack = + let + patch = fetchpatch { + name = "eolang-without-tools-pm.patch"; + url = "https://github.com/objectionary/eolang.sty/commit/2c3bf97dd85e1748b2028ffa056a75c0d9432f88.patch"; + includes = [ "eolang.pl" ]; + hash = "sha256-ZQtGjqzfhX5foRWuiWQaomN8nOOEj394HdCDrb2sdzA="; + }; + in + '' + if [[ -d "$out"/scripts/eolang ]] ; then + patch -d "$out/scripts/eolang" -i "${patch}" + fi + ''; + # find files in script directory, not binary directory # add runtime dependencies to PATH epspdf.postFixup = '' @@ -424,6 +454,17 @@ lib.recursiveUpdate orig rec { substituteInPlace "$out"/bin/epspdftk --replace-fail '[info script]' "\"$scriptsFolder/epspdftk.tcl\"" ''; + # use correct path to xdvipdfmx + extractbb.extraBuildInputs = [ bin.core.dvipdfmx ]; + extractbb.postUnpack = '' + if [[ -f "$out"/scripts/extractbb/extractbb-wrapper.lua ]] ; then + sed -i 's!local target_path = interpreter_dir .. "/" .. TARGET_PATH_NAME .. target_ext!local target_path = os.getenv("NIX_TEXLIVE_XDVIPDFMX")!' "$out"/scripts/extractbb/extractbb-wrapper.lua + fi + ''; + extractbb.postFixup = '' + sed -i "2ios.setenv('NIX_TEXLIVE_XDVIPDFMX','$(PATH="$HOST_PATH" command -v xdvipdfmx)')" "$out"/bin/extractbb + ''; + # find files in script directory, not in binary directory latexindent.postFixup = '' substituteInPlace "$out"/bin/latexindent --replace-fail 'use FindBin;' "BEGIN { \$0 = '$scriptsFolder' . '/latexindent.pl'; }; use FindBin;" @@ -498,9 +539,6 @@ lib.recursiveUpdate orig rec { !(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) && !stdenv.hostPlatform.isRiscV ) orig.luajittex.binfiles; - # osda is unfree. Hence, we can't include it by default - collection-publishers.deps = builtins.filter (dep: dep != "osda") orig.collection-publishers.deps; - texdoc = { extraRevision = "-tlpdb${toString tlpdbVersion.revision}"; extraVersion = "-tlpdb-${toString tlpdbVersion.revision}"; @@ -528,11 +566,6 @@ lib.recursiveUpdate orig rec { postFixup = '' TEXMFCNF="${tl.kpathsea.tex}"/web2c TEXMF="$scriptsFolder/../.." \ texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc - substituteInPlace "$TMPDIR"/_texdoc \ - --replace-fail 'compdef __texdoc texdoc' '#compdef texdoc' \ - --replace-fail '$(kpsewhich -var-value TEXMFROOT)/tlpkg/texlive.tlpdb' '$(kpsewhich Data.tlpdb.lua)' \ - --replace-fail '/^name[^.]*$/ {print $2}' '/^ \["[^"]*"\] = {$/ { print substr($1,3,length($1)-4) }' - echo '__texdoc' >> "$TMPDIR"/_texdoc installShellCompletion --zsh "$TMPDIR"/_texdoc ''; }; diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix index da1224a3bbc2..6f176131ed30 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix @@ -1,8 +1,8 @@ { # no indentation "00texlive.config" = { - frozen = false; + frozen = true; year = 2024; - revision = 72673; + revision = 74525; }; "12many" = { revision = 15878; @@ -125,13 +125,13 @@ abntex2 = { sha512.run = "951c039cf0c97a6bd3974bd01ed9323876f1ee74b8250037dce3e92e00d598ab1cb2cfd0bbf4ea6d37b5f8c3e1095e531aa245ad1a91ee49262e6f99c5c84e59"; }; abntexto = { - revision = 70885; + revision = 73233; shortdesc = "LaTeX class for formatting academic papers in ABNT standards"; stripPrefix = 0; - sha512.doc = "6038ac2a77969b1c22f126bbc77b49c5a1a89b349cdf209c1ef0d1e3ac5285955217ff1ca619a838fdc4eb145d5fa8a2dda5925e950ae8333c9b0a391d935794"; + sha512.doc = "1fa6d31a576347ecec06bd087a5e80b2ef633d2e0d568dc40baa4c21571e27b8009059e7360eaf9c045594f6d912c0b6b2f2bfe9fab1eb51e82e409e29556a9f"; license = [ "publicDomain" ]; - version = "3.1.1-beta"; - sha512.run = "6f3b7829a5050de1ae0e4458f471318926b097a8fcdcc19139676349aa6a345b25373a278f98a11169fbdf5435e72ded255857903ed77a83a26342181dc2ea8a"; + version = "3.2.1-beta"; + sha512.run = "d9bfc66fb36a917fe54d14b18c8abe69c8322447c25c85d23439df8761231bf9c10ba9d44d35846c386e20b26652b5f7cb9fbe7bf27222b5b553fd5f4c5aae97"; }; aboensis = { revision = 62977; @@ -242,24 +242,24 @@ accsupp = { sha512.run = "0b6e474617333ca00c2503e99f60a290b930d7e7534de7223be511404aa6c7ba9a8dd69b94f3433b347146bba7b8dbbd4b6d45ed8b2c6b0880c0177842ba8b45"; }; achemso = { - revision = 69638; + revision = 73648; shortdesc = "Support for American Chemical Society journal submissions"; stripPrefix = 0; - sha512.doc = "b26169bc393110b3805c4dfdd0fbb1838a469b6dd9664914a55eb7f1c031a4cfbca7e96cdbdaaf67329a48e3225e104f5d6a46b0b52384b77835a049151f6cf1"; - sha512.source = "94cab70cfba8492f44a09a3b94e411cbd5b32f3dd5b9a17ca8ae1ff5bb6c5ac6c8a882f4fc94278bb267556ccb43bc981f24e4b6b47b5c9df90c81cb44005029"; + sha512.doc = "1faadfd1ad706300d270b54f3a87b411705f5fb7a98679b093f1f185bc3369640c54bef7fecb6f47e87cde5351b1964c8069d55d7863c79f8c9b83ac65c46755"; + sha512.source = "d67f0cef43e6dfe5eca8f3514344885a20ed15690c200bd90f6e93a4620f098a683b387b425139fc6b17ed16e98d81685949e598aa9f52e72ece40c76d171bdb"; license = [ "lppl13c" "free" ]; - version = "3.13g"; - sha512.run = "1a073188cef886e2eb5c6090a2f887d5c58c04d535981d1926a1b389130092bccb614c22b8b5b675d6d2d49208e4d05ae560966db39443cd822c59bc41e6af8e"; + version = "3.13h"; + sha512.run = "850ed16edb824adcdccada73d986868e3a7d4ffc0bd5c5f20798c0c262fc6566260d94b458c6b4681029f0ac92da96be13443b306385983dc39f9d3ccd918f9b"; }; acmart = { - revision = 72113; + revision = 73261; shortdesc = "Class for typesetting publications of ACM"; stripPrefix = 0; - sha512.doc = "dcef7ac44f6a4a8a23c1f5b02675894ca5a99a63010f4e7b5047d8ba6b2dd97c72cf9cecb1cf7b1be994bf1213a9ae432b6b29c77e12b29271fdecf8830e63ca"; - sha512.source = "755477b663beb126038c04530e684c9a5550f938bde07c4f572d04789a1fc813712c660bb5f77408dacaca08b663788c7aeb52c5239efe06d05f9d16431b253e"; + sha512.doc = "d0b5a7920cadde3065a0d154c74845fba94a13150ed4fd92cf480944417d11a26521eb3035f5aa02a802d9369c0164a3872d36d9a0721abf0f530c62ab1d818d"; + sha512.source = "72865df4f63e73070d7c60d4cc916471ac1ba92c3dc36d738560caae0f32090af3ca1ed7c68f78f7ba3bea03d96b42c485731e89ac5c1c6a092dde58e03c944e"; license = [ "lppl13c" ]; - version = "2.09"; - sha512.run = "5e9daf0cf8ab3682f72ad86be920ed786a8dba9a26ead414a1f2f3be0fcf22edac81e04b6e57e866ae7194e4d762029d81b02b72eabd41388860b1d06236a322"; + version = "2.12"; + sha512.run = "d1f6fafa869c7995a8b47a3194333e6f3f7fce6cf318ec56f4702f208f80edce71aaefd0653d6f851ff737f6a2c32a217f80e03298eb2f0c44fe18a749e4d6b5"; }; acmconf = { revision = 15878; @@ -286,14 +286,14 @@ acro = { sha512.run = "25c0dc9cda98db7ead55613aea92946cd90e7edfa1213d59966eb8fdd93ae1bc7b532f7849c43fb8fa77291b23dc5d8dc80cba4584c991a7b38e55564bd59ea3"; }; acronym = { - revision = 72324; + revision = 73491; shortdesc = "Expand acronyms at least once"; stripPrefix = 0; - sha512.doc = "eba190713015212b17e50f6b169a31176505ef3694b5ead617802fed283f90d88842e518599dde95a336c2a98a67783c30a82d18291233077779c8d1abac8124"; - sha512.source = "cdbd613474852b12b10d8d427064d2cefbed67146121f94434b7d954e37b099b74cfbac7666334a75fdef41643795fa8d545bc6f7e6ed448e42b3f2a80fb80b9"; + sha512.doc = "1a2d3bbe59a81125561266b2ba5350f814ee5d8d01f0fbf1aed4be85bff05039bad754125f09a56d179fa9dc6263ef5950ab6774fc54e60b700b6baa320cd58f"; + sha512.source = "ace6d2c8ba88b10b2d33e199f9b3f1e22e5154977160e1c5df7054c19a69dbc6cfd3f2e040c102e99f8f6c0321ddf1a9457772c241fe67c78f21ee0e92add4f7"; license = [ "lppl13c" ]; - version = "1.49"; - sha512.run = "79ae084ade2f85de2793bc057e7022130966a5e14e709aad2ed0514d6c775089d0af192c2651d3634235a17ddef9c44b63d2f5eb38d7433f9b8b6aa020fcc6b9"; + version = "1.50"; + sha512.run = "98c527da3bdae829915562332f48b2a2e082d62bdce836dc0a7f379363eafb8e48fe1b09655969f126fa292f112f92e0c40f4547ee54869e48570c08524a0ea1"; }; acroterm = { revision = 61719; @@ -364,12 +364,12 @@ addlines = { sha512.run = "5d0a438fceef1481633f37824b686422e5000cf232b7dd24bba0f30c8d62b583daf01a67242283f2e4fe971438c061acad2860f50ce1438ca32677d497db8b2a"; }; addtoluatexpath = { - revision = 70655; + revision = 73424; shortdesc = "Add paths to Lua packages and input TeX files"; stripPrefix = 0; - sha512.doc = "f7a3b3eea2434280b2e5dce3a731874fae55f39b0ad84943a1d58bfe879c00c45dd8f9083ae769ce9e064f3a5d72b5f051c1c78820ef03e2b75b0733908ab8ee"; + sha512.doc = "6b14f1f6ac412782242144682617c889740678b8326d99d84e8a82131afb207e5cbf82cbe721e5fb924539955a414935773e1000320b595ffec41205a0169291"; license = [ "mit" ]; - sha512.run = "52f8e393aa03940866a0bd74f4f3cc46a2fbe8565db6d2066b41dfafd3cf21ad9a017e776294724b3df36d3ea107d78a19ba392285851bcb9e338746a283ed4e"; + sha512.run = "7217b10e4ac0e29e4c1b5a5d021cf387f23be4555656fa9bf64f647d93cfe4570a78f7a807bc610b5c8b088d08d7d49e065d96773b341c59f42436c7c3616858"; }; adfathesis = { revision = 26048; @@ -438,7 +438,7 @@ adjmulticol = { sha512.run = "aa3a350cc284bb52e5dd519155d9e74dcf96171e12acfd092ab3be502f09100a37cfb98c4ea99c6db7f7efc4b1edadfea86b29460dcdae212fd38cbb0b0062e0"; }; adjustbox = { - revision = 72097; + revision = 74312; shortdesc = "Graphics package-alike macros for \"general\" boxes"; stripPrefix = 0; deps = [ @@ -446,11 +446,11 @@ adjustbox = { "graphics" "xkeyval" ]; - sha512.doc = "0cd4e31196e4841b1e2ebc91001fe5b44eba145f28819ec95a483e3f327b1ff001ec39556983de34e2f248e3c27f3b1ff72f511c1a20fc37791d394bb36b7445"; - sha512.source = "ae59e1fd31bc2da5557bd46afb9bfffaeda4be20352eac079c52861c7bbd4594f39663676c4571217ca6d1e072ccb956e971f4a13ca2c917eda3f77773213805"; + sha512.doc = "4647bf17b06337dc20599b49ce48e5a5a2632bb75abab0acef2c4e2ceec79715a84a497603d8a9410250051791c48c7fa5a49026c55ebe3b6f7609edbea7f4d0"; + sha512.source = "cee03a372392b29a700550862b8c5be2e593caf5becee41139af129391ba3b8672afdf43f5c64177ce9ae818d6c53a11539f72d440276f13d6126e15af30ea22"; license = [ "lppl13c" ]; - version = "1.3a"; - sha512.run = "30272c43ff20ada9ee3ae7232a631eb5d95a6566fa4c0a89e7cd387d93eb5349e6cda01bc472ee97758d7eea934b0375344de96a73ac4cf1ddaf37e5cd3d40b6"; + version = "1.3c"; + sha512.run = "0a7cd51890999216b1407b50fc7c82c38fa816cd805383b7bd858c3c7fa7b384eee184e91a9328430ff02dd003b8de41071a104b548f725a5138c266b54130b7"; }; adobemapping = { revision = 66552; @@ -547,16 +547,6 @@ afm2pl = { afm2pl.binfiles = [ "afm2pl" ]; -afparticle = { - revision = 35900; - shortdesc = "Typesetting articles for Archives of Forensic Psychology"; - stripPrefix = 0; - sha512.doc = "d8185772e114a891ff5ce0f2a2e12b827420f8c486813d87bbb6fafc662ca1db710178e8cfa260d7d650c3432909b9f7a8521648f6aebd5f90daf1aec4e28d7d"; - sha512.source = "f12b5a10b929d78c728331704ee83e726bc28562b8179adc2d9e7324b6b742100319078f5ebe8371a34927ae1fecac4779b9442076a95cae1d66e015f235d440"; - license = [ "lppl13c" ]; - version = "1.3"; - sha512.run = "958ed5cbce1dc7bfb5d01befe74de6236a09b3ae5246aa3f2e80225bc353abf21b622f4128641c54a27197560557738d4c224e160c0be87010517c3a30a729ae"; -}; afthesis = { revision = 15878; shortdesc = "Air Force Institute of Technology thesis class"; @@ -593,13 +583,13 @@ aichej = { sha512.run = "7edc0ca36209f18dcca0b794c7ee712f0eba82e3e69b09fd46fdc7ede6bd33e93d4936d7bfcff88fe4f699acd04493053a7c76cabb87670215efaae12aaabc83"; }; aiplans = { - revision = 72202; + revision = 74463; shortdesc = "A TikZ-based library for drawing POCL plans"; stripPrefix = 0; - sha512.doc = "e2994e8f28a11a1861363036e95d2505b8b1a05abdad821e3a2467ec265a7f58f5e52f3a01cb8b99cefc7e75419749811954a13ae6e565a8938ccbbe4d7df46e"; + sha512.doc = "5be30712b45e6696313c9bdad3ae0cd0d4a249c37c0d7d997e93284382fabbdf788acb47b4850494d0b571a2066f97183459f2b640da5cf25e68ac345185031d"; license = [ "lppl13c" ]; - version = "1.0"; - sha512.run = "f6777842c749ee788501453517a5f7f70050ac30615ee38bfdeb52420a078af1e96b08ee39e9e4ead7e1518b299ad96233dd4f978fcf70483ecec94d8a88d40a"; + version = "3.0"; + sha512.run = "d2dbc91dae312014c7470a6e10300cde027957c1d9c896174a514a540b6ccbb5b94232668e0362330753c5341a2e4da1d3e98b50fb1cba6048cffc838a0412d6"; }; ajl = { revision = 34016; @@ -637,17 +627,17 @@ akshar = { sha512.run = "d626d6e3a72fb8319f07c56d200566fc351be15acbbdc0ded7c3abb9765ce257741458109203882e8fa6131ba182539fd04e1ccffa0a25cbdcbe6f7630d3bfb4"; }; albatross = { - revision = 69832; + revision = 73436; shortdesc = "Find fonts that contain a given glyph"; - sha512.doc = "6cd6a3122e7f43ff57b5407ed426d88666d45ea55681d1ff1f324040b92d9a127a6f44b630ea442ff2d220d420a655642872cb9f0cb382aa21302850d83c3093"; + sha512.doc = "6f80c2d5f716c887cfe5ba47e41ddf24137083a1d5b698571e83afe10e3563ba5acdfddde0980705531087c4a84923981035af7823fd7394c90772a937c2c36e"; hasManpages = true; - sha512.source = "accc7087241aebabf2f34c13a432875257fe32ec606d093ae6abd4aa3ade986e919c2e5f9a50332b6448bde521a1d5d73a90a0b83c908b50e2630bd8f27bc6d0"; + sha512.source = "7fcd168e7a10d8607b3907c93a3102391515fcf839f36bae5631ce40d1326d0e9185cb815947c1cad3de9050d3d963e0617e6282fd4cdf17436253be9c9f7273"; scriptExts = [ "jar" ]; license = [ "bsd3" ]; version = "0.5.1"; - sha512.run = "c501ca3b1479ef25462d4f4af6b525a980a51800fc2e13bc0a16058830df1d0dbb020c1db7d51eaeebd9f49ebe4e23bbd082ec354b8c2577414f10377db25800"; + sha512.run = "e43861305fb612100621b74079c43f554b85d2af958778ea47e2cdf01996d9e08f0ae2cbd576e14ef0dd90d5919571db537cea058200dd6b45e9165fcba8c9a1"; }; albatross.binfiles = [ "albatross" @@ -1013,14 +1003,15 @@ amsldoc-vn = { version = "2.0"; }; amsmath = { - revision = 71408; + revision = 72779; catalogue = "latex-amsmath"; shortdesc = "AMS mathematical facilities for LaTeX"; stripPrefix = 0; - sha512.doc = "4e826da3394194259ef9a9dabd4ce2743b6187ded19e56884e027ade7a6f5576e8668719c1290a2aa6f6e28513af6d6550aead947a7704140926f22187575a74"; - sha512.source = "85b545ca6c2d9ad08d7edc3af668b2e9e05d363cf1ab50e16d7be22a3010e8cbf23b02c3f98698f020dbb1253ff12185d1b5bd9c16b47c06072846299f383d65"; + sha512.doc = "8411c432c36e904b6c334b53798fb197081e82e853348ebc9ba9af7dfaaa38428372a08c941ba32b92fe0101215d57895ab8c72dced46f3ff53a5e2baa3207f0"; + sha512.source = "0559218082ba571848813fdb560b025ff57376a1f16eba9f2cd051bb8ef7487a8f6471cd009ead6978ccd39a9efce3841bc2f048c55000fa69d29dc05a5f8199"; license = [ "lppl13c" ]; - sha512.run = "443fb13e0aa80a73510166fce72e3f6b885ad743796c6509f1752ae070d65f909c6fae412096c740b84244aba958c6202956b2cddc4fefe5a5f591f91d6e6767"; + version = "2024-11-01a"; + sha512.run = "00bff1825685fc641f6c0943261d2e52ee432cee9b6ed9199aaa77d492d25abee3a1e0618475c90d487ecfdefc2d419e45428f9214561faac3549d7c36641fca"; }; amsmath-it = { revision = 22930; @@ -1087,6 +1078,16 @@ andika = { version = "6.101"; sha512.run = "4da9904459345033aa87deeb0019c8c4a39fbafcd59d973717ed2c4a410ece528944c69669b6a5ecf6ef8bb790f60bba909468e001485c405e7cf8775b7533e5"; }; +anima = { + revision = 73126; + shortdesc = "Create slideshows with simple animations"; + stripPrefix = 0; + sha512.doc = "72eeb8b4c61dd04f1111c141ebf41785ab7f85759698d2a999242390250aac7952046d4522e01307599a2f5dbe64e082555d5bcd8289f89b0043198f45daa0b2"; + sha512.source = "00e3fa32d85985e0853ec9ff57a87baaa7f86ed40a642f7e9475e9cd8d1463f04a739e66b7dc2bd26efe93b1afd28be1a4b4d8cbe5255b7263dc86f4b7f918e4"; + license = [ "lppl13c" ]; + version = "1.1"; + sha512.run = "7cf3899655b16f921a0940cae7e8ee61bd693c72b3c38e873df4a80ec07b39f45f57bff2e805da02d4c062e7e801062136df7cd6d7d4b3f2108fea39634e1d59"; +}; animate = { revision = 72548; shortdesc = "Create PDF and SVG animations from graphics files and inline graphics"; @@ -1253,15 +1254,18 @@ aobs-tikz = { sha512.run = "3b8865136cac0af006f8b02b527f7dcdb609a97101a6d5e51ece579a04c53ebc9b912dece8ea541d3014080a39554edb0cfd6f67529087a1ea57b93ae24a2684"; }; aomart = { - revision = 71469; + revision = 74515; shortdesc = "Typeset articles for the Annals of Mathematics"; - stripPrefix = 0; - sha512.doc = "72206c71ed342e6b7117c2971b92c8c765cbea554f21c1c8d730a7317792bb3f848456b06392e841bb8c5d4812d5f313f2c19f6034a36bb21737bc766c3ebe24"; - sha512.source = "f9106e79dce2bdaa9578b0682e7671d7f4e75dd445b90bd35e141d7dc1e618a6aa3effcabb91da0dbab790b4101b2ad6dc64bfaa27bafe91f8ad7c0be884c8f5"; + sha512.doc = "71295aa04f6c4a67184205a4ab08a5c62b1958468963fe259fa2c4a40b4e33430a16d612ecc76916c72084ca8f67eddcc871f8d94180a588c707d4e8ca42c9ce"; + hasManpages = true; + sha512.source = "1853c959ed782beace0da16eb1afe81789f48bfee16c074f7cc1b6364341cad3a57a972c07408836cb6ff82f325f409a5dcb730bb07ca4f7bc1ba8f403681c53"; license = [ "lppl13c" ]; - version = "1.28"; - sha512.run = "d8240453d838cc8d371a9b52e7f49befc0659d53e2172722dd02fb0542d987fb614b5e08655081b42bed48bef8875ba1793aa914743aa7fcf88d2e83a43eff5d"; + version = "1.33"; + sha512.run = "0030e735651f4298519107471651d08371b863deaa529736ae96e781e6337aa0f14d29e52a40b1a008ddeea8d6936b7b3fd24b32528ca88749af3f0b01b65628"; }; +aomart.binfiles = [ + "aom-fullref" +]; apa = { revision = 54080; shortdesc = "American Psychological Association format"; @@ -1554,13 +1558,13 @@ arev = { sha512.run = "8b6e88a41052740831fdfa03299f665fad9eaa0e45d1d235392aa0b849bd6ca03f1e18892c879d3a5289430a5d236b9544d617ea2c3af62a59b38b4d7ff8ce90"; }; argumentation = { - revision = 72381; + revision = 73824; shortdesc = "Create abstract argumentation frameworks via TikZ"; stripPrefix = 0; - sha512.doc = "065b26e0dde4642ed6d7b6f0d86624c0985f41dfc709b697ad51d4a2a9d3e8db93ac8e7a8c2470dc3fca3f537c82d8139a79d93c9854d2dce9e32364656200a5"; + sha512.doc = "78793f697b15352e64f415d14385a2aec4cb7390f47f6fe6828ef34c7ac8c6f9cdf32eecb0a846f74b5ee542458904b3d4b7c5a3e1804317eaa5f33f4659d95b"; license = [ "lppl13c" ]; - version = "1.3"; - sha512.run = "6f6216599641063e9c8eeda2344beb1b3535abcbd6b3c6103f694d68414598b86b7ef6f558c0da1f4333ab426da4da592fc39b18ec604fab919f4ecf1f2b9ccd"; + version = "1.5"; + sha512.run = "766b5499b46846b78f0bc73dc80697bdc483b2d99a76ee99ff0b57bd7d075aab6e6ab9f7c3ff561e6391ab883c513fddbcf970500304006c4055a60c1a62b083"; }; arimo = { revision = 68950; @@ -1793,22 +1797,22 @@ askmaps = { sha512.run = "0f4d91a15053d40d329744c429540075c33e2098f6d9d07eccc5ad16c5696233dd01de89c61a7090dc127c3730ef04e24f8d56845919cd268ec8c0bc68d9c09f"; }; asmeconf = { - revision = 71956; + revision = 73649; shortdesc = "A LaTeX template for ASME conference papers"; stripPrefix = 0; - sha512.doc = "bb5ac6f8626f311ccc13af932aca25d69b8a2cbe471d0f2e89f3f1194126e19d00e8b89accafe2a20cf8617ec0dd0be974653fbabf682fe4e80b5d9f6c681553"; + sha512.doc = "ab41d0554e0094e4e04530f09da9f04a40d7eabf680702a435d650fe7236ce5e85b249b29d839cffed9c739abd550eb88ed50f519a664bf11861c0f6e810c854"; license = [ "mit" ]; - version = "1.38"; - sha512.run = "26de71315f5bd7d01ab47cece6ea9332365c3454070151c3df7077881e31cd173c31a63f9fcf24b07849dcc4bd4e14bc6b1c5189baac1d98715eb73b147c2974"; + version = "1.40"; + sha512.run = "cba71b32873ab2927e3f584cb0920c09dea820e6b5da53cf0aeb39da66131b764cf844067a757a6d051a7b2494cf11fbbbddca5bfd65659adde113ce4de70bd1"; }; asmejour = { - revision = 71903; + revision = 73602; shortdesc = "A template for ASME journal papers"; stripPrefix = 0; - sha512.doc = "6ec3579de80e17ece66957aef3ae6981607330f31a09de280483d7b704c89f63fb8457e9a05b2c8d4183981da7d5b7f9eb6d38c282ec55bfbbb2719880e443c6"; + sha512.doc = "a8a67f1091240a269e3a9b7de10c5debf081321d6fe21c7f838b3a4440e4c3b43304ee09c912ffff92b2fcff4c138c6cc00136f6fc95680b8d8fd98b63471f9d"; license = [ "mit" ]; - version = "1.23"; - sha512.run = "1c790c15558eb7dbe0b8f9774cc66ade7dc5cd966f20f269262cd2f8a69ca9a2eb2f148208a268094e60e424ad96423f003def6eb4030a3d2480faebc5fd8da0"; + version = "1.24"; + sha512.run = "e94060e565cee872db424b11b7ccbd70176feb6b6f8a029e200e57cf265d6feddfdac92e64f89d59deae8e547ebf4046ec2bb7dcd0bf733439c62679fef25041"; }; aspectratio = { revision = 25243; @@ -1884,14 +1888,14 @@ asyfig = { sha512.run = "f067e6aa1f3cb481e07f59781fb7d4c671a0b21a392ca7830d7fa19ed7a198fefd5ad5104ed3644eed484100871f9a8d36d1ae6e31d55487e4ff2846df618e9b"; }; asymptote = { - revision = 72638; + revision = 74490; shortdesc = "2D and 3D TeX-Aware Vector Graphics Language"; - sha512.doc = "7641d9c3ed4c70e69105ea5e75634ec91a4b74c50548328d9b8cd30ecd610eea8aa01968737dab750ac4282b87f8d1db153541263ce638a200ed392cd319ddda"; + sha512.doc = "8cd83e21f22ec1ab1165dcca8ad50b56437898abb415127a9606cb59e5223b578bde95382009dd222ae98efdcab992287eb854eab3616cfa45bd7b76c10af398"; hasManpages = true; hasInfo = true; license = [ "lgpl3" ]; - version = "2.92"; - sha512.run = "0a523eb471aa7bc55295ad5301173c3e8967bcc7a3312b681e606b0c81ff9b478af30198c64417fee294c956cf51f2158db84fe3f435d537e22cdbc096cdd3bf"; + version = "3.01"; + sha512.run = "40b3b72dd016625298a67987c59648cdb63868107c0c222e05ba8185ca22313e6d10feab98865fc5d3a4810d91334c51855c8d4225378e169e82e966a1364876"; }; asymptote-by-example-zh-cn = { revision = 15878; @@ -1919,14 +1923,23 @@ asymptote.binfiles = [ "xasy" ]; asypictureb = { - revision = 33490; + revision = 73611; shortdesc = "User-friendly integration of Asymptote into LaTeX"; stripPrefix = 0; - sha512.doc = "68b060950fdad080061b8d2c1a91726d0eabee9aaebe322e983e0dab81df30c65d9d7d0cf32fb2847f504ede155f2c43f3ba8c00073fa425bddcfe7d47a6f000"; - sha512.source = "883968dc538186507f4e81a466dd980b8a8a3ec088e25e7973c62e949871c79baeb909ef64815720004d503cad33d7f9de6c7ca0950cc0618ad2111e92870b73"; + sha512.doc = "3babb6fa9eaa570fc9feff83b95191668814e880d8cc98c37b86d6619776ca5a6c19bd768ba6804309b3a91d250076dcb2bd2a0974b28e9107ad1c529b0b3bea"; + sha512.source = "9601f850f179eac69f2368c55700a6958a1df856c12303b5fdc0c8c819319e4fc37d374f873bfe862633c6134c681ccd0dde47261e15534be4efc54fad19b0e9"; license = [ "lppl13c" ]; - version = "0.3"; - sha512.run = "a1ab37814223b13bf49d23c527543cb537e2224335e727e07e1f645a7f76a2f3ba1a275073c775463880b0e258e716b6b00d0df29ca944f1f22b3ac70aef4378"; + version = "0.4"; + sha512.run = "51af74b7f56be6d689beeeec4c14bf9866d91b491da0235a1ac673f0f467d6a4f84d610b1db5509931923409c7fdb2e1dc75e6563b02a1a3f6b7cc74ef55ccea"; +}; +atableau = { + revision = 73576; + shortdesc = "A LaTeX package for symmetric group combinatorics"; + stripPrefix = 0; + sha512.doc = "881613c9aa83ea57e45c9e93098c50c6e4e8c153c66a6a18aec458de393ff46f783db5107924992fe6a38a12954797e31dcf658bc6ea773eaa71adcd5dfde902"; + license = [ "lppl13c" ]; + version = "2.1.0"; + sha512.run = "76dd80b2816ee76d945cc0dace211678e20c932cb25fef228013902d125ef31abb0b897291715080512a117022df6026d9a91527a845defdf17cd78db1bceb96"; }; atbegshi = { revision = 53051; @@ -2286,14 +2299,14 @@ b1encoding = { sha512.run = "b33280f64e37f300c92f9bad4372c13dd34e3dbe5fe47f2dc9fe0e270f33eaf5bedf9485293a74a6e0eb87b65f44fb66a286fb279a3d2c390c463e6aecfacb57"; }; babel = { - revision = 72607; + revision = 73988; shortdesc = "Multilingual support for LaTeX, LuaLaTeX, XeLaTeX, and Plain TeX"; stripPrefix = 0; - sha512.doc = "7a5cf7cc0bfbbc6167096aabd9ccb5aa4bf724a3604f95f436337b6ddc5bc4a012068525f041767bfff8294d4f5767774aee0f6d2884625ec457774f387decb3"; - sha512.source = "ecf2f25d1cbe47449231e326fad173d78905d2d992b698f6c0a0d6b69363d9652ce14d45721213a7ea7530e357750f017f42f2b8d638bedf25decb7f78c41f64"; + sha512.doc = "d538b5021dbf13e54e108b2aa6e0cb6e37aa415ac308bd1802020c3b1585b536ac7e5911f04cca6cdc40849d3c9395c9b1515106b59aa52d328f2ac6ea1eb44e"; + sha512.source = "fd0d2511b45ed9c00be8b5651d45321d7a498ea5e6252dc5eceeec1082b69e0a94aa8c27f349ea1875fa3afcd31cf8a95fb5b9b71dd1e6044edfc3e28e8d3eb2"; license = [ "lppl13c" ]; - version = "24.12"; - sha512.run = "fc6cbfb0f6854cc4aee3565009b2249dca1ebe78bcd02df90385ddbf7886460a2df1c3c24666e46bc4773c7cea1a0d6bb94fc38924c040e3888da067927bf7fe"; + version = "25.4"; + sha512.run = "2c267ed94712ca44a967884cdc5c2aca2a8c98726ce8714d594f2465431ad7e76b3db2ca28ef1d266214fc1b477b0274b70f86c515442ca658d85cbbb78ac5cc"; }; babel-albanian = { revision = 57005; @@ -2498,14 +2511,14 @@ babel-georgian = { sha512.run = "07adf0a76fb15951db5dd01a0a1595aa9c8119d6e39e94eb36ac340932f763975abe284d738a52a1fa2a938a14f87fe7ede10758529c3f68c6d573dbccbcbc82"; }; babel-german = { - revision = 69506; + revision = 73094; shortdesc = "Babel support for documents written in German"; stripPrefix = 0; - sha512.doc = "e4ca225a4fcb681c0b59d833fcc8a3781f1315adaf26e7db62f85aca145028f9f5f3bc7a19b7909220ebbbcbd25d2fdf2136d0f1ff5a5823e63c3362a24d9750"; - sha512.source = "786bf7b892f48e09496c99b998c692f8cbcd40c2727700291fe1cc35518c3acd1caaeb0841bf3b1d05c3ed931aaa0d7ee6cd564f40b41e30fbec0f42eac48da1"; + sha512.doc = "b220bcc5068919f01c7d1c1d6e8ca08c27ccaae1ddfd3e8e17212b057e7b54a88964e9a439bb9d982129d3dded6ceb94c76b2b8c3679192ee0a75fdbcd107425"; + sha512.source = "08fd8e81e6668ba702946a51c9e74a732c92e814a493c61ab274239fc9758c892dbff89eb86a53c7a09cbc92e1dda6f22bde94c8ddb01c93ba6cb54594d7fb4e"; license = [ "lppl13c" ]; - version = "2.14"; - sha512.run = "372ba15d67ae4a5299a8d193d4fbe1c01a89db686c4d152ce2fef05088be63e7d85a7cf4fb712629d1ec8b21517bf3881ad3de947e03e127af940714a6d059ec"; + version = "2.15"; + sha512.run = "18329e0a256943a7c1efe5cb070fc46c097c177acf5784bb77663f0cf59a930ddc64dff212d07b4951c07cb18282288c01d87668e0b599c22893840542a79301"; }; babel-greek = { revision = 68532; @@ -2864,14 +2877,14 @@ babel-vietnamese = { sha512.run = "ddb75c37017c1b0b6af2cfbdf574526cdfdce2099d599a23cc8ac819f6ebe5ea7a2eda4bd743af93d78835ca5dccb3d7fa55db22b3154862aa4affe83c28185f"; }; babel-welsh = { - revision = 71109; + revision = 73856; shortdesc = "Babel support for Welsh"; stripPrefix = 0; - sha512.doc = "2851177d9322a9635e14ccb8f50a7fd135c562f91e5349c5e0310f087d4585ae8481730f2f635cb83984359cd40770d790b982d32e89440cdea9607b0bd32aa5"; - sha512.source = "d9c0fd1dcee071cc178d647de9be4490d41c7ee86de1878e462d4d73a5a88b2bafa3b4ffdc25ee4594b19d4f280372e9e6d7759659a48c5972585aa31ab3c043"; + sha512.doc = "72f5c64584950140bdf2dcc7ed1b1257af9d9260707fde8803793de390d7a110b7f24836b5a17193eccc87fcb60868324697974a75c8b207ae78045e53d5ce77"; + sha512.source = "93dd6434c4e86e34ecfcaf20325887d13d475b5c2ca2132c53faa8fea6dff3be886f201e21f0197c2819c9b57564c95308cad67002b2b6bd5072604020c1794c"; license = [ "lppl13c" ]; - version = "1.1b"; - sha512.run = "2d753b1c4f5cff0e18e2a08aa05665d18f387715131c5b8abf4fb07ab9047a6d39661856035a5931d1e285402b22d2576914fb6e23efb244e02fa7253deeb5f2"; + version = "1.1c"; + sha512.run = "edc50462843d5ba8de6ddd8eddfdeb84887e510b261c13c405a70e27d67022ff4b012344213a07c0e7ca7c49281eab3ae2b380068a60bc775ab3a76e7f00a469"; }; babelbib = { revision = 57349; @@ -2934,14 +2947,14 @@ bangla = { sha512.run = "1559fc1599e2586c660ab544a5d7e279240a966da677fb658162e8497e17b574308f90f51823ed861d52c2d0f4c0b836316866b2d5cc1b0c3ebfa82caa9334d0"; }; bangorcsthesis = { - revision = 61770; + revision = 73173; shortdesc = "Typeset a thesis at Bangor University"; stripPrefix = 0; - sha512.doc = "be5e7eb308d2678c3cb7464e234bd63f551a560677e67bb6b5c9dec5ab59b29bd6f8a66db300065cb472b9772420e443a3fc7a4d31ebd2557868b3a6b2fcfe2a"; - sha512.source = "3141fdd4bde1e82edf0677625c3b599516ff8b1f71b19c4a486cf5d68361135983f4fcefbdbb390bbf324d78eafe4bb6ad9ffdca8f7b257fa98faf590ff23c06"; + sha512.doc = "436ee48c2d4d148e366b3e8c7653678eb28fe0f6e4a20db4b51f86436f7815f5c54a0d46113d4b5242fabd081b5e50044dd71cb2ff145c4835258ff56058d57b"; + sha512.source = "39d35726c20367eaf12ebdf1e2cca3ff06ee0002f38b2ea2bc58c6323738c2cd48f95bca9601026d39f15cc0300646a0998b48b0976e9267ac42be7d2495c540"; license = [ "lppl13c" ]; - version = "1.5.5"; - sha512.run = "3d297ec59cff75977addc7320f90a68a6fdd87bcf5aee4947c14e122dc7741e443582075eec4a9b327c3e988da500934fb5426d5e9fc17c7decab4a4872cce8e"; + version = "1.5.6"; + sha512.run = "b293b48e63de3d8f324ad6ff4cf60ec1f261be7e3704fe2354378e1e0a04b142d3527faa7d178424f0229c677b5d882a8bff5157b6787fbb78f69b27793903c0"; }; bangorexam = { revision = 65140; @@ -3047,28 +3060,28 @@ baskervaldadf = { sha512.run = "4bff5a91dd051b5b1468e192a0139357699e3c690c791ef8e9ffaff4a0534622d75b3d731b27c2501f6f0cd38ecaaa735ef4a7263e1a0e482eaa300ad39d0abd"; }; baskervaldx = { - revision = 71145; + revision = 73362; shortdesc = "Extension and modification of BaskervaldADF with LaTeX support"; stripPrefix = 0; fontMaps = [ "Map Baskervaldx.map" ]; - sha512.doc = "a4d81dd0addb5cd47bd4234f6127e9331352acb85c8bcb7109f77249f4a36fbcafd5ab44a20af67bb8aab1e8c6890d1c5baa36ac2e37cb53b0a3e792891a0a48"; + sha512.doc = "b4908eca39e261bdabebea461bc5af78bba84ad7ed1f9c851d15bda08b169ef56df5dce51ec31a7f0552a76fe8d301f23bb09c6183c640176bdd1fa7e0c3cc74"; license = [ "gpl2Plus" "lppl13c" ]; - version = "1.078"; - sha512.run = "8ef914386a6aed11cec27d54020a6f2161f4398cc4b30e6b1095d8800b10d6ceae97bd8e8bd9b8e9b820b121cc19e17c2eb12ff7c17c4a6f62a4f53b5c4d6405"; + version = "1.08"; + sha512.run = "5ac42bc7b97b210aa2c2ef9b64e1ef5a8baf6a194108cc4aab522183eb1ae438843116cba991d1439540dbf8927e484c966ee984cc70ad83e5a3de5ddb230be4"; }; baskervillef = { - revision = 55475; + revision = 73381; shortdesc = "Fry's Baskerville look-alike, with math support"; stripPrefix = 0; fontMaps = [ "Map BaskervilleF.map" ]; - sha512.doc = "131117d2170aa77f83954d61d630cd0714c7542f3b4f5e868f834bd091d0b4cd76185d478ae2e4d35c8b9930262d3f14e675681540fa8363b4aa060ea5fd96d9"; + sha512.doc = "4682a2702b1dda06c8bfe8f72995018c5bd9e69381f40ad76b7048dc88a4974d851d039ab99a2cf7a131c25d974e6a58c0018725b4543850a28ccef5a09ddebc"; license = [ "ofl" "lppl13c" ]; - version = "1.051"; - sha512.run = "d7ff1eaee4b050128ac89aff0d48d50c99936b1e04e778d0594d28ad3b225002012cfa56ff515486c98d9769d499ba5f4584358f8969c6286f07bd535b478ff6"; + version = "1.052"; + sha512.run = "2a2dcd99017a64aca8d9ba4d2e26972e444787b2100e96e49ac807e15f7cfb6900db0249bde47ef2bdfdec1fa9d22d1c1db8cb37c11e9115c3d1de300af0be5b"; }; basque-book = { revision = 32924; @@ -3187,7 +3200,7 @@ bclogo = { sha512.run = "d3f060c91f1ec7f8c836e22b21dd735895055873807690c4d8fd3b90652a7f6f1648decc23f66a6d51c4970a27817642ea6e66b74b2affcf5c938c4707568018"; }; beamer = { - revision = 69316; + revision = 73735; shortdesc = "A LaTeX class for producing presentations and slides"; stripPrefix = 0; deps = [ @@ -3203,10 +3216,10 @@ beamer = { "translator" "xcolor" ]; - sha512.doc = "8893df96934b3325455557a8a4499113c9d69d563452a01a81107054d99bf4ab67308482a70a777491d208d3e008b60d9c8f76cd560f1fb8af82d97a2a121bc6"; + sha512.doc = "d95d642ab065f85ba9eec5903c5b910c1ea10215f2bae83c8bdf1d1ab932aabfdada5b35b262ec969e32a9a25b9800d3236c519ad4a43b6e87daa292851ce9a9"; license = [ "lppl13c" "gpl2Plus" "fdl13Only" ]; - version = "3.71"; - sha512.run = "25fd0161673badc509511fe31b4780a68011ac796e12a841ed185ccb5d9eeaa22c519ddbcd2fc0a5cb70ba94a0752b6b5880f86dd499e4c89f1a5b708f3d7fd0"; + version = "3.72"; + sha512.run = "bde75c691f92694a563ff10463686fa35bec5716c5fcfaec78a2185c49a7cedb76af3f6d4a76493f86e5db147e997637f2674b18289df185f42988eaa3d563b3"; }; beamer-fuberlin = { revision = 63161; @@ -3243,13 +3256,13 @@ beamer-verona = { sha512.run = "71b241e603688bd22e10f171d32ea3dcca1f25c136a7c0d0cea3e72e936b068ea7ced6a40c03d2e2fb21e533506bcbfaf10f450493cb4e2c3df2981b714048d5"; }; beamer2thesis = { - revision = 27539; + revision = 72949; shortdesc = "Thesis presentations using beamer"; stripPrefix = 0; - sha512.doc = "ea71d35ac3e02d3016b8d19d38132ee16960757c9846192cf2213061c9899a9788e98f50dac074b0cf83f6029f883eb1f7784779d0256c719d55490284cfc8f0"; + sha512.doc = "627b31f61353a01e0e17111bd0234ed2cbd11bde4c337087343f07d2014cb5dcedbd64b109de1d8faf935e704618d71b832ff8e4720ff1c2629eea4dc8ade58d"; license = [ "lppl13c" ]; version = "2.2"; - sha512.run = "793ec95902fbecc2de84616b74494d7e34a1a1c88277277ee82bb172c1ef0cc42cf175f62fa2b4926abb73817b7eb258d85be6689b60a56e0faee941276471a9"; + sha512.run = "0958518f403ec4204ed555f02a6cba46db1eddd3774999390255d3eb1cafb116c83d5070ff38a91feaf63344c3394174c05fce9b750a1365e1464a23c258e40d"; }; beamerappendixnote = { revision = 55732; @@ -3373,23 +3386,23 @@ beamertheme-focus = { sha512.run = "bb09ca551108dace02506987f246f1de4672444e8d6ca7f53bbf1cbfb573a7e07b3d2f937b4724821b30b60f1c63b360e200754957289c95379aab06dde14a8a"; }; beamertheme-gotham = { - revision = 72340; + revision = 73932; shortdesc = "A versatile and extendable beamer theme based on Metropolis"; stripPrefix = 0; - sha512.doc = "febbc1d29129d886685ce1b17edc466167d5b32678a0d021337a4010c799da19004c5a6b43b99d0e5ad9adec094e43ed2a1266b382662d9b0e48c05008c05fbd"; - sha512.source = "6fb2b7b99eb69e5c3c1c574817231f1621f41988fa446d830ad3bc4dc14db814c637d159aec8b38b028dbff6eb247d4e67e702d8d0761b15aeeb488465c78fc4"; + sha512.doc = "f9a8f9f2929866f2973e669b93221c4d5da5d42635ba4b29c47d565106aec37c61e82ffc818150b03295cb727a844eb2c2fab0d3bbb9353e412c3e61396e14f5"; + sha512.source = "32579d287b9614c5a6a3b1abfff3659868dd79bb39bf2510a07a23f228c60ac0f9e71e4818ed521dd687836ccb4b67d195422458bbe3a437c59af92e7db60700"; license = [ "lppl13c" "cc-by-sa-40" ]; - version = "1.1.0.b"; - sha512.run = "024e33b589216977c7e873e45ab5a32b00e2ea7f92dbd25d2498874f8fa77c6d1cb6fbcf803a80ea10d5770d55dc163d8f89f1c1a4c54676697b9894e2ced4cc"; + version = "1.2.1.c"; + sha512.run = "9ae5fb8edfbbb1a21cbdb666184ec9431a57b099bba2b8e536eaa2bf3834ca080f7f299560069090c5d6f2a658e2bdb3421c02eb8790e69972ea902ec3638457"; }; beamertheme-light = { - revision = 49867; + revision = 73158; shortdesc = "A minimal beamer style"; stripPrefix = 0; - sha512.doc = "e2d0cdb7fdabe582f2b6f1a656a5b9b61ee3680fd4944c06f108cf69eced96bed7b25e56563b1cb9879e8da42fdbbeaa41d769158c5e256bc70b5d695571a5af"; + sha512.doc = "1062d137ef5f9bcf451f2030509cb0c2614ef1f3abdf52d56f75bccd9a6e6384e5afe5493cdbf8d59d6b6c3bbb059d22ffd4008eae2a37cb5befdf25e434a183"; license = [ "gpl3Only" ]; - version = "1.0"; - sha512.run = "5cc15c3ee0222678c1c97b31805421caac8b20fca03b1d748fd2a71756d5d764b8fbfb32ab70937e890f7755966b520362db98a9ae65be3f83509cfa287d600a"; + version = "1.2"; + sha512.run = "10014038e5d4fc30112f9fec87494c2cd78eb66c9fa5ae98edb72b8ef33f2f766859436d3be434ae41a41188092024094360ae9633de0a36b378ae96d2d2f710"; }; beamertheme-metropolis = { revision = 43031; @@ -3402,13 +3415,13 @@ beamertheme-metropolis = { sha512.run = "dae8058ae5c2883b383a2bcb85bbdc45d0b0a3fab46a4498ea1f3b8568f04d049598fa78b72429adc7e36773905c67801e129378e233582f0fd8eb5ca4327745"; }; beamertheme-mirage = { - revision = 72656; + revision = 73516; shortdesc = "A beamer theme with dark and light colour schemes"; stripPrefix = 0; - sha512.doc = "0922c5f0d6e74304f74fd9b0d95772c919fa2321a8284a867e50aba5b548563f4f74f808876ea3e16e9151df6a4bf64dd9711188f52d81a4253b763fc80c38c0"; + sha512.doc = "b666cef2f31cb29572998900ab95d860bbcb7c8a42677ed0ae08c59ee4d0558c570418bc46f035ec64b39d9077dd7a841f14298edb5fe13aa16af143181e34c1"; license = [ "lppl13c" ]; - version = "1.1"; - sha512.run = "ab160d3ee037a522595fad76746fc0a8d6a2e37d88f67e70c82b584c641c7931cde88dfd1a0f2fe05f8fdeb99ba046deb89073d9dcc4b416d47c26bd22d91b0c"; + version = "1.1.1"; + sha512.run = "1ebedcd3b9f7b4d28ad53ef9cdc03401f9632ac24673cce89e7a8360ea9606a4e6b58336bd74451895323d089e9bd1bb3e75d5e8fe00727720c5b81773fd2f6a"; }; beamertheme-npbt = { revision = 54512; @@ -3438,17 +3451,17 @@ beamertheme-pure-minimalistic = { sha512.run = "b9c6237108e1aa5f4859ebd1100efbddd2bca55c76bca876e0e3a0c10dbd322a3ee834e4e452b80b2f7755ce026fd2bbe5c69434371ad29df1fe3280b409bdc6"; }; beamertheme-rainbow = { - revision = 71925; + revision = 72864; shortdesc = "A beamer colour theme which alternates theme colours on every frame"; stripPrefix = 0; deps = [ "beamer" "tools" ]; - sha512.doc = "5beb176019d15ab5d92582c470b4ccfe928b5e273aa81cb359234386a40f22d8ce494f52d6c8a8eb07742e868466b4e6b869e6b5285416aba027aa5ce8c383b7"; + sha512.doc = "7afcb83069f78d1170f72c88625b3d8eee7d8e69c78fcd7b184d571e83b5b34945be6d934d8b1360141ccf7f9042b1197bc9c4e86a9d8f3b6e7c8f42125b6034"; license = [ "lppl13c" ]; - version = "0.2"; - sha512.run = "e95322c03afa835494b70eae1ac6e2d384dc5f2f6ed44071b1ad87942f3a037751ac731f8127617665fbaabd4dbb2d5309bc21495a79a2c282c376f582c9f327"; + version = "1.0"; + sha512.run = "022b7845a99e4a5b3df85bb6043b778be9f8e6b06cef305981ecd3f18a0221f4d7792579531a6da0c9c3b410184355b938cb0b13e88c4bb8be2fb42c1d2499e8"; }; beamertheme-saintpetersburg = { revision = 45877; @@ -3460,24 +3473,25 @@ beamertheme-saintpetersburg = { sha512.run = "c258a4eee25ccdb2437625982e54def90aec87be003f697a47334be52b85ef223b377c7fc57d49c889121caea664fcd6353015ad2e62f5bee5379bc222958f53"; }; beamertheme-simpledarkblue = { - revision = 60061; + revision = 73454; shortdesc = "Template for a simple presentation"; stripPrefix = 0; - sha512.doc = "9f8f642ebe4cafed03699377be6bb647cbdfb80f99e075e2863b69a4d6b6f59cab6dd4dc831b0fb015302b3737b32d08cf37b3034365b021e8fd9f086f7e6ddf"; + sha512.doc = "1ac2ab0c81a24f9db1c254d7d35eb46ecec1a948452f6ab7e26237a742ce0c485d1ec808255f74417c8230a6dae0b6d68128886d0d31d4f10e442a4a08609d34"; license = [ "publicDomain" ]; - sha512.run = "c75bb4c0f0eecf2aea0e24d30410ca1edcf645c323d88433bc6c12adf116740f2f6bc7d8517db764b0b33d9d9227db93ddddd1c521dde3343fce6d807b0e642d"; + version = "1.1"; + sha512.run = "aa82276be946f01f870859820c0e90c9b0ec56549437a6b6f50793b1ed12aa1a9db2ba536765f260aacd40042f065b412f4dd34e8cdfa34832a1b78c6bb853a0"; }; beamertheme-simpleplus = { - revision = 64770; + revision = 73362; shortdesc = "A simple and clean theme for LaTeX beamer"; stripPrefix = 0; - sha512.doc = "e96132fc4669ec82913ad7610a174815be79476fc40ecc1ed35744292d41ba47bbbf1a7cd9d244b41c12ab515c729655271d62a608ae47cd2acd0324cf0f0ae7"; + sha512.doc = "92158c09ff11f453608a52c9302cd6fe512f668fac2e20c0234ac5f30bfafaad01512d7c6cdb3b2fcdbf87019255a55bbdceb34306b1dacb66cd7b21ee99b446"; license = [ "publicDomain" ]; - version = "1.0"; - sha512.run = "de19e0011817552bbba482517f9ea4f59590cc837c4b539e01db5f08eafa2dc94adda9dc8fd4f92b07fe2acc38862b5a581c195f1776975469d69c1b7fdd617f"; + version = "1.1"; + sha512.run = "8281d86145ab16d00c4c2042406ac94627e642aac35979022d178afae155e78f5b95c443cb097e40e22a7b77475ddebb35c3d74f54e949a7aa2f0da7dfbb2708"; }; beamertheme-tcolorbox = { - revision = 72368; + revision = 73705; shortdesc = "A beamer inner theme which reproduces standard beamer blocks using tcolorboxes"; stripPrefix = 0; deps = [ @@ -3486,10 +3500,10 @@ beamertheme-tcolorbox = { "tikzfill" "tools" ]; - sha512.doc = "8d8aaef90bbb3b0dab4952dbb604fc15a314ac8bfbc4fb6a23e95229b639a03d4a686ac8ee0744b3e973c3fbafb7280fe2fb1ebde25251e8401004b3afd704a1"; + sha512.doc = "4a0df469c8023dd2afd90a2f3aaec461989efad3c78ad67f0a0617d1a9b24ef8d244137c2ec41ba3d98d0159f5861278b4cb5fdccfdaa5e70421463f2a34a926"; license = [ "lppl13c" ]; - version = "0.8"; - sha512.run = "fd1fb6c7fc066d396e020a5b6dff2513f3f84c90347b459eb8d6b1632109b3da2cb0c1b1f02705463d351ad73e679eefda39863741bd777fdccdee5dc826f25b"; + version = "0.9"; + sha512.run = "6cd6d25871cf7aa4013379b6f1c9aa8922a10a96faf4b759ce1b33336e85cab3f1f54e8448bd9b503af81604e8a4eeaba22b79fa9fe8a657f6f38fc67440b106"; }; beamertheme-trigon = { revision = 65985; @@ -3519,6 +3533,15 @@ beamerthemeamurmaple = { version = "1.3"; sha512.run = "c325ebeec7588caaf8966e9b8a71069f1613d694537298afeeb8d01c6c83c7991e874bc5bd070e722e15ac83eb339581897a501dd187ea5ee4919ba9c14fb541"; }; +beamerthemecelestia = { + revision = 73370; + shortdesc = "A modern and elegant Beamer theme"; + stripPrefix = 0; + sha512.doc = "3d80a62d910d91cf2771290d5b7b25856c9ae6c71642009613119ef5d304d8af935c899e96474382fcbf82322ebc59d2ab152914f8ec724a75bd3ba3b6b16aec"; + license = [ "lppl13c" ]; + version = "1.0.0"; + sha512.run = "addc664e198a13ff0b6d2d59032e1134bf2f5f28f4b0d5bcaee52b24440cbdea300b8342ca5598a4347271baa8b927448652c6decd68100615c200571865ccfb"; +}; beamerthemeconcrete = { revision = 69528; shortdesc = "A collection of flat beamer themes"; @@ -3563,6 +3586,16 @@ beamerthemenord = { version = "0.2.0"; sha512.run = "4ac0d1a6494f7acdb1afd73b2bf8e7c966ea3167f856432ebb872f0285cfb8fe759735b57bba5e9ebbb91a0bdc9e2dd643f5ab0686e9417e0719369266d7e46d"; }; +beamertools = { + revision = 73371; + shortdesc = "A collection of programming tools for beamer"; + stripPrefix = 0; + sha512.doc = "4af2bfc838f48c3a8167a43265a6745aeff5f3eed480f8a7270b8781e798b318022c482cdf0155557df487e99934465be1f525ec943955cb636f423c372f68d3"; + sha512.source = "42abc410e4ac3cf6f3ba983cf8a88718cd57515bb045db6bf80480e7afc19c498420b54a037068a7728f9207ad9d86641b803a5b8573bda00b819920f0668ae9"; + license = [ "lppl13c" ]; + version = "0.1"; + sha512.run = "464383ec00ed8a4b70977ee32051a78fcd64f047600400c608f6a54587d6038e8eb55dea4b09cbc36b618a340b23858f29456d1827fc511c03e379bb996e1e10"; +}; bearwear = { revision = 54826; shortdesc = "Shirts to dress TikZbears"; @@ -3752,13 +3785,13 @@ bez123 = { sha512.run = "e70a0889ceab74fcff4994568a97f31ac93165353ac207ee683b28aee2ad3cb8f770d8e3b450e3237537e97312a0995fa8c17196ead0fce55fd76a49c77de72b"; }; bezierplot = { - revision = 70723; + revision = 72750; shortdesc = "Approximate smooth function graphs with cubic bezier splines for use with TikZ or MetaPost"; stripPrefix = 0; - sha512.doc = "00dbdd0587f285142749682096b8a42756a62695113cb5b0fceeaf3026d42363713bf9e21d23fe3b760536ff2fe8970ecdcdadf2b66fd95f97c2072f2a60f987"; + sha512.doc = "88a45ca1316c77adfe0daec03912ab8c6bc09b536d412a9f91316fa9646ecd7ae3d7fa2e35852a4f881643d3bfc1f93acfef56ca5db1de28ecf23d099cdc813f"; license = [ "lppl13c" ]; - version = "1.5"; - sha512.run = "c7e7248ba0954d51e9d690c34e5a0df61159ee866aec6ca1edd1f38c02096b35ca4691e0401485c19b8a2a8cd4fb39ff6dace1c74e473b1d960e6f5ad35ca8f0"; + version = "1.6"; + sha512.run = "43509dc0f0f5146dbd5e7b77d80c37a4f344dd054c0c367f8061155e7fa5b75adad6981651180d5e4a2db9a3403920e3a76bebb43bfcb1556a9326f92e57ad53"; }; bfh-ci = { revision = 70623; @@ -3839,24 +3872,25 @@ bib-fr = { sha512.run = "24e5ada94266ba8786470453bf8a076891e9b7efac1ff64fcb559bfe2c95875d3120634f94f464c9e40da0f45b18a78af1bc428106b31e85851a2998b58f0834"; }; bib2gls = { - revision = 69635; + revision = 73766; shortdesc = "Command line application to convert .bib files to glossaries-extra.sty resource files"; deps = [ "glossaries-extra" ]; - sha512.doc = "46d4a219969aaf897cb4c7705a00d1558b7b16cf0d4b16121672df8df2bdb0c0d0ee3350687b430f1d1d29eacee330aaee3206ef664c406c1d2b1c8c316de0ff"; + sha512.doc = "4ceeb39275296f3a74ca040f37d5d252cd690858736ab4c6c0dfb60e761cee32074937c628250050c88893c899307f0a9205f51aca9f1d4f6b3367951a2af45c"; hasManpages = true; - sha512.source = "662855e5579429694325042e0256385b9a5c40a4b54e6cf98712432469243de567cd5ea68f1ea93a593428eaeaf09d9d5a97e3e670dfe9ba90cd6f8c2383a3d4"; + sha512.source = "b050a53b485df066d5064cdc829cbce7553fa6ef86a44f44d6b6a9f5f0fb48f1285587593f368f90a49032b9c3985a2431340915733ac21705df02a4222c5a3b"; scriptExts = [ "jar" ]; license = [ "gpl3Plus" ]; - version = "3.9"; - sha512.run = "e73d6e0c7596252dade43291fb26ae02c0ed8f2650498294d2b1c36d69e777411fc1637619226f34f80c7e5cc06d3ae07f3b5d2eb144a2e69bde16a22c4aa449"; + version = "4.4"; + sha512.run = "4fe7a069ba7c8a8f15f83da1da3df30eaec97357d2b72edda293cdbd4b724d2ccdedaf8c40d4d0223835f56c0cfcd20a6435e9450a932c7b4445aafc44c4970d"; }; bib2gls.binfiles = [ "bib2gls" "convertgls2bib" + "datatool2bib" ]; bib2qr = { revision = 71940; @@ -3879,18 +3913,18 @@ bibarts = { sha512.run = "358492693511d2de25fc7e080c862e1aa6a6ba40655fbf64991092a4a56c76a35f9fa9f8e0035fa042f0341f8fa9f13a5615079a2c9c56af36aaba4f41385865"; }; bibcop = { - revision = 71186; + revision = 73562; shortdesc = "Style checker for .bib files"; deps = [ "iexec" "pgfopts" ]; - sha512.doc = "db495eab98381c9cbab14df962f93243b091438450ed57f37931c80eb63ebb3703d219c494fe588b3170c2c85b6e7864ba5bd3faabf986b71bf07464ea1c80ac"; + sha512.doc = "34a1e9adcc2314f73fa1760bf2deb61bbbc0955c59732a40bf2b934723af941f1e2b5b9ef77fd366a71c6c48a31621897b6a9068113d43f88b9a271dc395a511"; hasManpages = true; - sha512.source = "9dde1f041268f72cf9b77b7f0c3938591e860662d2be2a084a20895b7ab2a859b0902379129ff6804dcd2b446cdf0d72ce6b81a4a64566a951327e79e17ad37a"; + sha512.source = "191ab80f597a0ffa8d0050ab81e5fcc3be4b70740b80404b5ef6db1811c57fe80a46200ef8ecf0f10d42bb214f045338a9896c5d58253562cff5c9f901c17542"; license = [ "mit" ]; - version = "0.0.21"; - sha512.run = "af20cfd6c4ceed888e143bab8a1e994359166169b8d2d7cdaa0d2fe965ebd39d98921b6a01195eea9325ecea0d799f57091bf879d60eea5c9e8f8346be6cb286"; + version = "0.0.25"; + sha512.run = "19c4003729e949a6251f427af616403f38c05a0f05226820a80aefbe61f09a7ea807c3a15613dc3ee09d7d47cac42b409c0464412717bc698f975ace72248d43"; }; bibcop.binfiles = [ "bibcop" @@ -3963,6 +3997,16 @@ biblatex-abnt = { version = "4.0"; sha512.run = "869aefa289e1e9102e497d14f06be3990e18de38e047563087b51a2d81318af2f2cbaaa292c942427dda86744342fdc413048da5f9479ab4b9f807cca96c50a1"; }; +biblatex-accursius = { + revision = 72942; + shortdesc = "Citing features for Italian jurists"; + stripPrefix = 0; + sha512.doc = "dd63f74941051fc4e17262f28b3071b5745d0c294df4b592155f0434150ac11250fd0e67abc27f8d98d1141ca57172effac3251294351246975a021349420e0e"; + sha512.source = "211a9fcf17066cfcec80628614f05f996662d6923033e57db06e885138c11c089deca79aeaed01e0cf5aa54fbf71dc8854494bc0137c6160f99290652d2ab8ca"; + license = [ "lppl13c" ]; + version = "1.0"; + sha512.run = "5b4e8c708019f98b9ef04255c0f1f1892996920bc9f480e9f216f6cb57167c753f6a208be0a7128c1057e3a0e17bdd9e2ea29d9557a226606a819221ef0a6a7f"; +}; biblatex-ajc2020unofficial = { revision = 54401; shortdesc = "BibLaTeX style for the Australasian Journal of Combinatorics"; @@ -4098,6 +4142,15 @@ biblatex-claves = { version = "1.2.1"; sha512.run = "008cb8403f1b35a7fd077f8ac2f33f73ced090ce3d65ce678ecfe90af8ab6fb2b4349342aa838d2d4f1e78d0d87267c7b8206a3377c6490499ee9196498c130f"; }; +biblatex-cse = { + revision = 73262; + shortdesc = "Council of Science Editors (CSE) style file for BibLaTeX"; + stripPrefix = 0; + sha512.doc = "f0af3db6d95065751c7a9b593b5cc4bd02713a779b555d7d4cb210ccb2d5288bfe08ce457263346575d4b016a23e3d16eaee110fc2a72a0c35b02467db8942a7"; + license = [ "lppl13c" ]; + version = "1.1.0"; + sha512.run = "15f6afc683be1785da6a9ae99999f5a7b009852f90d473a76c7c01603458616522c8db517039b4ddadbc8eda63373d6451a268736335030053d48310a10d19aa"; +}; biblatex-cv = { revision = 59433; shortdesc = "Create a CV from BibTeX files"; @@ -4117,13 +4170,13 @@ biblatex-dw = { sha512.run = "bcfc88a15950bce48844dfdfcaa8cc946d553c9fc31b3820dd52a9f4588c55e253cc593d13b1dda0b38153a21b93a3d9a868398296546f54b5b804c58eebaa1b"; }; biblatex-enc = { - revision = 44627; + revision = 73019; shortdesc = "BibLaTeX style for the Ecole nationale des chartes (Paris)"; stripPrefix = 0; - sha512.doc = "ae50544ebdf7bbf9ee708f193493ffa241ba91f0925a2bf03b6bf1ec486586fde3c630fe717f4f2904373c08a2f9a90afca86b50870f87aa0d04430554650223"; + sha512.doc = "fac8f18446b09d9fd1a2bc13aaa28eb616f9b5c6aca631f551e44839b937cae497201d966d4d01288c45c95d4ced6de70bd7058df5d0ac313f02dfb021a66c9b"; license = [ "lppl13c" ]; - version = "1.0"; - sha512.run = "6aab8a819ce9a3ec2d6676ab8850c3fc6bb81e5af5c9414555581cc9d164184d18ec550fb0ca67d28d800826356f1c709144ee7d38c0cfbc274179fa813a3a0c"; + version = "1.1"; + sha512.run = "ad7a289752d0efbd551f61b4ddf34f61b212e2083285e748ee545837b7a4d2ca2d555f6e74ac891a25294b19bece6b0c7c6acd4439c4ac0d663154bb623fcc7b"; }; biblatex-ext = { revision = 70744; @@ -4144,13 +4197,13 @@ biblatex-fiwi = { sha512.run = "72b1e41ac55403f144529fd5cbd88f51dfd61cd637bd8e6427a2714d3684ffa37774c698475994f1481442cc8eb336d8de398d55b3df28e5e1615b9cd74cef27"; }; biblatex-gb7714-2015 = { - revision = 71329; + revision = 74420; shortdesc = "A BibLaTeX implementation of the GBT7714-2015 bibliography style for Chinese users"; stripPrefix = 0; - sha512.doc = "20be477749c7bb1726502271ffb63ccd6545dae8ef5448b51e0fa5e89dfd760c30237a5dadfa47dbf54bc40c469c4c77a44c500ef6b241c39b4d8b1641103138"; + sha512.doc = "634b6679370bb2aef35ab4505f1fd239be9e4a3ec2f487fceafafd6b95fc235f0c2cf6cef31d47fa74334d649bb8ca0d8c4bddb3144bb29c13082a6a5d0d17e6"; license = [ "lppl13c" ]; - version = "1.1r"; - sha512.run = "c56f52d37f704a04090882609f8d613fc17208ded64e48002828f78f60bf3a473b1940155d151eafe99059c391a839dd2f776677d6143064e7f4b97a73fc3b1c"; + version = "1.1t"; + sha512.run = "e542930b8341f3c3848e98574110b210bd4a19eab4a5e0b4c79a978f4a32a2ed579d4e54222f84aea39e28198b52629138fea73d7dfaa9fec605660e6d9c05ea"; }; biblatex-german-legal = { revision = 66461; @@ -4180,13 +4233,13 @@ biblatex-historian = { sha512.run = "bba5cedd64fcf0c0cfbf9b56c66838141917ba1e7c2f27aea5bda44261ba28366b465415e3674a2ce398812d5cefbb2727c7e5e1adf53a2d9779754849664502"; }; biblatex-ieee = { - revision = 72032; + revision = 73468; shortdesc = "IEEE style files for BibLaTeX"; stripPrefix = 0; - sha512.doc = "54b9a5489cc31810305a18296250eeae46f165ea5b1cbb7a1a959b60b631cc6e69e5bd740de58300c31449779e193286a0ec444b699a6cd86b7c33cc98cb4e8e"; + sha512.doc = "95163e4f91ff91d2256b305c036e881cd03625ec01c1f0cef7ce4a4095cdb7eecb866da2b0cb97d5a06f059f85e002c257a278d217c0ba53cfac4a710270e968"; license = [ "lppl13c" ]; - version = "1.3g"; - sha512.run = "108ced17ce7fd1218aa3b7ced2470b0d312eeeeac20007f8da55fed4b66752efd8efe29b70beef0bdf37625103db2ad06cca173f0edcbcd77f3e1d4927dd5d2e"; + version = "1.4c"; + sha512.run = "29b2ea9416a289ab8441c7bbb0f3c3dd4e06b287330d8a8e8d74e8db13f666ca40b8b5d380fc44a81e474138a3867d8efea74c24eb52c8dd2daf8275ccb3f5cb"; }; biblatex-ijsra = { revision = 41634; @@ -4243,13 +4296,13 @@ biblatex-lncs = { sha512.run = "b2ab630bfdd41150b0be50d3851c03413ca8c8fbb5756989bf4e0bd8f98480a65eadcb9b11ab879f5cdf3b6c980376ff6ca6507bd26248a9f1b42b9217f656df"; }; biblatex-lni = { - revision = 68755; + revision = 73625; shortdesc = "LNI style for BibLaTeX"; stripPrefix = 0; - sha512.doc = "87f37b95865ccc3d66fd514fa038b8c224e1a7df502e6ab59e65a37457f129b1188e510fee0f307296222d40ce241acc307e6e2d2cef7598cc009fb21a9fd7f0"; + sha512.doc = "fa3348d79d83380ad6bcedb2daee0f8119126e100d0c5585c062120b013c5b49a42b3274206a6456fadd27b90d2edb7175b554a47da3498fd5bd56e014b35317"; license = [ "lppl13c" ]; - version = "0.6"; - sha512.run = "f5d636b5cfa0125be2f5f87f41ebd0ce7bb853f7eddb4a7601f72ad42267e6456e2212bcdf5d820db3cd8b2aca058123a8dc2bbc67305cedf331d83b9a007b6f"; + version = "0.7"; + sha512.run = "f925551aa6e762df5439cd2ecb3049599990094cdd560922deb5218b70320d4fe71111b045ac5a277c50de6e51fb2c0d544e34c7495ae87fa41f7570746d4f9b"; }; biblatex-luh-ipw = { revision = 32180; @@ -4451,14 +4504,14 @@ biblatex-socialscienceshuberlin = { sha512.run = "f927cccda37e1ab37bd01b49f3247b688ba0186db5b162ab9b73db7be5f83d1b261bcfbf355d575a3905cdfca2421b6b592ae0763d7575957ea382b451fb6099"; }; biblatex-software = { - revision = 64030; + revision = 73321; shortdesc = "BibLaTeX stylefiles for software products"; stripPrefix = 0; - sha512.doc = "cfe81f1a29f49a756df7595b18ebd492df77fb7ca208418b8627f49180a0a8bcd28b779dea58a88de16b6aa6553243b2755df3e16bca696ecb8a17fc3773135e"; - sha512.source = "6ee3d3df8bbce5dfd06f64b4e959742e8cb273db8f0606baeef97750dabb0391fcf409dce603772c525a0ad10d543e476d9ec217eced690b0c84e7a547a48f32"; + sha512.doc = "de89c9cf9aba35791d5b414adc5f9d541ee1f985b158ee009bfee15ba92cd96461902421dadab20f78dfe9d762449bdf717e83f79c29bc1b5872172c6af6f15c"; + sha512.source = "ba99b7239801f1c7c21061daa9f3e735591c28e64b27114dce26d76ff5b8ba36f725c99666368058900c93e3336c28a03c0e1ebc16ed16afb023c33e3deaa5fe"; license = [ "lppl13c" ]; - version = "1.2-5"; - sha512.run = "a95344eb338410804347bc0273eacda0c69804a5dd6886932d11d72879f4c59798cc9bf902667957cc26b56adc0c2f7f747e8967f85fe5602dc1e786bd3a717e"; + version = "1.2-6"; + sha512.run = "c054bd9c3b6130cde7243c4ea1779728e859d20ef7c9bbf78ebb3797f9e4f25c8baed7eaede7a562f19c56731786994655da882b03ca45e0c9e87fd2dad344a5"; }; biblatex-source-division = { revision = 45379; @@ -4706,14 +4759,14 @@ bibunits = { sha512.run = "5658d508b876a88f3916a190a9090d66f2dbee98260af8d23c8358d0708f27fc80d4cf6c348b1f6e1ff196e7de6d5567e371ada640a9a602185611fb09e64ddd"; }; bidi = { - revision = 67798; + revision = 73698; shortdesc = "Bidirectional typesetting in plain TeX and LaTeX, using XeTeX"; stripPrefix = 0; - sha512.doc = "09ac7b97d9d1a93b80e8dac120cd6e70932ca9239dc94202449a476979caadd596677a210b27700e3638c3cf0bcecf98c4f903ea228f94545a2cf5cb206abcc8"; - sha512.source = "1bdd170bb3065027106944aa23b99311482fd90a019a6bd1e87044f03a04f672e0b01a31d4d09e213db7b228718f7e9ad15d77acfcef7412af8ae180935fd77c"; + sha512.doc = "f650cc554305f1a2cff5c402d10e9423ef75aeb3b5bfec65562c8c04a6b8c49857076f0f146544895b4c0cb42c58bf6a862f0b4e69ffea82be1116dd91652960"; + sha512.source = "c257e7f5a5a89303889a81d75b79902008bfa21659c21dbacf0b39126ab342f7e11d9fa5785596797ada7756183ce5eee6296cc757f246b170e5d7038bdab7ee"; license = [ "lppl13c" ]; - version = "39.8"; - sha512.run = "e589f50dbd63df9d711540ad90b53384e52a5a0b353e2ba050657af3273f3dd7b65925101465d89831ea133504701c6d05d01ef959fcaa2570bb1188384c621d"; + version = "25.2.2"; + sha512.run = "a63bab026e80d3e14624bb2db83bdab9d9d6d266f892b2f9ced48dc2c8761c675e2ff2e21a2ca4d8761e9d90b81103a816d9e8c9ab7c12265cc5876b5b3f726b"; }; bidi-atbegshi = { revision = 62009; @@ -4862,14 +4915,14 @@ bitelist = { sha512.run = "a2022ccc4f45f7a911eea4e99557764770b4e6f2ba0333e043fda2419e29d93bac40462fd36568354a415a9b27204a38620e6191fddcdb053f8956aac5747cbf"; }; bithesis = { - revision = 72491; + revision = 73285; shortdesc = "Templates for the Beijing Institute of Technology"; stripPrefix = 0; - sha512.doc = "4d655db2f03d0977afef5a8e0ed7aa0d5118c6867e4a6e588cf83a951735bb53c5bb42f5266fb8cfdba8953a0e235fe101e7df18a4b40fd729db70d57c5bc94b"; - sha512.source = "c606902cc7cc4d4688b973815b8545a321b94a47b5595b75712ab69c304d365e0f90cf271ea9e868d58e17c598942d4b3c5d042d06238b66fb11793226bf2177"; + sha512.doc = "d8e63a9135d05d0a9479f695075a4309e86d9f168d66f9b1fa0e294a3bcc93658f67fa375e2f60443470a9d403b2d06d2e644bc4dff46f8334cceecc589abac0"; + sha512.source = "4b795ccd37596e2c11499447c12dd0c6c1d2056b4581294c77c953fe06ff422e316434660e0ce60a05daca57a93da4751092c2aec0bd6f7d4a769a42ee71134e"; license = [ "lppl13c" ]; - version = "3.8.0"; - sha512.run = "5ea2b5c97b3d0f88b4317819f017f8cd3aab5883480a469615138664bd573eb8577246674180afaae4de0d706fc08d992de699cf77f5a26d7c8eddf7aca760a1"; + version = "3.8.1"; + sha512.run = "b340851332cb440196684a844bb9b8797bd738857f75a8da8621b0a77a33425a27359a3028f6888428822180f84cfe0f8f0b06d436a91437b656640e1f226788"; }; bitpattern = { revision = 39073; @@ -5030,7 +5083,7 @@ bmstu = { sha512.run = "e8e2af194ab8dc10e88543cdd888438d6dabd37651fcb331df2a2372c863884ee3ff77344d14a79608ef6e87d3b82042497f26045db3007b4cfc85fa33831667"; }; bmstu-iu8 = { - revision = 72237; + revision = 73822; shortdesc = "A class for IU8 reports"; stripPrefix = 0; deps = [ @@ -5073,10 +5126,10 @@ bmstu-iu8 = { "xltabular" "xstring" ]; - sha512.doc = "f4641da097ce0c9100bb2c1044e86f430a3a843d0187c30d828a13b1216d0884b4d317604e7133031bb47a874b6a4534c1c087cf5b27fd5001fd7cf56c64e0f0"; + sha512.doc = "1009e243e6c5d0503750dac72da5fbdc61728336f54af83464765aec4c7a64dfcbaff8cfa46ea8b196edafa432501beec7f664f8931de0c34f731c72c8523f41"; license = [ "mit" ]; - version = "1.4"; - sha512.run = "d2c7e687236f9250530274010fd0510e31ea8751e7614bf31aa862db716bd99392fe9cdb8dfed4087392cc6c6653aec7b64f74fa0ef4a74ddeb12ed218e189de"; + version = "1.6"; + sha512.run = "20aa3e0fa36fb16fc0be04fb12c70aced5719933a8355b579ccad9faf69e06d45964d413a5ce16609cc3895e828b94b7fb273ae4c2972426b1e04b78243bfde7"; }; bnumexpr = { revision = 59244; @@ -5089,13 +5142,13 @@ bnumexpr = { sha512.run = "a868239dada7f16d52c5d16705ad796d6bc536b1943b5c0bb9538fc72242f3fdbe2cd579367e9230e20e2b3e53725ba8cf25d7d2aaca660a338d7863f4661d46"; }; bodegraph = { - revision = 68785; + revision = 72949; shortdesc = "Draw Bode, Nyquist and Black plots with gnuplot and TikZ"; stripPrefix = 0; - sha512.doc = "e9dc19657f581260a59f141747bee7b15d96352eb4b59a2decf116e1287a980b106bfff220642e4d1828d65201484e657d8f4513faf7998c0ce3938a98484ae1"; + sha512.doc = "c681180d14401654727db01619a6758f7757374c1316d4bdea64b08eb4415a5952510144af0a4feb8dd869ed165dec85801dc74868ea3b842b06a83ec214341d"; license = [ "lppl13c" ]; version = "1.6"; - sha512.run = "65c14de3d529c5f439ffe83dbeeb6551152bfebcaa4f6ca8f22bb29340f23cd2541fa7934a5c0163f6b9a604d76c7c2bda3ee6ac1ed3fca04367c08e5f580f39"; + sha512.run = "985e29dd103cd0008c9a013a16937ffeab12b36183da2f82d797ec96de91678b3fee5d770c4c022269fdedc5a216ea7267e85fa0538e09884a69de5c302aa482"; }; bodeplot = { revision = 71000; @@ -5548,13 +5601,13 @@ bullcntr = { sha512.run = "886109fdce6a936d22b829ff769b130a445876073c73b2bc1767610302ba8a40112938311a138e1c93a0495a6e7d5cafa8d3606ca3b2fe48af442e023195ab93"; }; bundledoc = { - revision = 64620; + revision = 74315; shortdesc = "Bundle together all the files needed to build a LaTeX document"; - sha512.doc = "d74b1ec9473c4616642911fb918553350c5c65ae2cd5171d3513d6fdd5b5b774a516c54a5ce09a8fb966a9de6c5e372b773f7e8ade9f14fa2b1a646112638679"; + sha512.doc = "8539a5cf8b66a92d13759f2bf9cd715edda91f1bd870717c4b7456aaf3441f7a170d68cd0b3a0c2c3ab4c485776fad9f33be20421d77e40806f2f4fd8ead86db"; hasManpages = true; license = [ "lppl13c" ]; - version = "3.4"; - sha512.run = "8f1e4428993dda804a2bd6b11504996e6cbef869b98a64d576f0edd97a47b1f2301b34ed234ecf1cc902c74dcb31064a96cb69018ac514fd91eb3e5c1b6df5ad"; + version = "3.5"; + sha512.run = "7cc71231d5a51323ac34c852a34da6de16818498b15f37761696c943129856840a6720ecbe60855e1132a18b81da9385c336e0cda083e7c52841490529a4a60c"; }; bundledoc.binfiles = [ "arlatex" @@ -5627,6 +5680,15 @@ bxcjkjatype = { version = "0.5"; sha512.run = "72d3a88c117ea971faf8bc836bfe32ddc52e96c1fe1546ceeb8a9b298b7a28fdfc8aa4b0f43bdb3fd27126383b289ad293b2ca6c4ad95873948be0651de4ea18"; }; +bxcoloremoji = { + revision = 72896; + shortdesc = "Use color emojis more conveniently"; + stripPrefix = 0; + sha512.doc = "b11b28b4ac7ff39809f8587798b88544fc1256e696bac96d83d1426b345f69e84340ac32acd15d8e9cc6a743d11b41f4aa47c31fa638bf20a41c0d95b7a7dd02"; + license = [ "mit" ]; + version = "1.0a"; + sha512.run = "77191e768fefb877e87376ad65e521e1458e61b64618849b9ff276266dc184904a9fd2194fe04f995ae67d262c730c9bb46dfe149ffe8614e39cf30b01b88da3"; +}; bxdpx-beamer = { revision = 41813; shortdesc = "Dvipdfmx extras for use with beamer"; @@ -5746,13 +5808,13 @@ bxpapersize = { sha512.run = "1a58a1a8281505922f5a6a2abc8695be6826f55dd1d37d8d42633665aaaae98544a0662cd4ba4c384757caa593eb000ff933bb7d7b215447fec6d6f5517993fd"; }; bxpdfver = { - revision = 71967; + revision = 74154; shortdesc = "Specify version and compression level of output PDF files"; stripPrefix = 0; - sha512.doc = "9292b2ca4acab64a682e34f5f52b937343f95f4078a80018b4d76f3b37a160177436bc65e10e1f44eb3def1e99eb8d66455be0c91279277c699b6a9dde524612"; + sha512.doc = "166c6dda672fb9cae020553a0eeee0a95cdacf8236c49af0f52e6c1000d0f37e94ba43e95a785bd89f31555b5ab3586c7b5e27c71d00fbf55e0e8a6c326636e8"; license = [ "mit" ]; - version = "0.8"; - sha512.run = "70c8820e1bf87c8429407feda8f31063c9231b58bc9f69221bae998c35ae11ff641b1508c6358118ebf397d10214169d7e61609481ead56b47c956609906a473"; + version = "0.8a"; + sha512.run = "0b83db909aed220f3395c34db2c77fdefc9e97fd857e4ad548b4c52bd46c52822496c06c7e396accca2fa3db6d796d3aea83787cd47943c6c041458b81019070"; }; bxtexlogo = { revision = 63231; @@ -5792,14 +5854,14 @@ byrne = { sha512.run = "ef27aa477ed05bfbfbe3729fcfe119f9e7e3335b9669a34ae812b21084c2063b819e1201340f3db269f9f2234b5644054ab30fb3112b6bae142c7e5a0c6831ea"; }; bytefield = { - revision = 68366; + revision = 74421; shortdesc = "Create illustrations for network protocol specifications"; stripPrefix = 0; - sha512.doc = "98e7e38ae0a9337fd9926af76e51b6381436d4e6cc9b05cd1beee2f8b01d460643265c09b53b1058e72cacda1ee60df6adfc210efaee67b2b0cb31e3d2624833"; - sha512.source = "d878e6325e42c5a7e2695af6ca46d876c56eb4f0bbeb75e560ebac50bac30dcbf6df4b82a1379ff60e713e5f92840150c96fb1b637591863dd9ca1387e9a38ee"; + sha512.doc = "edad854d5b1e043a7c25627dd868f5f2db41b914db98720e456b0cb7f7afb61087d7522e1e882d97e6a5871f2d2e5cb129680f5532ff95b1dfe7757da68cb777"; + sha512.source = "41c46b66de9d6d08c49ea88f703bc4fbde6a09dd8ff7639b9419d617b8040674551590e986c38a3d268fbba32a70c6561b2a19d7b97a9b1a9ed3cbe9b1f3e24d"; license = [ "lppl13a" ]; - version = "2.8"; - sha512.run = "394c796574674e877a6532900edbe3555b63aaaf62bf2c8bc8dac280c60064d77bda56991ae1c1a208fc8bde4c8e990cfbb05d21605fdd4f934aad0403775f31"; + version = "2.9"; + sha512.run = "8eb3b51a325bf4826d7166b8c71936c2fc08b551e28a777c79b75e5596ffb8ee862977233dd408eade1d72c742cfcf3694796c5501054a7816fda2d926f776ba"; }; c-pascal = { revision = 18337; @@ -5912,6 +5974,15 @@ calculator = { version = "2.1"; sha512.run = "de62244340b27b1b62c7cfabc8da5acac3da0440f3190c392ae86f6160544d3b8e44dbcf5b5c95526b87cb7a0272c63fb19c06181c2b996e6de2affcddfa797e"; }; +calculatoritems = { + revision = 73716; + shortdesc = "Insert menus/items for classic calculators"; + stripPrefix = 0; + sha512.doc = "68c6f5cf8cd8d5210bc71324c9b6c6b1e52b2f2d53b04a582f25bfdea458e64d38545216b57d237de2b0014d78cdd1b737467b968f0ccaeda55111810c23dd5f"; + license = [ "lppl13c" ]; + version = "0.1.3"; + sha512.run = "198884eee587e6d0a9ed79fe8e884c032f097ecbff4425484e548335ae767e64ba8e6df667c9c39e57f9e4587fcd7ddee61c7f4f40bc0f6d5650ccf096aa155f"; +}; calligra = { revision = 15878; shortdesc = "Calligraphic font"; @@ -5940,6 +6011,16 @@ callouts = { license = [ "lppl13c" ]; sha512.run = "a440d3815f5c5a6d291ce4d7a20bc8483bebe190a0e6944de9f5be78a23eef119f41740ca0fbae4515b6ea7f2aefff90a62005883c44e8d70c6aec0a58c777ee"; }; +callouts-box = { + revision = 74040; + shortdesc = "Provides visually appealing callout boxes"; + stripPrefix = 0; + sha512.doc = "18bc417f35bc30fa199fa9d88b531ebc7510292a87f454c7c25c7c599234e97ea27ef71e46b6514ad629756ad46246bacc5bd637a004292d0901c075adfd4f1c"; + sha512.source = "15e65d7f3dd16c1600dc667be97d1da394b0553b77e88e81e122f79a8c504bd6e45d5b1c15bd5beca202dbaa79a878562a201d26106f803f1a29be6c21cb2f5f"; + license = [ "lppl13c" ]; + version = "1.0"; + sha512.run = "d69c95bda3135cdb27142fe034feb7821bd1e26e1315ce5805ab3ede6db85650479cce0087b8a7153ae0e3650e0f5b20152523a924e3a6cbce9024bc5ad9b5f1"; +}; calrsfs = { revision = 17125; shortdesc = "Copperplate calligraphic letters in LaTeX"; @@ -5959,13 +6040,13 @@ cals = { sha512.run = "75321e774560d7a205a7bf6b7d2d512c6aa9b5f38f6116813ff43ebd4d1fed23ebe26c235b278ee5723062e49630fc5f9480dccbe5bdfa44f5168f18657ddadc"; }; calxxxx-yyyy = { - revision = 69266; + revision = 73249; shortdesc = "Print a calendar for a group of years"; stripPrefix = 0; - sha512.doc = "8c3f1a6a168e5891a07d39c7f67270adc521c19cc4be6a302dc779b9bc5284bf4aa7d9b3caab22b5591c0483800ce62f0647bf9e14c83902777aad0070e4193c"; + sha512.doc = "f2eb8dd1ddca73103fb752049b81f937818614153e2cdb322578c471d90eb6d3ab84451d22e540a210bb87f81c17de5d70d2a439e61ac61cd7f0d737fbe78219"; license = [ "lppl13c" ]; - version = "20.24a"; - sha512.run = "329c4f91442d8115c997bbab09ae77e29bd2a8146d3109328ed9e08a2a4080895618b9a8467d4827c14ef65741b1380771409909f80d0b5fba6f527fbc900411"; + version = "20.25a"; + sha512.run = "25c0eaa8729418e5a8db5491347921f8d08737e2660e55c613beb47afecaae58861c6d0bf04cbd003913e76c4db3606d9b4dd6447cd63ad84865b88a3e3dae11"; }; cancel = { revision = 32508; @@ -6108,13 +6189,13 @@ cascadia-code = { sha512.run = "3164663a54bc3ffe39aee9cbe9501a3d405fd8879059081ee2f0f66bb523686e25f3a7fdb69e61cb623a17ed21f21b0d6752f8c05b09590672d04315d5d6594a"; }; cascadiamono-otf = { - revision = 72257; - shortdesc = "Support for the OpenType font CascadiaMono (with CascadiaCode fontspec config files)"; + revision = 73392; + shortdesc = "Fontspec support for the OpenType font CascadiaMono"; stripPrefix = 0; - sha512.doc = "4e8e1c51e3ae538afe8da337536f2c0a9feb328149ac228b62d52ab2b6e2a3f5a897dec6c5e1d0ae962ba0f2f6937ca988c398b37782ed50ce91e8896dc50ff5"; + sha512.doc = "8390957e077651b571799bfe8128c131044e70f46a95a05ebbda6af2c2c9dea4d61be96fb97cfd5c68ab0e05d70c06e1a244ec625380119622c1eb73f7328657"; license = [ "lppl13c" ]; - version = "0.1"; - sha512.run = "f7c2f69a5d024239ae57eb6c367f359ac6a10153ed8ae1cd47e7882a7344e68a2b457449c7d886884f66c48f08175e7d2b766f00c92ca4dc5e29be1907ac54c5"; + version = "0.3"; + sha512.run = "99bc7258a6e86d73addaa87e1bc1fdfcc15c1a50b8e2bfbda73b08525e7932548945f529357831b1b71625a2856f26c816a9ada39fe3372c4c59870b045b01ff"; }; cascadilla = { revision = 25144; @@ -6203,13 +6284,13 @@ catppuccinpalette = { sha512.run = "32b9e674dbad59d2606f63af41ad8e58ee599ae9778cabecc9320aee51846d08f66e16230b5e0c2d503b512ccdffbfbcaddc06a653ce3e0c23a7bec29b041676"; }; causets = { - revision = 66359; + revision = 74250; shortdesc = "Draw causal set (Hasse) diagrams"; stripPrefix = 0; - sha512.doc = "241ce316af86e3f764929fa7c601a1533b86f85dacfbf2e81acb487b312c7df9c2a9ef1ddd047a977cc7eabaf4643caeca7f5c07979f9509867f3d522c507873"; + sha512.doc = "5777ac98fe2436174ca4279dbb17aa2507f36016bd4b82dc601ad4e84deb599ae8c0e5d3e3f4f782383631952c37ef1bc60b0d0a4d8d14e330c6b6e8d50c1c97"; license = [ "lppl13c" ]; - version = "1.4"; - sha512.run = "961f6affda4b94a2f67e1acfd62a12439faafc436c66320b04c3df11383016375f0bd284836a0618def46e624e7e7a5f46524bfb9c3113575c88d490d117a417"; + version = "1.5"; + sha512.run = "d0e73e927159ea5c5d9ed3f883be7e70214e61d674c8d96b3127b48d24ddab5cd019052331dd014a20a9d269e3c7283475e727d5026ba13f3a99ffea9fc83d02"; }; cbcoptic = { revision = 16666; @@ -6434,17 +6515,17 @@ cfr-initials = { sha512.run = "b4799007822a3bc82370b72ead503661f70cce1beb7a27bf1bd2523283a248045b0ef863ab1dd9bd93b39441e50d51fabe11a12fe6528a7966219a2da2618141"; }; cfr-lm = { - revision = 72484; + revision = 73889; shortdesc = "Enhanced support for the Latin Modern fonts"; stripPrefix = 0; fontMaps = [ "Map clm.map" ]; - sha512.doc = "cda452908a44e490f9d9ea419b8ed7543c1932744f9819625b3584439d60991d52a0c1683a2b865fce5ac637d841322fa482de976d49d1aac7a9e608fe1ff8e7"; - sha512.source = "5c776e3d3ead4a5b769a253e1aa54d290c8342efbfdf4c08622db33d59805520834c3065872c0994b718a888801de88159b38daa44532b3639e8ba30a09e92f9"; + sha512.doc = "184bf1337537ca55d99dcc3c2c54466148a9b0656bc30e6b710dfb3c09a1944214bdcdaaf9d9d2322410c28c5117b0cc96847948a1a1a7e7bb43c14478c6df51"; + sha512.source = "dd88f2e01ede0994b7c356a85be0abb160851930fbb76dc5f464a6854404370991e1ab0492cfcd4c5ec48fe987fe07e2e017a2d974cdc98f075043c017c28582"; license = [ "lppl13c" ]; - version = "1.7"; - sha512.run = "57a4e71d2a99ed0c60b055b158b46c02b444000d67bf12e071db8283914940886e2faa4a44766043a92a32376765ab96e0e852647df419cdfd52d51835fc394f"; + version = "1.8a"; + sha512.run = "a8cddfea8b0d5d7d0a10091360d7f521bb49f054ff2ca4932b74e111859d8cb4645d2a45eed37d4388df0d51363c29217c57a5574b1511a5628fd1b956e3b611"; }; changebar = { revision = 71847; @@ -6466,13 +6547,13 @@ changelayout = { sha512.run = "c6852a40bc8415656b8137cfb90a79cff8f8e9938979eba4e02dadb3c5d1ffef60966f9e5779696402f2b9344026ebc1e22ddeb9dba856d779317ca801f26e7e"; }; changelog = { - revision = 72305; + revision = 73157; shortdesc = "Typesetting keepachangelog.com style changelogs"; stripPrefix = 0; - sha512.doc = "30c37a6ce616419454395254d6159bb846eb28bf88e8c91ffc47de08de8055e2041175579305a240edf6dc25a597e0895be5e4110bc52e83529dff9655e75e52"; + sha512.doc = "731857f70faefee5f7042d935820fe9d2402cd569cb63312cb2b550c95a4d0da0e70dd1e3f41ca73e3a95a779af20156f8d29634f44bf1669016a10bd1f32ef2"; license = [ "lppl13c" ]; - version = "2.5.1"; - sha512.run = "173ce39eada5619e87bbd03b2aaab1d5b9ad1f0148af29c35020a213a06c8e469ca3f1aebe570a41d89cdbdc4c8d37b926bed784ad95cf88fe7b2508c50648bf"; + version = "2.6.0"; + sha512.run = "b5ed92d16b55932d43139751d7ca583faea2d3c53ea2867b4dd9abc25fa4bf9519993c43838990475ac9b284b0967e6ea6cfde15413d05922fa9568d22ce7481"; }; changepage = { revision = 15878; @@ -6554,15 +6635,15 @@ cheatsheet = { sha512.run = "5d50e5bc579821cc9296209983af68f5c12f6aaea90dffe386efb85d72683c10dd518fc2abefd51687402125bdd4f108ea6325c546ed6b2216cff130abdd1a51"; }; checkcites = { - revision = 70397; + revision = 73120; shortdesc = "Check citation commands in a document"; - sha512.doc = "e92c0fe91d5ae9a1e0810123599fc516355280fe7736af904a3bc7e6e38101eadb49ea0b5bc0db706f02892a0b75d3b52d9db524643dd18090dcf1c5a913f00b"; + sha512.doc = "220fcd050caa63f551c93a7bde569d9c2751dae11c03a4174d4ae20e089e16266d153f65932bbda9fdcf78730d170448104d36960e25d703f781713b95515117"; scriptExts = [ "lua" ]; license = [ "lppl13c" ]; - version = "2.7"; - sha512.run = "a6d0b8d35bd19cae661d081c76e48d3de40c277c5c5c40907130b7396f179ddda52c76288fe6bcf440f014bab2a5e5ce94831d9527b566579e283142a0faf7e2"; + version = "2.8"; + sha512.run = "7635afc01a22f18cb38dbb46afce0192c6ad9ebdfe99119aabd882602fda769d8c374dd86b157094c8c96f3a27f40faee58fe2c7d1df7446b9eb3917a678a18a"; }; checkcites.binfiles = [ "checkcites" @@ -6778,14 +6859,14 @@ chess-problem-diagrams = { sha512.run = "992cc482cf0696e00edb4785192d37eb4ee589df644523819630cfcf656f5cd30878dcd135326989994235d919f4defacfd4d93b0164d22b3702a5b57c21ebcf"; }; chessboard = { - revision = 56833; + revision = 72795; shortdesc = "Print chess boards"; stripPrefix = 0; - sha512.doc = "1c2e8ab2776a247ab1cbaf5527e04392dbcd1eae3a9b1c6785223268d1811a778c0812a1a5437a15cf4bbf08ff28785a57da10c472dd7567f1f0217b2d7de556"; - sha512.source = "674ac2dd69312d3959bca053d5170bf98381ec70e3d688c991e276f07260c10ded70055b4f9b819fa0cefc8f1ac7850dd9df61d38a97b58c0fc05c824a42c3e5"; + sha512.doc = "c5ae4db442e578293ed9e09f44d4c392291cb3b7c20c15bf1b08e216e948c8897a8201c6fc1dfbd1671dc3f8a21c6a78a12a5f81ca0d79ab260c8c2ad58d1f82"; + sha512.source = "c078a3ffd706eb626d88e00d2af0216119fe5fe6d5ff39caa93ec7b7cf7fcf0af61789f9267e47d087c6056cfea32f5e3faa92b1ba22b9f209202bb375ec005b"; license = [ "lppl13c" ]; - version = "1.9"; - sha512.run = "9447eb4dd8712ccbb519f91e99ccd1c64cc0e9ba904bd46dd8c83ce03c31e5caddca8e76c2cfeeefd5946c8881b9e6b198d50c131a1e8d5622b054d1459865cc"; + version = "2.0"; + sha512.run = "6d23ee4e644d58deb6fff5b9d0bd9ee1808ad9aa30e0718c2d9920a35eaf86aa10c3eb773595971a8530793d91282059754e0efa26bb2c66c7e764a919d4bef5"; }; chessfss = { revision = 19440; @@ -6998,6 +7079,15 @@ chronology = { version = "2.0"; sha512.run = "0706b70147c064fed807d750e3619d6f6c9ee9d875de70c8e08720bd0fe86e75fe79a2dc909ea9c76d98e0f6cd864957ee213f58f2753eaab86bbf2866b301e9"; }; +chronos = { + revision = 74376; + shortdesc = "TikZ-based package for drawing customisable timelines with support for colour schemes, styles and memoization"; + stripPrefix = 0; + sha512.doc = "fbb3c60fd5bc03d7d81ca672249856f1c2a77bfaf4a2e1932dd6c11160e03fe17e19483d50b581feca259cae3364fee1d039634d5e4d14b571410257041e5603"; + license = [ "lppl13c" ]; + version = "0.9"; + sha512.run = "1a48b335d0b3987242377dfa9de6daafe3abfee68b43287b09a0cb5113abe2015cff2ec10f926943bc173a4c8945450a5dcf6bdceca50db884a87f4a00d7b25f"; +}; chronosys = { revision = 26700; shortdesc = "Drawing time-line diagrams"; @@ -7041,6 +7131,15 @@ churchslavonic = { version = "0.2.4"; sha512.run = "6b312822caec9f9d71396b8737010e59521cc59a744c6d2e0633ac26b24ab0ea97ef29472a83b49448e8d82225ccb63926cd91ffdacc523ebf37bfbd2d4cf6b9"; }; +chuushaku = { + revision = 73263; + shortdesc = "Flexible book notes in Japanese"; + stripPrefix = 0; + sha512.doc = "9d81bf3e6899a3e19cb4cf72de8cc0d99e402d95e83e580adf8fa4c4e7d51863ddd9cdc395fb6dddece8e7e0e715651fd64dd4e64fc26ebf3433800edb21e687"; + license = [ "lppl13c" ]; + version = "1.0.1"; + sha512.run = "92b85604484b0c8b7911064cd0549be6020a289f24cd471b2be136b43d944d48146dfbcea3084a274560c6a9c35a2f75cbd27f8b9ef1c5e28b906fc3d9e19131"; +}; cidarticle = { revision = 68976; shortdesc = "A class for submissions to the \"Commentarii informaticae didacticae\" (CID)"; @@ -7091,34 +7190,34 @@ circledtext = { sha512.run = "dfbe176e0aad1e025797a675c3692e68cd56ad4e30b0a37dd8ee27596ea2fc22f7ffe3601a1420616aecd5c3abbfdb7e9591bba731c8de50c06879f7ed7bb3f1"; }; circuit-macros = { - revision = 71389; + revision = 73012; shortdesc = "M4 macros for electric circuit diagrams"; stripPrefix = 0; - sha512.doc = "fdc1a580c6286b5aa67d4418157dcb0361530fc04382b1c81bb4a4e00b4b24237f24620fabd63a5949fb31f46c288b1a61752f164f7d7ae7eba317d721718979"; + sha512.doc = "19dd2f85536264768b73d7cc8d88a83694f387e9bb83238b12f93536f819fcd9293d48622e254c9b4f62186f27f35e3b102f361af54a76bbfcbf777f069a44fc"; license = [ "lppl13c" ]; - version = "10.6"; - sha512.run = "2c3b2e7296a8a33e3b926c461e1499e1a4792a08b6005abc31f6c9eac53f6b342f674153e6985432c3a7ca9b482ff58ec5df93a236300f6bb90a382ca6f58313"; + version = "10.7"; + sha512.run = "b9f43c1008e5471073ea8dc6f16ee69f9cf1ec887064337c45bfe0e19fac5202caadd0de57c7cab42ccce759beedacc5dcd037f374fddb36a1daa193d1def5b1"; }; circuitikz = { - revision = 71968; + revision = 73395; shortdesc = "Draw electrical networks with TikZ"; stripPrefix = 0; - sha512.doc = "7567d9e9f69d40f305c858b00192e52843bda3ccca644e811d99d2a92887f39ff05199a09711aadfc627d02ec84e49f19228b9a1e8d893984f66f72ab29c6b64"; + sha512.doc = "78b1e0d4c34d9646e41068ac2f0c5e4a9324b60110398f490dc238f95e9738d7329d18d25e66d548611eea325c827dec84aa97602222715ccb9f697ae18d6ecd"; license = [ "lppl13c" "gpl1Only" ]; - version = "1.7.0"; - sha512.run = "d3c1772a0d15cd84c88bd1b988875d1ebed6f84562d911a346c218839185e3df88f7bc0b0dd379d411bbf4abe25ed99ad5734cf0de73c61a9a7aa919790411a9"; + version = "1.7.1"; + sha512.run = "03681e8b4021057a98520ecaaeb9ac6b898b537b312890f340474ef4620e1fe2c64994def959e658764126755bff9e1230bcee8201ee1d14f1eb0c29609f5235"; }; circularglyphs = { - revision = 68476; + revision = 73069; shortdesc = "A circular glyphs alphabet"; stripPrefix = 0; - sha512.doc = "8ebcaacfdafbec747a690b392e872a9ee8e7293070e3200ef583f6f5e660a5ab813a8a426464f024c493e17e956f1192984ca3a58fd7abbfb89fd403fc1e359c"; + sha512.doc = "da322d1f013d79b31f6f22c78da5ae20f8a92e3b0a3630cba3f7ff518f2bbaadf5e538f7544f130549cc2959b5f1d9436ec794deae3f498d30d0969546f57173"; license = [ "lppl13c" "free" ]; version = "0.1.1"; - sha512.run = "043f30f3b8e7834698e2c70744ebb66f938ff7189c593f54b1d3017b84cd7fe180b5b7685013985f68c31f8e62785804129ba91181053119679ea4f775676933"; + sha512.run = "4765517f2f4dc207d2d606d1ad17aa4473ab026a84900fe496a601b2d997dc854cf3eaea813e6d4f3f99cb102cb0aa019056a53c94ef877f47ae06020ea5d835"; }; citation-style-language = { - revision = 72473; + revision = 74250; shortdesc = "Bibliography formatting with Citation Style Language"; deps = [ "l3kernel" @@ -7130,14 +7229,14 @@ citation-style-language = { "luaxml" "url" ]; - sha512.doc = "e2d1bf12756524f8bc308d9a1f53fe344969979a34191b626990f5aeba3f646967d5655601fec8bd0c08b09ef8002857b869088cca40bc77ab40fc7a3fcfb5e0"; + sha512.doc = "f7b8f29fe355513ad7c8cd4597c7969fd306ddb9ab3bbb0cacf2eeff665338ee90f9862b511d9f3287e8a1425b53450e75b8efee8b719cedac2abb0623055b26"; hasManpages = true; scriptExts = [ "lua" ]; - license = [ "mit" "cc-by-sa-30" ]; - version = "0.6.5"; - sha512.run = "7c73cfb129de2d2f7360a67b66c58edaca44a20ba42fb446799284f89ac4783799dbec832efcd9a538d023bcc20d5d3413d9bc07485a17f06f3fd62a1f2b576d"; + license = [ "mit" "cc0" "cc-by-sa-30" ]; + version = "0.7.0"; + sha512.run = "9aa64dc4581f7ecd7ae63c24a116129cc6a94091f7924c688b810220b7477e6d9514f3c02b6417973058c476545d2a86430c48d83927a45bdcd20c92b517da30"; }; citation-style-language.binfiles = [ "citeproc-lua" @@ -7306,13 +7405,13 @@ classics = { sha512.run = "86eaa987025658749c642f5132933745a418002feda5a3dec0f1dd9967a178af7e9c3188cde0b0b1fc8fb9ddf5cd59b68cf95942bd811d978d72a68f44a2999f"; }; classicthesis = { - revision = 48041; + revision = 73676; shortdesc = "A \"classically styled\" thesis package"; stripPrefix = 0; - sha512.doc = "3eb82d6c0f951a060e56c763e90ec842d1692326501f538d71780f4a0981edfda33b0ac0b5d00ccded7d3273fa69d4dd5d4a9c3557d9a69e1c3bc17375fbf43b"; + sha512.doc = "2ee53c2d146c2cfaa8af69e71a0a70e3199cbab6e2eb4fef9e545e2841e615fe36d0aeaa45652ec0b9e0c1b0b300ceccdf0eb016e709533d3641e12a375e9fac"; license = [ "gpl2Plus" ]; - version = "4.6"; - sha512.run = "9a8c0c9ad0d97f187cf66679613514000324a72d2745c1026889b73e5981e0dcf36f388a0bf630f5ab35d28a39ae50ac842db28c214442ccfd987ff2c132ce7b"; + version = "4.8"; + sha512.run = "2a9d8c192667d69e6653374e017a65c8e01420e45a600fa664921fd9de9c306b03473726b40560031671ea338785a6cda64d1e9e449ae9d10dd709cffa8ead32"; }; classpack = { revision = 55218; @@ -7383,18 +7482,18 @@ cleveref-usedon = { sha512.run = "ef67e50ab2da6b16e97a99959f2b53a53844f2f408d265191a561dd0691f17466d14a54b24ad6fcc9a520f151901d8fff5809be92f48e580bd049a6e21e189ee"; }; clicks = { - revision = 64602; + revision = 73208; shortdesc = "Slide Deck Animation"; stripPrefix = 0; deps = [ "etoolbox" - "xkeyval" + "pgfopts" ]; - sha512.doc = "fc84edae6c263a889ea5b1d7a99b5fdf2c22bbb45c9c104e63d821a80b498d1932e654034f289a7470a15cb2ea6082eb8d8fedce24b21b9ccbd5e4304043d6b3"; - sha512.source = "ff19c270587c08c28db6cad54e2a58ce23f6041b08b6d611b7ffe6fe2b6506c1a7ae33ded3fe3ec59cee3fcfc276e6a1dc3750291b4f7691255066805ca90158"; + sha512.doc = "20a5e396fa49edcf460436ba7926103cb2296eacb26133128b239b8d5d30278b3341758e31043de08c5fa6148a69e7297171da2078795f118d61fe647304f399"; + sha512.source = "8ad547f1614e57e7d6c20cac3430506c6abc1066ff34d73374ed550f80e757b1def04596bd0af51998d944a5408bf811c6af628a233d4501b00bac64ada3b580"; license = [ "mit" ]; - version = "0.4.1"; - sha512.run = "7218b2bf0f28a0ed382e4884aa30b59c2d8bff76a3d7a09461e5e3ebf1f41648889005db3c79fe203a4d3753a65f76a48058582e25f57e61d972e8256657712e"; + version = "0.4.3"; + sha512.run = "c6846fd17ede59a78cfdf2dda3c7a51b10e12846452aaf60a1fdc6977dbd34c80034fe7f3b17919b83e2363d9543317cfae6d78b0be92af6cbe4804039ce48dc"; }; clipboard = { revision = 47747; @@ -7790,13 +7889,13 @@ codebox = { sha512.run = "04f63b435f360fdfa81bb7afeef38117a8a4b81b70562e21020470f49f33abc33038d6c55665a5ae4573ff61c19ed9120e824eb319ea97523fe1fa8e82ba9424"; }; codedescribe = { - revision = 69943; + revision = 73933; shortdesc = "LaTeX code description and documentation"; stripPrefix = 0; - sha512.doc = "b216586a47e207f374d9ab248cc1f14cedbba9c1237ccbd0afc77471ce320a6832f77cdc2b6f537110164183b6ec611456be5b3612ed947d0de97de3e8f52b5e"; + sha512.doc = "7850c0a0a1f7fbe6207a5d6ef5af78afa70b5613d1c00336518d653c3d73fc34d0af154fe660256dfff70a2e85dc8e63953cf8bcf8b2f026f858330fc9c2ac95"; license = [ "lppl13c" "gpl1Only" ]; - version = "1.4"; - sha512.run = "90b1ecf44f47686ae877cfaf822d298dacfa4ccdb23fbba52809bb95d34015223d014d49adb2ca54408bd2e99536bcfd28a0e78bcd7f7c8d106d42235d57d6ca"; + version = "1.5b"; + sha512.run = "afa9d88cdc3f3ef66529b9a9d1c8bac2a01d9fce97674d2a3dbe4ab85ff225b63e2ea69b63fc6857a63504d61428fc6105727fe15b9b22ab8a36406e003dec55"; }; codedoc = { revision = 17630; @@ -7808,13 +7907,13 @@ codedoc = { sha512.run = "8dc006776f2a3f0f28aeed0450e2d7b714402de1939a92d1e7f1e0174a8de7e9f7099e7ae9a5de34df03613ff16800bde17f7cc90fa82798f30c775c10c655ff"; }; codehigh = { - revision = 65787; + revision = 74191; shortdesc = "Highlight code and demos with l3regex and lpeg"; stripPrefix = 0; - sha512.doc = "f689cede2e83dee785e3b83094f5897a8d7af4e39e3c33779acceeb7ed0c1226d094aca64c222f4b1488916e7ad78ed1a6b8800070910d4e0daf6e6ccd24bc5e"; + sha512.doc = "0d99990e752e863a9db1ff83977c692bbfa00c73f5c3249b41167af03869ed773e1eef1323879be127754ba79a61990832899e080337860a8c21632d12412d22"; license = [ "lppl13c" ]; - version = "2023A"; - sha512.run = "ca33d6cb84e716357cb18d8448f8e047b4bc049cca8e77aa80525a209c66ae4b93dcd453f91672cf15fc5305ce1d62768e9851edd6fb07214153100cdacfc884"; + version = "2025C"; + sha512.run = "2e6588a7c48020e92ef3db136507b01aced73cfe66e8afca257c6465a16259672fe0e6e2c0e1ae059c0c1b3f418c4a3494417fa91acb5e5ae46daa4ed533f76e"; }; codepage = { revision = 51502; @@ -7877,14 +7976,14 @@ collargs = { sha512.run = "b55c95585cc2486ea69e83689322ca6e5842a2c285ead5a88f23d42df108c6698de7f2a897fd0f2be34865b8329ae0d35a3437a30eb880919ce58dffebc1e9c2"; }; collcell = { - revision = 64967; + revision = 74192; shortdesc = "Collect contents of a tabular cell as argument to a macro"; stripPrefix = 0; - sha512.doc = "a516c5c4030957305e413e252cc59f33652b42f2d0dc0aa0fbe297f33a68da4d534f0b07684d39276e8b6811b53b775db45b774e7ea82fc9b0c7382910ab6442"; - sha512.source = "1cd565603f9c6e4b267d67b501842a95916072deac09b0330336d8d2b97cce1a7571f9a8f0725958a920f0d786d1a3a6aa8682b232e276b9fe8e4208a08c34cd"; + sha512.doc = "b52907ffd523be5d60ea2004de003d0194b960da8b3dfc1b1d04cfc1ba2ec4aba7366ed2e3d15e4740e260b86ec6b4b4580c06c62726934ea863f4ed216ce0f5"; + sha512.source = "45cc68494f9683484d4491934a117b3a1176852df6fdb85aec6bade4f39cac02e2e6f09517116d2eeaf3fa62ee703ad77ef841b1895f14bbebf343a4c311f3c1"; license = [ "lppl13c" ]; - version = "0.5"; - sha512.run = "ecc414d09b916580b87aeba0192b55e698782ee9fca088ff3d3ab6f247ff2fa33caa0cf6913870f8f3219806e2ac88674c6f7692ebdc027675907355c38c6eea"; + version = "0.6"; + sha512.run = "bf4a4b147890d3eea3524121dfe836b3de20d1db01d6f9431c15213de15b5ed40b003695f87b635ea21be8832998b99470851454c1971a30830cb052ff7994fc"; }; collectbox = { revision = 64967; @@ -7897,7 +7996,7 @@ collectbox = { sha512.run = "59316a336010c03bbe288ecaf20953666d084500165befe465ac87210795f2ef68693e5fe155b45a461a690d918d83aad247dcd52eb40cd0bf80f6c68fcd8071"; }; collection-basic = { - revision = 59159; + revision = 72890; shortdesc = "Essential programs and files"; stripPrefix = 0; deps = [ @@ -7911,6 +8010,7 @@ collection-basic = { "enctex" "etex" "etex-pkg" + "extractbb" "glyphlist" "graphics-def" "hyph-utf8" @@ -7945,7 +8045,7 @@ collection-basic = { hasCatalogue = false; }; collection-bibtexextra = { - revision = 71940; + revision = 73262; shortdesc = "BibTeX additional styles"; stripPrefix = 0; deps = [ @@ -7986,6 +8086,7 @@ collection-bibtexextra = { "biblatex-chem" "biblatex-chicago" "biblatex-claves" + "biblatex-cse" "biblatex-cv" "biblatex-dw" "biblatex-enc" @@ -8120,7 +8221,7 @@ collection-bibtexextra = { hasCatalogue = false; }; collection-binextra = { - revision = 72338; + revision = 73049; shortdesc = "TeX auxiliary programs"; stripPrefix = 0; deps = [ @@ -8160,6 +8261,7 @@ collection-binextra = { "dvipos" "dvisvgm" "easydtx" + "expltools" "findhyph" "fragmaster" "git-latexdiff" @@ -8239,7 +8341,7 @@ collection-binextra = { hasCatalogue = false; }; collection-context = { - revision = 71879; + revision = 72727; shortdesc = "ConTeXt and packages"; stripPrefix = 0; deps = [ @@ -8248,6 +8350,7 @@ collection-context = { "context-calendar-examples" "context-chat" "context-collating-marks" + "context-companion-fonts" "context-cyrillicnumbers" "context-filter" "context-gnuplot" @@ -8271,7 +8374,7 @@ collection-context = { hasCatalogue = false; }; collection-fontsextra = { - revision = 72535; + revision = 73401; shortdesc = "Additional fonts"; stripPrefix = 0; deps = [ @@ -8366,7 +8469,6 @@ collection-fontsextra = { "comicneue" "concmath-fonts" "concmath-otf" - "context-companion-fonts" "cookingsymbols" "cooperhewitt" "cormorantgaramond" @@ -8444,7 +8546,8 @@ collection-fontsextra = { "gelasio" "gelasiomath" "genealogy" - "gentium-tug" + "gentium-otf" + "gentium-sil" "gfsartemisia" "gfsbodoni" "gfscomplutum" @@ -8483,6 +8586,7 @@ collection-fontsextra = { "iwona" "jablantile" "jamtimes" + "jetbrainsmono-otf" "josefin" "junicode" "junicodevf" @@ -8741,7 +8845,7 @@ collection-formatsextra = { hasCatalogue = false; }; collection-games = { - revision = 71129; + revision = 73533; shortdesc = "Games typesetting"; stripPrefix = 0; deps = [ @@ -8795,6 +8899,7 @@ collection-games = { "sudokubundle" "tangramtikz" "thematicpuzzle" + "tikz-triminos" "trivialpursuit" "twoxtwogame" "wargame" @@ -8806,7 +8911,7 @@ collection-games = { hasCatalogue = false; }; collection-humanities = { - revision = 72250; + revision = 72692; shortdesc = "Humanities packages"; stripPrefix = 0; deps = [ @@ -8828,6 +8933,7 @@ collection-humanities = { "expex" "expex-glossonly" "gb4e" + "gb4e-next" "gmverse" "interlinear" "jura" @@ -9063,7 +9169,7 @@ collection-langczechslovak = { hasCatalogue = false; }; collection-langenglish = { - revision = 71835; + revision = 74023; shortdesc = "US and UK English"; stripPrefix = 0; deps = [ @@ -9127,7 +9233,6 @@ collection-langenglish = { "tex-font-errors-cheatsheet" "tex-nutshell" "tex-overview" - "tex-refs" "tex-vpat" "texbytopic" "texonly" @@ -9146,7 +9251,7 @@ collection-langenglish = { hasCatalogue = false; }; collection-langeuropean = { - revision = 66432; + revision = 73414; shortdesc = "Other European languages"; stripPrefix = 0; deps = [ @@ -9185,6 +9290,7 @@ collection-langeuropean = { "hrlatex" "huaz" "hulipsum" + "hyphen-albanian" "hyphen-croatian" "hyphen-danish" "hyphen-dutch" @@ -9371,7 +9477,7 @@ collection-langgreek = { hasCatalogue = false; }; collection-langitalian = { - revision = 55129; + revision = 72943; shortdesc = "Italian"; stripPrefix = 0; deps = [ @@ -9380,6 +9486,7 @@ collection-langitalian = { "amsthdoc-it" "antanilipsum" "babel-italian" + "biblatex-accursius" "codicefiscaleitaliano" "collection-basic" "fancyhdr-it" @@ -9398,7 +9505,7 @@ collection-langitalian = { hasCatalogue = false; }; collection-langjapanese = { - revision = 70738; + revision = 74395; shortdesc = "Japanese"; stripPrefix = 0; deps = [ @@ -9407,6 +9514,7 @@ collection-langjapanese = { "babel-japanese" "bxbase" "bxcjkjatype" + "bxcoloremoji" "bxghost" "bxjaholiday" "bxjalipsum" @@ -9415,8 +9523,10 @@ collection-langjapanese = { "bxjscls" "bxorigcapt" "bxwareki" + "chuushaku" "collection-langcjk" "convbkmk" + "convert-jpfonts" "endnotesj" "gckanbun" "gentombow" @@ -9439,6 +9549,7 @@ collection-langjapanese = { "luatexja" "mendex-doc" "morisawa" + "outoruby" "pbibtex-base" "pbibtex-manual" "platex" @@ -9491,7 +9602,7 @@ collection-langkorean = { hasCatalogue = false; }; collection-langother = { - revision = 68719; + revision = 73435; shortdesc = "Other languages"; stripPrefix = 0; deps = [ @@ -9544,7 +9655,6 @@ collection-langother = { "lshort-vietnamese" "marathi" "ntheorem-vn" - "padauk" "quran-bn" "quran-id" "quran-ur" @@ -9589,7 +9699,7 @@ collection-langpolish = { hasCatalogue = false; }; collection-langportuguese = { - revision = 67125; + revision = 73303; shortdesc = "Portuguese"; stripPrefix = 0; deps = [ @@ -9605,6 +9715,7 @@ collection-langportuguese = { "numberpt" "ordinalpt" "ptlatexcommands" + "tabularray-abnt" "xypic-tut-pt" ]; hasCatalogue = false; @@ -9633,7 +9744,7 @@ collection-langspanish = { hasCatalogue = false; }; collection-latex = { - revision = 71912; + revision = 73720; shortdesc = "LaTeX fundamental packages"; stripPrefix = 0; deps = [ @@ -9654,6 +9765,7 @@ collection-latex = { "colortbl" "epstopdf-pkg" "etexcmds" + "etoolbox" "fancyhdr" "firstaid" "fix2col" @@ -9701,7 +9813,7 @@ collection-latex = { hasCatalogue = false; }; collection-latexextra = { - revision = 72656; + revision = 74422; shortdesc = "LaTeX additional packages"; stripPrefix = 0; deps = [ @@ -9737,6 +9849,7 @@ collection-latexextra = { "altfont" "altsubsup" "amsaddr" + "anima" "animate" "anonchap" "answers" @@ -9804,11 +9917,13 @@ collection-latexextra = { "beamertheme-trigon" "beamertheme-upenn-bc" "beamerthemeamurmaple" + "beamerthemecelestia" "beamerthemeconcrete" "beamerthemejltree" "beamerthemelalic" "beamerthemenirma" "beamerthemenord" + "beamertools" "bearwear" "beaulivre" "beautybook" @@ -9856,6 +9971,7 @@ collection-latexextra = { "calcage" "calctab" "calculator" + "calculatoritems" "calrsfs" "cals" "calxxxx-yyyy" @@ -9900,6 +10016,7 @@ collection-latexextra = { "chletter" "chngcntr" "chronology" + "chronos" "circ" "circledsteps" "circledtext" @@ -10012,6 +10129,8 @@ collection-latexextra = { "dashundergaps" "dataref" "datatool" + "datatool-english" + "datatool-regions" "datax" "dateiliste" "datenumber" @@ -10154,6 +10273,7 @@ collection-latexextra = { "engrec" "enotez" "ensps-colorscheme" + "enumext" "enumitem" "enumitem-zref" "envbig" @@ -10239,6 +10359,7 @@ collection-latexextra = { "filedate" "fileinfo" "filemod" + "fillpages" "fillwith" "fink" "finstrut" @@ -10360,6 +10481,7 @@ collection-latexextra = { "graphicx-psmin" "graphicxbox" "graphpaper" + "gratzer-color-scheme" "grayhints" "grfpaste" "grid" @@ -10434,8 +10556,10 @@ collection-latexextra = { "import" "incgraph" "indextools" + "indextra" "inline-images" "inlinedef" + "inlinegraphicx" "inlinelabel" "inputenx" "inputtrc" @@ -10538,8 +10662,7 @@ collection-latexextra = { "listlbls" "listliketab" "listofsymbols" - "litebook" - "litesolution" + "listparskip" "litetable" "lkproof" "lmake" @@ -10688,6 +10811,7 @@ collection-latexextra = { "ncclatex" "ncctools" "needspace" + "neoschool" "nestquot" "newcommand" "newenviron" @@ -10706,6 +10830,7 @@ collection-latexextra = { "ninecolors" "nlctdoc" "noconflict" + "nodepthtext" "noindentafter" "noitcrul" "nolbreaks" @@ -10748,6 +10873,7 @@ collection-latexextra = { "outlining" "overlays" "overpic" + "packdoc" "padcount" "pagecolor" "pagecont" @@ -10801,6 +10927,7 @@ collection-latexextra = { "pdfwin" "pdfx" "pecha" + "pegmatch" "perltex" "permute" "petiteannonce" @@ -10850,6 +10977,7 @@ collection-latexextra = { "progress" "progressbar" "projlib" + "pronunciation" "proofread" "properties" "prosper" @@ -10933,6 +11061,7 @@ collection-latexextra = { "scale" "scalebar" "scalerel" + "scaletextbullet" "scanpages" "schedule" "schooldocs" @@ -11028,6 +11157,7 @@ collection-latexextra = { "stdpage" "stealcaps" "stex" + "stocksize" "storebox" "storecmd" "stringstrings" @@ -11117,6 +11247,7 @@ collection-latexextra = { "thumbs" "thumby" "ticket" + "timeop" "tipauni" "titlecaps" "titlefoot" @@ -11215,6 +11346,7 @@ collection-latexextra = { "warpcol" "was" "webquiz" + "whatsnote" "widetable" "widows-and-orphans" "williams" @@ -11285,7 +11417,7 @@ collection-latexextra = { hasCatalogue = false; }; collection-latexrecommended = { - revision = 71527; + revision = 73720; shortdesc = "LaTeX recommended packages"; stripPrefix = 0; deps = [ @@ -11301,7 +11433,6 @@ collection-latexrecommended = { "crop" "ctable" "eso-pic" - "etoolbox" "euenc" "euler" "everysel" @@ -11365,7 +11496,7 @@ collection-latexrecommended = { hasCatalogue = false; }; collection-luatex = { - revision = 72049; + revision = 74070; shortdesc = "LuaTeX packages"; stripPrefix = 0; deps = [ @@ -11435,14 +11566,17 @@ collection-luatex = { "luaquotes" "luarandom" "luaset" + "luatbls" "luatex85" "luatexbase" "luatexko" "luatextra" + "luatikz" "luatruthtable" "luavlna" "luaxml" "lutabulartools" + "marginalia" "minim" "minim-math" "minim-mp" @@ -11474,13 +11608,14 @@ collection-luatex = { "truthtable" "tsvtemplate" "typewriter" + "unibidi-lua" "uninormalize" "yamlvars" ]; hasCatalogue = false; }; collection-mathscience = { - revision = 72655; + revision = 74357; shortdesc = "Mathematics, natural sciences, computer science packages"; stripPrefix = 0; deps = [ @@ -11499,6 +11634,7 @@ collection-mathscience = { "amstex" "annotate-equations" "apxproof" + "atableau" "autobreak" "axodraw2" "backnaur" @@ -11544,6 +11680,7 @@ collection-mathscience = { "commath" "commutative-diagrams" "complexity" + "complexpolylongdiv" "computational-complexity" "concmath" "concrete" @@ -11577,7 +11714,9 @@ collection-mathscience = { "eolang" "eqexpl" "eqnarray" + "eqnlines" "eqnnumwarn" + "euclidean-lattice" "euclideangeometry" "extarrows" "extpfeil" @@ -11629,6 +11768,7 @@ collection-mathscience = { "lplfitch" "lstbayes" "luanumint" + "math-operator" "mathcommand" "mathcomp" "mathfixs" @@ -11674,6 +11814,7 @@ collection-mathscience = { "pfdicons" "physconst" "physics" + "physics-patch" "physics2" "physunits" "pinoutikz" @@ -11747,7 +11888,6 @@ collection-mathscience = { "textopo" "thermodynamics" "thmbox" - "thmlist" "thmtools" "tiscreen" "turnstile" @@ -11765,7 +11905,7 @@ collection-mathscience = { hasCatalogue = false; }; collection-metapost = { - revision = 72550; + revision = 73627; shortdesc = "MetaPost and Metafont packages"; stripPrefix = 0; deps = [ @@ -11802,6 +11942,7 @@ collection-metapost = { "mfpic4ode" "minim-hatching" "mp-geom2d" + "mp-neuralnetwork" "mp3d" "mparrows" "mpattern" @@ -11824,7 +11965,7 @@ collection-metapost = { hasCatalogue = false; }; collection-music = { - revision = 69613; + revision = 73288; shortdesc = "Music packages"; stripPrefix = 0; deps = [ @@ -11845,6 +11986,7 @@ collection-music = { "harmony" "latex4musicians" "leadsheets" + "liederbuch" "lilyglyphs" "lyluatex" "m-tx" @@ -11869,7 +12011,7 @@ collection-music = { hasCatalogue = false; }; collection-pictures = { - revision = 72555; + revision = 74419; shortdesc = "Graphics, pictures, diagrams"; stripPrefix = 0; deps = [ @@ -11894,6 +12036,7 @@ collection-pictures = { "byrne" "cachepic" "callouts" + "callouts-box" "celtic" "chemfig" "circuit-macros" @@ -11965,6 +12108,7 @@ collection-pictures = { "luasseq" "maker" "makeshape" + "maritime" "mathspic" "memoize" "mercatormap" @@ -12012,6 +12156,7 @@ collection-pictures = { "postage" "postit" "prerex" + "prisma-flow-diagram" "productbox" "ptolemaicastronomy" "puyotikz" @@ -12051,6 +12196,7 @@ collection-pictures = { "tikz-bagua" "tikz-bayesnet" "tikz-bbox" + "tikz-bpmn" "tikz-cd" "tikz-decofonts" "tikz-dependency" @@ -12085,6 +12231,7 @@ collection-pictures = { "tikz2d-fr" "tikz3d-fr" "tikzbricks" + "tikzcalendarnotes" "tikzcodeblocks" "tikzdotncross" "tikzducks" @@ -12108,6 +12255,7 @@ collection-pictures = { "tikzviolinplots" "tile-graphic" "tilings" + "timechart" "timing-diagrams" "tipfr" "tkz-base" @@ -12142,7 +12290,7 @@ collection-pictures = { hasCatalogue = false; }; collection-plaingeneric = { - revision = 71220; + revision = 72878; shortdesc = "Plain (La)TeX packages"; stripPrefix = 0; deps = [ @@ -12253,6 +12401,7 @@ collection-plaingeneric = { "transparent-io" "treetex" "trigonometry" + "tuple" "ulem" "upca" "varisize" @@ -12388,7 +12537,7 @@ collection-pstricks = { hasCatalogue = false; }; collection-publishers = { - revision = 72576; + revision = 74108; shortdesc = "Publisher styles, theses, etc."; stripPrefix = 0; deps = [ @@ -12400,7 +12549,6 @@ collection-publishers = { "acmconf" "active-conf" "adfathesis" - "afparticle" "afthesis" "aguplus" "aiaa" @@ -12559,12 +12707,13 @@ collection-publishers = { "nostarch" "novel" "nrc" + "nstc-proposal" "nwafuthesis" "nwejm" "nxuthesis" + "omgtudoc-asoiu" "onrannual" "opteng" - "osda" "oststud" "oup-authoring-template" "philosophersimprint" @@ -12579,6 +12728,7 @@ collection-publishers = { "ptptex" "qrbill" "quantumarticle" + "rebuttal" "regulatory" "resphilosophica" "resumecls" @@ -12640,6 +12790,7 @@ collection-publishers = { "turabian" "uaclasses" "uafthesis" + "ualberta" "uantwerpendocs" "ucalgmthesis" "ucbthesis" @@ -12793,13 +12944,13 @@ color-edits = { sha512.run = "e1023d734b7c8c2c781fd037f29a8c845a45fcd1c62d7880d51755bf943dba142fee040c2f0b9bea2ef6986818b5f67126ff468639c0d962d0a779f6840fb1c7"; }; colorblind = { - revision = 71253; + revision = 73199; shortdesc = "Easy colorblind-safe typesetting"; stripPrefix = 0; - sha512.doc = "e123e6b7646fd48ab45e32eb4583cd43bd523cad09c412290b99b39921f7760151bc6ba5f6eacb98d9245dc25d630031f7cbed10fcb519d9502f6df13ac3e573"; + sha512.doc = "e1db9cb7e399576f23d1a41a0a76109be1290cfa4ef686df03667078e17c1cc99c76b6efa55fa9337a1a7fb514c4dfe9f8a6a89bddca58ddb8ffad12731679b7"; license = [ "lppl13c" ]; - version = "1.0"; - sha512.run = "84448c6f7029aa50ee4e82afe0e3c06edb226f6477cf6d437586538d1c16b0e36e7e061b28b3415a7886424356291c9b150e0811f91f454f2a1b50321dd5120d"; + version = "1.1"; + sha512.run = "07e9f05fb82a66edbe78e8c51140f42fbf6a3c8321b296959ecd6c17e7d5b2709813c02423d42cd266708c3af28297c527742d319ec9c960fee7c86383837f55"; }; colordoc = { revision = 18270; @@ -12811,22 +12962,22 @@ colordoc = { sha512.run = "a4d87deccae89f844a6251887e4d20817837fff4eef9cbd2874bef8890d41e0ab930a3ee55fae9ee46685c6b3b2b3324b54ce8507f1cb10eef332b7a480b94a8"; }; coloredbelts = { - revision = 68747; - shortdesc = "Insert colored belts (vectorial format) in documents (to presetn skills, for example)"; + revision = 73069; + shortdesc = "Insert colored belts in documents (to present skills, for example)"; stripPrefix = 0; - sha512.doc = "dbe9cd28b3bdac4b51d080edae7a983900fb2f9c583d7e19d0137d551222d23138862e9acb43de98c2f321d4abee3dbc2e43961f66227a5cf2c639545586ecfe"; + sha512.doc = "1d0ce727ba5f2a10d496fad860dc4665e5119683e7833c4eee00e5a69b4d16f6757b6b801e72caf4ae19abfeda20dfb8bfd9e2949d3099163ee8feb8e0d13981"; license = [ "lppl13c" "cc-by-sa-30" ]; - version = "0.1.0"; - sha512.run = "0c2ccc4f77c74e551361b6c479759d10db1ab96bd293926e3fb60c1888e073094c4aed403b147744711b5210c9fc8e0cdb431ef8b778cbd12fefb4f691faab85"; + version = "0.1.1"; + sha512.run = "a92a19de47cc1941cb00c529ac102c59db75b531be6daa588a9c482be0005ae076cdec1a0936d0a46387d75bd3ed86f69cc61ebe2b22402e24400c25d61e9445"; }; coloredtheorem = { - revision = 72298; + revision = 73397; shortdesc = "A colourful boxed theorem environment"; stripPrefix = 0; - sha512.doc = "50558df8e471b9ac439e75cf2cba09d0116e4344761bf9bc5b35d2bd2d582abbbcb0d32b060660e894843fe9bab15e7ff0cd101f64bd5e61866fad121c083101"; + sha512.doc = "b2068a86190ea31921e48bc821c5edcf7538a44e6cb329bce1cf221ab6f01aef6750e6904227c36b40033d9255a42cb47103053447b9984bffd9aff31f08d4ba"; license = [ "lppl13c" ]; - version = "1.0.4"; - sha512.run = "a1a06002b72563b120b716e4084a1aa7d558ff1127e9daa0a788f80ac8138b1e30fbdb0b7617dfea189ed640d7c60876f295bb37f8f2e8b14e4a94b79be71bb5"; + version = "1.1.1"; + sha512.run = "4778c305e6aab1ff923606bb00ba1aabdb94c97dfd23dcb7688eb29b99c3f4a7d9130e09d81d4353909af48a49dfa322795f17128e34c721fb7a4340a0cb40b0"; }; colorframed = { revision = 64551; @@ -13022,13 +13173,13 @@ commado = { sha512.run = "c5e48910b5e685c792b9dfe191cd8666472e24e7ef6d6c2fdb3bfb05b2f39f4d4ca68cc7b859d07f50e5d596250e36e1664e1ca48666b0e3126eb8c91d27c384"; }; commalists-tools = { - revision = 72641; + revision = 73069; shortdesc = "Manipulate numeral comma separated lists"; stripPrefix = 0; - sha512.doc = "51fb70644bc2bf959753b88b8d5f07bb5a75f76622ccf7ca2d9f1fed135f03272e7eee82e4e4fbae764fbbc1eedecf5d8eafa9170c467ad008e6a6ed108af768"; + sha512.doc = "52c5c8bd78c254799753bc7897c5063748e21631bfa7a4229d04c822598940f134860e7118a0fb7e86fd90c23ab38b2e26dc4c4e891ba60a17005efc7f36a952"; license = [ "lppl13c" ]; version = "0.1.4"; - sha512.run = "20c5c5926aec77842b311f6c91ddcf93aa0c1edf7f0340c425db21112cbd31cf0ed76f57cb29c3d1f64ca866824ef99b1d56e5da4c8efafa56d0aa154354f1f6"; + sha512.run = "b16b146f789c2a18ba88e0f3b1591f121946e16826f5dbd1660c3910e1edbaca1edaafdb35149f66a8a807888fa649bd933f3236b01591bbfd8b103fe8b94f68"; }; commath = { revision = 15878; @@ -13109,6 +13260,16 @@ complexity = { version = "0.81a"; sha512.run = "352e1a308e159e432c3123afeba8b173b28e164c81b4874273ddd3f8bb8c8866ef33ba7c06e061d52a3845eafb3307b045b82c9da5ea6a812f3808417fa074d6"; }; +complexpolylongdiv = { + revision = 73238; + shortdesc = "Typesetting (complex) polynomial long division"; + stripPrefix = 0; + sha512.doc = "041700efeea271a9c97fe8bbf52762a09a83f60605fb46a9d026654af4d3e5f5988d9f514ead74e0821fa606c9bb7717f902ed1b44b4285cb5d5cefbede5a3b9"; + sha512.source = "e05174926793507f04b1cbf355e2eb01d02ff80a3499eaa64e6368d4f8a6f20212574071b11118b7b5da29de1569e9e6654d677ef9387b21dafe5e269949e6f2"; + license = [ "lppl13c" ]; + version = "0.2"; + sha512.run = "bffb506cc46cbc102e0a8de8db7e3fbb8bf758339c829a08ebe5631ebc7dbf09c8463d2a1c3cb36cae78f6e379277f23c38c72c8b8942e928894481e795a6a70"; +}; components = { revision = 63184; catalogue = "components"; @@ -13162,13 +13323,13 @@ concmath-fonts = { sha512.run = "65b3f7003b8aaaf6565bea6a65da11f42dca2283f1d53710f4b476a48ab39ae6fffc1d0f9206e23b66047b572c28e793e1a75d047f1c1a892fb4e7c17c854741"; }; concmath-otf = { - revision = 72660; + revision = 74012; shortdesc = "Concrete based OpenType Math font"; stripPrefix = 0; - sha512.doc = "9216da4e961c690ce8e7a46bfe6c0f9319de71252520336e54fa3037f853668b1b1e81d30ab5bc8dd09396069f0d0ebf95ba88b62a0592281997f944837ca59c"; + sha512.doc = "fb785d6d72d053e8b092eadd7621082b3c5298aab381509ad3851802cce60e820dde963c4676f86328534ef174dec36bc8a020e0931e4aae3c713f433de06367"; license = [ "ofl" "lppl13c" ]; - version = "0.64"; - sha512.run = "6320cddf5c0896e74627c12dd3d6963cb4dbbae75fb4eee8215fdbdeec26211d08a245e8b0d5ec7bf52a409d1ae5a3a86c54f8457e068bef6da5e7ddc7c851fb"; + version = "0.65"; + sha512.run = "74380afb93924f6c06fad803e56fc65c26bd51941bc8a1d4c603f5294959fde61743fe58be4719ec303ac148dd8e8da6f1ef280ea977fcb5328e6b6fbaa52441"; }; concprog = { revision = 18791; @@ -13226,7 +13387,7 @@ conteq = { sha512.run = "ee0f344ed0eab872aca3c54422f83a6f8bbed2462a22cbd54dde075ceae79dc5a01ef13947327ec726d5eeb64eee5519e4074c138f4d172bbf2b4024eb88ceff"; }; context = { - revision = 70360; + revision = 74490; shortdesc = "The ConTeXt macro package"; deps = [ "amsfonts" @@ -13243,13 +13404,13 @@ context = { fontMaps = [ "Map original-context-symbol.map" ]; - sha512.doc = "13c42ef56f667c66229c83610dc4cc2d9c68300e2cee7b22e9dd5aff3b8b76774f6badd511d56a618fd37ef629ddae72261876c48a93dc4634fd919eee46e3b5"; + sha512.doc = "d8ef7b01fdf65ff0e704b53d99eb94c0920bfbf065dcfacb82690e4f56231af011a68fe0b71d38442f96ed273848d5c2e19b271ebc3c87d4e21ad32557734b79"; hasManpages = true; scriptExts = [ "lua" ]; license = [ "free" ]; - sha512.run = "29a167a4883c11d2524917bcea61bd465cacf366f54330a44e445dbb5406aac27ebfa444b635de9c569ffb614eba9f3319c8abbfdd48cd578312ea97f75f3f86"; + sha512.run = "8711bff6d8dd4967da576402a30d22faab473cc2e6af837f2cc02740ccedb199740fd5400a00ac8abade5438af694ee93bec2dbfd9681e6d2088ec1a1fe3b0a5"; }; context-calendar-examples = { revision = 66947; @@ -13284,11 +13445,12 @@ context-collating-marks = { sha512.run = "dec8338854260467eb5d6542d4561e38a87183290e53e75c3fa188fc8f537a466ce4a5974f4f5644b9f2e62591cd4e8860f8e2b314c8918ae45e90e00c61ba4d"; }; context-companion-fonts = { - revision = 71648; + revision = 72732; shortdesc = "companion fonts with fixes for ConTeXt"; stripPrefix = 0; + sha512.doc = "d8dd5a12b0a887a4c69c44c57a8c9d99ce3ad3b1e3cabc3f0c12fa3d11bf589e828b618f192bd1fef2dfad68611197c5315925a0c2079e7692c0f6196b7b72fc"; hasCatalogue = false; - sha512.run = "654f5c76c900578721201d8b72010def417dbf9b7245660f2d00a5f37694bc27e354f99a93c0077e784b15eaab6210a349264f1cb9c2b09b3fbeeca95bfa896d"; + sha512.run = "52533908c52f814619a3b48e90422d9124561ca0685f44a75b0da3d3805faccc26cfdb5be0a8eb48f22b4949d351f8357870f91bbc9ef4c1067933cdedd288cb"; }; context-cyrillicnumbers = { revision = 47085; @@ -13401,15 +13563,15 @@ context-notes-zh-cn = { license = [ "gpl3Only" ]; }; context-pocketdiary = { - revision = 66953; + revision = 73164; shortdesc = "A personal organiser"; stripPrefix = 0; deps = [ "context" ]; - sha512.doc = "a78ed374f6a7ad63a93aef4c9cb2ecc0937c2e3df821c543f49a3ad762ed6949a7d1c4c5a03c7cf54eeb0b9ad891a18c5d10b97a42bbb840c74fef2bf8f14cfb"; + sha512.doc = "ac0c5ca04c6f13a2320c87dfda147acaf3015f0f86241ca6b6c5eb37fe9ab6cb4502ffd3421c01706a898ddc3c4790bf2dffabd5d86b2ed9e006b311c4620c31"; license = [ "publicDomain" ]; - sha512.run = "fd90eca9b9642a16aa203984165302b111d4058ed970aab3867018f48d16884fe543d3067a0ad2fc2c0e2684924ef11e9788a7deacb20ad06d7451dc5b19383b"; + sha512.run = "eb10c183b9674f13abbf093fd9ee929ee56410ab1b64863ec6613933dc64e9a00983f860a2fc51b0124e698dcd5c67eb3721d9262130ae087d06331eb05932b1"; }; context-simpleslides = { revision = 67070; @@ -13573,6 +13735,15 @@ convbkmk = { convbkmk.binfiles = [ "convbkmk" ]; +convert-jpfonts = { + revision = 73551; + shortdesc = "Convert half-width Japanese to full-width beautifully"; + stripPrefix = 0; + sha512.doc = "6c3c69618330c4478b044cd144902553f47cf0ab9e12c32414df6b07ac7843b93d56d49bd2799cca3a20cda60327c3008140f62503f8d0e09cab7d19927a3ab4"; + license = [ "lppl13c" ]; + version = "1.0.1"; + sha512.run = "6355d5d778cf6d59278de4bd6c3fb4959c5540f0e5a4459683f6d30f924b8bba8e8c7eaaca1e631180288befaa8a5a3f29ac70276cd4fbc4d91e8e9b65f5a9dd"; +}; cooking = { revision = 15878; shortdesc = "Typeset recipes"; @@ -13594,14 +13765,14 @@ cooking-units = { sha512.run = "82f6e5b097ff7bc737526b13b04724fa144cb96d796cff517019e49befa174f621a41ec4c52d29fd20bb502dab46db1699b98f57de337fef8320392c63839675"; }; cookingsymbols = { - revision = 35929; + revision = 74250; shortdesc = "Symbols for recipes"; stripPrefix = 0; - sha512.doc = "fb6794942d016d12f527b86947c7fae9947a7cf9122a7b26d39bfeb6d5f55a7cccc11b666101b0c80a92c7385ae8305bcb4d792baa0974b738af80697ad12891"; - sha512.source = "b2e8ff3274ffaff3a3f5b3de1ab95a534247878f163cba8cac9af0cb49c59c54f9ac7b362c75dbc394a3c942864b3255ed28310ac5ba842b5b63ea0d0d80f7d5"; + sha512.doc = "7ea5c4d3c258ef39e38898083139da5cd6dcb972a4e0154ed6436554cc89db6fc7910ebb7e81a64ac912a5e1bb7706be4900ee147b1e59fd94fd4e774d38f4a1"; + sha512.source = "02093626f9a80338c413fc9e031da68282702c56c83dc6fa5b189518abed1c47a2f0696e3253f4c0187f700a2ed4f2c99bc8e0dd6e21a5355f5484448e40d352"; license = [ "lppl13c" ]; version = "1.1"; - sha512.run = "9b43ffdce038ebb001c0ab6198fa2d92ad6f1ec6040f1c315a53fbfd29367e5c851f4015c36b0cdb2eea84f4a8dc90aa3d5126a09f93766d614931bbf555f982"; + sha512.run = "6712cfd29d8257a0208d4dcb85ec6c5b42120a01dcfc9556ec82cad0f04aae4c95b6a8565b630f421d7299793fc436efa64ce66f96a5ff6d21ddaaeaff552258"; }; cool = { revision = 67013; @@ -13713,12 +13884,12 @@ copyrightbox = { sha512.run = "2ae2afc738cc906d24fca0a6319c98dc1e9382bbde6db3d0c3a371d3de8b92c30b3bf05be04797bc0ed6d905933a50e74809eed52f06cdba5fc5088be033d4a9"; }; cora-macs = { - revision = 72655; + revision = 73101; shortdesc = "Macros for continuous sets and neural networks in the context of cyber-physical systems"; stripPrefix = 0; - sha512.doc = "679a18a7fcb7e90fff1587fb2916a61ee3b4c42bf9975b38c7ebfa634ad4a82c9a83de639af9639fe4b5ac786382b4a3f64314eec44ea55ad9f55f815f7922d2"; + sha512.doc = "c3ac19d5fc1a27da9eb70a8f5422dbf9d078ab4ee9a41b8372c5a46e08fc30e9c9767a2bbcb8e63f83e0b2e687a8611338d52b79b687908c32241478831758f5"; license = [ "mit" ]; - sha512.run = "97397ea4c6cd8d143c57d2cfc736d94ba268a25f2678c21b2dc6620c853d8762ca0c0dbfa1ec94d26c40b80e0b9bf682fec30498813d8c037bfc574b17af0a4a"; + sha512.run = "c85496aa94f615b9677b60abbab38a71dfe4f9d1973ca7074eb74998a8cb8fd897538ad71485940f40b29bdfcf1e0655d80c57b23267fc33e2bbbe69d2c5fc8f"; }; cormorantgaramond = { revision = 71057; @@ -13751,13 +13922,13 @@ coseoul = { sha512.run = "21524a0721fa26d85b383879cc75600bcd55ee05220eac245171eadc30dea7296731e4d6d2d3d82d10b32f1d674d444bf1df41dd82b92d5cfa7ea06d53f56147"; }; couleurs-fr = { - revision = 67901; + revision = 73069; shortdesc = "French version of colour definitions from xcolor"; stripPrefix = 0; - sha512.doc = "8e88f3947d0dcebab82a60bf9886350762f57da2c2b3c739e2e3896afea70a2088ce325cfe6373d6a351b57fc2f0b0bb7f0f4c9716a094d86e1997744890c92c"; + sha512.doc = "85f95ce2f6c1e203c048dbc5648ba812ba3c593cc32ac89b0402201d046b8224b7774521766b808cf4606bc0ecfddd349eb5ea597c44cbcab4c7b358c5ca8284"; license = [ "lppl13c" ]; version = "0.1.2"; - sha512.run = "d3d1abad334d50129f77b35ebd6fa244feb84e347e64cd98f3e3413c556b1848a198e4679e266f838d947244756fc19071b1bb0816c73b887b2deb4fe061adcf"; + sha512.run = "11e8f07d552b97db737a4c7ca770c34bdb04395b0fc1f84e8312e78e696682a7ef31453097d6bf5a1bb4e4103e098a4089f33c1db78c6bd0c42f31e5249eab82"; }; count1to = { revision = 71526; @@ -13916,24 +14087,24 @@ crbox = { sha512.run = "087ae9406fd8f6916e355b51d2f4dc7383228813716ab9f6c37714794c931a9b5defa4678a4471523c5fda2c6b0b7784d11dfb488a8d9c60f0244d9d2d64ab2b"; }; create-theorem = { - revision = 70177; + revision = 72830; shortdesc = "Initializing and configuring theorem-like environments, with multilingual support"; stripPrefix = 0; deps = [ "crefthe" ]; - sha512.doc = "451cc00bd9e9d0e07ab88003ec6be2f8bb7ea2829b4f1164147dcbb816625459acc14a3ae7101f0540b40bf5ecd0349e714c1be9781ac6ab0a11780a3c68479c"; + sha512.doc = "501df02431d4c5bce8e12096c5a3579b6906075fc078c742b6736963df5e0040b60fc378a685968a6f6801fe9729b337ee6f07a2a91cbd7ec92a40b5b162aed2"; license = [ "lppl13c" ]; - sha512.run = "dac43c96419036f99183477bac728ce237563df359f95a1dd7f15dec3be4f08a7f429c8e6b5a58335e27a71364d72c0af6494978b092578158f2dae6c84bb1ce"; + sha512.run = "36191c1dbf97704a0f9ab42bd7529b7a839ae5bb7e2a54ddb28ad63f603709fef53f88e48d32073f44161348c53660dee0e3239a294ec316992a47d3ea320830"; }; creationboites = { - revision = 68087; + revision = 73443; shortdesc = "Macros to create simple tcolorbox with some customizations"; stripPrefix = 0; - sha512.doc = "42e8ce40f037b18e82899b570e8102835a437a5283193f1e799876039a856f86adb1afe52f5b07bc6151644e9b174dcfbd96f6148e2610a0a32cb400832f3ebf"; + sha512.doc = "f633895e6653163b3bcaf5e6880ad42cea0d4eaa518e9b75bd02b0006ba21efe49c178690d38ce5e7dd8808290dcaaf8bf7431f42f1604ff5f72e46e77bd21c5"; license = [ "lppl13c" ]; - version = "0.1.0"; - sha512.run = "5aaa071101c52bbd95c83b2e523ab664a2d52109fd5ebdf71da07d3af997d93cc2550736fe18dfac05348d92cbb02749f03a052954a0807fd3d2140efb322588"; + version = "0.1.1"; + sha512.run = "c2a02eab71455e89107d7b98cf47c629395de6ce89bcf026cdc8d275765c7e7e6fe1b2529ccd11a126a0302354ac8a9b84fc0f446e7dab5c8048f6feb6e4ddee"; }; crefthe = { revision = 70156; @@ -13944,15 +14115,15 @@ crefthe = { sha512.run = "ef1eeac158bf07d1251365e98d1068f684529d43461fe1e894b61cef20cad61eeeed135b34e1b961288af68578196095406e11863b0852143c44841ca67471a7"; }; crimson = { - revision = 64559; + revision = 73074; shortdesc = "Crimson fonts with LaTeX support"; stripPrefix = 0; fontMaps = [ "Map crimson.map" ]; - sha512.doc = "105068d0dd81b33a8c073ab33542f2ba7893d4e1d95dcf7af58b413d54a3e7e0cf24911fc2e56ee9821d6d55f016355d4e42db2d981e48e1feaa98b498e20e73"; + sha512.doc = "eecf534989b27c5be429251a3419460391316d7f068d079371b5cd1f76dba4a36bc5836b41ee21f2bc8465a1d25d02b3a026a6b7a5219c4b0504048f95e6b02b"; license = [ "ofl" "lppl13c" ]; - sha512.run = "fb807f6602365c65470ceb947e72c63171fc401145b83a63429836d274ca1a0877008c27e4f6416b2a89a3fceb2912062749deeec81346e59c734fa14e4cc289"; + sha512.run = "68f523904544b0ed66c94b992a635e09d1ccdeace49f7b33c3a6c3c01f8093c3ac66a2c1d0dd1ec74212da889d7fc640fb54dc5f408780add1fa472a265ea8dc"; }; crimsonpro = { revision = 64565; @@ -14019,14 +14190,14 @@ crossrefware.binfiles = [ "ltx2crossrefxml" ]; crossword = { - revision = 64375; + revision = 73579; shortdesc = "Typeset crossword puzzles"; stripPrefix = 0; - sha512.doc = "445ff450f4ebb1e615d0e9a7193904f4512dddf4af3b693f6eae9a115d5456202c54c291c263c37fa37d082d3403c4b7a83deff7e1ae37548efd7ad47b97bfad"; - sha512.source = "018058d6dae55c27804cc750fd6469f432c1a0edca187f6adcf75255d9d2a27c34a446e54dc7a6b5de3e030a0145f5b950961f53e4dfb8976fbd283f4db30e38"; + sha512.doc = "d509661a9fa998431a7ba7ae6cce4d1382a33a8b437f1d0c69e6ca86174bc9b0a1e0133b5e9e436206c5054fe8fcf76a7029f3110fa33920dd2d9c5a054c2192"; + sha512.source = "be2889c79b03d933340aaae35ba4c042a664f37249791fe1291511203ddd01ca2abecbf98b617141b94cf9841328a5b0c1ef0f3b5dfd047d962ea8c3363c9f49"; license = [ "free" ]; - version = "1.11"; - sha512.run = "8be92df53341bca46907f0125122e2498761880606fb42621df7b4e9f5d9cc9e9a8b74454aa254f49b6fd471b371df7f9f873d9209a94c419433b53247bc29a7"; + version = "1.13"; + sha512.run = "78462d7bb8329a11a406dfb33ec53c24f5cdefd338c14a7212dd3e83a574cff85cb0dd6f41c8bf868071542b46946518e315c9c107ac11adfb81c4f0225ac17e"; }; crosswrd = { revision = 16896; @@ -14087,14 +14258,14 @@ cs = { sha512.run = "bc956c595d4460f35c64c92e7730a7cc9cd3af95301afba56c49bcf8415666863de926733409ce1afd99ba767fe3a3fa45c68f2dcc912b69c6f72b618289fb30"; }; cs-techrep = { - revision = 72666; + revision = 73507; shortdesc = "Technical Reports in Computer Science and Software Engineering"; stripPrefix = 0; - sha512.doc = "25d38ede6b236ec7428d73463e82bfabd27c0aa4e525daea671d3ab894bccdd5f01e29d6ca9ee21dfd7932cd8da1a9bda8826ea1696ac75399636bbe9784a7c8"; - sha512.source = "e651031cde8c9ef0d7e8d516135d23dd23a6d0077801770f01f46477e2ec43703815f9462c2f226bcee03988b8f2bda462c1b91cac08933a9a60dfb2c39566f9"; + sha512.doc = "e8dcc382533fddfae173d81e859439eac27e619de8a9fcd63041247fcef429d465fce6c81ca61df1099e8e1c17189491323bf8a36d183172e4a64926a5556b02"; + sha512.source = "7f6675859c93fcdef989b22616295568d89c1a126ac635e66492d363d7b507751a199b29ed4326bc224b21f54cba9957bec4a0618e8dad23b771ee05ca572e78"; license = [ "lppl13c" ]; - version = "0.5"; - sha512.run = "4390da818fb3a9dab4cde89906da90c81cd2b49cfbb16440c2aa724808bdc0acaf85ba6747b8932ae579a58c17bad6cfbd5f10c2cf1eab5be5a9d1fb89f2fc8c"; + version = "0.6"; + sha512.run = "1dc9097c8a92030bece719e0be3388811d221b32369190fa042f008bba02cee58847a7eac6359f23d7f7945dfc42fc840ee37748e347e43aa161796d3f83f744"; }; csassignments = { revision = 63992; @@ -14248,14 +14419,14 @@ cstex = { license = [ "free" ]; }; csthm = { - revision = 72152; + revision = 73506; shortdesc = "Customized theorem environments for computer science documents"; stripPrefix = 0; - sha512.doc = "19ad915ec352e4b22debf624230b86e43c8bd5e7b904595cbab75f5d0b916335ef5ba8da8d98caeba26fb14ec71871e46f838c4c89ade1eafa8d4c1601532cb6"; - sha512.source = "0a784005b94ac340517a3a8f808c1d3946759a4ca7482a647824a31758812bce436f80a6aaae2d37c80ccbd0e839223fe84d7bc119e8d4cd21ef70e546791a3c"; + sha512.doc = "3790af2f8ffd79db46dc3e83568de02b5f3b0ad0ce7818a0d3c160f56eef6dc09413a2e09a2d336aa22d9dde468f62df1fef475b5a6de0cd5f71aab7944127d8"; + sha512.source = "8f89bcf6e9e48450429efee0098b1d6c5a39c634ee53f006958162ee1a70210df7f434deeaba9e161e3f4ffd45d2490bff2f7cbf10b4b030e7043acba9e09560"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "1e80e2f53e5a7ef74490253500771d882df01c35354c1242826bd2c5e22d6bc2012867428d1fbd74347c0e98bd66e883331c39387a08ce85b29075b1cd379e17"; + version = "1.3"; + sha512.run = "f4914ad38eea65cd39bca6ea745da35f246f40802982c01a95553f9bc1bfc751c6d7e794e7274241c6d8ddc3b98bea5fa116996025904403f6695b0434c39feb"; }; cstypo = { revision = 41986; @@ -14530,14 +14701,14 @@ curve = { sha512.run = "9d318d35ef04d171da1c36ab4646465d4aa0feebd90fd3e97db5f1cf09c28c174d0c3be288c369215812f51ca83b341abbfdf3fa44458d1994cf68dfaeef0615"; }; curve2e = { - revision = 67599; + revision = 72842; shortdesc = "Extensions for package pict2e"; stripPrefix = 0; - sha512.doc = "d28134fe19310084b6ffee13bea26b7dd131789a124041cbecb500e070bb134db98d4cf01d7d970781ad1823327f363fe886be9615d3458ca6763fbd7039f0db"; - sha512.source = "7a9207da9be81c2dd9de00adf25f81adc2bec671e4fe281904410e964670968103a4e556806a287e830aa9aba908c353606884079f3509a66975dd9411d2c886"; + sha512.doc = "6405f408e4963d24cec6de5a129152c1a1a28fff4e0d030b3f63180d05178e34607abab9333223694a1be3148d6b9113fdf3375565080efde5e295c27621d418"; + sha512.source = "42f19f79942c996e140c57ad42f3f3c448ae796ac5158399825d235adffc1568d5d3e5849fe4962ce140f5df5140c6b12fb8a6032becc685496dd7535d2767fd"; license = [ "lppl13c" ]; - version = "2.3.1"; - sha512.run = "36b8d1ebbc07ea1cb78b85fe2c327a4c932ef0a88881ef9185654cda6865ea5ca017aeb33334f603fad74fa0245a531f50e2016c912da4355cb552ee5e069f97"; + version = "2.6.0"; + sha512.run = "c2371efb065491fe30d7dcc16b6ed4ad0771c13baf41bece04a440d35881f5c50e704a50e7e1c45be66c116c47d067f3ca29342bc605c6202dd4382b0c3258b4"; }; curves = { revision = 45255; @@ -14570,13 +14741,13 @@ customdice = { sha512.run = "d537d8357fa1d718f685d3bd05afe849eaffcd63050b8ef5f85dfea39260b9268e7ed12e727ac3a14a7194f21e4de158bc0a8143408c45e5f3718ea143a27aff"; }; customenvs = { - revision = 72291; + revision = 73962; shortdesc = "Custom environments (MCQ, list with picked items, ...)"; stripPrefix = 0; - sha512.doc = "25cc76f1a1724f2f698ceab1611f72bac00bace7fa1535bc1d1654e38fdec8e78293e2a68228490de604e805ede362fc6e239cd4943d2c44317a1cafedd2465c"; + sha512.doc = "ee02aea53e6e0d6f054e79a60e2301e97e8a0fab92e020ebeca9ea58e12cc857bd9e103b0de4ee3c8af85eb8c4956d83241ff36f2be6bcbcbc8e2c19ee727a09"; license = [ "lppl13c" "cc-by-sa-40" ]; - version = "0.2.3"; - sha512.run = "9139feb2e6e929db1adc699db189e2f6889740682591b56a86ed2f3dad24c18accb2fcc63b09c5424e38b7ad8d84760cb6767caadc1fc901b18f4c6bfb62d086"; + version = "0.3.1"; + sha512.run = "09e00c18f77774bb65a0f1eca301a154b02a54c567a666070fd3d33b7804c940b4424a783f00e85ee98aea7da2a496aa0b7697b823eeade3ab0bc2ec40302374"; }; cutwin = { revision = 60901; @@ -14616,17 +14787,17 @@ cvss = { sha512.run = "563d310188adc99e14bc93772f8f94af0741665c15d8013d9cc98fa5d86129d48b62473835973bba90fcb4117fbd782b029b87045e5b392fabd308c8f1a6de42"; }; cweb = { - revision = 72279; + revision = 73451; catalogue = "cwebbin"; shortdesc = "CWEB for ANSI-C/C++ compilers"; deps = [ "iftex" "kpathsea" ]; - sha512.doc = "8c228b49e0a6cb34a648269f379095cf7a65d21a99fc6332d75e98c0ad97f3d08637070e3c25af81ce702f644afa8a61cdccb72e4d075a25c942cda47af5d9a3"; + sha512.doc = "aae1169288e5c57ac7cd4ff0a44a6d4de14a40ce9e9d7b57172183019006fcd4a2c05d0230a39040c2630a6509be53dfd2b36b60df68608752b017745b62ee64"; hasManpages = true; license = [ "knuth" ]; - sha512.run = "ed436e6e55498eca3fc7cb9d4e77f38f286e073d4b8f6a8e27be27077323488ad6cbd6f944716d224820e8d9df74d26065fb35aeb0f7956e7ca5b4ca47e21d4b"; + sha512.run = "e9375c4137b7fada8c0b23a156253410ceebac5990e92b877ded16f7df8189482cd8a1dfdfcf2036ef78aac73f948a45378dd656ea3c4907ae91c9aa9829fb67"; }; cweb-latex = { revision = 28878; @@ -14791,13 +14962,13 @@ dashrule = { sha512.run = "4b1b993e9044eb2ed4bf6bde0c114b0cd1fe7daed38f8bc5d3e25a2705d55cb41b8a372cce84b0d61093044d970003a4317de98cb468978c8cb1a8315f980940"; }; dashrulex = { - revision = 72642; + revision = 73736; shortdesc = "Draw dashed rules"; stripPrefix = 0; - sha512.doc = "7a23989c57037abc6639e522c3090d51ab9d6401364a10f49681799d65a5e68df791a25a449a55ab9924ed6f262d96eea09b5e8da13cf0ff934ac1ac6d54ab35"; + sha512.doc = "9449980355b5e92c6a83deb86ec9766f8938810defcdd8efeae56c15be6783a354ce722601e90194b09992c3b34e05fc87cc8948908730379be28c30f9cbbc0d"; license = [ "cc-by-40" ]; - version = "1.01d"; - sha512.run = "d0fd8759454cd997cc0b98c5b2472cd9318284562edd3adfdbc84c627b944aff3deb1ade0f892e70af0c482ae29f92b7eadb877ff3bc120e069a66da8d17bd10"; + version = "1.02d"; + sha512.run = "95e0a7769b3e08a83f8cc5224b92cd4bbda2bd6666092bb520ad817209a81b01e70321472c37d1d0d81e4eb87613a4279826d18831f4afca1aed98197ca95b22"; }; dashundergaps = { revision = 58150; @@ -14819,7 +14990,7 @@ dataref = { sha512.run = "da099bb462ae2698784097cb04268b039f0900fbe57d77284532c0ef694c50d422436e5e0d8ffdc9442b98c12d52c72629b29f772b0d66f226ebabca579b2249"; }; datatool = { - revision = 52663; + revision = 74464; shortdesc = "Tools to load and manipulate data"; stripPrefix = 0; deps = [ @@ -14828,11 +14999,37 @@ datatool = { "xfor" "xkeyval" ]; - sha512.doc = "32b5391c7197bc29783bab0c93a5225784fea999f69bdd8b1b5c152ed338716f82dbedfdb6cd19064ee409407c0b808e5f410e6090cda6d1f8ded2ca41f3ace9"; - sha512.source = "e149a3be96ee0161b2bd872ab73e74c36ea638f0a1f0a48e0268093bdff2c2c1cfabe5c0a4d3ca8ef7ee4c02bd03710c5c1b2ff9c1b543ed792a444160814493"; + sha512.doc = "37bd02213e0b7cdd4c5fa8c90cf193803174201b1f1e74c5ad8f8a43acfcef7e60020de4d9ce51eb151a4c5317128ca774e280cffe0e7e816885c65c64feda49"; + sha512.source = "53ae99f603c2d525a18ebdf3b446b4135275b764d6da0a834b485d9a361480f0eb5d92fd59ae522a3640ae834ecd2ab8d10969545907c763136da9a5812f6945"; license = [ "lppl13c" ]; - version = "2.32"; - sha512.run = "323b1526a32eb4e0d81db77278d66ebb6ac91fa357f7f76c8ac1f199efdc4be17ae4f8fb83fe55f3ac9cfb8a18d163a85d6c21cc11c26e4dea0db5f85dc12dd5"; + version = "3.0.1"; + sha512.run = "32d0da9d29bd38848d08525e7f6db75bb76dfcd69e91ceea4c130a3a16472f5adcd838321ba60fc7c3ebf3f6ba01dcd94c0ff661ee6cb2d51d87f90ff1b2587d"; +}; +datatool-english = { + revision = 74422; + shortdesc = "English language support for datatool.sty v3.0+"; + stripPrefix = 0; + deps = [ + "datatool" + ]; + sha512.doc = "fb54e130e8e0c1f649f8332a4b894ede247153b18c408ca0e183c14cbdb98a276c32a5b285f4296c21c9eb7c645021386948ad3aa11cf2054f7d77a77bd08690"; + sha512.source = "2e593dc2d4c4fb730ed69f1733ef410fd6d7e1f6d82acd5e235e79dd9ae62c1fbc01f1bbc5e89c605be6d2f9c84266de30c39962151c46f14159766376b1f7cb"; + license = [ "lppl13c" ]; + version = "1.0"; + sha512.run = "d9d8b85dea66360995d236a3cf9c6a559722984d978607fda8bec172e9271a01725c66332a65bb0d3001ca0e7af0707e9de47168a7429773ed55cfa962d2a10a"; +}; +datatool-regions = { + revision = 74400; + shortdesc = "Region (Numeric) Support for datatool v3.0+"; + stripPrefix = 0; + deps = [ + "datatool" + ]; + sha512.doc = "f709c43732d70988bff507db6819928df462d1ac125d321cf19ad47db3e26664ec7844745e959c0840b96794b91080731efe322b1ffcc5ec27b0692ce0e1d04b"; + sha512.source = "9012c861d2f3d927893ef73d0cfd09c3221c450564e1fc75371fb65f3d987678a2c1ff32ff0e32797f386408b0030400a294a43a6fea41e1c721a6eb7c1899ef"; + license = [ "lppl13c" ]; + version = "1.0"; + sha512.run = "98503b4959b7fc61aba6d80a0c71a42e42cbe774ddbbef1604fa25e6b458a33afd4476e5c5a6dc206e25b0ee2e69a34e0546b0b71a90075e79c4822550ce7aa6"; }; datax = { revision = 61772; @@ -15455,7 +15652,7 @@ dehyph = { sha512.run = "2dc4ee5b4389549c032f3a4d87740ab3c5e296a1ef109a6b673656a82ca4c317ca774f39f61417568b8ccbeac787c4058184fc893d53799bbf0b042ba5aca9a2"; }; dehyph-exptl = { - revision = 70233; + revision = 72949; shortdesc = "Experimental hyphenation patterns for the German language"; stripPrefix = 0; deps = [ @@ -15482,10 +15679,10 @@ dehyph-exptl = { file_exceptions = ""; } ]; - sha512.doc = "f57b785a92c950d808f4f29d1024264620bfecb223331295773bb0c74d02e787234910350b98e059f270445750e5b0832e04e1001400e92f2241c32bb94af64c"; + sha512.doc = "6b3ddd4a00f70117ae5b8d56f9ff2a33d6acff9743765fef01d02aa12c87c1e3d3d2684dde1c7292dd3c580a231358b3a27ba1323e3ec91c5bd5f24524101e12"; license = [ "mit" "lppl13c" ]; version = "1.0"; - sha512.run = "8c3b5b3f8d02094c3ac0028c5983f0a04ba8dfbe07c99003d27fd39263960d0347d0c26499b52d7d9e182a6e771b01a200fcfb56c2b5ba675d661ebe9191ef38"; + sha512.run = "2b1f6bdd423ececfef4519c2bdb9bc000d88ac3589c2135602c52e2217ecca73bb136844a7e950610692b7eeb1c43eced6f9a4812a736eaa31041d1d264d6b42"; }; dejavu = { revision = 31771; @@ -15500,13 +15697,13 @@ dejavu = { sha512.run = "a26a57bd02b14c6e67d328c2c00174730b819f7da37ac147ec7f34f37195b6aa17e3223ac4d03617f5239700b1dfa45ca1741eed7b4488d2e604f02ac34ef2a3"; }; dejavu-otf = { - revision = 45991; + revision = 73003; shortdesc = "Support for the ttf and otf DejaVu fonts"; stripPrefix = 0; - sha512.doc = "212663371f747b03694327a40de3bec0be8efd5cda15c0cc343284f3a427890e8d16c4223098fc16a260b837a9d522c9cd35876a4c1004e09ee9ee29c05ec7b3"; + sha512.doc = "9f79b829db645482180267b158ebfa837c48f2df79e2c31f07d5307a79c354153ed3b03f89cc283a85b8c1ac2a1859d70efec05c90de4f2b923e08a307f98f06"; license = [ "lppl13c" ]; - version = "0.04"; - sha512.run = "d0d32f3c9d53a1a61e6e717a6275f3fc934c0815fddc3b36fe2afbf7702e5128d4cf15e8cdfe8b02009a6fb7c203ea42b134eeeb080b9765ff99c4143f887744"; + version = "0.06"; + sha512.run = "800098019c3437a85f1e7db7a72a8c9798d991123bdccdff906021c47dadc1a957ffc4eee564fdd3c2a7e5f45e5f64b32bff5e4bca9ecf0df036d4be7178f4b7"; }; delim = { revision = 23974; @@ -15528,14 +15725,14 @@ delimseasy = { sha512.run = "7f9b1d77e9b9bdc6e5c45ed3c38606fb0d65113f7303e03f591c1b84aa83748d72fb8ecde0cd0c7b19d1bc9fcb454834e156429fd9080660aec77ddfd7b53e42"; }; delimset = { - revision = 71829; + revision = 74355; shortdesc = "Typeset and declare sets of delimiters with convenient size control"; stripPrefix = 0; - sha512.doc = "bfe0517d33fc23225490477b8858572b70b45e43a2e9b3019aabfe673a69683998c9c0f20e34efc15bcc0d4bf135af2cd867bc326ddf747ab02cf0973de5e7e1"; - sha512.source = "15867340a499e18e7a450da5a3b51a368a17755ed377a154a1bb4af9edbe3768102f879e472874e10cd3c82f2eb9649c4e2a7c15fd51def3e4319dd262caa565"; + sha512.doc = "73223a6d895ed2cc03455ece192b90cfd51d7fe451f153dd409de1939d27d8c5dcd82dae1ed5ed12c8de80d0714038896610fcd187cef0fe28677c5518ff0126"; + sha512.source = "7fe0fe753e4f9d11858113fa1cbfa5869554f08599550b104bd60169820e8335ee8c6310651c5e9402540f0d99095f392f9aaab466db9edb29857bbe301d9f7b"; license = [ "lppl13c" ]; - version = "2.0"; - sha512.run = "876eb8e327bf7a84760147bb3a360d7f49b79c2e1f13d14b10ad176d5f66bb696ef881bc5c513d131fd82b056b1b1208823274fb53e5481e50081f72f06102e5"; + version = "2.2"; + sha512.run = "3385caf0b9bdeadb746516e1bef5d49eb5934bf90f8fa860a2a5e81db298a2adae475b118ddf143b5f3b7d8e751c19f0a73e721ae1f609945a51c28e6b3b44be"; }; delimtxt = { revision = 16549; @@ -16238,11 +16435,12 @@ dratex = { sha512.run = "1a18f8866d1cffb0ac3c277bf27e1585c7596eab60ed51756077abe3154b6d67ea95205f60b5a244e9acabb05e8dc95a792d48f0a2fc492f90d224f85895fdd8"; }; drawing-with-metapost = { - revision = 66846; + revision = 72705; shortdesc = "How to draw technical diagrams with MetaPost"; stripPrefix = 0; - sha512.doc = "9d3ac79b2d4165a3e7fe1675826db2190b7bbdeaf8b14460a618ae909e29dcd9796aff70af98bae5307f67945434ab3a304d955ed5d56e17ea94a67f83f2ef09"; + sha512.doc = "6b29a6afba3c17862ed9a67cd9d52f80a84d57307f94152604247e7355469123fe4ed02892101485b7b1a6bd3f1a3d68fbedc622128157ca8ccf6eb4adb350dc"; license = [ "opubl" ]; + version = "2.0"; }; drawmatrix = { revision = 44471; @@ -16345,13 +16543,13 @@ dtk = { sha512.run = "8632a835439526deb7c0a60e9d057d405fcb49d3501fe100e505222d77aa893088ffaddae886ddbcb15601d2d2f77ff6e5918b3f043e45acb5954dba85703297"; }; dtk-bibliography = { - revision = 72281; + revision = 73293; shortdesc = "Bibliography of \"Die TeXnische Komodie\""; stripPrefix = 0; - sha512.doc = "c6599bcb08200c486baf210dc16c4f5cec693cf55c992b48492510235fac6efc25c445fc10f593f7c2bdf2496b3f3f989fb52dd3013472c1eb7de47b5f691db0"; + sha512.doc = "27c2cfd31f58192de0d26cc0a932b3b7467ba75e6893bcad5813dabd98792f702f3396f5ad3c80b77ff0ebd00b0e74ce19fdb98f5b4bbf83e88e40abe1cb653e"; license = [ "lppl13c" ]; - version = "2024-03"; - sha512.run = "239db4b8cb77f8576d579902ed8baa957f261142cd34333e8ef39e7dd399e5397324e95cc539043b4bb4fe9aec7b933c6972fc58896226d1933f15fcef84bb67"; + version = "2024-04"; + sha512.run = "dbe1d624c1f3b8fe7d6dfd054d24b765da387624e0f94e760038206b50982cc4817313079b8a0b53470259894c4e133d01577c15ce4d70cc7753d42f89ec4bd5"; }; dtl = { revision = 62387; @@ -16572,20 +16770,18 @@ dviout-util.binfiles = [ "dvispc" ]; dvipdfmx = { - revision = 71832; + revision = 73031; shortdesc = "An extended version of dvipdfm"; deps = [ + "extractbb" "glyphlist" "texlive-scripts-extra" ]; postactionScript = "tlpkg/tlpostcode/dvipdfmx.pl"; - sha512.doc = "e40f344c5eec99c84aa9daf7ecd048db9324252b46440c74341b3054a2d709660790efc1cc2baf94d2095da0ddb4f26fa2034a22f458d1ec87943d1ea5a798db"; + sha512.doc = "18c2541660f8aec093b09e64e4dde1f0c4e8043afcda8cc46a2c4880c151a1f8b4ef3693bf13c2740686a5dadf632ec5861d733207b6d70be82b85e515f1496e"; hasManpages = true; - scriptExts = [ - "lua" - ]; license = [ "gpl1Only" ]; - sha512.run = "a305d80bf9c5aa91579f457a3edcfee6cbd741ca0c89311fce65144af2385076d4172294ac77bb28f4793808c00c7cf7bed2e03edd40cc88a3a946f3ca2c73de"; + sha512.run = "3d5aa124693fd33ab1ae93b4bf706a2b4169fa0ef6a74668fe696bd7c25ed6912d827166664f4039c720b80269ef519acf858c8749f4c37d6a972d5ffe2ecc7f"; hasTlpkg = true; }; dvipdfmx.binfiles = [ @@ -16593,17 +16789,16 @@ dvipdfmx.binfiles = [ "dvipdfmx" "dvipdft" "ebb" - "extractbb" "xdvipdfmx" ]; dvipng = { - revision = 70015; + revision = 73766; shortdesc = "A fast DVI to PNG/GIF converter"; - sha512.doc = "333d44ac56c93e4142d3b6f7b05c432698433a886dd6eadeefb14374d3808b4be9fed9fd1c8c07f0c9dda42b2499cca7ad676acb3b61e7d21f58ccb7ffa418cf"; + sha512.doc = "29e90ddd16a54ef10dd3ec9d6c83f6ccf33dc5724cc9f71d93876040aa00a909dee28bd274da0b0d37e10733ebe6d450aea4f7b7bafdada54a526172e69219cb"; hasManpages = true; hasInfo = true; license = [ "lgpl3" ]; - version = "1.17"; + version = "1.18"; }; dvipng.binfiles = [ "dvigif" @@ -16671,13 +16866,13 @@ dynblocks = { sha512.run = "bda4ad43754e7d4fa87cc4ac5bdb772cd24a4e613bcf7993e3d448a9c884aad5ad484c6dd7739f4c6edb983560181717319dc26376a6025f3847afb588fa47a1"; }; dynkin-diagrams = { - revision = 71883; + revision = 73036; shortdesc = "Draw Dynkin, Coxeter, and Satake diagrams using TikZ"; stripPrefix = 0; - sha512.doc = "131ebb94d043415e84e3e4e1c821c0d735c05ee4424a2c43976c8c7280dc652261742a49d53f1d34b5de174c7003ab1d936e629297c604e75977424aca56d655"; + sha512.doc = "d7644ebe7be8f9b439dffb7ad67740d5af79b9ffccd366f4bc918ba8e6296494274f66ee13488a58c8a8e95322d779bafe170fa9f500bd28be2e5019068a988a"; license = [ "lppl13c" ]; - version = "3.14159265358979323846"; - sha512.run = "f2f57ddd28f9d7c361b0bd05363bd75684068f516705cb16c1ee2f0c5a24bf9df1fe47e7e6560985499e9fb3b08787104b82b06fdd8722ddea80cf435544e527"; + version = "3.141592653589793238462"; + sha512.run = "44fc1acfcdfc9dcdba089c813d9857e6d52527cf82e58b8ddd9e346c298f03e32dc7bc89ba99b4e2e3c12a6be89b33e59450677f9a0b45b91155b3e4b521ab53"; }; dyntree = { revision = 67016; @@ -16742,23 +16937,23 @@ easy-todo = { sha512.run = "88b496c1f4f56d26ac2fcc6d82e28d71bf11418368d82d3dcb193f8299672bf41d6c15938f3f6af5ac28141f2a52d132844fd178ebb9694de7f7a22fe8f13eaa"; }; easybook = { - revision = 72667; + revision = 74266; shortdesc = "Easily typesetting Chinese theses or books"; stripPrefix = 0; - sha512.doc = "287fd56d4023cc22275927b6064077cfc84bd6525d197817b2101a68706fb29e658a6c03e0105691289c92dcecec6d00001aa4316e77e714d8c7812ca2b658db"; - sha512.source = "aed7c3a52760cd903d07ecac178e2078b0877e6df75430a7826ebd7f31d787d23eb1296a5be589d44c9a2098e25c6336ce41819a8ff6eafed647eb9a719e7fb7"; + sha512.doc = "3d2c67775e18409624aae871be4fd83a5ad3e30bbfbbe3d5629c44412212713adc26f6c4221937425b972dcd22fab7e906448dd3e3036691fc66298ddcbbba95"; + sha512.source = "8e81621342f0a2d4dff78be3201313cd7dadfa08426c81452406a54f96040a93b7b3cab50ac0193fa82ff53a97a38e7c256594699f27dd5f12d2339dd8b80bf4"; license = [ "lppl13c" ]; - version = "2024et"; - sha512.run = "de7a5c67f46236e0ebb934b89c2c61fb1bb68911a1954bca71caf36a0594ba1b8eca754a21d194e45214c8fc7526ec466d1e18a37f51bdf6dae8e78285ca2a83"; + version = "2025s"; + sha512.run = "4f9fefb8611c056a6aca45d10586768ac9959b9dce2f80429ad646c2c393fa420ddcbf7280dadc3a1be3ae79590dda5d76f1f0e370e6db278200a148ca18cf87"; }; easydtx = { - revision = 68514; + revision = 72952; shortdesc = "A simplified DTX format"; - sha512.doc = "2f9fe3dd6b2ee2d326a05de9f38966f26ea5baa154c3d7fdecea4af944dd041858b9e66f593b1a246bc6a3fe7d44d64fe1ddcb72e2495917bf8f4ad38b6531c5"; + sha512.doc = "82cf693814547bdf5f13655cc0b2e117a08d5d0902701790045c05979afeef0ec7ea7f497cc6b15d1dd07b18edd9fe9bb59dce956cc2ce680bac3a005d8884ad"; hasManpages = true; license = [ "gpl3Plus" ]; - version = "0.1.0"; - sha512.run = "f3297c900999197a5acbd73b931bffb21cc989296777b4884d62792d283490e46b06282ae5ce0cf3b0411690432dfa442a4f00c693f4d6677b9ced6037234914"; + version = "0.2.0"; + sha512.run = "f2dc6484f572288024a0526d2e2e4bb719c32896d9532db81689741cf519966b079be23359273be3e7f0fe160f6b867b5287c4db5de390ce78668d04a98d3a47"; }; easydtx.binfiles = [ "edtx2dtx" @@ -16774,7 +16969,7 @@ easyfig = { sha512.run = "37a8654ee9f53ed35003d7d78fdae32ef195aaebc0530310e7f00829cec431d7df4f9bd807da8dae844731650a79a7cb9f7a7ca20c5dd540bafdca7975237503"; }; easyfloats = { - revision = 57204; + revision = 72699; shortdesc = "An easier interface to insert figures, tables and other objects in LaTeX"; stripPrefix = 0; deps = [ @@ -16784,11 +16979,11 @@ easyfloats = { "float" "pgf" ]; - sha512.doc = "d6e96d7af908e83b67b77f0432e6ffcdcc55b64bc63ac360e42291f16adec4ab6655a423f5fc8f31180071afc5645f47b7ecb2c1c80af719b6cb0cc6e77948da"; - sha512.source = "b21681d30b8963127d603bf81b140851b5e8ea17b63d5979bc05bcfa68efd67460b9f0d0419a69c44606a4d569f5840b3c8d6f0ce7b0cf18d86c1fa104776b5a"; + sha512.doc = "3b7195ab443fa8f03e2d0d0634adedd43553c89c624d051efe118894db784972e78eee03fa6dcbc486a46956d1c197b10093cb72ad18d2faf7bad0f8e4e12cd3"; + sha512.source = "f914a4e32fd756d78cd646bd73d3a98234b5e2b4cc3539e075bfb6bafb8b96cb9489602d4c9c765133c0671bb1ff625ff00c4cce90688687400c9040f1dfa2c3"; license = [ "lppl13c" ]; - version = "1.0.0"; - sha512.run = "2d02a55fc3d50e5fb79ebe8188300db47aaecb42089843033c569ee0508a38f81e9409d872535e1f7fe3b13a067bdabbf8249073b803c8d232d08aa1d5520d48"; + version = "1.1.0"; + sha512.run = "e739fa07848b904bf3a700ba768168554ed9b385e31df0c1ba0d0cdc09627c802a9fb8f376d84800321f745337940334660703d4aac70fb898de195bcc054469"; }; easyformat = { revision = 44543; @@ -16840,16 +17035,17 @@ ebgaramond = { sha512.run = "d02ac16a7ccb8ded53a42c002824791376357db9909c197f1fec6ce62f55d136833c995120e7a077e51b802c8cc2e1c18234d0e7833222fabd1f6bd04933578d"; }; ebgaramond-maths = { - revision = 52168; - shortdesc = "LaTeX support for EBGaramond fonts in mathematics"; + revision = 74174; + shortdesc = "Limited LaTeX support for ebgaramond in maths"; stripPrefix = 0; fontMaps = [ "Map EBGaramond-Maths.map" ]; - sha512.doc = "d2207e0f6535be6ed1a53fc15717a60fab0d473da4f307cfc70c7271fbd93e7f6cbd92d1c0f0738da6d1b607832cbed95e5c87edd53cc5423f35f287289b4573"; + sha512.doc = "6e6128b98bee5656995c2a98a9fba2063af6ca27c485709ade4a9019c48b138790dc6ac82764e8c11927b25e0894cda14bef52ca88c4f8137d1c9dd3aeb8273a"; + sha512.source = "2975843fd5b57b6b63b5cbf794def1525f11a32905e7bdc9c047a0fff92ed589cabe6606d77d15d6df7ddfa6104956819f577e30b6356280f0b81c992abc154e"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "5d65f676daee62f96875def0faf6d1fa217143046768985956372473b4cd3c6c00ca650cdedcdf677d6ae6a03c65743d30df6d32c36cc8366d8a1a9961bc11d3"; + version = "1.3"; + sha512.run = "bcb9f79c53c13cbce28e58c5e9991d5535db4401a752358398ea6f5f0f3a3dc2a512455f0c72bd2a0f2d048511bb89a60bb413b57cb5265c66f3fae10dc125aa"; }; ebong = { revision = 67933; @@ -17329,14 +17525,14 @@ els-cas-templates = { sha512.run = "cdea81b550a3feb99a1667fb78b1aa0632a6be669ce16fb7e6b0e5b5642c18201b194ce2e9f614b86e08a27479860b66d935dc69ff236fba3f7ba17cb32419a5"; }; elsarticle = { - revision = 70902; + revision = 73421; shortdesc = "Class for articles for submission to Elsevier journals"; stripPrefix = 0; - sha512.doc = "fbf28810dda49b299e543b09bed81d0ef7463fc391f8f4509448944123dc4bc3558d11a41c6e645590b0199a85af520a2bf225260191aef2273f94b5fb179073"; - sha512.source = "c6f206a16e52dc1b5ad89641b7af75c1c34d8d948727b19b296b144b8a5a5122802f278e5845750c1815bb306ce53277e9af70dd7f53b92b4f77e592bdd7b202"; + sha512.doc = "f270f0caf84a8fd7eb77ddbe10f8bcf21af29b76aacd34fded042b5ddb3582e8c15999d9918e040d0027ab8d5d933ab8a838eadd20025dae3c147a4db31fac54"; + sha512.source = "35acfc44af6dacee480a4fb29629e32b896d761d260ef3fbf75b7f45e7145f2771e901412e80194e69e9367b2b0faa0e7e30f3fe6f9b410d4a3500b6d120b658"; license = [ "lppl13c" ]; - version = "3.4"; - sha512.run = "4c60c80b0f92c0df646ae36551eaff7f1716a2247d93d24fe1a7061acf8df617e87f548ab81953ab3660bf5a4fd92ba1663223955bec8f33eee206d435f9419d"; + version = "3.4c"; + sha512.run = "54a1c1e16420592b615d62e18e2ac992e903ff1d03003c1ad1b9a66fdd83d2b5499242a52f92732af2c174fce30817dacf9fe4681b53828b2888b5a68de7aadc"; }; elteiktdk = { revision = 71086; @@ -17498,12 +17694,12 @@ emptypage = { sha512.run = "6379cbd0983ca7b58d2c94ce02a76e054faab1afb2942227469dcf2c4d572d9946921b6d24e9c7d2b5a82cc45e7e380a8ffae671f165ad0e2a3a611b95841352"; }; emulateapj = { - revision = 28469; + revision = 74171; shortdesc = "Produce output similar to that of APJ"; stripPrefix = 0; - sha512.doc = "2d226b60313de3387d87c373a23e490a66c2fe1a94e97ef2364e65fafb037a148db7f5162ab9d3f1d788a037fdebe02ddedaa772eb715dc1ec8fea941b0e6708"; + sha512.doc = "092f5dc790251f6a6db8fdabe5298a0bb7186a0d4e40129c18020a3f3f8dced3dcb21a9359cf5fff9d110c8a824a2e0066c37be34ba90bb735895c006f8d5961"; license = [ "lppl13c" ]; - sha512.run = "12b73ef4234af72358c1f120d860b7ba823bb4d65f91cba348a4a136b57f8edccf3849eb36e95c50cc40445a5fe3908652c221b938ee34a17aed6b4cb265744e"; + sha512.run = "e1c505fe122a6a53e0b4eee64fd39d325147b30f69740233311d78d3a3f91fbb1808b95e3ae37fceea837c0303df1aae4fe6343ad4604156c18715cdcafd8010"; }; enctex = { revision = 34957; @@ -17533,14 +17729,14 @@ endfloat = { sha512.run = "9c3820ddd36934dcfd049ab766ed037119459d02e9c049401b910b1c14ae2aed93d94110db66f0cdd2149451e152b5bcac14866c7844ba4a47f8c0a27756f733"; }; endheads = { - revision = 43750; + revision = 73964; shortdesc = "Running headers of the form \"Notes to pp.xx-yy\""; stripPrefix = 0; - sha512.doc = "bbed9408161f827ebe39ae2161e89f1f15d8327f29f7eb18bf58f3cac7c58492529caf05ebe3111891520c406c547b2f1aa57d2927c5f857ea6e02ecfa9cf84b"; - sha512.source = "c58d68a17da865391ce4480dc02f3375ee6d311a2590f8505885c3ce7fed65b2e7d6c6dd5838f55f4fe3d7192b56217b7146646269938a3a10cdefd3c55bd0c2"; + sha512.doc = "cabfe7ee2e0332eac8237f6264b8885a555ead1d21cc5e7fb17ad2ece12959e8780770b0d3aa761f0f2fcdfc44b6c5a83392124fdde6a9830762ffdb481ee495"; + sha512.source = "ae44958e3c1b9c0a4a93c6668c44804fe7d956c7c3cc15bf7f3e56da62edfe10f896e80211888de89f0b8235a719b2fb418ea999c38d6b0d30754ece84fa552d"; license = [ "lppl13c" ]; - version = "1.6"; - sha512.run = "55f01774d62616b81fc846af275067445c8979d50cbb67c8f6cdc362a26999c83c9ce5428af28170ab9e4c6262fc4ed8bd0431c5aee8aafa89e38bf4cdc30989"; + version = "1.7"; + sha512.run = "d02c2f616c49971b779be8638b5e8b3d0627ca2a8dda962ef219c3cae946b4a9cd7defbc60989b8f4fbcd318fe6960cfa8a2e9059efc5f9e24d7dd23077c2a58"; }; endiagram = { revision = 34486; @@ -17642,14 +17838,24 @@ ensps-colorscheme = { version = "0.0.1"; sha512.run = "68e47de3912143bd1a7263b493a30ba977a6b882080c1d72aa35b3d5416f4bc9a8f2de6ac0baf0cd584b106a38b57c4157b6342320dd23c0a607bc2f95284b97"; }; +enumext = { + revision = 72861; + shortdesc = "Enumerate exercise sheets"; + stripPrefix = 0; + sha512.doc = "27dab5d87c35e0419cfeec96bde81904424387fe439a40e2808a329d085fd3b229bab15ed6f8827eec27214849f6838ee5f91b8986c7af21bea994eb2fe7aa25"; + sha512.source = "1770bd770f9a4635d9d12e84017c5bf8bc1422f2f47addfaee31be9c04e5ea6b0c4aa90ec1d821161983dd5a8bb0557ec8eebb9a2e8cd0abcf10b94e046f5de9"; + license = [ "lppl13c" ]; + version = "1.1"; + sha512.run = "d2a5c8bb1e37ebe35ba705a04fde4c1710fd713e12deec110e8a7f9816f3b0f98c8eb095ef666ba521fb7c7d9e2c897a9ef27d33a1cd6d1c5f03157837509ce6"; +}; enumitem = { - revision = 51423; + revision = 73750; shortdesc = "Control layout of itemize, enumerate, description"; stripPrefix = 0; - sha512.doc = "b61f62bb0da61c7124f661739ebfaff6147d73899511d8b1a1d4b98b31bc596c3994acfd73c3c1922f5cc8a05c6a98572254067718be394c48976a10b2351503"; + sha512.doc = "a38b59dafc31398c76d1186345e0451376914d26e7f257ffd9e75978f5b781a16e3e537a4395f1988fa64cb3efefc7f99240978279e2d8701324ed37b4a8c17c"; license = [ "mit" ]; - version = "3.9"; - sha512.run = "d49701368b0ce611f5cfb52ec06616edc27b2dedb99230983ffc59c4c1eadc265a8afd3c94f1e57920de875c4ec684fec007dceca59fd4f4008bb5572c13880c"; + version = "3.11"; + sha512.run = "7a6fbf4a231a9041c241ad1113e905c4aa9307e42b0bae59ef6692b6d3d6c0638cb7336c6939e66bc82e58f7f4cea9910d0d54fcef344cea62bef3661d305f72"; }; enumitem-zref = { revision = 21472; @@ -17670,14 +17876,14 @@ envbig = { sha512.run = "e39ce40decbb52360cfe465d8a5147f9eb5bfae8dd42b86a868a46f1d3c2544d14035d6c307e116c0d08e6ecb62ba5943de803ee9d40a0a8cdf94a88aec8f808"; }; enverb = { - revision = 72137; + revision = 73422; shortdesc = "Read an environment verbatim"; stripPrefix = 0; - sha512.doc = "c3f7d4270612ef79cbd9dfbb080a7bcda120fd93193dcd3462d446520cd484af1728eedf3d5f34a55b1dfdfe145bd7183726929ed146ef709fbabc182796c509"; - sha512.source = "b75635aae25977b5b4f9331df4e9abb4ce1fa2735a12e874129e66ce08cfe2ad1b8ca5cbafd49eb1db1d1447b4d0e5c9018ec32438ac171700774b5815f96195"; + sha512.doc = "638359b6481158c1f2e2e5136315d31d4938dafa8770bf1b4149b11ba1643e015188181257a8554dc0f25d57f60c9127d4ea4488b4435270fb048fad2ee1a7fe"; + sha512.source = "f946a29ec7d5512eb1a66dfd5236635fb12ef4f126440361b81c72408ed3db017bfc1a502ab49dd962b408d803acced0075cd764a43909e9f8c8acf237f92758"; license = [ "lppl13c" ]; - version = "1.0"; - sha512.run = "412992824c9caad9314b9db0cf6c32aa0ed58da017fb5724557c52e05bd47ed3b8b4f93f95442d96033692ce04fbf5267ea3c9818b4e077c870fa9f80982f74e"; + version = "1.1"; + sha512.run = "df734750d3a27b2fcc54f03568fac1da5e31222caf2b05bb15b069b34ee2f07abf54f4fc15ab1b100c58ab660604897f66d3dc8e73306130417b1fd875229303"; }; environ = { revision = 56615; @@ -17703,7 +17909,7 @@ envlab = { sha512.run = "d4272cd079bc0b48835d675f1b36d0155d7da4cf920785dc7fdf608c311f43afb88e6861087c79774af6a434aacce05dda59f9e53aa7b2f3f37e06415eafa01e"; }; eolang = { - revision = 69857; + revision = 72724; shortdesc = "Formulas and graphs for the EO programming language"; deps = [ "amsfonts" @@ -17714,12 +17920,12 @@ eolang = { "pgfopts" "stmaryrd" ]; - sha512.doc = "6ce37139c0e96fa0516a870e028a80033b878a2651ff36b31e03edfd5f426100eb16513566f6bd970e7b6405baaca65cec31e94e52b453e42b29ff5ee28c6d0d"; + sha512.doc = "e2a0f6493feb7d1e06b04791c050637fe3fe37439fed28a31068485139de234b264e798d93fd06e5651a4ffc5a5cf5d4d352c7dee205503bd01a0ff1171d65ca"; hasManpages = true; - sha512.source = "fb1f8d04a0aeb14a2151304a894fc10c150fedf510427949f2080e94cf124f22f8810a6a39acf884e28ca44357bce6ffab4f8f360e1ead841e59234c44ea68a9"; + sha512.source = "9bfd779e93fb9e450c9600b1c8153d24db857879b8d628cb98990db1e0d54d408620bf364e7db3e0153dc0366cafe4e12d15f6b6f6f1e926fd8f62a7d894c4f1"; license = [ "mit" ]; - version = "0.18.1"; - sha512.run = "3581c5da5a97d8158e4fba0d6c6260a39e3b1141dacb63eeba9b4aac26ecf7a8e08bafa9f212bb997527a45a4a45aee051bda0c85e9d9e055a6069b946ccb267"; + version = "0.18.2"; + sha512.run = "58d0214df512456616ad835cacdfb4e4ed8da55d1f82dda08ad2a77e4f82dfd428fe89e5c4b2124f7ad16e3097e17ca97dcdb059e47c53302e9c4785ecef55b4"; }; eolang.binfiles = [ "eolang" @@ -17863,17 +18069,17 @@ epslatex-fr = { license = [ "gpl1Only" ]; }; epspdf = { - revision = 66115; + revision = 74490; shortdesc = "Converter for PostScript, EPS and PDF"; - sha512.doc = "ee5687a3add6773e127a1e83c91683b5c6ea5e37dd98ec5f5558a32015d292c31f1a456c985ee5d2e4201c0a47324dbac4a7129529236438676f587985bca64a"; + sha512.doc = "6d56ab25206a2900b26dc9ca04efdcad200d72427a44fc12d1a11af42b453fc2758c1b02495167e001c84c2db46147b63518be3638b80ecf51c226b5d9329aba"; hasInfo = true; scriptExts = [ "tcl" "tlu" ]; license = [ "gpl2Only" ]; - version = "0.6.5.1"; - sha512.run = "3dc467713b1d90b96a8fd3903effe209fe15be82463a1ef4693e29e7d145220936bed0e75dd3824a1e520f778ab9b96fe29389037e14690352db136e642f6a2c"; + version = "0.6.5.2"; + sha512.run = "d7a0c5791882d7976aa4c48f2a18962052c0262cb80105f1e8af4d4cdc2440f762f726d9b2c7ee9ad481505327726b67fd361300017fbe42db5aa5e177e5c981"; }; epspdf.binfiles = [ "epspdf" @@ -17977,6 +18183,16 @@ eqnarray = { version = "1.3"; sha512.run = "f5abd20910152cf65d92c7e44930729c1052f72441f162de2f4ad869f0ff37b669066f43089a1369298e9ebdb536ed62d437b3f34be5b3e417d8b0bf34d9c870"; }; +eqnlines = { + revision = 74313; + shortdesc = "Single- and multiline equations"; + stripPrefix = 0; + sha512.doc = "6ff8a22c07544c2d46eb40f97176320f65eb68601750d69abb2cf5ca0b070c2401c74c1042d1a33ca52d47569ed136dbba87300012282180f604816de6f46c2e"; + sha512.source = "b0f7c4da34f442dc695117e72880db1335a5aec329d9b0462608f6fe3ef3bab5f6d124fa4c4a2954cc4a7d1eb5d4e1301102a306e33cc537b811e5d07303a71e"; + license = [ "lppl13c" ]; + version = "0.5"; + sha512.run = "13eed55cb17d98a042f000d3bbedb336cfd9a5d45dae8c71fef7c78cc9a29d1d08a82a2468455a8b0492b877953a1aa9d053a61ef94394d17c7cfdf778ee1591"; +}; eqnnumwarn = { revision = 45511; shortdesc = "Modifies the amsmath equation environments to warn for a displaced equation number"; @@ -18019,13 +18235,13 @@ erewhon = { sha512.run = "ac74da8a957b1a3b2f79d42cdd6408c7e590231a857e0c1f6e7a87155e26f337b6ac55d1a924bae65d814e209ceed384857a17606fecabf61425f62080587572"; }; erewhon-math = { - revision = 70295; + revision = 74013; shortdesc = "Utopia based OpenType Math font"; stripPrefix = 0; - sha512.doc = "92a1bc2a4683d61c35c94a414a365e4cdecacd7a790ccf335d4d536e9592422925615d6eca3d334ca45e84e28fcffbb31666e35fb730c82b1f48529d21ebfacb"; + sha512.doc = "148dfb6b7ec9cacbbd9294f49df1acacecb7f1431ecb47ac14e0399207ebf1e9290dcf36b3664fe774c02d948cabe96f7ef55afaf3579a4600d7bba4f60345eb"; license = [ "ofl" "lppl13c" ]; - version = "0.66"; - sha512.run = "0fe28ddc1bfafb6e274a79989f36845f02eef9fe8287dc4b3e9b74323eb8fbc5401047daf52a5171ab6de5dcb4f9684bd88c57b3b0c8850b10ba7224fc2188f2"; + version = "0.67"; + sha512.run = "25177f37e39a7d12cb50d364a116ac5e1e8ecb9e9104d6b0fac372d157e6413d4d27fa2d7f340c8e028da0be23111b29c2224b9d27d7c1e6fe913deb04f5eec3"; }; errata = { revision = 42428; @@ -18312,13 +18528,13 @@ etoc = { sha512.run = "ee9e46861d53c0cf3f0807f55a78b2e9c24ed6d5b37037b87f162a297421548561728dbe268927e7155a16da256e61b24c74ee9b1c18addbca937b8c85ce21e9"; }; etoolbox = { - revision = 56554; + revision = 73895; shortdesc = "e-TeX tools for LaTeX"; stripPrefix = 0; - sha512.doc = "15f5f37471b991c1363e7d34c419c4defe1920522d6f666c383ce31b25b412d40a1dd6ca1c0fdb0e56ef3c7e529215964957c5a2dc55522bec60e79bdd972947"; + sha512.doc = "c01c29ffd9e8fe448c9e2b1ce80a8b17b69e564f88f6e9ac58e21f218c35b673028d91c666f38785b90edbd3f97160faddffaaf5ffe317868e4355b5bec36d45"; license = [ "lppl13c" ]; - version = "2.5k"; - sha512.run = "b4c2ba570b1636b7ccd741c8960335f4863fb7242253be6c071100b64ce0d6ffc1bcc9da5e9bc65830ae5e34cb4cf887220585c0006d7afce0af3ca95f96b36e"; + version = "2.5l"; + sha512.run = "60ede3e867bb17b725c8c6820b687c252a7cf3e2874590c17bd7beba44c79e6094d469582fc82ed28d162de815ad8ff0dd8cfe386751160b6055dda155927635"; }; etoolbox-de = { revision = 21906; @@ -18346,6 +18562,16 @@ etsvthor = { version = "1.0"; sha512.run = "c70654c50e186f73bd6dbbb65cc40cbfd809a86de223f96b4bbd1af94fc5fa928f2400eca58d6a97e5578186c58cd038a99264a412d9bb7fe15a01d7f3aff8b9"; }; +euclidean-lattice = { + revision = 72985; + shortdesc = "Draw two-dimensional Euclidean lattices with TikZ"; + stripPrefix = 0; + sha512.doc = "4ab8e5eb81ba61b5f6db2159d30cdf8a9f9c17f751b68d9f9735a2af4868f0f2aec650ccfa90fd734fd85707d922a616c4f4db8a3147ed019f25a8d7a36eb715"; + sha512.source = "4eec03b98fa5f0995c435896416ed31f929c9b9c443c2cd187f86a0d448433d9366310e933c19714d3d8ea9665b567a8cadd2d77211d9b9165d38787d9795b36"; + license = [ "lppl13c" ]; + version = "1.0"; + sha512.run = "00f1bbb866b5eebcfd2b5ec3b967fd09ccf2bac1ef1fe0e3c43cc4b666ef13c73fddd705ee9e87b240304a9a1b8fc86a5623af7f0f39726108995795389d176b"; +}; euclideangeometry = { revision = 67608; shortdesc = "Draw geometrical constructions"; @@ -18397,13 +18623,13 @@ euler = { sha512.run = "3b3d383a2f715f14dba0ab926d3df9d10ab63c06d203c59e551732a7f6af4ff8965750404a37863c91d3fc3db7d44d1a279d03839162fde9d8d9fd849f0047c3"; }; euler-math = { - revision = 70296; + revision = 74014; shortdesc = "OpenType version of Hermann Zapf's Euler maths font"; stripPrefix = 0; - sha512.doc = "bbb713b3b4aec1d9cf97ba17234b8dbb5c029264519ba7f87a22e4151d0c5a2198d41dc847dd87389a93eea071737e2ffd16eb9940f023348a9207335ee5e602"; + sha512.doc = "66ba4888bcb5d421cca59fb8152e4ed5cc1edfa4ee1f47c78383441dbe0855606442ff064efc5ba5fcb836fdb76fd34ada5a37b251577a80126b41a7233996eb"; license = [ "ofl" "lppl13c" ]; - version = "0.61"; - sha512.run = "cc418feea95dd9c32327dec2807e5515cdf38df533ffb237df65613557499abba1cd1983576a94a544d01833b4d71dd6434f508ff2f9d4ba2e9450267d9ce7d9"; + version = "0.62"; + sha512.run = "ee2af0e36a6b197442c1b0009ee9fcf64e22c84eec9145235e3e4e239da5125fffa87fa46a77d8e269dd40974162cede15b56a04b051a302cd1f1cfbbbcd9bec"; }; eulerpx = { revision = 63967; @@ -18444,13 +18670,13 @@ euro-ce = { sha512.run = "c1a864ebf022c8949b62195be6ce857ba108b7f930cf6e0152d70b7e3283e09c2f93fc670732cac79e3f48b860431186ea903324a02597b2a92fa43a0819b57b"; }; euromoney = { - revision = 72221; + revision = 73069; shortdesc = "Vectorial coins and banknotes in euro, with stacking option"; stripPrefix = 0; - sha512.doc = "7ff2953ea735ecb139772d2026f6ad3c8460cdb6f73ca0b19c8d1dfb4ecef0e9e5d2b9c4df2d584382c2028381dc016418b1b5cfefc21a97bc9cb40ca215a3d7"; + sha512.doc = "8333bd7f4c9c72889b6be3627a2c7e651de5e1a719c7597ba9d8577bf1db990d7ad6c64704e529703c9d45a91b0eba3cb45a0943185cc59b7ba2185cccc1d41a"; license = [ "lppl13c" "publicDomain" ]; version = "0.1.1"; - sha512.run = "229340cb9930ce2d442044350a2dfd58bdb04b9a588e7619cf3ffb13f1af49de81a10e0f9d169e6cf54ef38adea549d72a189c1111a2e6baf9629f2e3ce5e933"; + sha512.run = "7b12f378132a346a956c81e90d318c46224278f04079801a8b948cd14d17ff3f7c7cd09bc4109c6769fee806f99a065547c1a974d6ccef860cc9b6e186976e1b"; }; europasscv = { revision = 56829; @@ -18574,13 +18800,13 @@ exam-randomizechoices = { sha512.run = "bc29ee238d430b0d1b536084568ec8e68381c827c7ea7a4742eb497c7092ac8eb0bb990c3356eaf5939420e37979412c61ecd2e83a98a0e36739f1d6c73be3e1"; }; exam-zh = { - revision = 69917; + revision = 74149; shortdesc = "LaTeX template for Chinese exams"; stripPrefix = 0; - sha512.doc = "59a1cd83a32d6ad024cfb6148e6e818a0a454d079af4edd45c6ddfbc5e93e8bd6e800ec84b84f679c06367fbf86e37c7ae9d130207299d40a97988e27908233e"; + sha512.doc = "80d058ac4097dc281689ddd1d38923014245de5c17b6102ab190056ec4a9727759247fe7722acde5f40dabf7fe1fe1688c31fccff4ea6470ee096fcc35d3d7b2"; license = [ "lppl13c" ]; - version = "0.2.1"; - sha512.run = "fcfcc8fceb74b8fadbda2a0f13df071f6a3e6c5c997f6feae07f8f2460f79b77f2fd6045c7c6aa32efdcadcf9fb527328d5f6d6522b988854f404827de676039"; + version = "0.2.5"; + sha512.run = "c65891c25615af186d0426783027ebbc282f27ed5afdc83d0636691be0904aeb674729d12df65f0aba95637281e5f4931ade0b881029ce18dfac6a6dfdf6b060"; }; examdesign = { revision = 15878; @@ -18686,14 +18912,14 @@ exercisesheets = { sha512.run = "42bacd930a3fa8af36594984d5bbec23e062e7677a07709dc364019791411dc9311aec41fe9249f8509cc67db9085d812ad7886a6b8a310010cbde1985082407"; }; exesheet = { - revision = 69838; + revision = 73235; shortdesc = "Typesetting exercise or exam sheets"; stripPrefix = 0; - sha512.doc = "a01bf5c297629bc7a74db56f45bfeac4a78825ba20e885d2b26c5264c842236fe204923a44d7975effc99a023625849fec03c69feacf80bf1da23334c4e413cd"; - sha512.source = "3e285c073c10b5c0551be6f9544c9e21df44e39c8ed89f08693bfcdea40628eb6f2da25a4b545a378ebc9596fa2295190f5ec015028b8c00f8dbbea422da6dad"; + sha512.doc = "50d2e5ddd3e899afb5f3775b6b83c4c549c57d8db33f658884a1d6982245bad2f8feab158a9c84acc2626bca7cf93a8521255f4ad84139cb45535d193ff31105"; + sha512.source = "faa06b9f73698349f11f5a3af6fabe5158ae5e99e76fd37b24dd07f2afe3223096efff20f8302132f79c99773c6de772d6d4bef23e70fb7829ecccce1157bcb4"; license = [ "lppl13c" ]; - version = "2.7"; - sha512.run = "85122ce81519a49329c26797d0e44f0c52cbacf29a1ebb6f71684beda6b0e1d9b5ef23b8275419f4e788173cf6bc6d1fddd52662127e22d865c15be894a56032"; + version = "2.8"; + sha512.run = "0a9ef843a10a9468423c3bb2ed531cb07cf5ad2eb4005f30a3bac842e208a225995f02b8aff69491c4ea3352c97eaff05a8d54bb06c0f798b9d3c97b07dfa629"; }; exframe = { revision = 72595; @@ -18754,14 +18980,27 @@ expex-glossonly = { sha512.run = "2014fc075fab46dc109a290838b9aa5e52bd0a33c370bf822ad6fb74a8d492b58b5ec1adcdf1d0532cf8a53ed3de3eec80a87e550508675e2bebc048f3e89bde"; }; expkv-bundle = { - revision = 65623; + revision = 73212; shortdesc = "An expandable key=val implementation and friends"; stripPrefix = 0; - sha512.doc = "091fa4f7e8a3b321f02c874160eb92aaca0bbb9b0abb895c74f398c879cf52945ff3468f5f9f4f9d5ada750c47c817be3f9280328e6958ad7de470a11ca340b4"; - sha512.source = "aa9721025f7ccf9091933d95ff411a7fdc763f9d34bc191eb693dd2fdf4e8056e6db929977c89956cd4bbf0804a2c6f1e902b06e26047f55e11e6e2c15fb17ad"; + sha512.doc = "d94ba5a4e8a030d8353972862465e937f88586ddfc7bf60c018dac0ae9af5f06c96d903cfbbdede7c93c47ca0b58dbf54a6d34e6379b22977e163cb641bdf77a"; + sha512.source = "1a84dd60dcd95c2f84185d3d25a3d2cf6a009af19f0b5fdf5316fa4d1da9b8e181983dc4f9a2e83fcd17b003e746e5bcc28779c531eb049fc76699a0a6ca8f6a"; license = [ "lppl13c" ]; - sha512.run = "969711569e1a27e2b08fb7aa9049413ab55c6799d6e1b6cd1c92a79f82214e36d26608fa0613bc3299385a94919f8f2d0029bd28ff2a649873ba6f5da74d48fc"; + sha512.run = "864f43e90542762c5db2d0f38a91638fc7eef2606c9914eb0d448991cd17705771f0e967a3353161bdaeb43d4b0e9ba0008e601506123c56c713f307f21a755b"; }; +expltools = { + revision = 74292; + shortdesc = "Development tools for expl3 programmers"; + sha512.doc = "33b2589725de8b8d76502e5cd279b5146eeb141aac5cbf4c65344e89204f43617c68b81335fb4388c095c491f7321fc3cb56227139b3b1b0461fca6aa82f98ee"; + scriptExts = [ + "lua" + ]; + license = [ "lppl13c" "gpl2Plus" ]; + sha512.run = "d22b6aeed08b776071b4109d20e24a9cb5eb378035963aaeef885dba0751e15fd1a6a7f07d05e68120fd15180a55326f0871cc1d5c0cb86783e7a7fd4516ff1e"; +}; +expltools.binfiles = [ + "explcheck" +]; export = { revision = 27206; shortdesc = "Import and export values of LaTeX registers"; @@ -18800,14 +19039,14 @@ exsheets = { sha512.run = "475b2508bedfef0f537b02dde56e489ec464ab500e1b6b63e7d8accaf9d5c17e8973d9aee8d370494115592febe684262fbad239fabe5a314c5d89e781506377"; }; exsol = { - revision = 69343; + revision = 73991; shortdesc = "Exercises and solutions from the same source, into a book"; stripPrefix = 0; - sha512.doc = "8be8c7e37139dabc5095c1c77f21a55e60666067ffaed66448db31a3cdf1ef2c21cfa4cd8e4021ecdb6586f1a7b0ece40ebd79f485f878fb25249e1094b7b316"; - sha512.source = "d48acde6262a2eb4fcb2de2f0e3da5f7b0c33418d896235b2ec656df5fa946872c8cd4b266b8801fea5f9a30bae24154ab663358013e450736742604742578d8"; + sha512.doc = "59df3b1e64d4a023d59efc1bd7d7206c76c8ec8af9233a0441aa074e7835b64a3983ba1c89e416840a70b7ba5e16e222af13fd7ad7996728b957e8922723f2b0"; + sha512.source = "1b01e75c5bcb4a1d8e1d7ae4aa311cb8f3e8793c8f3c8d56ff42b7de4d6d24273b472243f028f70d60cc6061917cf0cfc3483d23f273f3be596f66bb66ec40ff"; license = [ "lppl13c" ]; - version = "1.6"; - sha512.run = "b29f3f9e3ba9d4b98b5db23876e69cce17740923419bc2999c742bd24ecf8f6434bc6226bf4f0bbbd17de79b45653b97ea85866b76892f07d696b0ab5b6afb46"; + version = "1.7"; + sha512.run = "925bfdc8a4f8490b716dad03d6350331231cf497737026a24d16cb12edcac80c3db4a7b97a026b858aee0f6d3e2507d299bee3e573c91a2df9f8ab4e351a323d"; }; extarrows = { revision = 54400; @@ -18847,6 +19086,21 @@ extract = { version = "1.9a"; sha512.run = "32889da48868c2335866bb5c229728f9a37dcfe552830ca03ad3b704d1f7a471ee120de2ffed07bcf50797f7e34dd6fce53c77f1b63d15071888171d44cc938e"; }; +extractbb = { + revision = 74250; + shortdesc = "A reimplementation of extractbb, written in Lua"; + sha512.doc = "c7e23ca59f1ef45c1c12616d86534c88767500a2904cf0f1205772a2e4c00ded6f6e3670d6a52e5ee840cdafd85539b6b4dea619ed2e8e15d1c623ccf670736f"; + hasManpages = true; + scriptExts = [ + "lua" + ]; + license = [ "free" "cc-by-sa-40" ]; + version = "1.1.0"; + sha512.run = "fd4ba203c8f313ba1e8cc4408349c45fdb259abc9268bc2428d9995051075f24fe4e354e6b6a5da1b051d74049e501ea3cba6f985279bc67a29e0f8db65a837a"; +}; +extractbb.binfiles = [ + "extractbb" +]; extsizes = { revision = 17263; shortdesc = "Extend the standard classes' size options"; @@ -18857,13 +19111,13 @@ extsizes = { sha512.run = "5b000d25ff594af2895408f0d83eeb0e7d6dd5604c53d5acd835898197e44fb88ed2469039489b75b45678f28182dc88a0af56ed1b1730be2ce41e6e81f13b7c"; }; ezedits = { - revision = 72273; + revision = 72849; shortdesc = "Commands for tracking document changes and notes"; stripPrefix = 0; - sha512.doc = "88c553a2733c461d23ecd6dfae33c73d1628500231a9309bde40135b15be69876a6d4c4e385cf3d5e220b631fefc3ceb4bd95a693ed5aef08879d38fe381550f"; + sha512.doc = "48503805f65e59ea0e3233179d6374bc9cf7b4de397693f0c8d59394d6c5a73baeff501a33cd4e0d02609e74b13979b66a6f4cf3a081f1ae6f27226872d4b402"; license = [ "lppl13c" ]; - version = "1.0"; - sha512.run = "33a5c5d068a0715d6209a9e3a5e293d290e54c9fccf6ddc7dad1b53fa4cb79d3d0fdf45f5afba13d92d9dac1ab7e7358c275aeb175886b255eeb05d5c5b87a9b"; + version = "1.1"; + sha512.run = "aea66944b4b472b20c2eb1658dfb191cb090874fa9a7522e7eef825d954263fe24b62b610a9fb62b08a207fe16c4c0a8dc5e41715d19bb3b392da03236020658"; }; facsimile = { revision = 21328; @@ -18961,14 +19215,14 @@ fancyhandout = { sha512.run = "0091703483cab573f9c9202603d31e310baafe932f929ad852c23d2ca97f21681637bb3ae34fd3d916f3e50f553b42ab1682b437f5a63b67c6dc4b7b7f202c80"; }; fancyhdr = { - revision = 71883; + revision = 73790; shortdesc = "Extensive control of page headers and footers in LaTeX2e"; stripPrefix = 0; - sha512.doc = "147f143d8a4a63fbf1024b0163e0f337b4140c9e37ae1a7213fac2a2e8b4140775b27809d1cb102d6b328b887d35ebe1005f228d352ecd9b9e5af5c74a401ca1"; - sha512.source = "964e476c476333880bf4ce8515c97eb3422b666e2c421bade8004db74327c6bb8ac34efbbc3d5ca31b32b6f545fd5c07984bfda35bf7573683a9ec4f25fa4c69"; + sha512.doc = "5a19ce5f2c0dcfa5b564586044585fed8c303f151fdc460742e7533875fbd6336433c1e73426755d273d267d2d9f1af74dbe755a091beb5c2e9aebbeaa5f75d7"; + sha512.source = "18c2dfc2cd45da8269712426315d13a7ca377fd886ff06213c1c1a80c6b33d1b1c33af77c51a12bbf1358a4941bc05f548ae811bacaa28bf01ff7d4bc0f363f6"; license = [ "lppl13c" ]; - version = "4.3.1"; - sha512.run = "6b9e23e88d86984fecef5552ff5e0038f358d2a98104833098276bbd5e471a25094a7775e78fcd1bc5d59c18089b560256a5a08b7808c707eeeb5bec04ad9ce6"; + version = "5.2"; + sha512.run = "f1a8e7da8938b10d3d9f04a7330e7cd9d9563d1440d364a5ebd04450be40fb47a3a2f8caae15293680d1302942456076a80226d99f33717ae4ea952e10fb9e97"; }; fancyhdr-it = { revision = 21912; @@ -19008,13 +19262,13 @@ fancypar = { sha512.run = "2f4e242eabb151834c6014a15d0ae012949e5e35f87bc32374e12f032bbb0fa21d6562b207ba855afaa28c36497cda3ca51eaefa579956f51283c84be8cefbba"; }; fancyqr = { - revision = 72472; + revision = 72986; shortdesc = "Fancy QR-Codes with TikZ"; stripPrefix = 0; - sha512.doc = "7330ee3ddda81046d5aced07397a8edb12bcb4ae5d4d79aed90b2b33a1adefa6448dac7f8472f0ed020c754d562f5b9176db48d524db86f207b6b238f8c5823d"; + sha512.doc = "2adfbe599dd9596effb24857dd3a8c77e6baceb122c13838ca17b779025d78350a58951223419a65a91fe64ad67f9e1295614a51c6502b6ada6ae66588acaf0d"; license = [ "gpl3Only" ]; - version = "2.1"; - sha512.run = "39f5605eb25941c22b48266bc659768a183bb8ff6415f0ec5a61d1d9d032c93f18849db9e552e10df7349a8b6c7251c1aeb5f4d60e68576499736811eee85059"; + version = "2.2"; + sha512.run = "5946be9b708b6964d8f861a6e227a8f31a54919427efcd39801a2e844105952bfbf6078cd17c6ba17babb7826b2edfdf32cc2b217b6d1d6bfaaa3c985cfed63a"; }; fancyref = { revision = 15878; @@ -19081,10 +19335,10 @@ faq-fr = { license = [ "cc-by-sa-40" ]; }; faq-fr-gutenberg = { - revision = 72499; + revision = 73163; shortdesc = "Sources of the GUTenberg French LaTeX FAQ and PDF files"; stripPrefix = 0; - sha512.doc = "878c6c2f278050844534105de0dea4b942468c017929720fe0a6e51b53a2287396f4e39665400f69a03cd40c676588799994fc218b68d2338f28d1c391f6a6ca"; + sha512.doc = "3a505ff478428f6b5d41d95b33f6d0453fa65a1aa2da209637b5dc5db2f05e2cb2544d81609ede6d793d025a701161e01332362ac0e7d3017b227fa9f74d08b1"; license = [ "cc-by-sa-40" ]; }; fascicules = { @@ -19183,17 +19437,17 @@ fcolumn = { sha512.run = "0edaa6ad0c01a2cf9cc06c65fec3bc13b85be893d7fcf4a92b0c8760d1999e5c3b90975e44c586ef104b020eaa0a18cfc4476b3abb243c5f2862941864113bd2"; }; fdsymbol = { - revision = 61719; + revision = 74250; shortdesc = "A maths symbol font"; stripPrefix = 0; fontMaps = [ "Map fdsymbol.map" ]; - sha512.doc = "88efcb300a84b6c214fec37603ea23cb51043af78e1af8aa6e3ce157bab1c8e395e71991c7ea7854051f4706c6b702fe0d48edd76e919a4592e57320b1f77b98"; - sha512.source = "7be26193e05d57fba2a91d57b49cbadaf5594d9ea843b9d9f1ae15608cf7d45e40112aa286bee73ee16da976c7ca7bb7aef5627cf8f0023cded506a493426b31"; - license = [ "ofl" ]; - version = "0.8"; - sha512.run = "e8b2d08c3e64def77a688dc9d96c0b9da9eaa4c942e571578fa0a7e6dff9eb3910ecc66a7be9334ecd41fdc0023f89d8c98facc2d42cd0095c75d6e1b4da69ac"; + sha512.doc = "568ae826b4c40a5e30a9e6ff9030f828b7736a2e3fb7696e2cd59930ca2d1a2584578eac50dbf0d3cb53d5e5a37f4b7788d1ff8cd05906535480417a364c6ed2"; + sha512.source = "4d1a34581916fd96deeb7ac32d0ad1f26310708c07d54e074b5d7bcfb751c7a951836480f7478f0c5ddb83886cd3c954619b129d9cbfe212a11efef66acea967"; + license = [ "ofl" "lppl13c" ]; + version = "1.0"; + sha512.run = "f2da5e70ad2c04ba47ca71e7f0980a917a38a36eb8f93c3f7c07070163f0dc18809a890470e2a9ba2b97187346d2d78154afb1bad9fad3da7e61419bfbfd6b42"; }; fduthesis = { revision = 67231; @@ -19225,13 +19479,13 @@ fei = { sha512.run = "2be4e4d83c5a02bfd43eed59741e07868e0e22489bb087f91de0681dbb04e999cff2bb9441b87937c3e2cfa60b7d4a1641dce4529a5aabc15df12d70e22e521a"; }; fenetrecas = { - revision = 68779; + revision = 73069; shortdesc = "Commands for CAS-like windows (Xcas or Geogebra) in TikZ"; stripPrefix = 0; - sha512.doc = "8fda8eeac400f810e3839f5197c53b808594c2536b1d4a5c7c96c788b8faec40a4efe403b065519d20f09cc1d14fe80e9e060d2b8e4a396cc9c1ad34dd16fc42"; + sha512.doc = "fa9e34cbb6b5cea35e285cda4547c1a2391b92f4c5d75e232ac6f63ba567900f315f886d339d9397c1cc312a4e1160670cbd39cdc6efb57332f9ce068d403305"; license = [ "lppl13c" ]; version = "0.1.4"; - sha512.run = "6337deecbd49a9ef9d19ab31cdd705cb49bb127ff451d9f3790a3ef8fa95ee7b65f52d49d22b1698d039fe268fcc178c07f30dd66ba7aaff69e883594e6956c1"; + sha512.run = "9d54e1385dbb036826f01318595096c9397900086c8dd4a09f4c8d890531b5f019c59ee7b52493a537ad7e329ae6607d2ed8054de8675e4ec227a01769fa706f"; }; fenixpar = { revision = 24730; @@ -19314,22 +19568,19 @@ feynmp-auto = { sha512.run = "64ca275292b12847d823322ced9dbad615a34089c8cbe43262e676b34db205ed56509f641e18e949523bd252ed1ea73eeb5f019e2cd052274c02b1df67860a25"; }; ffcode = { - revision = 70740; + revision = 73318; shortdesc = "Fixed-font code blocks formatted nicely"; stripPrefix = 0; deps = [ - "environ" - "microtype" - "minted" - "pgf" + "listings" + "pgfopts" "tcolorbox" - "xkeyval" ]; - sha512.doc = "6eefa300c1c198f8011da12cff2ba6ceae690dc78cf8b921f34694e4c2421e663884244a3464f663dfc3996067c8d09ecb1fa8d967c94609ad13dd66ee26cabb"; - sha512.source = "7f8e8e72a3df714fa80b733de82382b89644bec7265cb1a8768f28ea86981bebd5dbf2535b476b9fb4dad963bf1c03a8ec7a086f324fefdc485298b690f562d9"; + sha512.doc = "78d429df33fe8bbe838e334d18013293281342b2c390758db2e0d727d120265699814a3fefb8668e4e1f08c34113fdb61820a55f63df73b07f174ecbe528de1c"; + sha512.source = "011b5dee61fd61543f70f0ec13bc7f2c322517bafd236a1cb728da4c99ce42de7e4a3700dc68254f0418ad847647ef0b6fdc0b32c3f9cca56099cc079efd0459"; license = [ "mit" ]; - version = "0.9.3"; - sha512.run = "09fdaf7f9ce2057ece5b5dc559f9469ac22f8381b011eaae92f475713d6f70eb4f6e82145efea15f9a7ec724e5df1a30a56f2b29c3bc10f45db9be3c3d928d37"; + version = "0.10.1"; + sha512.run = "aaede3b4ca090bd609ff449cc6939ba1ee4750b8304b454503d0419c8377da3db422cff7713191f297f0fe8c72816310406f8f5f9b99045bfe872d4fce1acb49"; }; ffslides = { revision = 38895; @@ -19502,6 +19753,15 @@ filemod = { version = "1.2"; sha512.run = "e346e795df32a3b0cec0232da9c2b190bede65d905035a758b949c9cf01219e0880ec2ce2e83201f8dd9dcc77a98b29df2b463edf8c44cb1c220a7efe7c9f24a"; }; +fillpages = { + revision = 73550; + shortdesc = "Fill up the page count to a certain number (e.g. divisible by 4)"; + stripPrefix = 0; + sha512.doc = "88396becdafe8fc15d64c3e579f93913423583f64e1134291f3478756998be13cee89bebe1cfe3ad1eed58ef891cd731ea78c76f504097571f82d3c5dc7ae7e6"; + license = [ "lppl13c" ]; + version = "1.1.0"; + sha512.run = "b92c2b46874032192616a02128c42bce5f69b918a9c4e9394a50cf4fa03a5ea47cabcd0794a5b4c46de4d0b74e8e292e2ae31397739c4612c5c2dca2600d7338"; +}; fillwith = { revision = 72006; shortdesc = "Fill vertical space with solid rules or dotted lines"; @@ -19593,15 +19853,15 @@ first-latex-doc = { license = [ "publicDomain" ]; }; firstaid = { - revision = 71628; + revision = 72968; catalogue = "latex-firstaid"; shortdesc = "First aid for external LaTeX files and packages that need updating"; stripPrefix = 0; - sha512.doc = "7d7ae827cc2d776bb9764ff19232374ecec7b635b505963e8e5d71369d5a9a10bc89acc957e212369aac1fa0560292fac6df52df5c2dd07d30b3403fda433890"; - sha512.source = "3c88ed7d2e811fcfcf2aa43664f374528c863e1e12397655f395b541e4f211106f4fda4e512f46880d88c1a74acf591267aa7cb5742abb8d063ceb28e02b8af2"; + sha512.doc = "62a012822e860992fae4892d59f01f2c034e02015954716d323bfa6d4ad6ab05fea30f7e5d8dbe175a1ba6efb0c57811aad48ecb0d997e454e1940c665b00f11"; + sha512.source = "ab6196c1d172afb99ce5fdf5720e90da458fe4a8c4a5d0e3c5d232c0ed404725ed83b2764ce5a401ee11163cc6f24967ef830fb4a47cadc8aff4c82136ba94ae"; license = [ "lppl13c" ]; - version = "1.1f"; - sha512.run = "23a546b9fb06b49e6bcc27e3f6044ea749e9c61cce85b569b993f07fe7df6744026f62b3836799faae2402f9fe3cf0b0c0a6b463fdab4e24924d50928d5de025"; + version = "1.1j"; + sha512.run = "3804bb07c8a787fbc83da1d83c1949906c33026df6413db228565aefb0c8e943de7b7e9dc84055547b5223994f7a5b28bfde8c565c299e013dcb55183da1569c"; }; fistrum = { revision = 70187; @@ -19701,14 +19961,14 @@ fixlatvian = { sha512.run = "48d39745498c187d23c62191d7da6341ecc13d6c43ac97deebf453046e78a26d221b5c7b7ed22aa8909476a754e877de26c20391bccb5cddb2db1fa7b238d643"; }; fixltxhyph = { - revision = 25832; + revision = 73227; shortdesc = "Allow hyphenation of partially-emphasised substrings"; stripPrefix = 0; - sha512.doc = "37d6b9903a56d33577c8aaabd40de592bd78dc6b2f5a2c82457f6d5b499d1d6f9a9bdaff29bb9f9511365d32e160f92c85c6c0d93ed065fdd1688aaeae9ab246"; - sha512.source = "321e52dbc69bceea16f03d5d280ae10f497278876cdf3b7f64cbfb6f31993c18afc5bf4c38f424c9a84ffa55b235b73b4daf7d68dfd115c31dc3a237a6b64eac"; + sha512.doc = "920ae1ba377ae137051c510b5772deef771673144a824e1897d429e74fb332c229c71c6528b11e3ca9203947372d17b02f4969d2b2fd0699ae9697a477ee71cf"; + sha512.source = "a1fb075410a38549f2504958bba3bc6a4b3734e6e024e6bcd7ea0bdfbaae091841321e8b4ce124834dec917767327db3e352807d4b4c8b9dbfd9bb102c4592f2"; license = [ "lppl13c" ]; - version = "0.4"; - sha512.run = "df41497da718b157073b6ad2a4b9cea3f9ee0a0824698f47d4441b76261efb21271f1605f69b1c0de8a99e3e636587a25b4efdb4d578683ef0c89d7f849d2c8e"; + version = "0.5"; + sha512.run = "f392c0edc17148fee811b088ecd59cf87babf4b1c5c4beea8fd812769f33d31c22ff742fc78c68825d2c1ff57fa30460d2318532f712be46584164c78998f201"; }; fixmath = { revision = 64648; @@ -19931,14 +20191,14 @@ fmp = { sha512.run = "b87a361454199c16e1fbf97bd2b82f8b5569bbd71b7beaa780a6d88357e9262f77c9c3ce17d2ab0ad9b043ed7a1dd721e533c516e1b927f0439e13ced6598a30"; }; fmtcount = { - revision = 72583; + revision = 73821; shortdesc = "Display the value of a LaTeX counter in a variety of formats"; stripPrefix = 0; - sha512.doc = "29dae72e495896184e1c0b4365272bd310d91e8a4167edbc6e53e52388286468201a65c9fbb05caf7eca170b3a0c87950a398066f9a9a3511c5e957cea47fc81"; - sha512.source = "f02a381f7a86ebe5d65c6e9696f6dba979a5c7e8aa42bc47188c3df1db56a7ece77c8061a193597373a56b3164d312d85905806b94050272d4497f33b72ecebe"; + sha512.doc = "31f44ad6d70b80de91b752c6f98977ca97b7686ef344ea7c43016f4063fc50f87588f24110077c75b9e99ed3d4b20aded245994177f06ba75779f2dae8376924"; + sha512.source = "512ff3cbc2c09eb7c877179e5141100891e16d69b307bf8f2b71983ae5856c6b84f45c6daf9b752ce3ae88154105c0d14b0ce00bd7d4f0c0848ca846d092c021"; license = [ "lppl13c" ]; - version = "3.09"; - sha512.run = "7d12b3d818f8ae1928c6193c10202a1ac9a7272656f6a77b6cb7a2bf4cbb0393c8cb8e43083331c91efd07b5ec8ae6e16dd8b833845b5b49a0fd8beac722c028"; + version = "3.10"; + sha512.run = "b656e7d388132a8f1039a59170fac94a5b81c3e9041018b440389b0a898a286146b2fffee85a006e80f2961a8f8b3f1053fa1f198ed979082231ac575769156c"; }; fn2end = { revision = 15878; @@ -20134,14 +20394,14 @@ fontch = { sha512.run = "c8354fbcb6a13f2f874dd3df71f23ee1fcefdaaa1eab5166f35001811b9788ea2b53e5d5653437071d02978dc94b0a658bca5e2cfe825a0315d3389446b6c138"; }; fontinst = { - revision = 62517; + revision = 74275; shortdesc = "Help with installing fonts for TeX and LaTeX"; - sha512.doc = "23c569bdd6f12dd4cd0b5673ed9efde2c7c7988d86bf2f89409bc22c80f64ea80ca6824745b50ea3ef30f70e4bd7c8d7005a9e05e511c1e917a12630f4b4bdb2"; + sha512.doc = "63442c3d41351a570e53816ad8a9881f06322dce500f694c167efdfee983b6e1decdcc317c664f1f22fa2f0e715a6e2e278988e4a365528f77640bef125b70e2"; hasManpages = true; - sha512.source = "1645dfe5c6cd0efc8d8af966eb7363176ee7a44646b5860a3c137dd70c7e130340887e8690913d03be84eb1d84134c4ec2add713e4583a0feeefe4a1c4554402"; + sha512.source = "f9e888fb824d0ff79f75dbcaaa7e033df82363da6deba38af2aebe198d239ee61c773b01b4f40c3883f7fcce4aa657b22d1d1ef1f13ff429921428cb9603785b"; license = [ "lppl13c" ]; version = "1.933"; - sha512.run = "c3668f79f4b926090188386044fd68b0f13913168cdcb2aa23ccfd3aead488dec03e79133669bac3d2b719fdd2d5ef735fd46cbb27fd26fe560368f9e0cda05d"; + sha512.run = "76c79ae34346941fe0e4655fdc901722c856b38112b0f894b8b0beebc57ed0ec7829c345682b2500c43277503cbd1aa7ff27073617cf48715ef5b05829e4506f"; }; fontinst.binfiles = [ "fontinst" @@ -20163,21 +20423,21 @@ fontmfizz = { sha512.run = "43febb41a8bd7b0a89a2b60b52f9b83e0d0fa8303c0a7986658a95c93307ba6642fe07f8ac935ccb50b3047bc74100cc7268fde438d3ff80c944ac59afa6e3df"; }; fontname = { - revision = 64477; + revision = 74432; shortdesc = "Scheme for naming fonts in TeX"; stripPrefix = 0; - sha512.doc = "78199996913192f5f69423b6f412acc52b74f051b01d3e345b97b7f1d9ea4aea762a7b83488068f3091b41da69471d56b3f18ab4d299cc6adfe4e004072db303"; + sha512.doc = "93cddea6a7d360ffd4f17ef8c478168a41a719e7c459ced74c0a11b4fc5d552d14310659094e5a39fdc54da1cc2cf1c1db207fdd8383b30c58b796d93435a101"; hasInfo = true; license = [ "gpl1Only" ]; - sha512.run = "424da4dbbc07c41840e6aeb6fabeef5d4778d206b9cb8a90e752ebeb65d962b96ad41a7e20c86a16665e2bf48ad795d85001da66ff41b01ae3c949c6eefa4593"; + sha512.run = "5ec3ac1ecfc9d4b28cc262804eb77603aed40a3afe21ceb9a40ea8b53520c70ac17c773ffe11f9b3b8d03d3891a602fedd44dbe67b9e66e15566577a409f4fd6"; }; fontools = { - revision = 69241; + revision = 73362; shortdesc = "Tools to simplify using fonts (especially TT/OTF ones)"; - sha512.doc = "bcb3ab7f49e817ef5b6f710bbc227309f28396c6f4233e39e94163663f10db3daaa41b6db93a9ae85a26599dfce352a0c132a36b0c047ecf8f5269f428af4f6c"; + sha512.doc = "c73793f2c4f636a01f5a293e439967bf4c7f4901c435f96e1bae92bf08544be98d03c5a677d4e4a13b75c99df5af4c592c99f010f2a04f0fe012f1b589c0b4a0"; hasManpages = true; license = [ "gpl2Only" ]; - sha512.run = "5144f4a0636b49e63bf04f518b6c416623e2228615e33169839547cbaca574bed78777ab20f4db7e5820c1acd401b756896b39998c43f21f93de6cf8f987f6ab"; + sha512.run = "3e1445ce15d95aa2ef9fcbfc6198f40803291283604a1229c10eb04e4ef344f74353ef8009941127d852698b8e20aa378244c33ea08774773d9934bac8911350"; }; fontools.binfiles = [ "afm2afm" @@ -20210,41 +20470,42 @@ fonts-tlwg = { sha512.run = "3b1894d677b63c88010fe583381ff7c0c8a7c5c6753e62e166ffa8ae7f18d6a521b12a4e57f16634855f3b807605407cfad110eb405a3ad334f8a14bfacb6338"; }; fontscale = { - revision = 72614; + revision = 74423; shortdesc = "A flexible interface for setting font sizes"; stripPrefix = 0; - sha512.doc = "b6e93de342a92e01f54ae4aa082b6933ba0681d065a844bd169d918587c74bff68851b75a768d289a4ea1d415be33c6fc8b4ee78541b298e2f4cee9451803acb"; + sha512.doc = "976397703258df8770e81de791ddbd1b15d8f033ded3221830fee237c9526edea50dda4d97cfdc10e04acc66f8b236cd7c08e200fea9041df9720db4697f4b3a"; license = [ "lppl13c" ]; - version = "3.0.1"; - sha512.run = "145ea0181235bc9a5431a7f73460f9b5b53d6e5b6121d8fd9fb1acfff026a30afa30ad7df9a4f5d468000c05c464be80c074e7f8a3e60da6937ac40f2ee0cec6"; + version = "4.0.0"; + sha512.run = "8d2479d0a2bd8e46fce46b3a868110c79db53955ae3df3bfaa5d9e87419bfadcfd8f164199c173ea4b473eb89441c2db73949512a33ec83962578abb91b57c10"; }; fontscripts = { - revision = 72672; + revision = 74212; shortdesc = "Font encodings, metrics and Lua script fragments for font creation"; stripPrefix = 0; - sha512.doc = "95421663eb7565a4113f4740fc5a342857d9cb1212dfa65592fc1d5b8ce0674eb4fc2d9dc7b8e9b16ba13ec1b4317089004ff73790cb568df61f960c74d3adeb"; - sha512.source = "756ae518c7bfa559c7f50e547f0ffbbb74067f1d64923de5984761c070e9e16a9ba79fe6d34b9f3c9af3d40a03d18e09b58518f666be2c3dd9e8a0054a1ac7df"; + sha512.doc = "479dd297aab77cffd87eec6437daa54fcc3db21f0010f687c50748f83fb8bc8ab4d4bec695684ce00c5037a27e39ba65f9685effc1391ef4c1e8154efce8eebe"; + sha512.source = "a4bdb4aa0a69bb868f83a775a3e0ff999cf16fe34f5e4e467f4157854b69d45e9bf27c68e151c1298d6fb5a920a325cd7f363e9fbaec6637704b146511166137"; license = [ "lppl13c" ]; - version = "0.1"; + version = "0.3"; + sha512.run = "1d75480302beedb6a747d9f0ce87d212ab1aa953e622f32f8be9226ea8211b156f5694bfc0f74d91049ce1990cb01ea7e2d81e5988658f3e8ef30da55c7bd31d"; }; fontsetup = { - revision = 72261; + revision = 72734; shortdesc = "A front-end to fontspec, for selected fonts with math support"; stripPrefix = 0; - sha512.doc = "3d7ea26d54311bdc73af337bbb2995221334766a2956d3b4952eb730f9f82ebbf7fdf16cb1e388672fee3185d81733114211bd0a5edb4692942eaeee8928387b"; + sha512.doc = "5e95747772d41d7ae8e87a4a1c9fa7b82d190919208001da764f468c986e7d0e824e15732f8a1703d1b31cce484cb14bf3b496a9344bd80742d1abbd11b965b5"; license = [ "gpl3Only" ]; - version = "2.2.1"; - sha512.run = "ee45ab3a6c99aa1cbffe35e5a3042a67753e0571c9421ef30b405997978e0415f613856324a68328b4dbc591242a7f117ee7b0c02431f30dd42b1be7f6841e0f"; + version = "2.3.0"; + sha512.run = "b06f8644a96abbbfebc47254f7384a6f365342b0ccf9b60a2f8e2bece56deac3f2330348b6bd6d8695507040cd148e0e7e8f1ad751147343b15b2d66ebb2c7d2"; }; fontsize = { - revision = 60161; + revision = 73038; shortdesc = "A small package to set arbitrary sizes for the main font of the document"; stripPrefix = 0; - sha512.doc = "0b4cb325f4ca5b94a1757aea9ab3dc00dc92ee2b095dd35f176e7acbad7e1ec87a7e2b7cdf9ed19bf50095c41f221f8c791c0e7c9d541021768945a84a30e51e"; - sha512.source = "42b9a587d63a2a0190776851b86eb66c4e7e2811a4367ba659ebc996fcdf365b9447c94a4d04af5129a6b95d119e37735df9b26fcf12702f157d61932f64eef3"; + sha512.doc = "a51c5eec61721daf4c74a38e917c83d7498bc413bef1c6089e28143eb545c9d4f434cc275f4ee22c5308ce7207aec1dfbaac66622d7ca3d3cbe9e022a226a70b"; + sha512.source = "aacb3570993c18336dd6c5d057c8e07eae374b7184cca3b4356041aba60eb5a07e2cb63711c75c803977a9d90fac1518c58690bbcda96f5748690b1c990734c0"; license = [ "lppl13c" ]; - version = "0.8.5"; - sha512.run = "8e89cde1cdcc388a5e8ef48ccfeecf6f1f25e938c7513081bb17bb4b65f889c2826a929baf4833b2191554f3ddef2dd9c5bbf50f53ff14fe7463ebd1e494aa4a"; + version = "0.9"; + sha512.run = "1e87cb92122c972473909fd952a08e75d1ba3bf10897fee2caf870d4f8394d5a11114d77cf3ddf85a9f6bd1f05a607e62812566e450678b8eac98bcbcc53a819"; }; fontspec = { revision = 71237; @@ -20307,14 +20568,14 @@ footbib = { sha512.run = "0cadef58331d5d51aeba1f69d0c9ceae99104f7c31ea79e0f5dee33c8612bc52cd0c8551abc6da1799705c879cc88535b46e4ef15232d3c4a0f7136e0fe46e05"; }; footmisc = { - revision = 70885; + revision = 73202; shortdesc = "A range of footnote options"; stripPrefix = 0; - sha512.doc = "0c0bb9a04199aa1297b5de402ff773c4e928dcf541eb60516853de1193dc4f96c6d2bf096262cd6f300c72a742f20ba70179fc75c1edab36d9697be742cec751"; - sha512.source = "4ffc61f4ca836ae1857f1f308770ce3cc8125f8523c965114913016fa3e90e4d29fbd3bb9b10ebbe47471d410a454c8849f126760472f4473ba0bb9faf63a6c9"; + sha512.doc = "4fd1d727c567fdc6f6cafaae6337d92a439db0d340608144550db741af75665c6179418c105929eee730dd96de8e4be23fe1c7b81d95a63c497ba44c6eccad26"; + sha512.source = "5f6ecb8f61cd32a3cfbb01429fcb6e7bc7f83f0442e9648bb926de9395d11853b1bdc18171e73d6ef0a15f2663cdcbf502ddcf8fd1c22a09ddd9d2e064b26598"; license = [ "lppl13c" ]; - version = "6.0f"; - sha512.run = "209f43ddebaa6266ac6cc65a9dc6d0bd78f3be76955151e3417e94c6ab90edd94f2974609e83d232be85c0beb04456c3a350ce0412f6b779cfd1de24c40bd410"; + version = "6.0g"; + sha512.run = "97f4aeaa36100051d88cc8b9c5ecf17fcd8f73a2beb0ec7b45b87aa7c946b194b7883e1661d132f0f78f95766b0808bf8dc75030886df14d02c9381b79237c52"; }; footmisx = { revision = 42621; @@ -20346,14 +20607,14 @@ footnotehyper = { sha512.run = "24d270cf9fdcec81a91be4084e371338f1daa0a12c8344b850860bddef360c97d66e7475711106ee0d1d2f4df359abdb2f0005740aaca83651ce92f1d6c89140"; }; footnoterange = { - revision = 66149; + revision = 73642; shortdesc = "References to ranges of footnotes"; stripPrefix = 0; - sha512.doc = "bf5b704bb39a8d369093feecd02da251eb45790381605495960dabb9a4ef099f9118dc7a791c9d9db74eb19739628638a8c003256a42890d64ed821ebf2b8c12"; - sha512.source = "22665f8b1e912c325a0ba7b8b05ca7da54f54b92e8f7700d045a837e98a544c651c479dff88937615ea1d13a25ae3f6d6f3a5a60c1c7402c8a892dae0fa0a62e"; + sha512.doc = "5aa4b6a9fd5883b7ed212f0430d810543eb93d74370996117f18e5b1136549c903a3a26126438391c8ce77c382edbc0608e42449614cec4e6c0bd6df5c026cf6"; + sha512.source = "3de417063841057c9c170b0fe83a7b550178e62a09dd38597dea739274f8388a8eb504f68513d0bfd1773e90e1fbdaeff7e89778fb2fda4a03cf27c7b62e1bbd"; license = [ "lppl13c" ]; - version = "1.1a"; - sha512.run = "b2c20e7b528219e0eee9ca32da40982670d3fa88938a58251e1ce6aca26b831d9ffdd89752ac19b78bc148c11c265374d2f679e7e3f54cff0ba445acc4025922"; + version = "1.1b"; + sha512.run = "b1e8673e18432e24fb0a8a952996d9db0225851cb9e815e92f41f6d77b36590dd9d628cc9dd719a7a3680f04a4ef96e33461baf06bac6333d976ff1ec47343bc"; }; footnpag = { revision = 15878; @@ -20757,13 +21018,13 @@ functan = { sha512.run = "0899d9a3c30e701d5ba6a0275521a40a3cf2df680e9d4a95624730184fb370ae2537bec1becc3b185647a988af5fa8e4bda5198f42cbe68cbc848d8915f1c9da"; }; functional = { - revision = 69908; - shortdesc = "Provide an intuitive functional programming interface for LaTeX2"; + revision = 73156; + shortdesc = "An intuitive functional programming interface for LaTeX2"; stripPrefix = 0; - sha512.doc = "547252209555b45bed443a18fc3ac85c7a43304adfcde8e960afc78ba8c3681c8c2d380817d7242bbab08d4ec6dadb3a14934401739c8e9d3840d65adc0d44c3"; + sha512.doc = "1652727bfdc8c4e53ffe1380196370a5e7a500980021c1a57c65ff0bc46651f0284aaad2c2a7e58b77ca6b2ad1d997d73ce1afe1f3be40ef3691407707c9dfd1"; license = [ "lppl13c" ]; - version = "2024A"; - sha512.run = "cacdbda8a87e523931a71781558f230c6e0b83a5bb20bf42fddd8c613bb61e307386d58ac41088caf4aceecf109985e58ff76e3e1f217c708c21b90f92c01e57"; + version = "2024C"; + sha512.run = "cc6ac78c6d281ad680426bb9551f21c7182ca237634c45d93e7de2ee64f8d4b17ba210c4b001a7bcf0aed296a9b0a535eab0a32a8a97d6b2f7981a6988c50f0a"; }; fundus-calligra = { revision = 26018; @@ -20793,17 +21054,17 @@ fundus-sueterlin = { sha512.run = "b15a1fa2ee3272f25a616234a335d0bd5c8ac810724ecf453e172d2b68293b55f01f3e57acf81c17721cd3f489b35cde077d5456b78afacc589853224f1bce94"; }; fvextra = { - revision = 72282; + revision = 74465; shortdesc = "Extensions and patches for fancyvrb"; stripPrefix = 0; deps = [ "fancyvrb" ]; - sha512.doc = "a02f7aeacd0a247e3be625b06a0483853536e116097a05a1a3b5b074523b78444569e8e1205766d82835ce528799a0c25cd433ca72d63125477030de3fc1a8fe"; - sha512.source = "bce089e3ef076f432e35b075c6e4d960cdfdbebbda8e97b752de4a44941807addb9d5ae1dc13de66224d57c7e2f23e1914031df22934afada6febe4095e1dbcf"; + sha512.doc = "7a75172034e4c13805cceaede99ccef139cd061f4c790dcd9444825446ce274990d92e3a6c0ba9c5b0a483fcd726b07a42873c5e0abb7d44479d1b2902ce4ce2"; + sha512.source = "052aba47a1c34137f57620a7c07ab0ee6d0eb8b5ed804d77cc28adbc552ab72f3c43a24612537c5bf0a7590dc44d6893b8be3cfc6b27ff56dfffac6a961b5d65"; license = [ "lppl13c" ]; - version = "1.8.0"; - sha512.run = "22cb602608bb0b7f972ae7f9aa7e0f43f7595f9780d0cd811aaf14de6f9872f6da4e9cf5130da499d8e1b283e6e5140bf12ae1cce308d9e70f8fb7790a44f913"; + version = "1.12.0"; + sha512.run = "33220f95d251cd6808d276e7c5af3a8c52e6949385e9b43a7ec8729cc74252bbcf032b9c03ef48493fb1e0e9518f9e7543b1d7397e86de809a26147ac666d7da"; }; fwlw = { revision = 29803; @@ -20957,6 +21218,15 @@ gb4e = { license = [ "lppl12" ]; sha512.run = "1ec519ad5f22e6d61d16a0233a73065b45e8628549bfecd109f968b8749c362cd04f358d67e96b1311577f94f6152e7de7a9e3264ffcff5c5769662b52df7e29"; }; +gb4e-next = { + revision = 72692; + shortdesc = "Linguistic tools"; + stripPrefix = 0; + sha512.doc = "bb48ca0f3adfdac7b0c7f31e7e7ebb53c0b61e5f8236957dd13433e0d1f9038a9d344a6b7e8fef238e23bca74ab946a466736e0620c6e187c2291e7739ff2316"; + license = [ "lppl13c" ]; + version = "0.5"; + sha512.run = "f82d96ea63af1f77da2a557a7fa0e5b400c2a6ce2ccdf02756e05c4f0a059ac384581723217f56970a68ad61929b537a5d4a9290af5679c91545333621db6883"; +}; gbt7714 = { revision = 64633; shortdesc = "BibTeX implementation of China's bibliography style standard GB/T 7714-2015"; @@ -21020,16 +21290,16 @@ gelasio = { sha512.run = "bd24dd793aa45dfdb7073333f20ace9b14844a177b9958f29fbbe68a64148b757aa813bdbce389c796aba14127269525ee163017d0ffa4a311c7a741a207806a"; }; gelasiomath = { - revision = 71883; + revision = 73362; shortdesc = "Math and small cap additions to Gelasio fonts"; stripPrefix = 0; fontMaps = [ "Map GelasioMath.map" ]; - sha512.doc = "13a3b6f899ea0fa5cbf31b537246a8f7e8565a9b26d6c6332e0eb11b4ad0fc57f06002804aba1a64bbd4f02605c6a47f63792cb933848caf6766f1bbe0aaf0fb"; + sha512.doc = "030a16a6cc30894330275c21850600b5dd933d937f1445a429c653f85a25709a83dc4ec20d26091fa227bfd74f601677e149a88d7b7c55cbe6b1551002216737"; license = [ "ofl" "lppl13c" ]; - version = "1.00"; - sha512.run = "9a90e264e08ce04ac51082383956c4884a9e017d4cc1f951ea4031d1de74f4ad84c81e28a6fe34dd6e3f7bb2e4919166b830385edadc3b01db14070ba4834e88"; + version = "1.01"; + sha512.run = "7628b162c683bcdc8dee987eb43b5d8f477c0a8f5ec76051c93863ab065f34448dea73a8a577ff0325f18ec477e498e0239adbf156a833a4a3eb2e3b7df74c64"; }; gender = { revision = 36464; @@ -21059,12 +21329,12 @@ genealogy = { sha512.run = "907394cb0ca9b3d339d78595e613236038ea2acce27c4468b7d028d0db7ddf36f7037c4f0bc63d5970e904d0675bcaf057c769239a79f064fa6aa9dae4f2014e"; }; genealogy-profiles = { - revision = 69580; + revision = 73043; shortdesc = "Genealogical profiles for LaTeX"; stripPrefix = 0; - sha512.doc = "52f75186e84f03f21e33bc1b5ca935bddf8f45b348ee5dc93d82506b444cf72a1a51c4a33b0510cccd8e89cd46a74215e6acbeaa5d2f32953ff7ff3629bea5b2"; + sha512.doc = "456ba786a2590e35eee691e75c259c6d1fdf6d41eca7c8b897d994c607f6e410e0a40a3bd039d6b8d757328c89a2b933d6e6d8032896d0734874f51f7726d2f6"; license = [ "cc-by-sa-40" ]; - sha512.run = "36b0b0107bf8999ce6d2a0ec46b792dcb9cbd5313734e2cdb2879bd7a15d8f70af09fbc831b6183412cb72c44eb6fe3202d00a0dc510e1314ce7115d78be12dd"; + sha512.run = "5b46c04871eae71980f625d8ea95a414b0bef3ebdd7d00ef57b8ff97acc3c9f6f9494ec404d02f232b03c5c6ab41c44fcec8b282287c705a390d2e54b9fe536f"; }; genealogytree = { revision = 66513; @@ -21095,18 +21365,23 @@ gensymb = { version = "1.0.2"; sha512.run = "311de4fa6c68b21cdc8c655a7092d98772398e82bd9790e0bf00898a6575e234da44534635dfdd500eb7815d302a4487162f528452caf373ed11b7994682a43b"; }; -gentium-tug = { - revision = 63470; - shortdesc = "Gentium fonts (in two formats) and support files"; +gentium-otf = { + revision = 73366; + shortdesc = "Support for the TrueType font GentiumPlus"; stripPrefix = 0; - fontMaps = [ - "Map gentium-type1.map" - ]; - sha512.doc = "7cef5c563fa13b5b8458e2932be450edd48168da9db9ac45ab16ba608323beb4ea79f8dabf2c38b13b479de9ff3065a0cfa84ff5c259aea95495248e9794ec18"; - sha512.source = "b2743e38fe079ca3d46711fbcf810f4feaa1bf781e35bbe33b62cf45cca3b2ee1ab6da22d61965c440f987f9850e614d3f1691f8aa0d01beb0f56984c31e66f8"; - license = [ "ofl" "free" ]; - version = "1.102"; - sha512.run = "03a32d7926747e42f25daf87ef08f866b9145a7782fd372a4688404951211a3528bcad7ee5e4a6888cd8ede2602930f628141953c840268041edbde2624006ec"; + sha512.doc = "deb9a4e909d75b0dc030c6c453734dbd2ebbc15d39dd580aae3d1d5133692a0b65d4694f68ca9a8d1e8c61a07aa925637e76ed8b90e4513d1063d4ebb347670a"; + license = [ "lppl13c" ]; + version = "0.01"; + sha512.run = "aaf4982b52094229fe572e7403df8cd7a958acdc8cb6db74a72b36c0319312e9b2f8182bc439e98baa58b4491e04380ce51256c5ef7db493eaa2f53e9ade60ca"; +}; +gentium-sil = { + revision = 73571; + shortdesc = "A complete Greek font with Latin and Cyrillic, too"; + stripPrefix = 0; + sha512.doc = "65fcd212a555f3ef50d9253b8490c6da64f5c01b0ad50be8cb38aed295d63d76102a3af675d3729232d8224c223088eb15609af2dac177c26469c7fbd7cdae9d"; + license = [ "ofl" ]; + version = "6.200"; + sha512.run = "9e3b195b59d3cd09c55d17dada4ee18e98753f4966d74cb853820ccc27a59c0ed0aade579d0f0bcf544d30f8b482366c1971a5e6a90c0a5b82e2d1f23e47eb23"; }; gentle = { revision = 15878; @@ -21549,7 +21824,7 @@ gloss-occitan = { version = "0.1"; }; glossaries = { - revision = 70866; + revision = 74424; shortdesc = "Create glossaries and lists of acronyms"; deps = [ "amsmath" @@ -21560,15 +21835,15 @@ glossaries = { "xfor" "xkeyval" ]; - sha512.doc = "5d5e6454b6d179b10d984a63a68650d25e69dd904038174a0ee8a33c47a7e3fcdd248ff09a637b6d115a40142b36c0e381916b1bb57ca399eb6b3d1afb906dd8"; + sha512.doc = "21d07ed4f9177e9a97131ea764794286f8583f99536d54b38b5b27fd55e7c9f7b44abc03e30c1ab9c14c96c1644df05b7cd652b9cefc0b2494b06eaad2413b93"; hasManpages = true; - sha512.source = "83b6a7353413caa1856fabb003d656a3125333e8dbf3038cb5222fd134510751c70dce6a6d0124d97990443fd655fb06bc5b550a72d2c7e8b53d2e6c53c8e175"; + sha512.source = "54bc512e9df86e0f459a702d1d7834e40e9ac2b6b080b65849f51c9d1d41fdc2057b65d8f83c3b891ebaa3af6c3e8b84e21211265a2c43731fe0f8d29f3aeff3"; scriptExts = [ "lua" ]; license = [ "lppl13c" ]; - version = "4.54"; - sha512.run = "10987c0d802a2560d8faa98421c0714513f94d370c7967149c763f09ebdefcbc59a3717abfd934903e2b288ede614e2aff06ea2bbc6b53fac856968e1165fa8c"; + version = "4.56"; + sha512.run = "b6332a0f6b467d25142c5d474bec061cdc7a4c367a28dfa0f3e9192983b46ad652747cdfd0e154b072637d08c3dc66de413c62f1478bd9da09bf4dc5874167f6"; }; glossaries-danish = { revision = 35665; @@ -21611,14 +21886,14 @@ glossaries-estonian = { sha512.run = "48eac96868bbeb636bc8d4352cbc1959829daab75716b3dea2ef98d98e388a2668a2ea1e35cc46f53e9ee030aa07dcef3e528f056f59d49883f0a00380785bcc"; }; glossaries-extra = { - revision = 68409; + revision = 74445; shortdesc = "An extension to the glossaries package"; stripPrefix = 0; - sha512.doc = "f90103cdaae2e6ba00cfdc82865a4beeab9f76d364579396b8710d81a14a71cbbd6168a307889664b0a289a34f9f7f9c1c69f449b09e90669184a0159c8aaf90"; - sha512.source = "3eaf0e0f29949277c66928fb0952cba6e568d700c118e32e7045628da340bfa12aad6b1b6c794c9dd79d73bdd7e0e120a4ba2418e7390115a611696520e39488"; + sha512.doc = "86a48d03b39a4eda09f369941a16635f1b145a9de328add382ceeb84d50ead52633f493e18f901cba90fe022a26d7aa3e9b7460ed5b2b09c02de1ac77161040c"; + sha512.source = "05ef0c86c6e5fa5782aaebcf0f9330eee6b25338bdd9264e5a4fe47f082547c5b0def8175f8c56cd71eb3219f42c41394251287efef2b29151ab5d9a73c3b373"; license = [ "lppl13c" ]; - version = "1.53"; - sha512.run = "65f5a9e3aea0c8f419c530a9b989b0296830347cd0f1ad4deb0d879ac82970d546be4a907f90c917e35b7197dfa6b16fa6f1b4318a2b7aae74bbe924580fd0dc"; + version = "1.57"; + sha512.run = "d5cc3fbb7eb45edcef49c059c089d62de835b43cb67c4259693194b785340705033720c6bdc8fe55eb934da7d03985a3f78f7bc90ef1ca19b87fd120b644b2bf"; }; glossaries-finnish = { revision = 54080; @@ -21991,7 +22266,7 @@ graphbox = { sha512.run = "d78f870b4cd54f7c6819413fd8acf0e3e1fe9b3b44f3b68ff3a20ad51aa6fde69c52b336b57285db1f6d5465204beb8a1179f918a71922889297cf6925282d14"; }; graphics = { - revision = 71408; + revision = 72739; catalogue = "latex-graphics"; shortdesc = "The LaTeX standard graphics bundle"; stripPrefix = 0; @@ -21999,10 +22274,10 @@ graphics = { "graphics-cfg" "graphics-def" ]; - sha512.doc = "c78f041950cdbc008823fa84216d631e29a779e270aba0227f54399a904b86a4d8e189c6bbe7366564fe0110d6193c4030bd3a9194bc4e5a7151a50053d98bd2"; - sha512.source = "8775d58a83f6be2a1a1dbd78bd37160b044c9e2e190ec1cf16126dd5f17c495be6903fd92ef229399e10b5dd642bf662f8afeb28f61a0eb91ca40f80538b94a1"; + sha512.doc = "97934f9083786d72979327549f85bcf2a3a0ed19c702d929fba24c12cb417229595263a17b679926d5326aefc3bd99d728298a01fc163c57e6791da3a04aae1e"; + sha512.source = "e2d7bc14aad85aa216d97632d27a83869f9540200ab250085d06ca7147fbff51831a43823d7ed1bb5a1d52df064be8f2401198d4a24f0504bfa9fadfee651798"; license = [ "lppl13c" ]; - sha512.run = "f171662caf5d2f8b6bec3ed7bd7617c9fb3dcc22468f6f577425cf088af944638093999a619330761fa52c78c5f4506ed4db6c0d507c3638824de9da27d4518a"; + sha512.run = "a5c858506c03e1f9f557f397673c00afc3c79c949b449d538398ffb1199b9dd31cffc7b66724a5c7776685dc7bcf38d7077042ac0bfecdd1c80a7245bd244b29"; }; graphics-cfg = { revision = 41448; @@ -22087,6 +22362,15 @@ graphviz = { version = "0.94"; sha512.run = "9065f2316f423697c8f815ddcf91254f22e44d89964196d971c3a42192bb1e20f9152c5a98375060daffbb295f8885899d2800728de31ecf60e1a25cf7bce31e"; }; +gratzer-color-scheme = { + revision = 73199; + shortdesc = "Colors definitions, theorems, corollaries, lemmas, and propositions"; + stripPrefix = 0; + sha512.doc = "c5a55e9c70d3e3635491ffffea4c224fc2e771cb38131717ef172e2833a85e0feb3705a77dfebc54f80f71023fc45478c6410109030201dfab60c1df8dca2f7d"; + license = [ "lppl13c" ]; + version = "1.0"; + sha512.run = "557707dc4b3de3803bcfd1f87d48f3a9580698634634e087de4751c803c6534422d98bff8102dbe9aa7edc888ad68cba7980377224b0455f841e7d8dbe9008e0"; +}; grayhints = { revision = 49052; shortdesc = "Produce 'gray hints' to a variable text field"; @@ -22149,16 +22433,16 @@ greenpoint = { sha512.run = "2ab6b0a9d12c12936362e9e1ff387c393bcd2e9769357dbc74a5d9bcbbe027424f5d58d85d608c2c519d615f01e6e809f6192280c8c60aa53fb8d96dcbdeb8dc"; }; gregoriotex = { - revision = 58331; + revision = 74490; shortdesc = "Engraving Gregorian Chant scores"; - sha512.doc = "67f018fe0eb9568b0ecc6977de8eb8fc1b0b9503372e2f674a97723c537d8a8fb4f48d48b95ee8979e4d4490d3725cf4a1411ab9d7da2ea14f72d0dad0fddd95"; - sha512.source = "0ae6211b33a256f1b10a2b167f3f5886f712688ae73baf13f698af37f69f83a9be754efbc6b0d5b3a1cdf11e7d459a98986b27c27b6318cba8fbb3e48d7f682a"; + sha512.doc = "fcf8efb04dfb90c204cd314e57a91d4b5422b1723f6b51af6b37707ae60f7b7fd2f225c67ec7f7ecedffd0af39b6b1c12cc11a8bcc89884fbdf493c5ebfa2c52"; + sha512.source = "a33dc2cc4d1d2920c7da77c9a41c1152dbe5bb583a38326609465182cc758d1a8bbe895e30dfc97c903fb5f9fc0d99d52c616908e27d3f15622b064f0b9c5ccf"; scriptExts = [ "lua" ]; license = [ "gpl3Only" ]; - version = "6.0.0"; - sha512.run = "00dcd5bc7c12374a15d778cb903715036bd29a7a07522446cb5a5cb14509956db71df518d97e44d1e89366402281c26b96eaf39cc9f97d624ecb40107eae3db4"; + version = "6.1.0"; + sha512.run = "50f848541b193c25044cfc5d9149befe6b708ce07c0f6333555b4350224384d3756df120c12b8b709973c87c3d1f1b26a4910296eac89fb850d645f85ee43aba"; }; gregoriotex.binfiles = [ "gregorio" @@ -22452,12 +22736,12 @@ hacm = { sha512.run = "6f4373f4e30d95c747ecbec45c53a9af23b78acb84a063dc0b2d4d5ed218e7c5f70d4f29817d39f6cf62cacc455cc3117ced589d41bf3f321a6f9d882823164a"; }; hagenberg-thesis = { - revision = 65819; + revision = 74267; shortdesc = "Collection of LaTeX classes, style files and example documents for academic manuscripts"; stripPrefix = 0; - sha512.doc = "9e73ee93a231c319ed65a2c23d23d28ad224367ef7773a9d5c1de474eaf6f9d2a402ae1afa4138ec172ca9e07a5fe64c47d57e16ceaf24b203390a0adbf645fc"; + sha512.doc = "9827b3c21a5d8c0b805d7fdc2489e1330bd8d7c9b6eb3a0baa53372e544a0b680744438d14e76b76a3d5ff0fbc73488931f38dc4cddedd62150d446640ae184d"; license = [ "cc-by-40" ]; - sha512.run = "bba9dd22c1e4cf082697c555f2bca5b53af2f3684c47c8911cd11af9f35c9e16e60c5d6e7941436f0a584cc98f882f22c5c855194cc71df7e928f105bcecf9a3"; + sha512.run = "825127899f49088552f7c520fb7ede11a74897eceef67c6ca07669bbbd97316c7566b8636fb7f8b3a24fadeb3b06e9a3738a92003aaf7d8ebf18bb8f1d95fc09"; }; halloweenmath = { revision = 52602; @@ -22688,13 +22972,14 @@ hc = { sha512.run = "17c7037eb04c1d0064dbb637f51947243d1b8f07d46245dfb8f2a38a1ea068ebe41da7e2346ccedf02979003a0a2fa0fbd25eaebf7847b266e21b7c873b032d4"; }; hduthesis = { - revision = 72513; + revision = 74515; shortdesc = "LaTeX class for bachelor and MPhil theses in Hangzhou Dianzi University"; stripPrefix = 0; - sha512.doc = "ba90dedb09cbdbe762b9e18900461db685290fac445efdd9b661b9dc75416eaef647585b9284b8b20642ced525ccf26d2bbb02ad2bb38811a906d893c4997206"; + sha512.doc = "2ab61cf5c052beb7dfd9f2d60e1c736e990be1089f60b0761c71cc84312a0bbe481332b7fb0ed2cab6335a0812bb622722f4bf63e3a71d5367dcfc77d42e0082"; + sha512.source = "a73f6afea087506a001d8760bfe377646c14936d631376eb62be3baaa7531db07c36ec090ed6a8f22d20ef93c11742102867684eb5f4278d41294e7c716968bd"; license = [ "lppl13c" ]; - version = "0.2.1"; - sha512.run = "053b61cefeb25b7940158580c5d31f2e95417484100f432bfd7c549137f4f1f8545ba912c9fd84c7a53d091ce88723ba0e61dc858f1643e6c0c4db9b04aced76"; + version = "1.0.0"; + sha512.run = "75fd6750814f091ad3e9235e5be5213cdf394de3f148d4f010da3a82045874686cdb602bd58b631fe1dd5abaa733be0a71011f7f8166136d4590c116daaee4ec"; }; he-she = { revision = 41359; @@ -22765,114 +23050,114 @@ hep = { sha512.run = "9cd27826b7dde1ebd5830cdd17423f4092c9833c962be7e73b515de2e624a7853badde0c244dc26be6b7d3d9f9c3932fffc48bb4e86e06b90d6699dcebb0d497"; }; hep-acronym = { - revision = 67632; + revision = 72984; shortdesc = "An acronym extension for glossaries"; stripPrefix = 0; - sha512.doc = "a17c6f61a44253d6f9db070392b146f0fa297c080f04577f30e190a2742e344c22b3d70a58d3609eea6d981e843bded2a1a01b3fda356c822b1f60ef7ed05271"; - sha512.source = "83b2899d05ac7f8b2e1525e76327303a135860a358c08dcfc6f9d1c66e79c1d743f77a625b225c477a39c07a091d282ea2869fa9f5189ae4e3007e7e792fefb3"; + sha512.doc = "5fb6ba76c71f523724bdd7c6a4b807c3e8d483f44fe13e15a6fe95028f219c1ce4021f10615b537357f09a62d14db5b9b4e0e187934560aeb929aeb2b1b27f0c"; + sha512.source = "050e34ad371622b9aab5f7c6581065e2727b3d5e3cc72f8af1ddbcb708bbe4040bc3c4aadc178c05b351e0e5887620e1ec48b91ba6686af9c91e859337872fc8"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "3eeaf8ba9215868df3ad2d8eee5ed17aee0f91c5404b8c93a7ab378ff6d928660853f8dbbab4cc52421f0d902936983a8cb34badd675453d2fc30344de19fb1c"; + version = "1.3"; + sha512.run = "585843824cf579b513eaba7637757a39d8464b0d3c642664dc97404f48889d5a734bcdae88fec7db8f64ccc4d9448cafb99147b4497df737980100eccc57f3d4"; }; hep-bibliography = { - revision = 67632; + revision = 72984; shortdesc = "An acronym extension for glossaries"; stripPrefix = 0; - sha512.doc = "388fed1b3b5b9de09ae4b1cb73de2f618f99293e1b3a4cba5ffaa2d5ae611e454688bea2ce01780ad844380e2de56e62c38013677bbc3a9194d0831de4cc97bc"; - sha512.source = "5e82014ec9abfc9ff19d01c929d7475f6bbc38d0e77b9888f884862f17c1332a868153315af6d13c023e8f94b3d8b567e73d610ebc17c2df799692c603d5b509"; + sha512.doc = "f8c297762b5319133cf900963dc996dbb892286807aaddd3d9bc851c87d73eac02a7e6d229e60b2b88959e9f8e91700fa83705db46f516042d780cb47e9442d9"; + sha512.source = "c9bea516cc2e29c2f0e08eb6c9ea1ac9e6c3ac2f34ff3aa8012cdafb3348fecef90e0baa11a4c222ddcbfea2b7b877b4803cf9aae0f4c3494b31a82e6084b3b5"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "8fa9f0a0f19f7dcadc88e727c461af05f3c0723d2eef1c4c7cc91fa0b507a6cc20f0414c82f7bc3ef12932ea54e8fd9c7c402fb2041032e23ee14c6dafc3a467"; + version = "1.3"; + sha512.run = "78269dde68dc440aee1ec5875b78c9b775147069a715a629efc8e8aef9683714004d2112ad473e731f637f0f12851fa992064c1c56e99e63d614d3f89b9b5d6d"; }; hep-float = { - revision = 67632; + revision = 72984; shortdesc = "Convenience package for float placement"; stripPrefix = 0; - sha512.doc = "11c922d42d6793dffab0cf82f228f554510dc089956030c9c5e76b0a17e4d96ce2ae4d95533f0f704be1d4054f35884901a61ec851fa73f68b06c87b93f18821"; - sha512.source = "c896cd60a4b8b4bf2bd46425dc615a55132fda57b42ad536807bba8cfafb65feef34cdacd4efc2b90de2b30bd859d6695b4f670d5f507786c48d19b8d0dea842"; + sha512.doc = "5d78411dc8f8d5a979c18c18c1f254e2eb799707c260a740baefd4f3d27caa2779364b1c4d992d644b483c6388d18677d3db7a274cd86dcd6de19d3e662f1fda"; + sha512.source = "2a110eee28f3e69e2dca3898b32ae8b2c3381c25efe8dd28fc69223b5fb6642489174b7699629bed65d6e5ce9c57227de983bc6bec37f613de36ba4bd7678359"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "ccfbce04c651a478a811b2148141090fffbdb3851a05b9d3fa7683943fde9e6579eb75693c4b2834741b6cf02a5b381d1f80bcec5d44783e71605e445840145a"; + version = "1.3"; + sha512.run = "43bc3926d9558d17bb4b02d6091723dffedbdb70db05daf6e93bb4878c9f6e3f05bb3f2c19318022dece61de354089630fb103373729ae7a8348e76a89f0f73d"; }; hep-font = { - revision = 67632; + revision = 72984; shortdesc = "Latin modern extended by computer modern"; stripPrefix = 0; - sha512.doc = "97a4c20933260eb24a935ed7a780a6e0a49f8b305872a33de5fe6df439ead0e555b909b04bd559016451bbf5cdc3494a3854d257b1804bc022a8925166103877"; - sha512.source = "d85c106c458ebb002830f7f0cae13996f203bbc3377c66bc2776b7c501e6c2bea26530955b250eb5dd96fe4b6a18af18c9b616ca49096b9133d0041782e2ebbd"; + sha512.doc = "2f88a2b9254daa4bad7588062e34cfa93f3026066b561e3849761d2f0b6c9bc4cce77f7e522dc8e0785fe41daf4799b0fbab730095dd57a6670574e4d89c947b"; + sha512.source = "d85be798c402f4ed02177d8f229ff6013bbb0093b2d1c1fb171d14e27c146be41d32d757096207471aebe0fcdd2fc4c092c821a294caaabb9e5fef999617acaa"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "a70b15ded3774985b31a78ae5d05572922133d3fb59abcb482677ccefb6767726b902b62007e9d0e14950ca9e9f133c8677d6c2d352e0f529a3909b5f6da867a"; + version = "1.3"; + sha512.run = "f2a7bf57339c7892f76dc9113d8421ed53f728236ac87bdaceec73e9dc3c46ac480521da1e0b87b3a85df2d9f08d7e10f3dbe9695064ee06f4096a2cb4bd00ae"; }; hep-graphic = { - revision = 67641; + revision = 72984; shortdesc = "Extensions for graphics, plots and feynman graphs in high energy physics"; stripPrefix = 0; - sha512.doc = "9398029fe703f385decf3ed9295cf64501a9ad7efc3c50bddf1ac261e780dbe5a4ad9fe5f1871c2a8f081909741ec11a93b2b399b89c841cb9b661d812f326b2"; - sha512.source = "fcd58e2b778eb16b6b0cc9d36d44f233b9f2e40a243dc8792f37b8159c4ec3b9500df418465ee2c809bffb24d919d8295dc83b661553ab413390b0b5cf32b9c6"; + sha512.doc = "03f2d734e02f2d9d83b5dc705ee9dfdb1257ac83d20155305d5ecd94c0ac23cd9378b8dec0f4b487e9559f84d720836725cd7d29b22e445e1b5de8176e1e3d66"; + sha512.source = "1e1735cd8cf9dff3c50c26616938380f0aa83db8a94f5976d71a3713fd33d354eb61d46f0c395947dab9d515b3ef3f93dd7d10ce0015bb77e06a1513e76ff2a9"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "59dc1363cdcbe8376b5d5de1a2220c9d70c7022d1d943f657ff226a9ec1bafc302b30255983c090656d293c0995095dc325e1cafed113ff43ea74d2a85add741"; + version = "1.3"; + sha512.run = "46841ec6f09c768e202f8f8c6a8ed80ede65a77be999ee5658c56134c53fef75520141c6889337c31ed139711f174382a2ae6a73e850756232b4a3c02b40a86a"; }; hep-math = { - revision = 67632; + revision = 72984; shortdesc = "Extended math macros"; stripPrefix = 0; - sha512.doc = "5110d1cd03ca6b925ba6872932cb53c99068399a5329d7368189229103e13f79296bf6b97b2097ab800823eae6dd14ac408fe404d309c37b1e6e9a20c6543ba5"; - sha512.source = "d853885d8f6910843558fa4854b51719e3d4917a324096e5dc38cbd7b701e8e250dea3a86fb803637268f36858760c2ac82ee147cd982df0b1516b93cd92150a"; + sha512.doc = "f1b6bb0730f2d334e435ce096b63908b7746070ea3200613d17fb16bd8da9ac3a4a3481866c35db6448ca4414b886c57bffaa4f685cade39a61c85898867f17b"; + sha512.source = "55b981994a8a4f5d10d47725217b10951702788bdc39d53dd9132722b5a0a3c34c555a58f99569b37fae0377539a9260886183687ddfc56eef30f8536308c590"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "4446d255ec62b12b2eec1958696c10f4d55d83e3ccf30590f40d146d1305db3a351894c73d03baf6327834d0cee4592491c0a3a57bcfa7f95af0e172fef3148d"; + version = "1.3"; + sha512.run = "b48683758c33f73c802be2021961e93735dba98c6b04daadea4208dae20b270173d5d8cdf30e4fbd10a80e2d910782ca9f8d96f8aa59b15dc10848529b3fec09"; }; hep-math-font = { - revision = 67632; + revision = 72984; shortdesc = "Extended Greek and sans-serif math"; stripPrefix = 0; - sha512.doc = "eac39c9916a87efd036b9f680ee9b774584845d1a3451b192857d5db72cafb1eae5ce580f1225fc6afdffe80e136f69ed2447f87986cdd3afb34adc9f9d9a49a"; - sha512.source = "ff88e396d084bd47256015530ed0d9b6a2f29f67a0a88db018fa6c1efe5d949449a8ecb339e4ad438ebaec4f57792b8cd83496ccab23ca64e383e28ac3929cba"; + sha512.doc = "30c91067ab156a32d575e8f449c065577e8c0df54ad6a051af5168cb056ea182f79a7d261bf197c3abbc7818239d755d025c72e8d1718df5b726cae900f14a55"; + sha512.source = "96e1f978dd597933b1d766faa4b01954d8e0379e28c81fd1b99c8bb0cec08f58983cf24dcbaa606830dafca93bb9a2f95236788935888d71b124b2dfe39df5ae"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "0bf2ac1f414216568cfe4247f1c1c9187fbc8133831ebe7a55b2c2d3d30555db36b0c0c1edc2e8bdb799a34b20650990d26c1cc838c5a3a31c55bd9160ab1efb"; + version = "1.3"; + sha512.run = "789b960ef546560fa4083ccdcc1913ec9dcf537d07cf229d14ffd5758dbc72af740a6d55dfcee06a07e01b3e8f9caa309f9af4a706275030a14409078b7cd3d4"; }; hep-paper = { - revision = 67632; + revision = 72984; shortdesc = "Publications in High Energy Physics"; stripPrefix = 0; - sha512.doc = "dcb2f4aff93c609edae00fa44c285cc6f5d5bed76026c8d5f3f722deee19dc197a28dad7372f2b44466036d6e8aa0e576457e07f953d36953219175224fc6818"; - sha512.source = "ca7865f2f8ce574fec8d7b3a9faf77ae3899d75a2c2bc7200b8d355b89149cd88e0fbba66d5060f5b5cb567aa6a355d5ba45d34863f7fbd5749b4073e6114437"; + sha512.doc = "21e28b7439b06c14c78047ea9c74142dc2bf4464d1838921cd6f68f3a9179118362c6b29767d73931768077d537c55ae10b64a8d192b6cab84f74aea43832af3"; + sha512.source = "5ebc39439a03fba9a5640990b4c61a95b9418fa509e02c2d50ff65e490da8fc59a997eec65cd07336083e84ea3d046368b195839993414931cd1b107b26e844a"; license = [ "lppl13c" ]; - version = "2.2"; - sha512.run = "2cb6988dccd76f121a7aa39de3246559caedc0cc697a25382f7edf6cab36af32b03db915898f6073b31cd459e8dabb3da3acd387bd0c027e44d40af917613c76"; + version = "2.3"; + sha512.run = "b29c794cb4fd68cf4ed7e80615db9928bcd4f70137562715372238adc0ba55d66e16c2840665e21d0cd7267989c59477db841b499ae2f43702715077404bb416"; }; hep-reference = { - revision = 67632; + revision = 72984; shortdesc = "Adjustments for publications in High Energy Physics"; stripPrefix = 0; - sha512.doc = "588d2c5a2990b44d64598cf698cc1d6e04e92991e5319167e412692d62ee54de5c6053e4e10ce719f470ed08c028d03f9dd301afb65be4f5370742fe621a80b3"; - sha512.source = "84ca10f669a9541f7c51609b72d2caee0bee956489b4b9efeacd356548ea573457bc5cfed865b3806b1175d0d6b3b47793283589eda435b065668395a01a255a"; + sha512.doc = "ee7c57835610c2f57129666ab12967b79800a7b54eb2671b538c11f34e68620a85ab2de33fa76f324fec946a83c72a29b2d98854c197f92992d4deb6651029d4"; + sha512.source = "41e76a3895a44e9b68eec3918d3ed9263c436242862a55199b5b6cbff468b1fc184c902aafad04549fd023cdea70afd286eefa1c2e55483a7eb6f97e359f30a8"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "9cc4b4b63f41b28fa95fa6a81e47b5028c8ed0bdd03670c6d239bbcc09922265dc69b443ab2b1a4032cbf966a5202ff6e8b1a8c61afc2072e6628d11e071391e"; + version = "1.3"; + sha512.run = "07e89df04fd41ce642ef84d2aca921af7d24709b03e3d6ce34d1c22d91fcb7a200198170c3f9c81e5a24ab089c12cf683d4137e30c296bc12d7ce014adc1c9c7"; }; hep-text = { - revision = 67632; + revision = 72984; shortdesc = "List and text extensions"; stripPrefix = 0; - sha512.doc = "5c914c5b3bbda70d93fb340b863c656d67a480eb3f59c51f05fda65396d408ecc26229992bf4a0161fbbfe0801e8807381ffe7fa3a502ca68b56f5a3afc88caa"; - sha512.source = "0052e0357e20251faab93ac645cec196a504881db615869e18073124671005a5c942e791705f2460f55bbc8bf4aa4906b74ff6cacc7174c59aaec6106afb5291"; + sha512.doc = "715f851dd7dd2fb537ca697d3295a0dacb38bb233efad7c489d1790b4a8ca363fa643ecc34668393856a5a19765dda0c06366d940ff62b106838b2c8d80d4d3b"; + sha512.source = "de9c05dde93c52ea8dd905bdfb1a88e6ce136c1486b51b3afed637d981d24252d0ca76d7ea6808cd6547baaf8dc2e6d4b8f97df901f36f08ca77c9b94c816a3a"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "bbbf90b0e85a9b962267f42a2ced125448f8aa85bb93e347214164167a151e663f647b754e4b55faf42041ede7b6e90b6a073290056e00814ed25bf554eb20b7"; + version = "1.3"; + sha512.run = "9a646aceac38f05aebb70fda3d84239a4982566e6e7f08912147fe49a440c6967ebbf1c3612a2fa7205e02e683ad536f480dcd03a15268179b0ae4dd0f4f2497"; }; hep-title = { - revision = 67632; + revision = 72984; shortdesc = "Extensions for the title page"; stripPrefix = 0; - sha512.doc = "3841dc3378d6f8fff0783815f68d75581dc5623961799a034410de2e37224fbf0b1d9ea6b0b65b9b5c339cad565520960d51f7077f7c785807e9afb5acf83d3c"; - sha512.source = "40f64530f2328fafe8163d4bf0ce2eaa7ff34f3d1661dda967bf14593af9270e33c8e3eaadd79b7d9b70e065a8876afddeaba059c64a7b0759f1cffe3bf565b4"; + sha512.doc = "bcc21e936fefd9a83ac60f68ef2a5ee7c84bbef310b2defb52842b08355a356b4546a19583efc1542aa0d1f615e20ae50874dfaa006ac99a2064ccf2879671b1"; + sha512.source = "caf2a5867bc065719f1cb981a72322436f162646b65683d7f634a15642b657a27dfa0dfe42f9e88a322f23c1ec0d63113b20c7ae331a75fefe6b2cc1f68225cd"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "6da28ecfebbb06469fc666978d8674e81b60ce019e0f9a730bafab928d95af4d92bb8783275bc261a43cc61efcb14cfdd4973fa9f52b92f33d70890983d89e53"; + version = "1.3"; + sha512.run = "0cfd3a83750a5469be6da3cebe58b6d7832f045b8aded445d7901788188740b27235d58612e2b3de50de3ef25ec84d18315fb687476226389226ccf5d76eb7dd"; }; hepnames = { revision = 35722; @@ -23046,13 +23331,13 @@ hhtensor = { sha512.run = "ce772bed045b85de5032e3b4beff52958e18513e2c9628e67505b75baa17befe4e3a5eb86f812305b87dbd15dd2f483df78ca7c5db54b64cf18abc75a2ae8f59"; }; hideanswer = { - revision = 63852; + revision = 72949; shortdesc = "Generate documents with and without answers by toggling a switch"; stripPrefix = 0; - sha512.doc = "f9bad79f55157a0f9007c1f551592d0e054f2a519aeda36c175afa807a70542068cce1b9bffb31855de8e99e8460fa22f41f046be25c2bb4757ba859300b77b2"; + sha512.doc = "7f9b34c3f144fc9a8792efa3c31fa67927c9821075a551a4eb100996aac4c69a166c19bb9acb6a491619d8ae214858d3a5407744d23deb14232128a7ef84766d"; license = [ "mit" ]; - version = "1.1"; - sha512.run = "9124e631262dce82cea19158e34353817129e014ec5808dbfbe87df661127d516664de2a895622344dc663c68ca51731bb6d887a5043789e3d830fa908b82cdf"; + version = "1.2"; + sha512.run = "aae7ea67ea2aa73808f440a36173a52394b916b1d4e9c60476085db6e986c1721af6ff31b97ec360577a6210a8e6627b7051d82707f73b5dc7bc392968798eaf"; }; highlightlatex = { revision = 58392; @@ -23063,13 +23348,13 @@ highlightlatex = { sha512.run = "befd40ea2efc15015a76f97add004e33da86c628b3bf58277f8a9feff9396544acdc6603cae74e7bb88d2c819656edcbce9897e32f65156f39a0667c087a491d"; }; highlightx = { - revision = 72619; + revision = 73069; shortdesc = "Highlight formulas or paragraphs"; stripPrefix = 0; - sha512.doc = "6fa7a3adc903c35459727a9981986b78f089f53bdaeef8eeee77552ac4cdef873086ec37eb156d99595b98e66af53a970657fa1be1b313029c8fd4b63e1e15bf"; + sha512.doc = "edc05d1bcb42a69ac0b63c8ef9d274e5826db1b5b9c8206f07de144553479da48ad3f07eda6eeec283877ddd38a83702ced08785595ce5cb3d6ca461b6704971"; license = [ "lppl13c" ]; version = "0.1.6"; - sha512.run = "083e9ccdcd5071f9981619db893a2b5a0ba23eb89e94f740f77bc64c2f46c6063b53fca7640b25cc53a571216a5c2261d3e8683bb44cb7f4f4c2068b051103ae"; + sha512.run = "e0846c7c998bbd3efa96db11e9e5a1b1bd32f124c4ecc99f668205456781000af156451732864b5b2deecdacf150a22e3360403af74ab77fe41ee47276e9ed9c"; }; hindawi-latex-template = { revision = 57757; @@ -23317,28 +23602,28 @@ hpsdiss = { sha512.run = "4905368d081cc6e7f2c7b43b28d4c6e22081796d8594e5a07e521bb7ab0fb14c9ccce1dcbe135b0cbc5a7b2671e3041d7764ff80c7e1543b4ac4cefe945794b4"; }; href-ul = { - revision = 69359; + revision = 74515; shortdesc = "Underscored LaTeX hyperlinks"; stripPrefix = 0; deps = [ "hyperref" "ulem" ]; - sha512.doc = "56babcea1003db2bc7456ccc77e004814d9dbb7711289e2a0af89548ef2e6b146f027ab7d0503628c7e61ba25691b1b2c7d5a24253e0fb08a30256cfde0c1e5a"; - sha512.source = "eb842f9a9b01a36dd033f2079f0f4508eacad634c89c33e6c2607e78c6016fa441cecffe82fdab65c27870af5b3eedd4e0af45a9db224cd7c60c43a24b1b0d93"; + sha512.doc = "87f0a4e8ada9e184d6b3aae3217ddab544cde16ce0f177303129de2c4f33b0366ab78e57a6faeb6112a79dd0d98d87f90381eecbb1fb4e77e2b8c6f96d5ec493"; + sha512.source = "32d18587ee7f71e89aacf775982d1960dffd45fdc45337d51b4dbe93979d053fca2fe64f8d4a2946fd3fbabc50adb6b5aabff864050cd5eefa8fe28baa8b9bb4"; license = [ "mit" ]; - version = "0.4.0"; - sha512.run = "e8e5d7767c93d0f30a7cadadfb2c7644078b590e46fa073db9251426f961dbec4abbd0dfcf6db6056f9a03342a01d706e19da027f64a01adcfa584a9b1becd2e"; + version = "0.5.2"; + sha512.run = "57366210d6bf4d4cfc4e632249e839990540545b26491f0271220481020155543471ae4ac7216de5f69b58662bae84cf7c319cc1bef4954257b48843b47de9fa"; }; hrefhide = { - revision = 66189; + revision = 73641; shortdesc = "Suppress hyper links when printing"; stripPrefix = 0; - sha512.doc = "0ade5f947160493a66f8772d6980db65d0c52ef03b1c12cc2841ae40eeebaddb8b0af50a8c28b010cfe7689dd1bfaa136b80c419fe26ecad302699e754f372b0"; - sha512.source = "51373bd9570c5df5ff388e9174875db7144e5868a0da8d5d27a9f4c332dc37c97436d1ebedb60c18b47a1e6befa07e5703fb1d6d5d5f872d46f3bc3e2ef71b84"; + sha512.doc = "1d486eecb934fb951a6b59bd5cd1663ce0fe91502a81b2ca748b13a3af3b55b546a06aa94721b3ebf1df5568b4f7cfb4baf9b7245cda218820d428ab915ea203"; + sha512.source = "58e7d185d56eb9b2060ad5f0f34b8ded7227cfb45a2550d487059bc0565077200ffd1af7506a349c20dc1c0c8dc9bf5ddc2ada53f4400a4239076ed5d8230135"; license = [ "lppl13c" ]; - version = "1.1a"; - sha512.run = "f62671bc667f8a0eccf2d63b06b55e5483a7f5d1f97e4a1f829c898fe947adf048c21cac10b659160d6ee51f0ad4a48a3998a1e820e387881b6df390ce9bbd0f"; + version = "1.1b"; + sha512.run = "74e2e7a167ae1735189aa7199b866110ae58bd3bea3e039fa8f9695923492ab02e3c8d537190ddd996d5ddee6a37176ebe6d92fdc6422c287ecbccbd89ba9025"; }; hrlatex = { revision = 18020; @@ -23361,7 +23646,7 @@ hu-berlin-bundle = { sha512.run = "57b3122fb063e5f930e5d94aaa94dd00fccbe865570c345abbb6252c42d3f67ed7f2dd163d9474452142ada7691783b7b4e0aaa8a23fcf6320c4bbc581e5391d"; }; huawei = { - revision = 72668; + revision = 73148; shortdesc = "Template for Huawei documents"; stripPrefix = 0; deps = [ @@ -23405,11 +23690,11 @@ huawei = { "wrapfig" "xcolor" ]; - sha512.doc = "306a4a847d7fc26a1912f26318370929058e1d57382ff44503c7e8ec5b42d59588da3aeb53990be7363dafd5ca553f1aa8ae739b10ae3fa6622f94eefbab363f"; - sha512.source = "4ebde0ee154a148a55b67c3ad95d3d3fe280de9c73f1087ab4b1b05b10828c988bd3066bab1fa8347113c35b6c40c194abb26f54391df3c5e43276e820b74cf6"; + sha512.doc = "4a6846c4bb99dd2166f1ec734aee2781afbf3b5c782bc3939706998ef70f5dc71e9ff0fd77f90d91b01a2d4b47869418ee7255dae76dd630b7906b71ded961ab"; + sha512.source = "76d6d843527a2a5b3151f57df81a4caace367d3390560a771a51a0d6db33fa213694e7bf6b4c7be1509e40dd9236f482b0c34cf13861403297c52f8f5e1ffbe6"; license = [ "mit" ]; - version = "0.19.0"; - sha512.run = "ff6d49bd5ad8ad87f42ff92a0873493a24f93c909b1c37a202365ff69d649321f4e0b29f1494b6b621126904f579ae1b57817443eda50de902b11df072f043f7"; + version = "0.19.1"; + sha512.run = "8fc53e6a51f41755f2992296711a252ec4eebec1a758da16fd1bc0a46fb813046272cf23b6a7293a81055f0a943fbecb3842caf0a45918944f4f4ebdd2b22f28"; }; huaz = { revision = 71180; @@ -23440,14 +23725,14 @@ hulipsum = { sha512.run = "d5280573d663e6a517e7826e1f7ffb28fcb7cab3ef913f44c8307cb2bb2393c9c3f64063ae070704d0a40deae9b4b714f9d58afb6f96d0c2b3c44697dfaed667"; }; hustthesis = { - revision = 42547; + revision = 74356; shortdesc = "Unofficial thesis template for Huazhong University"; stripPrefix = 0; - sha512.doc = "5c114cda4bd4264904b7fdfedd55720046403b8cd3c1bce4181dffbf319a9107ec0ad8cdd092922c8c5268aac62437d1128a45ea0cdff4121a40f02e26dc0148"; - sha512.source = "61b6147d4bd063995900479b894b60d929445e60855c522e46abaedfbd33f7516f90a99d5052b3241d7070d375504cd660446d6647c28284e76d0ff9ec5aaf76"; + sha512.doc = "065743f109a1670f36a9e13d86bb60015ee8ccdb9f52e35128792263a8a5bd332e31a9bf93b407d8ab5b4b4aa459a7cc648ac91f09df946fc25e65a24a10b748"; + sha512.source = "12786c2c98858be25078f427adb59f431ef251a3f2aa15ede8ba734256cabc3e663bb0b5fc392922d6616baab4c68a9cb39363428be0412d3bc9a783d1d53218"; license = [ "lppl13c" ]; - version = "1.4"; - sha512.run = "508c86a6cf5e3d952dd43786f78952cc8bbe635620a913abd82b49c2cfade29875bc924d5ea89803b03008328c7297010e98f70b62b5191d9855e0cc1614d3d0"; + version = "2.0.0"; + sha512.run = "b0b3e82519b08c987128e7ca20dd795ce5fbfce42c29c8e93f77f8f2a1be0a59255e812598a1d0b0aa48c42b6d534f7dede4da3bcf9cfd5762a35b74e282adcd"; }; hvarabic = { revision = 59423; @@ -23468,22 +23753,22 @@ hvextern = { sha512.run = "e580c5fac751ac5c2c89cf29690b579630d7ec2a63787c16283a67099c38b75d4ef869c5a6bbb91e48627d3cbb40ce369988819bf78e4834924f700e884c554d"; }; hvfloat = { - revision = 72452; + revision = 73130; shortdesc = "Controlling captions, fullpage and doublepage floats"; stripPrefix = 0; - sha512.doc = "0fdcd6cda21831a9a96fb719ed4bb89af6d9ebafe39ae47155d4e23a512fd54aac20483eafb520e093813b0852e9962ee0597964c8b0fb0100e7f6e182e32144"; + sha512.doc = "d70e04ba1c6ec41aed73b11ee1cdb6e5a82f87a4e5cb7616168375134d4c3e970db1c3da43aa8b047dbdc0bfdd15586dc152aeff6e0fe8e7ace604cc49d4af5e"; license = [ "lppl13c" ]; - version = "2.51"; - sha512.run = "200231ccee62399f01f803eb18df6b828d5e24a680bc43da4e9c944640ae5910fbba49f039ac216c752480a4eef969695d842768b6d68cbce0796624c4815b57"; + version = "2.52"; + sha512.run = "f6e99108328bb03ebee06254099ca81e40af2485ac04943b024f4ff46fa5a6eb8bb0786497aff170228bf11cd03cd01bce86c67e472c2ebe116b3e8e1b08f33e"; }; hvindex = { - revision = 46051; + revision = 73580; shortdesc = "Support for indexing"; stripPrefix = 0; - sha512.doc = "2a10c26537e550e3d51330c704711c2c43b872f90db15ee709dcfe603a5fc64102a8b466c5d5b7ab4706d5e96e91b11559305ac607477776f34da97590151368"; + sha512.doc = "a1b3a54e11ebac6f5b8ac2f3a3d106c42fa546d14825429010f9e2d9a24707cbae46bf563514abc59e8f1744810d0d816da89befb15d100737d8f3403c052e86"; license = [ "lppl13c" ]; - version = "0.04"; - sha512.run = "12e47531ca8dcea2f195d86b5721f2a62d2590de5a0b464e5e6de5484ee34803eac14f2474e4a00938f6d5e5b307ed3183ea3aa0a4f0d5874877356de6e8c83d"; + version = "0.04a"; + sha512.run = "fa458819ea3bc61fcfa64190fde0cb867d0b264aac0ddaac084da3f3e407b6e13584e1f16a835fecfaf31c258b36804dc1beba7a53bdb3c11a30cede820d6201"; }; hvlogos = { revision = 72538; @@ -23599,7 +23884,7 @@ hypernat = { sha512.run = "0a803b9e7d23d364122869a89a6f181132f00b54d39f677a9d9471c336c933ba0e743fa4100636a6d3e929714a8896ce964e7614800c675ab9df7cce7e6d732c"; }; hyperref = { - revision = 71883; + revision = 72773; shortdesc = "Extensive support for hypertext in LaTeX"; stripPrefix = 0; deps = [ @@ -23625,11 +23910,11 @@ hyperref = { "url" "zapfding" ]; - sha512.doc = "b08369f8da36f6a3018fa8d2e4dcb69682588fc0267fff4a005f1dfc43d3abe9f6021daa2094db994e3bb32a7c447d777ee3cba6fd5f0d164b9dd886c14d86c6"; - sha512.source = "a24096d3f31ff29be45c9e4da9e9b0f3bf249fcb7b9c262727e3f42cca8dd11e0e9dd66e346256cb78417076037e550849dac7459702a36f2622a3ac83f2e172"; + sha512.doc = "5a783e7171d6dd332d60cff15f5eb35750d325d2d2df8f97ec5a65302a845d590412286276f0c3a7e65b22fc2647251b2397763e21c6f723ef4887d9c1d16420"; + sha512.source = "e285a35eb6d42b0e2b5e478b2a761799d98eb6d38de4cbdd7fedba5aa5d37dbe35d6e2109a136f94fd32469c9de8e464dd722365af2c13b5c1616bae67244881"; license = [ "lppl13c" ]; - version = "7.01j"; - sha512.run = "83a084164404ad60b0691e487101d9d7d39adfa600a35a3ac1b0a2f84df9cccccf7bbb999c93fe385f4295bb8d5354e7045e491d1ae54682c5ea2ad8842245d6"; + version = "7.01l"; + sha512.run = "dece11f0aae3c06f12fabc165a5c0b4505165b721c2d1c357d813157befea5874a22fef3396200cb33e164270cd97b10c5949be16029c1b6bbae70cc625cc59c"; }; hyperxmp = { revision = 70694; @@ -23645,16 +23930,16 @@ hyperxmp.binfiles = [ "hyperxmp-add-bytecount" ]; hyph-utf8 = { - revision = 61719; + revision = 73410; shortdesc = "Hyphenation patterns expressed in UTF-8"; stripPrefix = 0; - sha512.doc = "c4aac42267b75a16559705e7de3716eafbec96a285d523d5e7b2f77f345d8e344e174571e247b9c5de8fac75942bc1b0f924e81efd8356b52c9ed91a149d8f09"; - sha512.source = "2ed5177a81f46bb538517447d89129d82bab87f937c98e4afc6c74863d5f4cc3342470f66d2f5d05247fb3ac26b23ed4b6ce4fd093fcb61fbabac6dd330889f2"; + sha512.doc = "4a43f6488b393a022555adcd385bf4f9b8309bcb7e71c8687ae80adb422e6bf9c50d451f6b520f59538ceff94bf3e9fb1f304be39f6dd6a2c3bae1a97cc94c41"; + sha512.source = "dd655e0aeade972bd3873599726644dcc99bf2453d9f03e9af1ee96e196c30b2ad374f133d9d8c25d4d86bab67a22f9b14f72a2d50efc9e1051da16d6ef47ea0"; license = [ "mit" ]; - sha512.run = "64055aa046fdbc721fda474b7848b37d094b1a8f5f01e507df80003ba591dd959871c880f04d5bc6e0bf169e99bf89f5a1a7dad1195c8839773fc613f3719d9f"; + sha512.run = "ba45aff0577327567e51a448ad5d6fb8b21f1bff2d8e58fdf040c449a9e37f8b213f92c670c718e32428784b171870a2a94634e29cf62016666dbdd8751272df"; }; hyphen-afrikaans = { - revision = 58609; + revision = 73410; shortdesc = "Afrikaans hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23672,10 +23957,31 @@ hyphen-afrikaans = { } ]; hasCatalogue = false; - sha512.run = "0f969847994b3b377c752c23f802e8c51b4076efc2d43ad2560a72b83cea3bf0a64d7df18a59afe4289a4547a9f23cf81b0c365a499be85a2467579941fa9700"; + sha512.run = "06316355f2f2fad8f991d74d8c4a5cb02e3698c16db22654590c5591259e4a5dd74bba3978921242866317d735cdf95739c7184155dbc6c74e179709724baa2a"; +}; +hyphen-albanian = { + revision = 73410; + shortdesc = "Albanian hyphenation patterns."; + stripPrefix = 0; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; + hyphenPatterns = [ + { + name = "albanian"; + lefthyphenmin = "2"; + righthyphenmin = "2"; + file = "loadhyph-sq.tex"; + file_patterns = "hyph-sq.pat.txt"; + file_exceptions = ""; + } + ]; + hasCatalogue = false; + sha512.run = "07e14a47a57b0c685dcfdc84037d1984693c097d1dff2b1c24f79cc724c0c5b103e49b7a4977760cb71e43a42c4b1c4b5227bab6107106058bc868b80ca0af79"; }; hyphen-ancientgreek = { - revision = 58652; + revision = 73555; shortdesc = "Ancient Greek hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23700,10 +24006,10 @@ hyphen-ancientgreek = { } ]; hasCatalogue = false; - sha512.run = "3f91560ecf78c5540fd4f5d9890f6aa7a57bcd3a41095985785505b82e40793b91a5da3a01bdc021b11c32db3dd7030a104686b34b496c9094acfb85509cd007"; + sha512.run = "e0f8f682d5311290c3d58c247a07181f732f85801d84e350f2db3a93d393ddc2d0d2897c6f90da3e6692f77c3df87afc4731db770c54bc696d70fd972d922490"; }; hyphen-arabic = { - revision = 54568; + revision = 73555; shortdesc = "(No) Arabic hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23713,16 +24019,17 @@ hyphen-arabic = { hyphenPatterns = [ { name = "arabic"; - lefthyphenmin = ""; - righthyphenmin = ""; + lefthyphenmin = "0"; + righthyphenmin = "0"; file = "zerohyph.tex"; file_patterns = ""; } ]; hasCatalogue = false; + sha512.run = "110c2755a3fb9cb65a7cd2c6297422c76f76d2e35d2547b714b852c8c592768f2f3ceac8e7091db8b3b2d7d0fc24ba0baeb12724ac0a23c6b3470f5058d2baf9"; }; hyphen-armenian = { - revision = 58652; + revision = 73410; shortdesc = "Armenian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23739,19 +24046,19 @@ hyphen-armenian = { file_exceptions = ""; } ]; - sha512.source = "d25e6347545e00a809db1dc8e48ef3fe67678b9ec93a1f3619d2a5a3d786d6e411c2e9f905120e3c5d01d9489c0a83035ce8025836249c88ee768bf07b8e2ca7"; + sha512.source = "91c046f97002d9d7aa3f93cb00dfcc617494158805407d9ca19a19c23338ffd81eac946acd6455226b679849e20ecf515d88b8d5e9d9017d5845a8067efad062"; hasCatalogue = false; - sha512.run = "59538414bf5a4701199100fbd9d5247999a36bc28c7c6ef2a28deb9024e01605d48839f00f345c848365853ac3a9f1aab7402f44860532d7a5c099d2f27ee189"; + sha512.run = "97e69e17fce813ee0292675e307d56547cead81ad5168d2865377d9352c4f2de3031b3c0d7f3dbee7404d4770e4ecbf04b9d2db91a208fb7bbc6f7dce9b3466e"; }; hyphen-base = { - revision = 70247; + revision = 73526; shortdesc = "core hyphenation support files"; stripPrefix = 0; hasCatalogue = false; - sha512.run = "4a3c458a0ed0fc0300adedc233a4a5eb7302952cd507d666682caf74910476534b1bff9c86f6352da0c89d4ef2ee0dfc8e7b6c732a3b649f95659eb410a5651c"; + sha512.run = "ffc5b8e80a902524e962af426d2132b7bef5ceb490a849e3205bb87a9834032fc7603d369707ef98099c83170f9be72edea65638d3f7b9e70584331ce866fd83"; }; hyphen-basque = { - revision = 58652; + revision = 73410; catalogue = "bahyph"; shortdesc = "Basque hyphenation patterns."; stripPrefix = 0; @@ -23769,12 +24076,12 @@ hyphen-basque = { file_exceptions = ""; } ]; - sha512.source = "75a20da77fa056c719ecc1f014bb09c67f62f1c4a3abe04b7cadf45c7a4e06e4492cb0d34a8025f19f3ee5e3330e488212885095335d4a7e97baa5b106576223"; + sha512.source = "ab616fef4f1e3cecf6bf8aef4f9c83b89c7b7fbf67b080dbcdb6395bda8b41b1923106019f25805cf6883479131c22bb4da0573247ec2bd0fddb39425c64c27a"; license = [ "free" ]; - sha512.run = "b90680dc5692824d60ca603e8bdd2fcade7cc772c8c0f9538d579704fb16165db2baf0c466ccaff46d92491b4a678fa86a127c0d106dbef6d640dfd2f887663d"; + sha512.run = "f4b55c4a744c975b3854b9e7ac15448ac717577c32a1d26728bfdffc40a50cd282ef9474be8bafd88fdf4f4b97b2ba67bc40e33f6b60345bec4fee658fd9b0ad"; }; hyphen-belarusian = { - revision = 58652; + revision = 73410; shortdesc = "Belarusian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23792,10 +24099,10 @@ hyphen-belarusian = { } ]; hasCatalogue = false; - sha512.run = "19b9bd10d2357d0cb6ecc9ddb5e46b65b3c0eec1b2917a78311f255c1609bbb86595ce617d331271a72de934ae4001597f4a04d61b3810e34f3b197b21cab193"; + sha512.run = "1f171fc8a816ef6a509eb178dd743743e85a4fc81885092344fd6837039cf54a27aa43890baf686be3ba44e5700d864888b9b2d07a7951d7d70f19cefb3a3af8"; }; hyphen-bulgarian = { - revision = 58685; + revision = 73410; shortdesc = "Bulgarian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23813,10 +24120,10 @@ hyphen-bulgarian = { } ]; hasCatalogue = false; - sha512.run = "9763e6ece053594b01cd9255a8a3551eb6b86ab082f6f9283664e256c55d43b9513b624774a650d83215d656334751f569496030187c1c78e2fe80f2d10f2f1f"; + sha512.run = "4103cbcab115deb99d24d22d190cb4153926e51f017f2ba86179ae855d209ebb0b57d60fc174d496b82e90d7322fbfd762f7ed9470fa4e972f6f930ffc100130"; }; hyphen-catalan = { - revision = 58609; + revision = 73410; shortdesc = "Catalan hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23834,10 +24141,10 @@ hyphen-catalan = { } ]; hasCatalogue = false; - sha512.run = "37189e09ee902f2c5145f30180b51211091b07d7d04125c98f1b7c424ad27f6899424b78cd17c559509076eeeb957b4f268fb4130807e7fafb461174fed8200b"; + sha512.run = "0fa4527a7ee6bf2ee0ed0a3b2292020b726f64b4cb2cd4b9b41e2f1f79e244e1461a4013ea65274b5beb681b3a444f8c6f569877911fd2b0e4b58b90183dc6ab"; }; hyphen-chinese = { - revision = 58652; + revision = 73410; shortdesc = "Chinese pinyin hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23855,10 +24162,10 @@ hyphen-chinese = { } ]; hasCatalogue = false; - sha512.run = "a78b70095fcfe297e2d85a49108affd5d48451ff4740461eed46d395410a665011614c9a89dff37e9477ee3803de6ebaa68595ac39222f2968a4124355ea7fa7"; + sha512.run = "d386e30b1d2de464d3127d98716aa1312117296b032fef5b60e9c8ddc1352b059c7328e315856aa56ead8ada3ff0d494b9f97f1c286b0ecc49422040a6cf9d79"; }; hyphen-churchslavonic = { - revision = 58609; + revision = 73410; shortdesc = "Church Slavonic hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23876,10 +24183,10 @@ hyphen-churchslavonic = { } ]; hasCatalogue = false; - sha512.run = "c44b3f5fec7b44958336dcfb1a43c5b71fd1715262278863f5fcd74d7ec0cc6f1d572b741256d791e6979f15e4b0fcda8058725e27f17e1deb6e5df5fdb007ab"; + sha512.run = "c87f20a260968ff796815066648df181ffbac8063ae87d566c4e0858e0e0e51fb6a0386b1c4d2d03d0d3099a635f3ef3f828ab74f586d4b8e02b55917fefd685"; }; hyphen-coptic = { - revision = 58652; + revision = 73410; shortdesc = "Coptic hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23897,10 +24204,10 @@ hyphen-coptic = { } ]; hasCatalogue = false; - sha512.run = "fe36adfe900e23f2b0c3e9c3a3d96b608c49bf597222537d355d6a68e2f87f587db78a1921ab1c9a80ea175529e353524c35e99b83ef7f5515ab7c0aacd2f680"; + sha512.run = "3a492b64b99971c885a82815aa630ddf5d195f80afaa9a04f0d0449ef94ee9100e10456520d8b751fdc75e7d0f206948c5eeb5f8c5bbbbd0e158f27cff98b25f"; }; hyphen-croatian = { - revision = 58652; + revision = 73410; catalogue = "hrhyph"; shortdesc = "Croatian hyphenation patterns."; stripPrefix = 0; @@ -23919,10 +24226,10 @@ hyphen-croatian = { } ]; license = [ "lppl13c" ]; - sha512.run = "8355d0aa95bb2e72bfc45015f9ae9f6a138f94441387a4daadfec5be4060878f6e69d05eab15432d99c256c1a3f68c122d5c915164fe343459d658a4543ddf42"; + sha512.run = "a2cb861915155ae165a70a4e1e4f6806063aac300cd4ab8db1b94c599c49e7c95c12bdf301782d19f048628c44405bcffcb9ecb7ae8713d176114a3c1753a177"; }; hyphen-czech = { - revision = 58609; + revision = 73410; shortdesc = "Czech hyphenation patterns."; stripPrefix = 0; deps = [ @@ -23940,10 +24247,10 @@ hyphen-czech = { } ]; hasCatalogue = false; - sha512.run = "f5c8b08c2db716dfa6d36fcf337b4e18372978d04e28ff2c8ed0a0b3866f4bb3efb7b498fedbfde5052fc504b8677ae553c2dce73701e219632d8c5460d7e826"; + sha512.run = "d42b1925ec71a6ff81b34ac4c791eac2f5257fa0d86d9dae9f497555aac464f059c550cfb3cec5ed10155e87808bc02dd07ecba82f541a9075a37a1816684566"; }; hyphen-danish = { - revision = 58652; + revision = 73410; catalogue = "dkhyphen"; shortdesc = "Danish hyphenation patterns."; stripPrefix = 0; @@ -23962,10 +24269,10 @@ hyphen-danish = { } ]; license = [ "lppl13c" ]; - sha512.run = "954543a3fb81ff00d9c58315ba59d7a5e3430217dda6c1453bcb7ffb0516025dea4b877eb9d66c9f80ccc69d3d4895bdc6ae1b611d8394435fa647b8b806559d"; + sha512.run = "b4a33945a9b8b4a05ba05ca54c4e1565cd00742d128e153bb772863bfac23fc39873ea1191780c4260a999570d23676b89332e4a196b57da2268fa7a92a001de"; }; hyphen-dutch = { - revision = 58609; + revision = 73410; catalogue = "nehyph"; shortdesc = "Dutch hyphenation patterns."; stripPrefix = 0; @@ -23985,10 +24292,10 @@ hyphen-dutch = { ]; license = [ "lppl13c" ]; version = "1.1"; - sha512.run = "111371e47ca29069a5a9144d694858dd899b19e2b38d0c793b1e4884c69ae2d62398aacb4cd89e23246fc025e42872875bc808c1f327ac1502fac88c962e6c14"; + sha512.run = "ab5f3962545eee59868b208549ebeb292a9c1ff6bd891b78db034e70e22f8fb110d7bbaca1a661eaa900ef2471d7b522ea5994b20bb1fe4745df3f8d3c0af030"; }; hyphen-english = { - revision = 58609; + revision = 73410; shortdesc = "English hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24015,10 +24322,10 @@ hyphen-english = { } ]; hasCatalogue = false; - sha512.run = "a305cf89138e4327844d43a7e21773e31ac97a4655e4d58ae9a46dc0df565e432330debf704c37b4ad552561357521eba0b676755544ceb9c4f21ace09d6dd2c"; + sha512.run = "45ef57447251eca794998f373651ca85429f347396185b3d9b8d0467062dd77b1f2dd94090b9e393f52e5cf503ea7cf344bf61785072b4740d99a77fab4b1f0e"; }; hyphen-esperanto = { - revision = 58652; + revision = 73410; shortdesc = "Esperanto hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24036,10 +24343,10 @@ hyphen-esperanto = { } ]; hasCatalogue = false; - sha512.run = "ed2976e9fb3eec5d2f0759348b284129e43bf161db571dd21270335388b8aec57e1b8393bc9b246f8a6e9cde22f93a4cb3c1a03dcadd64fdda3d70b576789050"; + sha512.run = "9279c2d46191551cf88c0d7c1f79388335bf5160bba1b8a336d6b99f3c887d1280b9699a35c68f6e0f4d914096d077897adc80525156c162a2386d68c2611560"; }; hyphen-estonian = { - revision = 58652; + revision = 73410; shortdesc = "Estonian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24057,10 +24364,10 @@ hyphen-estonian = { } ]; hasCatalogue = false; - sha512.run = "0eb91153214aaca8c3b5816f5315f9afdeb7c19521c87c79ea2b35e82217bfb23c8bb774baf810206f4413fc663e441ebe6b4962880ca0dbcda9209d2acce3b8"; + sha512.run = "d752f61400df32474bda0f146d08acb3a64cd7e3fee25b0a01a69155c9217537f0e58113884b4545b8cd6f92c522adba7d399249b2bd0012df0425da3eff98b6"; }; hyphen-ethiopic = { - revision = 58652; + revision = 73410; shortdesc = "Hyphenation patterns for Ethiopic scripts."; stripPrefix = 0; deps = [ @@ -24078,12 +24385,12 @@ hyphen-ethiopic = { file_exceptions = ""; } ]; - sha512.source = "9d6c8c1b0ce5c40d388937328461336a97fcf1fe780fa6198e029f12ef118d9d98f6eec03ea217743851f0217217d6548298df9336fcf33e6c4c196bbdb9eef0"; + sha512.source = "9a2f7feb676233d34bee698f30ff7f194872d2b573e124c9cce1090dcad1be3ac3ba2788fc146954e628c442cce6d215334933602de18a86272c3b84e8970be2"; hasCatalogue = false; - sha512.run = "a1532603758e7f774acba7c13ee74f0046ff187598ca86b2e93b91da31317f03fdbab5d4d7c0814978fb2ac159bd6e5a48e6e734c19758da21ad0a031844f52b"; + sha512.run = "328dcaf208026bfc034758d9d6cd1854ae3c1ea9391618adbb3610a87ae178de3c64702048e394a509239f95cc84d5569364bae047e9701beb9244033a4bf41b"; }; hyphen-farsi = { - revision = 54568; + revision = 73555; shortdesc = "(No) Persian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24094,16 +24401,17 @@ hyphen-farsi = { { name = "farsi"; synonyms = [ "persian" ]; - lefthyphenmin = ""; - righthyphenmin = ""; + lefthyphenmin = "0"; + righthyphenmin = "0"; file = "zerohyph.tex"; file_patterns = ""; } ]; hasCatalogue = false; + sha512.run = "9b75115c0e58c47ab7151233e41b893b3ba931e6fa9cfcdc2261b6a71f9e6106ec40037bff1e35dd2caf8878e9c905e2ebc2bae87c3518724ef1fbee3d49a297"; }; hyphen-finnish = { - revision = 71880; + revision = 73410; catalogue = "fihyph"; shortdesc = "Finnish hyphenation patterns."; stripPrefix = 0; @@ -24130,10 +24438,10 @@ hyphen-finnish = { } ]; license = [ "publicDomain" ]; - sha512.run = "e45207eb19ac8915bf4c3099a4a4f72d5e77118f75147ef5dad19afe30067417ca377db7a6a25daf92b51c43ebe74d3c9e6e6e2d2c35c2ebca249f73e2055ae6"; + sha512.run = "49a642ead47046c4f699ac464a00cd8e49a04efe8176a23293096f9671182dd4e8ef4d2f91ac033accb1d302f7e5eb6398f151ec5b89b22c57e68092425027e9"; }; hyphen-french = { - revision = 58652; + revision = 73410; shortdesc = "French hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24152,10 +24460,10 @@ hyphen-french = { } ]; hasCatalogue = false; - sha512.run = "b9d2d05311a90f4caa6c4e8aa8a2e80e9c15fc3552f03f0ac6ec70d386610612715deb6e778247248355a3a209fb2413d6d2aee12f18bc35d5a334870b612507"; + sha512.run = "97fdceaae53e1201b9562d870037e9bfe6d14df655f514505ba1361b540a9a23b35180727503883c90f5bb96276ee96faee0f35ed3d18850554fdade56747b98"; }; hyphen-friulan = { - revision = 58652; + revision = 73410; shortdesc = "Friulan hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24173,10 +24481,10 @@ hyphen-friulan = { } ]; hasCatalogue = false; - sha512.run = "d1775a9b6e6b7fa155e44c93271e2ccb41bd1ec143ea0cf624841ad48a123db924dd134e6e60b862a808ad2058ed5b86cb34d98e5728b9dccd3997ba2f06932e"; + sha512.run = "ac81077586c261bc60387dcccae9f0dd983005cfe253ac8384e24cc24118a1f16f5a9987b3919beffc6ffde8620564a71cf8567f797f3d724bb97926f7508657"; }; hyphen-galician = { - revision = 58652; + revision = 73410; shortdesc = "Galician hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24193,12 +24501,12 @@ hyphen-galician = { file_exceptions = ""; } ]; - sha512.source = "b9925168b1f9ae5139ffc3bd34810cc05a27475cfae31e98fd0d7618575fc994ca95d7479506024abec2c33bb20121811244d69c490df18a29d6c93fe02174c6"; + sha512.source = "5eb265b139472702757f3667354376073630419982d6436a7ebfcb7c633f7ae07478307abe3cbc71366273ec0cd454e81f3a62f9a4ed89abc41deaf46e68ff8a"; hasCatalogue = false; - sha512.run = "2d707542f80dc94ad20c0daa776df23b773a5e6ccb261e11db675e1e89f5f303a4f5cd50d97f491cc7ea8b0f3c0d3f6391707812a95d4e72cca3afa7815e566f"; + sha512.run = "b1d9f733ec7d3a42f7c98c45522e218d2c8605bef14753cf355a428b47a723be26f02f4a3d53172c17e3adae9cfbcb86650a06154b04f7ad5602556613313f6f"; }; hyphen-georgian = { - revision = 58652; + revision = 73410; shortdesc = "Georgian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24216,10 +24524,10 @@ hyphen-georgian = { } ]; hasCatalogue = false; - sha512.run = "edaf041a2f92b0f7dbf28042c81838e8fd781cf9c3ad529c314227c94917ce4e8728ca676f8bd42e2a81bae76b11aabc1e22896e3ef9cd38ca4b718bc58fa0cb"; + sha512.run = "5274c24d684eff1feb3d9a6cc1fe6be3f3aee8219e291b1c802a61185ea6d94e296a9670d8ee84f0b9627036af827f9339df5792c1f6fcd7bdfd31535ee4cb9d"; }; hyphen-german = { - revision = 59807; + revision = 73410; shortdesc = "German hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24254,10 +24562,10 @@ hyphen-german = { } ]; hasCatalogue = false; - sha512.run = "c27389dea67ffd0d45419d484b0c72577b2d5b8234266483add078b970d5d994d41f7cf9a1509ad93efe9489501f986127ea717135c5f57588094393e0d7219e"; + sha512.run = "489a06f62a700ad9c0ec7801cff9e92b477b4e49d6e971eff37bbb52a45d73e15a832f049679a9bb9d0f129b23ae9dc18b2d86f81f9c64292c5c75d819b0042e"; }; hyphen-greek = { - revision = 58652; + revision = 73410; catalogue = "elhyphen"; shortdesc = "Modern Greek hyphenation patterns."; stripPrefix = 0; @@ -24284,13 +24592,13 @@ hyphen-greek = { file_exceptions = ""; } ]; - sha512.doc = "865aaf1f9f0fbe130f9006e41ef677713667832745fc24c28cffe805a540a19f7104a3f0fef3258ba0e16c1c456959904887899a4c584338c58de7fcc80c5419"; + sha512.doc = "f069b7be8cad1d1dc7d54d537694d0bf58dddbbce7cb093c6a0af09d010e0760333ba554d9d4cfc7f83d0822d05b9d7d637839e0d360f1c8cbbbbbdba6f3a5db"; license = [ "free" ]; version = "5"; - sha512.run = "3da84f41aaf7e5d4be0ce609e4d119e65c9189ff6662051cb7e879e9e373d990ef1c59ac7cfead1bdbc6e55b52d4b3ed28d157b22dbec43e5226f16872d5a7de"; + sha512.run = "5f6bfddec0c93d3341a8b4bd778be4c582947d6782fd07a476a015c101fea1dcd21f7b89b6d18d2684267afcad6894f8f6c54fe9b55348d8d1c3f8abcf41deae"; }; hyphen-hungarian = { - revision = 58652; + revision = 73410; catalogue = "hungarian"; shortdesc = "Hungarian hyphenation patterns."; stripPrefix = 0; @@ -24308,12 +24616,12 @@ hyphen-hungarian = { file_exceptions = ""; } ]; - sha512.doc = "164180f0485e16a49ba83dcb4721902e8a29f399032d4f5a59d55e424b8178a25dedd9fb99919d9d772142342fb78fe0dbf7a5303382a0b7feae4a381b76f8bb"; + sha512.doc = "b61bf21e25582f010786565b6d47258f03b271e031a980efe38dbe00194094e93b52b5026012394f0722753d495b5e426eb0cd4bccd5e07d2bc3b622e6f34678"; license = [ "gpl1Only" ]; - sha512.run = "868a4c3f4d0eda078054026bd1ec35e05c2f4013e093bf58147bfa2d861814242b55a900ce60384767558c9552ff9d41cf447e2a157bae83bd2877251012d96b"; + sha512.run = "b72890bb5f7e8e8f21c0ea1ec4d15b2644dd9cd486f37f6d9dc74cd24e01c1419168094a45835f3c9dff1abb67efa1f639b66b706c38dac1e9fc059299768ed9"; }; hyphen-icelandic = { - revision = 58652; + revision = 73410; catalogue = "icehyph"; shortdesc = "Icelandic hyphenation patterns."; stripPrefix = 0; @@ -24332,10 +24640,10 @@ hyphen-icelandic = { } ]; license = [ "lppl13c" ]; - sha512.run = "69add7ccde189e86810e2a82692a260de9a9fcc0ba011352881d202d4f4c94c4dbd84fe36dff40ef9b9ad3e8e990947cc61022307790f13cad56744f3ef5e41f"; + sha512.run = "8926931fb3e7577a0a65e3950d17f2d754e0c92a84ce9e0957120cea775bc6c42a7a20983606f5a11909bcf9c2b0a0cfe14e147d9dd69cec18afe7d1bf031ccc"; }; hyphen-indic = { - revision = 58652; + revision = 73410; shortdesc = "Indic hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24441,10 +24749,10 @@ hyphen-indic = { } ]; hasCatalogue = false; - sha512.run = "765be1c13ef3445b056b61c24460cc2f18bad038c04541bf4773c7f61c6d26be25d3079b260a1b9623e2f01155ec52eb5bc87b0ea9234e50a5ca24dd8a7a5937"; + sha512.run = "21780119ee5236bb5d3db1efb1e1ed50ba0a8212f58a26dd50f3481a2aabdb88aef8121084cb045e056d7b1301b537119693029422695b185fc63799965b730f"; }; hyphen-indonesian = { - revision = 58609; + revision = 73410; shortdesc = "Indonesian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24462,10 +24770,10 @@ hyphen-indonesian = { } ]; hasCatalogue = false; - sha512.run = "3f04a63010c02d77cb229c90aec9f1079557493958573be9ce992ac5ae3c229f01f9abc0cac785d9340ff48aa169a01f8b327ecb2e255bef57f1fe85d04d1d2a"; + sha512.run = "e6cb9bfc94e2463cc7b88942355a859c9714ab0b6f3656f3a96ff88ef5a8ab4401ac5d63b038c34bf274bbfa340a0bb2b9c690a4b8fddd8530748235bac3c2ec"; }; hyphen-interlingua = { - revision = 58609; + revision = 73410; shortdesc = "Interlingua hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24483,10 +24791,10 @@ hyphen-interlingua = { } ]; hasCatalogue = false; - sha512.run = "dfed82ea70f25d452726b5cd03d8e060bddc23cbbc5deebab2ddad93ce6744c38d357327fbe570bf7a1444f62cee0cc422a6c7d066d6693a238d851b4fe46e32"; + sha512.run = "c0b3c00aff822143deac9e54342590be8d6ce6880e927a66e64125140b043f1bd3be45a6c9de70d78797e8519b9854626468c2ebbd87cd9240c793930d3e4294"; }; hyphen-irish = { - revision = 58609; + revision = 73410; shortdesc = "Irish hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24504,10 +24812,10 @@ hyphen-irish = { } ]; hasCatalogue = false; - sha512.run = "478a77c4ab8231a3041c3427075f16c072f58a394eced8ff0cd5da6544f3f2fd65722f33fd8344e18060c96f09bd18b90af71f8508639fc9c59d29d704d9e348"; + sha512.run = "022faa8d6c94652ac11fee257fcc2cb2063cd8a8e849d1ab5a583985ece324292b793970e0fb8ba6168b60d8408ab7cacad75dd76b408bdcf1c2a23a7438f641"; }; hyphen-italian = { - revision = 58652; + revision = 73410; catalogue = "ithyph"; shortdesc = "Italian hyphenation patterns."; stripPrefix = 0; @@ -24527,10 +24835,10 @@ hyphen-italian = { ]; license = [ "lgpl2" ]; version = "4.8g"; - sha512.run = "4e79ee31893d6c948a3aac8588d4beb75d89f89df973b1e39cd63894e008af55f8dca774194d7eb105fb0aef692b17bb645d5bd85cca7debafd74aabf241bc30"; + sha512.run = "88973a7a3d62a4a37b9875cf599a705965d34603ead5fab9003273f3fea4adaf6f10759a4aa75bd9614840ce4f618470b8f7f22725d349f5336bd5b8b497c271"; }; hyphen-kurmanji = { - revision = 58652; + revision = 73410; shortdesc = "Kurmanji hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24548,10 +24856,10 @@ hyphen-kurmanji = { } ]; hasCatalogue = false; - sha512.run = "e5114da178fc841b1079130c01f8729ac94f0e3592dbd479f44a978ea009fd75b410d6130d9badd6227d115d8f6dad3ed4b553dbfbf4f80be5d1c2adf108e2fa"; + sha512.run = "03e7906dbe6260bbf38ad1c5bfbcd42b3594e56f667d7abe8062347dc3a6b5ddf9022356c9846dba33dc29c47f16d7e17c8b20acf1e29b1671e813bcef0a856d"; }; hyphen-latin = { - revision = 58652; + revision = 73410; catalogue = "lahyph"; shortdesc = "Latin hyphenation patterns."; stripPrefix = 0; @@ -24587,10 +24895,10 @@ hyphen-latin = { ]; license = [ "lppl13c" ]; version = "3.1"; - sha512.run = "9d0db7fcad4ca764379957fa22f9daede79898bcacfbdb62abe54318a52dd82a66f8e39542c18008e3f6b6d0db284b1e9b891531d3c8f3c9cf22c764e83d57b3"; + sha512.run = "874041574d7f5b81858243abf562077b3df712ba3dfaf0b0b8f57e5948e175c97cfc98fcaa9ec5d18662e6f3e44cf94e247af74a817ecf43a969840f07532a7b"; }; hyphen-latvian = { - revision = 58652; + revision = 73410; shortdesc = "Latvian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24608,10 +24916,10 @@ hyphen-latvian = { } ]; hasCatalogue = false; - sha512.run = "85aeadb0cb3c5de9ef48057132ccd958d17f014b07b56b9ebe2186a709c4e7646fad260e156718e43ec3eac88681654f88c9b53a6d71fb3eaee934dcb4439ed9"; + sha512.run = "5a8a921691865d8c06619a9ea1d7e6e6e510c8dfd3a3e7bd5bcfad7854ab312a85f31f4e4a8c8035175207bd3e5c0b0a3b020f3a8606997109d4d4e3a5058ee6"; }; hyphen-lithuanian = { - revision = 58652; + revision = 73410; shortdesc = "Lithuanian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24629,10 +24937,10 @@ hyphen-lithuanian = { } ]; hasCatalogue = false; - sha512.run = "7a691e3c55c768b9ea5ef13552dc42025ab613df0a0d5c0d54aad58b63da11a93e59bc53e6a8211d5e054cbea8500846da01e9619bbee723d648e2d369a49d55"; + sha512.run = "e21bdf74ad6a5f734a2fcf3d5ef30b14c7a13c173c2802c2a78831a9ed6d6142a5018ca536329db78fad8caf54b33a7c393af8a918bfb2ac6b7f650fb3213a99"; }; hyphen-macedonian = { - revision = 58652; + revision = 73410; shortdesc = "Macedonian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24650,10 +24958,10 @@ hyphen-macedonian = { } ]; hasCatalogue = false; - sha512.run = "f88208291212874df493151581205d1b270b2d4278176c42e11edac9b344b73c2ee859f93b6947e4a6003a00abc4d3753024add9caf84f114c8a0cec72aa8c8d"; + sha512.run = "21f28eb952d019a3063bbab803f351278968d50b05f5e7810bedb055f16e8d23160e6cf1f2e208436ff7934691bc782496325fc313d58a8e180b9ef8c3aad4f8"; }; hyphen-mongolian = { - revision = 58652; + revision = 73410; shortdesc = "Mongolian hyphenation patterns in Cyrillic script."; stripPrefix = 0; deps = [ @@ -24678,10 +24986,10 @@ hyphen-mongolian = { } ]; hasCatalogue = false; - sha512.run = "159562a8feb25918bc422e7dc78a46423c7fff2f3c61016a0162761411999a5555be3c6e36cf967d5034f65c12f4b0834ae0c0423c2f3ab17a65034b1803dc72"; + sha512.run = "3e498399bf79fc81c68f44440e758ee04bc6b5fb502e98f0270cacaccfc1f5ba7b9bb2b37070ab68d90479635c357c964340c2cd96ad63625b9c4d1f12a5b334"; }; hyphen-norwegian = { - revision = 58609; + revision = 73410; shortdesc = "Norwegian Bokmal and Nynorsk hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24708,10 +25016,10 @@ hyphen-norwegian = { } ]; hasCatalogue = false; - sha512.run = "8b02e90bfcdf3c6d4bd1966b21e0512069f1749c638d537e9553f68e61e0bc325db8d3b462f45650db4376c7a769c2cde3e0c0601d7de272898a23cd2251c064"; + sha512.run = "ce62abb79b3aedf1c056f9e297c8a32a039de59100426f2ff577cb2e650a1c71fb23c78e794fe747ed5a22840c58082c53126dc160f54463f2e984439e677196"; }; hyphen-occitan = { - revision = 58652; + revision = 73410; shortdesc = "Occitan hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24729,10 +25037,10 @@ hyphen-occitan = { } ]; hasCatalogue = false; - sha512.run = "b0743d1f6083dac7a347e22aed19d0c5d76119582e4862557a55b817b17dddaa69a2150f14daf6b08689278dd61b27c1b6ed45df5601dd6327bf185a7a46a5c6"; + sha512.run = "6ef6af0891e81ce59d492c6b6ed2d98d421ecf817be677101958c8283ed15f1a8fb78731a1899d13edf664402822380ee36ad1e1b77ea8c752de5fa476af4634"; }; hyphen-piedmontese = { - revision = 58652; + revision = 73410; shortdesc = "Piedmontese hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24750,10 +25058,10 @@ hyphen-piedmontese = { } ]; hasCatalogue = false; - sha512.run = "fa7fc73edd582ba20b8236507385f0a30f477bb9c79e35fea56aa4020be966b9c4a16a327848dd051fa4cf6e6117ef8a51eb92ed6cb72f6993cb290fa5cd5ca3"; + sha512.run = "7ef0ff21121fdf0e0c74d26ab4383d8f61dab09067837c9b679d82feb01e95870aade063b55e4fc269b82f188ebd810ef8fd173e3cee6301a2c1c3299d8a2772"; }; hyphen-polish = { - revision = 58609; + revision = 73410; catalogue = "plhyph"; shortdesc = "Polish hyphenation patterns."; stripPrefix = 0; @@ -24773,10 +25081,10 @@ hyphen-polish = { ]; license = [ "knuth" ]; version = "3.0b"; - sha512.run = "5580b3865ff8d20d475cb962b0257b909ff0e410b6776cb8153145fb0ee42b2f777069413bc6b3622c8c52318aba1ba836210e8972c5b6a47ef978c24fc8848a"; + sha512.run = "a092676b0e97d79a85827e98a14af8ed9d1a095e7fc9eccbf1f018dc99c2c46003b501c87eb9362b3331153f27c414f6dca43eab3471d8153737b4a6c35f1efc"; }; hyphen-portuguese = { - revision = 58609; + revision = 73410; shortdesc = "Portuguese hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24795,10 +25103,10 @@ hyphen-portuguese = { } ]; hasCatalogue = false; - sha512.run = "9d9ab3e616522ab9837bb7c7509127f998c442e96f96ee6b6fc0fdc9ac53fd03319d0c0ce28e23a35f1ae0ebb840cdeb19e8ab6444549c33059b28e7b307486e"; + sha512.run = "3029d2bccf0a8b85c37a322dbebfba7d46fe7825fa87fe58fe6d633a33fb74e4d7d7e2207e90ed8a8256ddc0a36d69e2144dc77483c22d390d8c5c1c42c90058"; }; hyphen-romanian = { - revision = 58652; + revision = 73410; shortdesc = "Romanian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24816,10 +25124,10 @@ hyphen-romanian = { } ]; hasCatalogue = false; - sha512.run = "124a93a633731dc1b3d6cbf2fc9b8489bf0737911a0c25ea44dbdfffa07c165ba5804dfd7e9cbe0be3b6eceb9fd6e95daefcae2356ee140f644416bbe1b13507"; + sha512.run = "82174baf4673a236979b99799675368c221737a0cdc5f1957e072dca7859f8633f4907afa203858fd7ab8a56c9a5bd958b32b9bc373258cefc5357f88d5d87fc"; }; hyphen-romansh = { - revision = 58652; + revision = 73555; shortdesc = "Romansh hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24837,10 +25145,10 @@ hyphen-romansh = { } ]; hasCatalogue = false; - sha512.run = "a69d3881493c70cfd58e3d79ed76ce6f18bbcb43e1683f31270eafeb743b366a3c52c9945ff94db333e88ca18145263ba74002f5e78bb42d7aefa48c66af7955"; + sha512.run = "12beee99c3d451a7415b5b51d6c06190d988618d4cc4363bb4576512924374f47e70f7517912b89860ad58d6a968af20e8d4450314969a420ae07ff1af7ebbec"; }; hyphen-russian = { - revision = 58609; + revision = 73410; shortdesc = "Russian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24859,10 +25167,10 @@ hyphen-russian = { } ]; hasCatalogue = false; - sha512.run = "f17852dffbb8f5c337b8316b92c2b0a60a318df491231047d9c0930d55d8b2be3274ec94d0d87085d53e06e89c585d47250f046300bf3890ce751f6f2052d348"; + sha512.run = "85dda7047887073498ad5fedde3560d1951dea080750baf108a3fe8fefd06d7d88b35c196e0181164518ed615a84faab31d12ba3589e2fccb09e2c6658f18b39"; }; hyphen-sanskrit = { - revision = 58652; + revision = 73410; shortdesc = "Sanskrit hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24879,12 +25187,12 @@ hyphen-sanskrit = { file_exceptions = ""; } ]; - sha512.doc = "95c6ae15687118ffc9019c8634347a602e6590b4a1d18bc060e57fe548a81f097070322975be1f62fa2685c5affff7f31b4854b0ec941bbcb9377ecf16986cea"; + sha512.doc = "42d4a37d8c118557a89dd1c348c62c9fdeed6ba27f1f106fd76a10daf406e0d574cfdf4962d55ca5fd84b5e47c6d39d05624e5201134320966567acac94cbfb8"; hasCatalogue = false; - sha512.run = "e84b6ca93e922c9c6edf03f4dbec1fae9eef2462379ef2fd0f3508a5048b54819c5ba12e0d76bafe1336666ca74ba95e27f63224fa048068bc515f3bc41f6eba"; + sha512.run = "669262bfa007cb8aa30bae37be16e398b6f2d3e0e75a80c8988a0ac296adc87035c74843167b6495ea0b2cec5bb1f4fdace67828a46a45303db9be19246aebb3"; }; hyphen-serbian = { - revision = 58609; + revision = 73410; catalogue = "srhyphc"; shortdesc = "Serbian hyphenation patterns."; stripPrefix = 0; @@ -24912,10 +25220,10 @@ hyphen-serbian = { ]; license = [ "gpl1Only" ]; version = "1.0a"; - sha512.run = "390aa9c116b6db7b362fc57aa0758a4c489c5fe33c718fb37675b17a9772a463ce532a2ace3e1ef90275b4afef5ea8d6cff71a7abe625d84e3f461c115306452"; + sha512.run = "5ae363b7db299e13577e7ad87fccecbba0c1b2525b97e068e4eeb71490f19d48b39ca3099a4d2aec08cc1b88f688676f7513450fe3d61b9f6d30df83fedd843a"; }; hyphen-slovak = { - revision = 58609; + revision = 73410; shortdesc = "Slovak hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24933,10 +25241,10 @@ hyphen-slovak = { } ]; hasCatalogue = false; - sha512.run = "a0786980e0cda7029a72075023520acdc998b83226e85deb0b8186ee4293560321517d507f74fbe68f1d68a16cd8af67aae68baead9176f9cc687bcc7d0a72e1"; + sha512.run = "27151e496bbc99d00b7fd6d9fa72424e007cfb63fb3df3cee7f427a3e9f02afeeadfd3800b243f9db525f9b389fc527d87e00b3a08bb121cd89676c75c8baa3b"; }; hyphen-slovenian = { - revision = 58652; + revision = 73410; shortdesc = "Slovenian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24955,10 +25263,10 @@ hyphen-slovenian = { } ]; hasCatalogue = false; - sha512.run = "a605c9149ae452df8b2c25aa0f6bcdde53150e4485147a065f1f56c9740c3544c5c7f9c6049aea913916a62aabaf40777cf6f0f76a858e485c0bd09826a6ef5b"; + sha512.run = "bce8aecb7e255cfacb55c828c6812adab731ab05b09dfe8f8e1a3b7d78c65f6f78761248096fc2a4071bccfb578fc02eef580f3d1679620fc3bbb674e4382c37"; }; hyphen-spanish = { - revision = 58652; + revision = 73410; shortdesc = "Spanish hyphenation patterns."; stripPrefix = 0; deps = [ @@ -24976,14 +25284,14 @@ hyphen-spanish = { file_exceptions = ""; } ]; - sha512.doc = "263fd9480c5f225c7e36169b86e846baa64745b83c1072c9602e873f2e7cf8e63b07ab85b29e9d4263656faff58a39fe83e1eba34517b8ba34720f189c8e7f43"; - sha512.source = "b1ceb7602a46ecab68fb767ffb154f0dea9626d81bf6c46dd43be328204f72141842c81efda9d7d51997ed25356746e345f7cd9f9ed88ac2f99746794becb75d"; + sha512.doc = "eb795847f91364939266b7510a74d94e4f2fcf1d7d240f76d42b6d9563694d136fe76d38d17ae47022e9bc6d7759880ecc24a352923ad390d931c3008de1529a"; + sha512.source = "9cc8d47583fe8920619e3e4cb0aad983c8e3be2a16593e8fda9e262c16d9f7cf8eb06f8bd7f38ae0c5af069362e6d24e7e93a930ce02d672c072e91c24aaa4da"; license = [ "mit" ]; version = "5.0"; - sha512.run = "d6783537ff44a326b83c2004afd63f5bdbd162fa4865138c2e6d34c9e6a103ac41dd7b382454646b09c74970f8e0d5827a5f4af617936f74fd300b2054a096d4"; + sha512.run = "8c5c66d08aab66674c27750f3d123644299b3e1b0316b15c72b90962e3de668034cfe1770244f53cb6ef51a4e31e8511e6f448ea6977875c5a9339da854dc761"; }; hyphen-swedish = { - revision = 58652; + revision = 73410; shortdesc = "Swedish hyphenation patterns."; stripPrefix = 0; deps = [ @@ -25001,10 +25309,10 @@ hyphen-swedish = { } ]; hasCatalogue = false; - sha512.run = "5f993ae6b22eadb87b6a1839bfa7d78a0dccc1107c5afbec8c248ed001018da38bb179e29f2430cffa90283221b20c5475346a8d5566edf16152266257f2a37d"; + sha512.run = "b4b7f2e4e17b155c9ff133b0854f920b5bf97557a8cd101d315446a5d773b6ef6ec51c0934e2e9ad27e1afdbda48a90cc56ad0186958f4e0bdec815a114243a6"; }; hyphen-thai = { - revision = 58652; + revision = 73410; shortdesc = "Thai hyphenation patterns."; stripPrefix = 0; deps = [ @@ -25022,10 +25330,10 @@ hyphen-thai = { } ]; hasCatalogue = false; - sha512.run = "8336eee03250859ab4328ad3c1fe437d2af688ef56b43be49c45838965ffe033befa84cdf600e9f48cdf60cbbfbff44450c830bd4c34556f680c5096ed3aecc4"; + sha512.run = "8948e8dbdada15d08a375cc51aa1c187d9dc946aa3caf6638c1a9bb935ee4894aa2de76d26c3930f50533cbf2586a8b73385726dcc0b5a166cd1efd446843ec4"; }; hyphen-turkish = { - revision = 58652; + revision = 73410; catalogue = "tkhyph"; shortdesc = "Turkish hyphenation patterns."; stripPrefix = 0; @@ -25043,12 +25351,12 @@ hyphen-turkish = { file_exceptions = ""; } ]; - sha512.source = "2aa80889b9657b03b6beb6510b6790fba13811b97abbac186eaf4d3f40212b41db0dd2d21583429820faad558b0415a09aa8254d2edd96812cf6396fb18ccf5c"; + sha512.source = "f5a69877b90f51d3974f7aeba3dbbbd5f3c16170999d235a8f9d8137e64e44dceee71d721a06aea171e4e2a7660e59ef5369aa423d317fe0a0799f56f32ffdf6"; license = [ "free" ]; - sha512.run = "5c7023e01bf59af4d36bd451f51ae00c445711c7ecf109c9d835f1d689446d7b0b1b2627b7f9e84e4f4a8ceff52227ff280ac64481e1d29d538a30e093dace85"; + sha512.run = "7ba0e810f2780831486a7bb8790d7589ca0fccfd78c8316cfb37289dc66f02b0e8fbfc3ca91a198614e88ba0ee04b995a320ab5b74cf5102d4a2bdec8fd5a40f"; }; hyphen-turkmen = { - revision = 58652; + revision = 73410; shortdesc = "Turkmen hyphenation patterns."; stripPrefix = 0; deps = [ @@ -25065,12 +25373,12 @@ hyphen-turkmen = { file_exceptions = ""; } ]; - sha512.source = "a496f681db0b4b85d82ec1dd60c057f63b6d1c1b52d391e7bee98d3d6e1fb596701c91f2ca400d0df13b96ec7a43d275646b7d2874fe1e4efc9d9b2b47f6cc5d"; + sha512.source = "710bf8c2190168e2209dd887c716118b9f0d41075895057689db25a841f1656a2ada7a85f3aa55325d0fd8daaabee089d9e06f131eeaff035ea1b4a46962fabf"; hasCatalogue = false; - sha512.run = "c984bb7f09c5816c36a7a790f16df1750ee90f36e2130994ecd1db63f26afb650245985699a80da9b4d7004ad67106771d8c7b79262438369aee3f52fd8374cf"; + sha512.run = "94d09158df98526c15ce8886a12e7fc732a62b2161fcfea0011a98581425c0452b6f8abe1be968430a9cb0b33a2bef45b41a3bcc0e7abc66f8fcee74063f974b"; }; hyphen-ukrainian = { - revision = 58652; + revision = 73410; shortdesc = "Ukrainian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -25089,10 +25397,10 @@ hyphen-ukrainian = { } ]; hasCatalogue = false; - sha512.run = "05a9111b358c659159c6edfd38b9ce3d78febd794cc82968dc3e2acdc3612786304721fbd07f00f0a8278f4c2e46a1bfad821b5da45e60546d6acb5bf9068d08"; + sha512.run = "8b30460264936390f7ee782213ed11c9fb99bdf09bb88a18e7815cf0054c4a80d4a64762dc3f1623aa2d71d0ef7734f86f4e9c696d5621dfb20003218c026b66"; }; hyphen-uppersorbian = { - revision = 58609; + revision = 73410; shortdesc = "Upper Sorbian hyphenation patterns."; stripPrefix = 0; deps = [ @@ -25110,10 +25418,10 @@ hyphen-uppersorbian = { } ]; hasCatalogue = false; - sha512.run = "b2cb1bcd953ffabbd3f5acd8c72e9c60415fd300004de56ee446fc77d381aac1db65d613a2f591d3d0e45f2a12ff5340457ae3061b4c77de502923932383bdcb"; + sha512.run = "560d70530a97c0b634c51c3f6923282cd315f1be8cb533098375bb72162de628ebd6074e541818c0791faec94fdfb4ef99548f0a8b24067994f72ea2e9d65bb7"; }; hyphen-welsh = { - revision = 58652; + revision = 73410; shortdesc = "Welsh hyphenation patterns."; stripPrefix = 0; deps = [ @@ -25131,7 +25439,7 @@ hyphen-welsh = { } ]; hasCatalogue = false; - sha512.run = "12a23e0b9d00eb4381e3c97ecbb449faf5a73b755a17fc0301f1cbad5d0babb370aeec16dcdd316cefb56e142873abaa685288b1a1d3c7dcb76a07a9ef127ac6"; + sha512.run = "8a8a83b7596db194c6e12389f467c5013dfba45a18dbbf4ec53c6200ff180d09f826dad90d17784ead0c325d3df1531636f6ef5b1570c4b257d89b628dafb271"; }; hyphenat = { revision = 15878; @@ -25161,24 +25469,24 @@ hyplain = { sha512.run = "f2968e8baf048329d8c78934770aa5d0a364ac7b3f77dc00a163e085e4fe45420c180acd05b281016aefdfa6523bed234e75ca07da0d133438798c1e51330d83"; }; iaria = { - revision = 72670; + revision = 73502; shortdesc = "Write documents for the IARIA publications"; stripPrefix = 0; - sha512.doc = "a98119d5929b61a51a4975ac57aafa833391337c900264b37ea01cc43771a39c35d36c9e3ecfc24eb85ac3c07fbfc07a4a1283754243d769bec868a9920c0278"; - sha512.source = "dd5081418c2d50cafa2babe1e3ee56326dcfb8ebbcdb11ecefbaad540a05173a468271f784bb1d079a527b2459630703107defad48def72bbb49cef346fd89d1"; + sha512.doc = "c962e0bfdc7b002afeee2ccbf083da9d41a0ab0d05f771fac65fae6bef69f6b1ac55f158350edf5009fa77b11c39554b66b3529134305f17443ecb891f41fab8"; + sha512.source = "e54868ac31e5a58abcf70fad7b92f8652764fdd2548b4f3bc300282f28fdd64d698abb82eed59facc7944ecff8e568aba0d224c5043fb0fdb0528d0e18d1d90d"; license = [ "lppl13c" ]; - version = "0.5"; - sha512.run = "41a2543f72a104cedde65bfcbe7b2784e17357195cfff05acb45da332a1987e55b8ffac64abc1f119369c4a963813627d5078db11d3756163df085200de22250"; + version = "0.6"; + sha512.run = "833953be95773caf275992c3488677e5f10f37896cb050d0ed666dd5d8ea57a1a1d0de6c490c79504f9fd8a7931a4c28273fa617ac2a63451b175dd3ee896227"; }; iaria-lite = { - revision = 72669; + revision = 73503; shortdesc = "Write documents for the IARIA publications"; stripPrefix = 0; - sha512.doc = "e3a632093cfae92ecc5275edbed510967254635f41dd23934a74ff5c8f813112d08a18498ea3ff559f9f18b03cb16610afaaa19b0d1b8d3d1f915d8949b8ba09"; - sha512.source = "d065c6810cfb5f038e284819d8ce359ef983209e1bfb861b20d963be9747c50bd9151b7697ec5323ec91167d5a3d78fd4eb44aea04e70adec89c9dbdf3238eb1"; + sha512.doc = "81b09c051326da6c9cd8153ac6c7e76d351b746ffb0eba69ee59cb50d08cff90b60a835a4a65766c5aa2d0e0b16584a10710da8ad901f6bbef98d30fd1bf7ad2"; + sha512.source = "3eabe87f5452c30922a1d9e59c68c4cd099511915e15210914ffae71942bbe98446a01235dc0106ed699315f4bc43a55c76dfbcc3ca34f4037452e8e4d79e4f6"; license = [ "lppl13c" ]; - version = "0.5"; - sha512.run = "616f42a3d2e103b36471ff925daefc46455ba18e2125cd004e132e5307e19a5634ea49d3aa7b66b40528ee91d3c9c2c4bdb541ebff297e09fce591a8afee021d"; + version = "0.6"; + sha512.run = "ad6b774de3f23b433a481778964cb84bf115336c01e71b0f12fb928081514d0b07a9e04ba3a80c4e71b932f6d9f52a5c45765e1ee06e798b3ca21668175bd0fb"; }; ibarra = { revision = 71059; @@ -25326,17 +25634,17 @@ ietfbibs = { version = "1.0.0"; }; iexec = { - revision = 69420; + revision = 73480; shortdesc = "Execute shell commands and input their output"; stripPrefix = 0; deps = [ "pgf" ]; - sha512.doc = "7226a854dba47fd91eca3ff5781e312fdf1650b8b3596d4232b353e8854d5cc213cb3f31ba4010016daf4d8683249697290b7886ca8db651b0bce2856bb7e08c"; - sha512.source = "53b295fced75d6a8451d1d6e9130b3aad977fe7b1e0ad57d67e899920dbedefc297b36636772cedb94bace189efa7f2a65172e44069ba62609961ea0cf8fe2f2"; + sha512.doc = "1b286ba806658426a78e48f2bf5b19b2e7b44d385c6a08049a636f0b467b237f85b39a1776aebae033262127a9da41da7e0a776bfd088110806f9e01458bdb49"; + sha512.source = "8d2edd71bac19a4ee6e4dc5a2551e4d3c2a6d1643264a8bd8d0f5897a5b027271ddb9f22bdbc21e3eb022cb71bfe91f9fa1b2735e1f0c1231e291d0f7cc120dc"; license = [ "mit" ]; - version = "0.14.0"; - sha512.run = "c9b89b8d93868060d969ff2943fc5915b831f5354a78b87fe99edc3b475875ed10349934e6cc23376d23d3fbd8e84234028bb4d2ccd49a30e8cd3e3b20035311"; + version = "0.15.0"; + sha512.run = "b381b04d57237aab65e49696ce40e518396ddb0e2481fee9a6699c61c274c395fbd9bc4957046b4755fc9f82391ff1c714d1448a5288c4130ed4ef3d896b9ce9"; }; ifallfalse = { revision = 60027; @@ -25434,13 +25742,13 @@ ifsym = { sha512.run = "ef6615a3768f87009d22c3feeaa074a0589b17efc8585a509e21692195a100e5b11e2d0849fa2eaf8f80cbe0d96ea12e773aee0be28e7120ee80a86dcfa6f8e2"; }; iftex = { - revision = 61910; + revision = 73115; shortdesc = "Am I running under pdfTeX, XeTeX or LuaTeX?"; stripPrefix = 0; - sha512.doc = "d51b452532fcffce4b1078ab26396bc4f8739e2c3025917b4ce88af2e5aecfbe0a54e481f1683afe2d25259c6f73e27be8f257beb1b599f9817dc37df427fd70"; + sha512.doc = "ca80b5babff8f78624e2908b55c3f9b9cf4e9f3f3ffa777c965e20f00e8bc71840c694cd50c94042c1cd0037b88e3260f29a57a3b39abbe0b6e498245e86ae5e"; license = [ "lppl13c" ]; - version = "1.0f"; - sha512.run = "ac7958c10c0cd5ee3a82273632445423c347bc9c5fc2015b97fdb7018d7a07b7e1316761698973b325314e945fba6c86be0dd49e058ecf74a55ccf2b9df8774f"; + version = "1.0g"; + sha512.run = "39761a9fe27652d444f3ff119c891c25af859b1dc8e8e21419cc44a45443bc8cebd631168b46dbd70853d2b84c88586972c7f471bd0a504d0b6afeec13ad6b7b"; }; ifthenx = { revision = 25819; @@ -25641,14 +25949,14 @@ inconsolata-nerd-font = { sha512.run = "e6d748131726c0a81dd4fc4868b0237f15ce3eadb60b874ebf5ff9f76b6bde9f6ac86bb9800e3cdc15867330123bef773af20d3755d4281434694f6889a74ffe"; }; index = { - revision = 24099; + revision = 73896; shortdesc = "Extended index for LaTeX including multiple indexes"; stripPrefix = 0; - sha512.doc = "0e68aca1c5dda444aa42cb1883821f2003c450291191b2eef16169f3f76e03e5ec9d31577574afd8d3b10237309be303538ccd1d4c8edb9757e7c910da7c5f51"; - sha512.source = "fc9e646c54415a14e41f1adf9894e723ea8d25e1d151b56fe40e5dd437a4659535b11eccbe9e2b6077d01a7a83b044c2d1d2b9aa1b08243d82b5a37a70641c11"; - license = [ "free" ]; - version = "4.1beta"; - sha512.run = "2b9bed00e12b5aa7b1813be766ba7c2e1eb750dc270e9eb585b1cc3d559a3f0c9094919344aaaa51cb6cf7cc132a5f89f8c07c96a12c5b1a5446524d07f4121e"; + sha512.doc = "ef2c46963148a9df2cf387a459368d4b0ee635e5c215a1d80b674ee7ecdf54dadfd9e25eb5b55b5733f7e8191afc2fd2f0325a7db8a59e837efe215e479bf19e"; + sha512.source = "3237a3c94bfef1661df89a2eadceedaf748cd4dd98dbf0a2accc6f68fa53249f046841d279c3087df40ee00b9fbabf42e08eadd5b44461fcfc6a8dd77fc9acff"; + license = [ "lppl13c" ]; + version = "4.04"; + sha512.run = "a46e2c5d08a969808fb20d684c58c19eb7815ccef0f0f65e163de349badf505ccadedf2d9968a7f2ce0b0db057ca1d3594a92ba4d1313fda3320e4be08ca9c28"; }; indextools = { revision = 68555; @@ -25660,6 +25968,16 @@ indextools = { version = "1.7.0"; sha512.run = "decb4d3e7a2504f0f08f5e907eabcd961d1900cfce98e79cf8d7745868564eace7f3fd1217de69d615f9267630c71f9289a0519dd9f3b8603be6544ce6d1cad9"; }; +indextra = { + revision = 74328; + shortdesc = "Enhanced index typesetting"; + stripPrefix = 0; + sha512.doc = "ab0bd92ccecd49fe68c33dc592363639869287bdd5a6469b18324eb00d8c6bea443e95af5d9c72cdd5ec98cf0ce545adbbdd4fcdd9eb6c5fc8a9d2cc67700cd3"; + sha512.source = "fc6ff56e490f90e154263475b97806689a262cc08674f147c1bab5063dbeaea010de92075453a4ffd39f7740cc8c33f03d647aa5c1a5d0c7b58ba909176feed4"; + license = [ "lppl13c" ]; + version = "0.21.2"; + sha512.run = "b8169c67d65f440e78cd98ca5d19ac736f1284d8bdcdb151e5e1c44da61becde2f9c62bb3ec23e016f14efeaee21223755417b29484c296ef1c112dea2e80cd7"; +}; infwarerr = { revision = 53023; shortdesc = "Complete set of information/warning/error message macros"; @@ -25739,6 +26057,15 @@ inlinedef = { version = "1.0"; sha512.run = "b98b83ff26b5ecc9826f111d9faef5aa0f51ebcec7978881da2a61287af7aee022dc1b7812ee457885c7813eee0d2200d250ef45648619f3d105e2df54cd21d0"; }; +inlinegraphicx = { + revision = 73069; + shortdesc = "Insert inline images, with automatic size/positioning"; + stripPrefix = 0; + sha512.doc = "f13e561513fd9f1eb54aea19b7c123386298bb69da49036faac1efabb7a7429af4a648b6764d590bd7149a2732b8d8377a580294f61cb556163f889fa5c72d99"; + license = [ "lppl13c" ]; + version = "0.1.0"; + sha512.run = "b9280f79bebbe6bc95126c91665c2490abdfba5d81a2873418e8816128c3a00ea6dac950e23eaaed87f5f01bc3f8f8e11cf8fbfa2b4498513e5a4cf7d7950d4d"; +}; inlinelabel = { revision = 63853; shortdesc = "Assign equation numbers to inline equations"; @@ -25811,12 +26138,12 @@ insbox = { sha512.run = "98398c838689cfe22ba859e2983f374ecf94b21bcf46de362056821af31285754717f7b2169f8bfb6fbbbee849449a1f3caf52d1397a901133d0364b392654ce"; }; install-latex-guide-zh-cn = { - revision = 72158; + revision = 74375; shortdesc = "A short introduction to LaTeX installation written in Chinese"; stripPrefix = 0; - sha512.doc = "74f20ba52b2ab7552a047ce7260a926ff8596a87168ffd0a82522f5e50226820d0ed3452c236e564175aaae6c8ba4b2ef008a0c79d628e7c1d7ca91626d341d2"; + sha512.doc = "f9adb3ee453e25c4ca3808b2e223edc3235f76dfd98f4fa6173f8804702c74dcfe6f1e48fb6a2891daab4298fcad2ba785174c203800749fd2dfc7ac0c2b2c52"; license = [ "lppl13c" ]; - version = "2024.9.1"; + version = "2025.3.1"; }; installfont = { revision = 31205; @@ -26024,13 +26351,13 @@ ipaex-type1 = { sha512.run = "0dd513aa3cbb9dba7e1099f7f08d839e80002fc5f5bcfc2a2a013dc799a0a6389f128fe72ebc32b673afd66f3ebbc7fab9b97c31763f94b7ad64eebc83b2f569"; }; ipsum = { - revision = 68861; + revision = 73069; shortdesc = "Insert multilingual placeholder text"; stripPrefix = 0; - sha512.doc = "b53fd7756b3ac604583d95f6cf9b90d322ebee9e6a1f085607de710a2bfe3257d29394cc816f1817b0cb499a550202a0dd1578c9e7e04152e8aa132fea05bd3e"; + sha512.doc = "fffed8d35f5a42cf3761cecfc360ba3c84c9a4edf501a2bedd9f513050e7a8362ecd49f57c8422f67647baa1beb0c6e4f434477fe31380a04a2e946ec554bdf8"; license = [ "lppl13c" ]; version = "0.1.2"; - sha512.run = "72ba4708735350c0b1c6521d3ba09ca0477b203328c1452033755da7eca159b82e50ca0950f2eaba7cac41c1f27cfb28951716887e2736d9e69f29f91acd29cc"; + sha512.run = "edf5d3c3ea5723f471c7632809b3040c46bd229136fc7b5596e8dfe3d01a90ed37d1b534dc71f8668127474359aec6cf60c195ddd3e62ce04d899a6ae2727b55"; }; iran-bibtex = { revision = 71972; @@ -26155,14 +26482,14 @@ isotope = { sha512.run = "27c03c4c6519c038185ee485e94ac51d90c21fd095e4a4cb6d91b06f98e7adb7a423a53b1df035514f58cd0556ab0ecb1afd55c05008e558812d95de2159c8ba"; }; isphysicalmath = { - revision = 69343; + revision = 73239; shortdesc = "Simple way to write nice formulas"; stripPrefix = 0; - sha512.doc = "f044b6cbdcb63a5e66b6dfd396393a99d605a219ede55317c759c28c3890a7c79ff6c0feb1de8f6517350d15a6422dc54426b7b5169ea1865024e5a335fe5517"; - sha512.source = "d68bb0b9753303e844476ec27156dc22ba7f3c4456a26870edb080709efb88a2485f2b41bd3c15a89d7d665f22acbd206c951d0f817742d352f6997621188734"; + sha512.doc = "235595daffa13b6285cd7e2323a7ceef17c1f517bed677e4c2dda3a4f62e613bc1ed04d73c48c3bb55ca35ea422957e2c45097c04ee435c9ac35574fc608de34"; + sha512.source = "5f0dcf4996f67bfd12e5640d7330903869bf7819f8a4172609896439a8d6869d0312c5574f440261d9c35719aa4dd31fff63acfe60b519ae17d3d6ff668c0f49"; license = [ "lppl13c" ]; - version = "1.1.0"; - sha512.run = "5329b97930fbe9cc13c275132a32cfe4293bc23b2c1911089aaaa80baeb0437606c73503b4430574e88da61615d0649fea6f5666a5609a79ac5ca37cc90294a5"; + version = "2.0.0"; + sha512.run = "4d82ad0053f82567d38da5da07d623f48a3a267d235e094ed29e43ff0714411335556269c279330e7a689c261920c4ccd86036b747db07c0f3cb6db234e29ffe"; }; issuulinks = { revision = 25742; @@ -26359,14 +26686,23 @@ jbact = { version = "1.30"; sha512.run = "0f1cd72dca41b37c26d863aa734737ad128f5c39c508db13a3e91e4088477a99d9978aa1ed003ba0812e276bb4d80e527c80915cd7a08fd1cbe968816359814e"; }; +jetbrainsmono-otf = { + revision = 73401; + shortdesc = "Package (or only fontspec config files) support for the OpenType font JetBrains"; + stripPrefix = 0; + sha512.doc = "bd3938003fefa2ede545e93ecd80d8391d683a492fd57703ab1008b5172c7a7406dec934eea2c9af663ffb391229e4e6603c4939188a335b959f54775c80d8ac"; + license = [ "lppl13c" "ofl" ]; + version = "0.1"; + sha512.run = "1929e57cddc67a96d5a125b322ac40d3d6fec54b5361b0866a84115566785b11001fd27171c470291dd0601d2d03a105320a470f11de8d16ca68cb0a32b1bef3"; +}; jeuxcartes = { - revision = 68266; + revision = 73965; shortdesc = "Macros to insert playing cards"; stripPrefix = 0; - sha512.doc = "9c918a0cb97ac3b82a88fd104a2e084404b83b2c04acac44e5f566774a3c01d8c91b0a73b49325ab6d7d366c5849e69a60c28a9686049c009bc249cc9b04c7a0"; + sha512.doc = "5e76c131d3bef3ca784d83c5dac7bbd0c7243ba0f0f90b4b1baac6d18a25592887b770625ba46c8ccc447bb8428ba0c2f42b4c5da6caa45cd9fc7c6d3fd09c60"; license = [ "lppl13c" "lgpl21" "publicDomain" "cc-by-sa-40" "publicDomain" "mit" ]; - version = "0.2.8"; - sha512.run = "ad90719dd34791c88a5300d33ad7d633e650b3de6d61f493cf9069c39429f57ffbbde7aca1d2356a9cf6486701511fb7805049ed6a53ccbf49daa7a3dc5ab4e3"; + version = "0.3.1"; + sha512.run = "bb233e76610a04c4da8ced995661aab95581fedb29ede038b0f24522d7b4def3dae303e710f584416ddff02ac2e412e63bf44fb8a3f4d58f74e17205207ea0a4"; }; jfmutil = { revision = 60987; @@ -26545,22 +26881,22 @@ jourrr = { sha512.run = "cbd5484b622c865b7c42f8ce54a76e54a5cbde6045701cd8fbba54d17c8abc510c79125e7d335c3509cb9c674ce233005f9fcac703fa95f3297239c00c3be682"; }; jpneduenumerate = { - revision = 63893; + revision = 72898; shortdesc = "Enumerative expressions in Japanese education"; stripPrefix = 0; - sha512.doc = "447c925bfe05d1c6657bbf2592bfbd16f80d9bcc1a3320635231153b90198f2e8010cef5d13573e84504d5a41b9cc6ec750054c00a9178154c4e210684919d0a"; + sha512.doc = "84e5c54c731976ec8b5e2bd105856299bf170d203a490955bc11429d142fccac509062dd0efded4e033ad590a3a8b0a0f81e6c675c4af57b4e2370328f7d1362"; license = [ "mit" ]; - version = "1.2"; - sha512.run = "10bb936cbddc6e88979ceed208bdba424d4e4c9c388cadd3a9b84a767c59ea43362f11092907f98c16696f07134ed66765a8bc7b02ea0a8fbe9eb7b814760780"; + version = "1.3"; + sha512.run = "86a6d325c9bfeeccda2b0f134fd6756fc68f0d529f56dcd3f7df33d9ce02452bd71a8a55faae8644d71e8602b13f325e6a5f6670bf3e65d5f3e6ebc3ad97796d"; }; jpnedumathsymbols = { - revision = 63864; + revision = 72959; shortdesc = "Mathematical equation representation in Japanese education"; stripPrefix = 0; - sha512.doc = "0589ea6fa4dee93900753dc170aea295e9bf1103687fa146633589897292dff8c472ee95607a2d0b682321a5a33e22220234e2a396cee4ec2abc54fa4276459c"; + sha512.doc = "1a52b61f409a249e7a283750ddeb8a5208e6ef4160cf5a3f7168e664d087ccfeacad92fc31ad17cb26e4b039785bf40be612b3251430e0479e135497200482b3"; license = [ "mit" ]; - version = "1.1"; - sha512.run = "c4f23412a83fed8ee870922d1e8e0c2e8a881989223b340de7ecda0851d45d504fa6c5f0cb70ceb65e2c07f5df0154f77f343787573a6265a709bc398e3add9a"; + version = "1.3"; + sha512.run = "cf0abee615f54cfd47727cc22ce350389fd7a41aab8eb09d11150078c2fb0269efd776ab7431ef323cee0d29ddd42f0e6bd9ec9805b9624bf3042789d20a3ccd"; }; jpsj = { revision = 66115; @@ -26589,22 +26925,22 @@ jsclasses = { sha512.run = "aeba8c75d3af2077763da1846e09b6d51ce0f5935cc4e8a09fb6c747d9321161996423ce620d04c15cfe3a4f9af3ea36f90ccbded6fa03dcc088c5e71be74295"; }; jslectureplanner = { - revision = 70443; + revision = 73640; shortdesc = "Creation and management of university course material"; stripPrefix = 0; - sha512.doc = "dadb7116ae9fc7943dd060b261bc81a3c9f0222bf2e231e588d54ffbc9cf4b21c2aed513683a145dd4b03de5b7f604147c44c93a480ace509fe377f7f3342e42"; + sha512.doc = "89a55caf1549bd6575573dcba3eab1bd1dd95350cc96ac0a2604125440eba27fe99cdf9a84158ef37d17faa7a092739ff59558552ea089a25f099af64a006b24"; license = [ "lppl13c" ]; - version = "1.13"; - sha512.run = "80a89168832795b095eea58b2219895bd21a4959653420955057653173fdc4cc3cb739937bd01f8845238a2db5af7640848b8a64d70ee28939631f9c478b9a5e"; + version = "1.14"; + sha512.run = "ddce34a9fdab11635a7d279b065954041de8a74ec4f00f25779f2b5cd55cf940d68f127a8c31486a93a9e0295d87e8cdc4416d135125bb6c668780b7f69ad0e8"; }; jsonparse = { - revision = 72654; + revision = 74289; shortdesc = "Parse, store and access JSON data in LaTeX documents"; stripPrefix = 0; - sha512.doc = "8565d940885ced7a9f0a861b9fc5693e4c77b7ae5651cb1dee9b51143fcfd6ed7821b8b6aa118615c3af4421669b5410fc801cca70416a93ab66018bcd93f5aa"; + sha512.doc = "4203fba2c17f8b3491f89469cd7d5034b473c82f628181f5dacefb1f8be0a1d3dd73857c0cde4b328fbe691edf50c3552f6b7bff5986cd73b490dc7cda60f967"; license = [ "lppl13c" ]; - version = "0.9.3"; - sha512.run = "6159ac88d7f6d29f88920184dfa777b3e0e467f12c43360936b613231f7dc193861fa64033eac068406404b47caa8cf8f25ff32c7a6b108b689df112ae0680b6"; + version = "1.2.1"; + sha512.run = "67980bbd4990844a434c0a8ef5961876a453c5e51cf1c1c02274871f3d6a8c425fffba0d9e96cf5355c52069b32cf5013a1a2b9edd1eb624dff9500e4dc4d1f5"; }; jumplines = { revision = 37553; @@ -26704,15 +27040,15 @@ jvlisting = { sha512.run = "70626cd23359751909ce385a7ed4415c5641e9c303d0dafeb99e36d0151f382c02c2f6818a135bc92fb156d4fa25d1976b2c906074fcc112e56a1a7a458801c2"; }; jwjournal = { - revision = 72172; + revision = 72788; shortdesc = "A personal class for writing journals"; stripPrefix = 0; deps = [ "einfart" ]; - sha512.doc = "fdf642685973e6116c51ef03ce82d9892ab50bd17176e4c71c82fec4e504ef0b517d5516b6cd16a7db3e094f49c79f3d583c3deed0a2ce2e94164ce8d15d7ac3"; + sha512.doc = "f4b35286a60c624c1aeb930269b7011a6c91c370f75d1324d6238805b004a2d4923b9e50464ea8f210cd0ad4d096be9c8166db22da83a22fc958acad155d6687"; license = [ "lppl13c" ]; - sha512.run = "ab83dff90500ba693788ddf6c112dec381eba6f551e1f9da1df6c00c315dc85eac62b7c50f9b6cac12ab22fb323cd0f486360852f1bbbba3eaddb44b828cafbc"; + sha512.run = "64446db4fe3ae20687a451369c7263130962ba52b6e8d0e8e5705df557894b343a0b5a52e3bce26ee41884ea749498326581fb892ffef01b5ee8a9d7930164bb"; }; kalendarium = { revision = 48744; @@ -26791,12 +27127,12 @@ kastrup = { sha512.run = "d7cbd22ead6633284e9d114d90b2cb47924bfeb10c15eb350e4c2f82b883930c953410362313cdf8ac476a68cfa3a9b020217097909504b97a8ecd7addbc8d97"; }; kaytannollista-latexia = { - revision = 71784; + revision = 73292; shortdesc = "Practical manual for LaTeX (Finnish)"; stripPrefix = 0; - sha512.doc = "eafdc86d0af21460854029abc5dfda3610fe67db6898c174da7d81899bdf206bdde3991991d7004c5430b34ec67d3cd873f45bd7d848bdfd2621efaabd0b2994"; + sha512.doc = "4b870e3e7fdb6979ca023fa3ffb0b98bfa4966e987e568a6a93d8533246299d0828bf45f4d985c77a925d51c0f86e86f34fef41b7a9840efc9fe2f2944ac6217"; license = [ "cc-by-sa-40" ]; - version = "2024.7"; + version = "2025"; }; kblocks = { revision = 57617; @@ -26818,27 +27154,26 @@ kdgdocs = { sha512.run = "79b64f2f20b9da908fd9acee1033fdef290c30e99794c37f5020f33dc5fdbb670383463bc17614f4ecaa1d5d4c03b4ffd3aa4f2b7c53f27455740adda9d0545a"; }; kdpcover = { - revision = 65150; + revision = 74399; shortdesc = "Covers for books published by Kindle Direct Publishing"; stripPrefix = 0; deps = [ "anyfontsize" + "etoolbox" "geometry" - "graphics" + "iexec" "microtype" "pgf" + "pgfopts" "setspace" "textpos" - "tools" "xcolor" - "xifthen" - "xkeyval" ]; - sha512.doc = "880f981153526b41cc128677d950e52b4ff5449adc4fbb3b0004a983bcc7222fb64714ca033b605172fe0b52107e6cc8ff0fcbd1778bf7aa6b9d20fa994ef452"; - sha512.source = "e67cc3eede96c42506beb03d8e4e7db1b5fd4a7ed15026a060c3a5db559c0abc7fe0f9e24c22b23d2aff7c7979005f0c26d250607129d29b6d4bc9babc0e11be"; + sha512.doc = "e3b5e9a7e1ec3c821f72e74c9fb3a25736036ebcda5fb0ca2994997a803be82c08d66b13b183b06803f628914a3a49975779f5ae871ffcad16e3796d5973e6cb"; + sha512.source = "dc77b6e54f01c7b6700fba42c9668bf3c98e0ba93d8dfeeda1de7eb3a97e9f044b8ef43652dbf961f270db9d1fd0dc396d45608a2d8925154880f196b14ce2f9"; license = [ "mit" ]; - version = "0.5.1"; - sha512.run = "d68fa467a50f7d1648e51b918201b76c199920e39915a3c5fcc72cd75c4b11b0924082cf8c01363fe5af998c66ffae71137e7f9635e147ed40ed5e7cd4fd63cb"; + version = "0.6.1"; + sha512.run = "7c12a56a53abedf07e80b26e833cd92050113178b19fdc5b21bc8fa95d057801ac2d99073029055ec1660b67dd15306deb6bc5947719dbd2387fc83c480e8458"; }; kerkis = { revision = 56271; @@ -26935,13 +27270,13 @@ keystroke = { sha512.run = "e04e13e23b3342686078c2278d3b6f7c8678d99acda197f50296ade3dd91bc4316323a669efd7238fd246c60f169c694677252601a81d9e23b49a1e37049c93a"; }; keytheorems = { - revision = 72620; + revision = 74018; shortdesc = "An l3keys interface to amsthm"; stripPrefix = 0; - sha512.doc = "448e8eab77371dcfc1178feee254c70f087763218e76fedbec78f3e6bcd0c20518679dd6b366afff5b4b3f9dbbc66e19ef4ba0bc675e2f93be00227b9b6a60c1"; + sha512.doc = "57a13e01a22d3e99c3ba4bb07242c4f6fd33fb49218ac476aac62eb487f3868160317fcf5a620590611529a6f99bcaee2bef344f02fb39561fe899554c1570a4"; license = [ "lppl13c" ]; - version = "0.1.8"; - sha512.run = "be8069b4b2c02d66b6badb9e7cf2ea772c1a17d8d0c46ba791859f5945f2a78ae0a630eaa3f690e6170c578f2b0f481322987951a9c068f2f489d653c9fc1b3b"; + version = "0.2.5"; + sha512.run = "dec4188fe5ef4923ce0cd4647918360bba14aa633108eb3c0332073b7bf7936dcc82c02e2787f9a12e053c9dee0036b76cbae7953bfa6b74d74e3d92d0d0fcb8"; }; keyval2e = { revision = 23698; @@ -27036,14 +27371,14 @@ knittingpattern = { sha512.run = "cee26b0e6fd54a43a12e0e48fd5b4bf381816dabb6019cbd7c13ab5e2561b9f191d9fce4c75a513c06530077bba8d383b26552e2e6f4e97600aa2216547a08b5"; }; knowledge = { - revision = 70594; + revision = 74193; shortdesc = "Displaying, hyperlinking, and indexing notions in a document"; stripPrefix = 0; - sha512.doc = "ae37ddbdd67bb60587605be85a5974f522ee7e89af2aeb76dad3cef24646379d9fd0b3c927fd5e0676027ca231b068e68ad2c56287a3cf3cf1ededd9518f410b"; - sha512.source = "83278472c7e50e986901da91f4b36a1582faaa6b4ed6d95fbc7f5de9321e99f921e73386c0eb9cf2e97b8f70d827d23b0220e4f6f3e8f021ef9f27df1882bf4a"; + sha512.doc = "2ac6eff4385d197579258dd83be030634794959bbef600d2f40863582b4df6e022719aa2fd2e871fc814dc439fd1eef9077074786bce1caa52491367dfef4d2c"; + sha512.source = "0b60b08222d4603c6061af4bef116219addc2387d64a43404860008116381b0221b2fc19649db12b823521058e0ad58326b9861c2be68a8a05c22776fc32ebff"; license = [ "lppl12" ]; - version = "1.29"; - sha512.run = "7d12b779220ae4905a74717f2244e32f35f7f6323778a3ef3ad2da074c6d325a42f4efc9c1569101479448d1ef81c587e3a6cd807d56609d90bbe7ed83003691"; + version = "1.30"; + sha512.run = "593f7e19e9f6ff6a01cc06c1d72ef012e48ae03eefebdfe480ac9768789a9595cea665f284b7dfa719e49ddd99ad6f21bf1e1afca36e14d2b861210fd6bc8365"; }; knuth-errata = { revision = 58682; @@ -27149,17 +27484,17 @@ korigamik = { sha512.run = "4021b99d8ac5f554cb8faf2028adede6ffc49e37aee96a65dd6eaf6496f7190a437bb1d165263fd08e906d8f9079658f07887b3e5155a54dddd12c2637c2018f"; }; kotex-oblivoir = { - revision = 70491; + revision = 73766; shortdesc = "A LaTeX document class for typesetting Korean documents"; stripPrefix = 0; deps = [ "kotex-utf" "memoir" ]; - sha512.doc = "c8faf9be789aa61c3ef06bc8fd858dde210b194818ed06a89c8d4c521101900f5cd33aee8483a0cdcddffa26bda8b5ddab2db5b40b708519567738121db7f660"; + sha512.doc = "02d8f5c3079c58e15b0dffdf02436c5ff010e62a00203b7e9b243ffae208ad3a1769b55727ebd92ff4549a7d6ff441ff67034ac5e111d9941397f15d2392f723"; license = [ "lppl13c" ]; - version = "3.3"; - sha512.run = "11cab6c1073761692a2dbb2ce4e2f4fe2a2f7ce4594b5a9633b4f482bbca5edfed3682a16b8e9d598a3663219291d3a5962a6b00e07ad9cafd50d9fb96cf3776"; + version = "3.4"; + sha512.run = "7a4ba1ff5f69c06ac5b8c01715d39e668a6a96e5435e3ca3137df4e15ab0d66908f6c88390dc9b8246fdc3b0d2f1549e1cc46b05abb4c3e386f5a072bb5069f4"; }; kotex-plain = { revision = 63689; @@ -27214,25 +27549,25 @@ kpathsea.binfiles = [ "kpsewhich" ]; kpfonts = { - revision = 65583; + revision = 72680; shortdesc = "A complete set of fonts for text and mathematics"; stripPrefix = 0; fontMaps = [ "Map kpfonts.map" ]; - sha512.doc = "d030abf78988bc21f0e4afc06f0fda95339864036883877f5ceec11210640fcea8cd0ba54eb4d7b7dcc33b9eee8a0b2593739b4e2260b9db6e23cd480861e79d"; + sha512.doc = "274b5a6a9012eee0168dfe0449ff4445eac55c2baa6f87ef36d81d842dab42347613edd06821b5f7bc070558106b7b0cbf1f52abf8681c2116ed8f8364e009eb"; license = [ "lppl13c" "gpl1Only" ]; - version = "3.35"; - sha512.run = "d4d035c30acd5d5731a16e144cb45df6a3ce12c06d290f50c9e721ac67aa4808eade4eeae4c91a5093e29c64f91ec4d7a8d65d42307238c472d87d22eb5298c0"; + version = "3.36"; + sha512.run = "bfe0c56318a5d4c9a314e2562429cc3b71c2ae03a830b7a5ebe0af57b3dff3e65b7f57b73e3e4c8dcd1a0d04f4d226796e6b8e0dd8861390ddd1743d9e9e443c"; }; kpfonts-otf = { - revision = 71153; + revision = 74015; shortdesc = "OTF version of the Kp-fonts"; stripPrefix = 0; - sha512.doc = "66f6e8db7c002ec8a7d3b5519c7f7cbf2c90987ef403468fad00abc248adfe1a44046d06e4c9551b91c0bd735bc6fb674b7cfd712368e3b177d75fc72b57b6df"; + sha512.doc = "b48cbce98b33bb57c8632375f7577f9081c04462d0d5fcb1bbd53a20cf39f2544a0977406eda92bda0713a22a5a9dfc19a872dd1864ab472774de5fe2204a26e"; license = [ "ofl" "lppl13c" ]; - version = "0.63"; - sha512.run = "1f765652903691c14fbf984bd791628baf41f6fa60969c3b7335d072e5c9a765beb9029cf45c272e395d9dd996d72c18c7c801f092b1d0cd3de0ca483911d041"; + version = "0.66"; + sha512.run = "8161820ff08f4739e0db0142d9efe52b5d33604d267f5cecdf2039a7f7aae16e77ed6c674dae3f8c5a81209c0f7b49acd862d51d2e7b0a0e9c9f90ebd2964d2d"; }; ksfh_nat = { revision = 24825; @@ -27404,19 +27739,19 @@ l3backend-dev = { sha512.run = "00b65edbcc4ada59b04d73655749b2a3e8a6f2def3af3e207ca34d2557cc0fc1028936284fc3d593fb694a43dd8f8d2faeea21c201a8277c67065602c2797ce2"; }; l3build = { - revision = 72567; + revision = 74232; shortdesc = "A testing and building system for (La)TeX"; deps = [ "luatex" ]; - sha512.doc = "f94717f7886259311426c3db446107a126f8fe390bc3b0f267c1b020cd4ac50fe4e4bf017803ad6e2b253b2818f8e273a6b5dac2684c386c47aee5febd3d6d95"; + sha512.doc = "efce6154560982bd86d00d33d2f5488e806d020aa8cec416e68f2470f246e44af0c045fafc93b373969c7a01a1aa88a8b0fd92fd55428ec1f2ed2cabfde59d48"; hasManpages = true; - sha512.source = "c827aab33242506c71b5fe1c68f3c62f05dd10f3cc298601eeb3300e9be069eca45cbc57d11461a6d01bfa9668b39ed59e585246075d00938eb5a362eea22099"; + sha512.source = "3dd32d712470764427705de02fb240e022863e725cee913549f0f3765f9545c6a778b5003c726c27413a66ad43c73e15c4d077b2988e298ee2611556fab4b8d9"; scriptExts = [ "lua" ]; license = [ "lppl13c" ]; - sha512.run = "257342039be96573c104dd6847669f6f25e48885b3ba49f6a5bce739adcdfeb7f549c34447fb63b67355f3e628d0e944be1a30204e0ab4c6d32fbce1a20a5b8f"; + sha512.run = "0cbc1cde6d08d4340cf035f792c20e3954efb680fbdfd1069134007d1db070e27a51ed1c9c492e59475645e5f8d93807fea11de41a69babf8dfbf560d11065bf"; }; l3build.binfiles = [ "l3build" @@ -27434,28 +27769,28 @@ l3experimental = { sha512.run = "de17019573671ee1b1c6bd99071e4f9e743c5a569707b8e5487bc4f40ab329c44b748b675cbebe42f986924bf7eb951db716498501d64919cecc2348614276f3"; }; l3kernel = { - revision = 72625; + revision = 73651; shortdesc = "LaTeX3 programming conventions"; stripPrefix = 0; deps = [ "l3backend" ]; - sha512.doc = "b8572ecd76143d0e9f444d071ed4ed8691731d5d881a5f7ccccfa7486fe928fff1f09896ba85a0f45a3f8f8fb1bdddb319734faea74d854f417506b62b7de2e4"; - sha512.source = "635a60a2c7f94b2d5362ef57e2011b81f804f764fb1e5c872079ce4691942676440498ab2894d8d16c17eab205f88305f208ee1668be8aad2f6a3164e4a64c66"; + sha512.doc = "d7f624ed282243a54be66f179551fedd78ea2bf533ce89ba7756fba07f02b3260caf520fde0c9d79a7628fcb509e78800e1a8b7c5269fa64e5591e5b44f17146"; + sha512.source = "ff13d1e896767b1beac687e5d6590d87a233eb970afabd5a2ad500a18883174efb325d576b4c416b043d3ca438a7ddc25a17aeb118734172d346ec257597fb5b"; license = [ "lppl13c" ]; - sha512.run = "19ffbaca7b5a0f27ba7bd01e4cc12047b90945057ac9807868abb53da1f6c1d1d1f5c3d86de55cae8a197380641ea6281903930fbcf9c2607ceaeb033fbcd117"; + sha512.run = "3e7a3c94ba113cd57100b1755ac85e9549c1da1fed6a89c503557d5d65439c5d6c00521ca896c80fc98569ad47324f67a621e9146b26e5dbf5f7c6f38cd7e51a"; }; l3kernel-dev = { - revision = 72506; + revision = 73508; shortdesc = "Development pre-release of l3kernel"; stripPrefix = 0; deps = [ "l3backend-dev" ]; - sha512.doc = "312abe641ed0fae4f185e8575be33a99927abdd5ace3c3ae4b7c38965e4d70a435b2fe68842d92a1e264b94381d6b1294fc0d930ff10011006e5a4659e8e52e7"; - sha512.source = "b5e931ade0f0b47c4b24322c81a0acf689bd2a0f77e0ce7d4e0e3313a9f267b092f725a87c4c62275c17313e60a8c9b7aa3146e91b7e953e769b0f8e80579d89"; + sha512.doc = "04e0a8afd9eb0bdb48fc1ab02fb0bd4b73c6201124768a95ac4c4ce34cc9d284602a5e952e65b1fd96d3ec7b3fdd29366917535d7d0b0c30613dca706a098d27"; + sha512.source = "5e4af20e2f439d416510e6f89df4b8dcfeaa88ab8644771e5541f654a19d7f0c80fc5b9c301313529770ae8231a52722d4425459710d44ed8e5c939157d4d80f"; license = [ "lppl13c" ]; - sha512.run = "ed16066877248c893b907a1d80f98691534b424f6949f3a26f21bc9e1cc0ce0383dbfed7fa83b69a9afb809f15ffa3aed01563b9771b3d7bcc3e63a33bc3f8a0"; + sha512.run = "496ff5a81e7b5ab17273d97ee19fd22dec781d3068002703d994f5e5a79b9047c2af4417bbb9d83a9ba882c8e0dbd50fc945c5ae4fcee55160d39149d41824a5"; }; l3packages = { revision = 72128; @@ -27597,12 +27932,12 @@ langnames = { sha512.run = "16d4b14025e142be2c0d21509041d99ee2eb9b4b765abfa3102cf79759c79e79f43191f8ba1fcea3d8c7269bdeb6feb0a9efafb1f1ea195b58ed97a307386bdf"; }; langsci = { - revision = 70025; + revision = 73027; shortdesc = "Typeset books for publication with Language Science Press"; stripPrefix = 0; - sha512.doc = "6018bfc249de196227395bc67c75a3e42eb1e2d6a3445959721a696e6d608ac4bf3291803d7f38f2295980a45a79cabe54638b663a8c7a7ffe7103ef7034b367"; + sha512.doc = "52fefa062dce32b1f8acf5c8a937cbe47ea2110310292e047d3dca008205c1d87b560438a7a66297f6fd8ab0dfc5e43b8a5011cc2112907e24dec91712d120e5"; license = [ "lppl13c" ]; - sha512.run = "af3100e7254ba029b82bc7ffb1fe5134cd76bbfae5b3d5c10b002d8d450d8ffdf5441c849ba7c64914889d6d40939dd8f848bad02bf94fe2cf8c9c11f1bf28d2"; + sha512.run = "69efbf3034dd68cb349d38bfdd890f5ae578b702d0f884843702fb870df588980f4e38d648ae9f0bb95ca771ce98283d64d22ec50c4cc4c305c3e053afaa406e"; }; langsci-avm = { revision = 66016; @@ -27643,44 +27978,43 @@ lastpackage = { sha512.run = "f4d30e327704b32afe1bcb81023a247095203a9b47357f9a6dc4b631f4bb669255ba899cf1c8378b42ebd16f2608d8a649a0999f26e3d05c963eced1cc955ee2"; }; lastpage = { - revision = 71883; + revision = 73639; shortdesc = "Reference last page for Page N of M type footers"; stripPrefix = 0; - sha512.doc = "af25364ead9f3b8dc8d45619c009575b809cea2a63e3a2f89684c61ba7b32356949f1b7308ec8d0399381ed5289675308a00737ec9ceff05a908ac7379cecd00"; - sha512.source = "b63e43a23fba37905ee97c7a04c0d769cc1500be0b2ceb76b97639a1755d45b4fe07a660f5e7333ecfb3b85dcf8766b95963cf83b75b6746e08ff40a552b074c"; + sha512.doc = "503914f54bb3fc6082c78e166da8fd7e529f12152e22c3cab74ee21cd650888b1e3c165da672bf55661dde063f942738651274aa0247d8f8af5170bab12ba4b2"; + sha512.source = "cf63acbcd05e669d86866a1f1c3da8f99f4cab8952e6e6796321a7f985a9db4c347ccdfd82d090e647d2f2934341a7b1daeebd1649095e3aea38e3ddd514a359"; license = [ "lppl13c" ]; - version = "2.1c"; - sha512.run = "eaab6f9366911524336085e2fee070a81c60225b5e6640b42cd9bbada8992d94ff17f0160af3abee7ef3d4167a6e1b95c25a230882566e818f3aef6276aa2e72"; + version = "2.1e"; + sha512.run = "be7b86c7fc00aab5df8df8f2403eb9f71a5d5055fb7f904f87eb8d79e278d0fa37021d08156bda7c1c7fa69fb2a8ff414212f19e82f1fe7320c470cefe687028"; }; latex = { - revision = 71629; + revision = 73643; shortdesc = "A TeX macro package that defines LaTeX"; stripPrefix = 0; - sha512.doc = "e26bff051d1e4991a8b4fd0618ec6c8fa4fc8a1d9a4c03e2c65ef392102e1ffb74dab282767fd4708ebc0bb5d538d3b80c72af54159a851067c2f9e66d550431"; - sha512.source = "c88156f1a7ca1af8dd4edb4e232a191f61c254786106dbf574f8b58a15bab6fe56bd770ba6004761be5d8454c70353742f3b76dd7be96506599e2f07ff47b191"; + sha512.doc = "191ae9c597da53addd358cbb0808188ea83746f5281d3fc10d39428abea76e2e32346bf74572f0127c1ddbd2d28f2322cb51d31d9d1c0d03cb0f2471f7d0fdc1"; + sha512.source = "cedd02656a51f8aceeb6aa05ca8bb617dc6759fc0d2955edd3014af1de617bd38eff8373098f9bdce8ae120286331fd3bff4008eb6a6de6cee85d3ae74a732e6"; license = [ "lppl13c" ]; - version = "2024-06-01_PL2"; - sha512.run = "1755be1175826dcce1745540a1a668f313b12801d2b7c3fbe915bd18b799f7884bf4c54e3604749d8c43e9c35ea65c023c251adb17175ea4d2fb6c4df4fc1bec"; + sha512.run = "1caeb1fcf994ec2e01c361e92370fd78575ee05f0fc764b6f81da77656dbb8d7d15953ffee5831a4423b51588441f887aae73b122cfc4d1d2438774973f77834"; }; latex-amsmath-dev = { - revision = 72549; + revision = 74216; shortdesc = "Development pre-release of the LaTeX amsmath bundle"; stripPrefix = 0; - sha512.doc = "ce93a3a9c6c532af004f6e96e269687552ce1c89c5be34de57af1bb02acf46b9279f5a08ac41dde542e5e8e27429a893f8788c73f895267ccccb1154f566f3f3"; - sha512.source = "edda6398088554e02d580fabe547b4ebf2357842b23b0a6dc2ace96d6876317353e6ba66aab0d9a8ca746658a517e70a8db1bea85154b1cd47b0b59120ae542f"; + sha512.doc = "f7813c09d0cd71073e7f8110a14bcb7d14d1bb33fe6ad43faf83a063f2b8c72887116200756d9f402717539e33e2e9f8132bc8204dd02a38671d6037667ebeb9"; + sha512.source = "9bb92e9d509c69134422c728bbb6af452b920e4629042dad8997daed7f6255bdc58be8d9b04f75ed86f7dfa4749ea50a079571380b31923c08f1bd74f116b0ab"; license = [ "lppl13c" ]; - version = "2024-11-01_pre-release_4"; - sha512.run = "e6eff09d5ac2686ed5f35f0c1c7dd4d9d343cf530d93ee82df4073a261db9a1edd17ba99a6d1326833d5dcf29d885cfc2d7e79fef757ab23c2b5fdd69eede201"; + version = "2025-06-01_pre-release_2"; + sha512.run = "c416627c26f3a5ead94fe29c8cb33b7cd6266e8528f79a4cdf08d76752b7c3833468fcb80dd76ec5a2fac1e4f68c8e790aad3c4479c05b436c5244af57421415"; }; latex-base-dev = { - revision = 72549; + revision = 74216; shortdesc = "Development pre-release of the LaTeX kernel"; stripPrefix = 0; - sha512.doc = "fafea70a6ff7cc8f3c6e8e728ca22cfaf65c10d24f1dc3b74bc0ec8ae3d060d4af455d5a0272fac53ef03a720f738edc56a0e1c14403578e929ce4ea9d58cc0b"; - sha512.source = "a56e57906e0d5dae497ce66d1ebe0d71410f4c859090945969e2c1267ce2eb24f4a92a2eeacdfb8accb4a3f010657c7d90494f573863b5d25f0da6a16ec65c78"; + sha512.doc = "f6c2a29fcccddb50c5dc7f1c4907f0ab8d21deaa513f4c09d53d7b80e7b823f4967e2c70e19b37e317beb76d236decbed1a7732153ae028a86897c2dd2c6ca03"; + sha512.source = "ad2439ec95c978457bedf8bf08f51aae3af76f6f4a3b37ecaec49038077cd72e34645099d84925aef549d2cfbfb4f54c1be32b6bf4d2e9a31b5507630f11a476"; license = [ "lppl13c" ]; - version = "2024-11-01_pre-release_4"; - sha512.run = "eff35af828a81d68ebb0787c613e4813beb88e39699568881b495cb2a35cfe5f5d85934811caa309b267618f681c5dfb0c7ac1084ec4aabd60d15ab7d2d1de59"; + version = "2025-06-01_pre-release_2"; + sha512.run = "3217a8a1f09f47cb703d47053702aec17f628366ff20af1c2aaf8fef0983827e0b54acea4b16c932aa00571e12c5f8120e7e5fc13cdf83cf8501169ac2e41a8e"; }; latex-bin = { revision = 71362; @@ -27843,14 +28177,14 @@ latex-doc-ptr = { license = [ "publicDomain" ]; }; latex-firstaid-dev = { - revision = 72549; + revision = 74216; shortdesc = "Development pre-release of the LaTeX firstaid package"; stripPrefix = 0; - sha512.doc = "6935ae5aa359d5beaf7b87c1b7af8a7afc48e4ba6c7672cc7b57a8f7d4e8a96858a4a7f5113b681f6ac7f97d376cbdefbfbde3442bc58a916f04f026d90d3cc7"; - sha512.source = "724ca2f83f99ca43c079189352409b78c8ffa5c4f999e58875742eae765ea8c1ec9d92ed9aae613bcae5ba19201200a97aff2bf625d2fdd57c47b132844ace76"; + sha512.doc = "a2226b311a06d8f7b41fb8ff30814ef92b3a53c2cce50358dd0b0cbadf7359c782fe3a5548c419d42bc0b2e36d519a2a526c23ea11dde6002b046cbeaec3fa49"; + sha512.source = "6ae0e7c4593a61d68f87e3a1d10056428b95eb5aa187e85261b1214f16db38de1cf284c6807d58a15a9a6a6446c139fbc6c761b7618e0d637ec6e8a66f95cd77"; license = [ "lppl13c" ]; - version = "1.1f"; - sha512.run = "baa9c8c6283c37113c4bdeec470770d9ad45dc93e1045c0ec334afd5e40698ebf5a1c0c9d5f14b55a7ce9bf148bd6d5d17ac23dfbd1b2f0ec05e3e831dc21375"; + version = "1.1m"; + sha512.run = "8772bc7bf43195c1d0b4a9344d3047821fd7ce177f54ef50e8bbc1e6ab3c1ffcf1ee3f74aafe8dc6cc710cb8a5fee17cdefda8b0a29a27868b3d31ec06f52449"; }; latex-fonts = { revision = 28888; @@ -27889,36 +28223,37 @@ latex-graphics-companion = { license = [ "lppl13c" ]; }; latex-graphics-dev = { - revision = 72549; + revision = 74216; shortdesc = "Development pre-release of the LaTeX graphics bundle"; stripPrefix = 0; deps = [ "graphics-cfg" ]; - sha512.doc = "ae924e872dda206c6c89709bf6a10be85200cc8aa344af0cf7474bbd595234ab547ecadefd11bb1c37400bbb410d3476fa644b54b5b8076bf6e5be9d139a5610"; - sha512.source = "44d9443d8daff0a835341ddf5d2733d4599af1589a810f8ec51e6abb1beaa02f36b77fa43a11e0dac639aad447a23b7c7d8809b2b8422e6033dee6240c6aff50"; + sha512.doc = "c4678e8f41023cd07c37458984c0cc10ea0e795f4e3df7090bd82b829288cb24db7b2d5560eafa78cad78cff4d8e8e4ef324e3df9e93512471a5f50332eb3f32"; + sha512.source = "7445b79cfd4c8c2c3f3b9929c8dbd9829b2273786addc052b8b926d266d225ec20dd3496cc98100241f1e894e11cdb6cbc29af7ca4900f18451f03ec0e280047"; license = [ "lppl13c" ]; - version = "2024-11-01_pre-release_4"; - sha512.run = "57b9af80f371d73beed5e452973e2fd1bc6209234995db6c34152283ecc3fdc0a9a1695b98564643f9e5303bd61f952e6d0db0b1e1d6684b1029b43758cf284f"; + version = "2025-06-01_pre-release_2"; + sha512.run = "fd92ad0f7d78803d84629aad091f9cef5f6826d76342660c7d24cca464a58a123d8a1ea42b0fab34b6681123330ba3d1ea27b15fb4f0e092beefcd979f3e8fbc"; }; latex-lab = { - revision = 71408; + revision = 73665; shortdesc = "LaTeX laboratory"; stripPrefix = 0; - sha512.doc = "da2349d22c117a6eb955cc20aee5c213c8f0635f174157f25304876e841758c4fc63122c2e06ae64ff716763345b32e32c89fdcd9c14bfefedf2fa1ef2d0efc9"; - sha512.source = "c59ee81ddbe526ce29bf6470ca29852c2881ad1b20fc37ae14b32460a94e656dd6ad73e393946d048b088a6e796fcb79e5cbf6e4e425db74a4f5cf29a8ad2ae6"; + sha512.doc = "b287aae579f69e28b8069262326d6703f7dfbb3d76757e619b6c6d274bf0652206143d18452502fb9c543e6bba4464de492f0329935405009fb09c0a64983ac7"; + sha512.source = "20aa3f471fe533f978c33746a920ce4c021482b4b3c7a911c6aca04d522baf0e34a783c22dfb1b0104ca8633911b55e666c9ce0966520170e66d2cdceaa628c7"; license = [ "lppl13c" ]; - sha512.run = "c51167b3ac687afa863e1d41da232394ac4c9ea7b53952b6e7f11f0353d6154914dd04e4100bbbf015560682db5b827807a98b552bc5eda7ec4cf97f2390fc5d"; + version = "2024-11-01_PL2"; + sha512.run = "0bb4f41c23c59a380f5bcfd9366fb27e1ac469924bf15d4d96e8f133259728b9b2a2af621863952c25372acc59c92c1baebc3557d2089f3a94c4a24caf6ea60f"; }; latex-lab-dev = { - revision = 72549; + revision = 74216; shortdesc = "LaTeX laboratory: Development pre-release"; stripPrefix = 0; - sha512.doc = "ebdee482a82aff4e0ba3b67ae415612950781041370de1f04516d7db95761e35785c13e6017a2ddd0d05b8b169a6cb9145555030bdebe7b2b7bb194d2ade746e"; - sha512.source = "c6865896557835f255df5f872f1bf9896b7f2d2058571ecd9c2d609a96a40078ae453635710069e39e2a25f245b4db628c0778d59ffa8754ae6771be56169fad"; + sha512.doc = "c2efbd874dac3ac1098b47910fb9ced23af216dd0f308486b6cf47e0205a4ed6d1bd2222be71128277a07e6ec69b6dacc9bc240ec4ba1e0b8a1555973affebfe"; + sha512.source = "4975fa186a5d30d2066f3820cf2ab755982851726e196a15e3b2259c47fa2344d366a547a57cb318bb1783f32f3e995b89370e02df475af9b538726e56afa84b"; license = [ "lppl13c" ]; - version = "2024-11-01_pre-release_4"; - sha512.run = "ab5f2651a0458f213c12ee1359d07dedfab35e76ca302310518368d5b2d5a1e17bcc43de67630ae9673883b285697abb61f06937dc0df3d28faf10e8e759602e"; + version = "2025-06-01_pre-release_2"; + sha512.run = "22841457dea6fa92f11fb5a6354e5821e719a47c07ceafcad9cbcc97b4852fb18545ad85bd8edd9dac111d730891299a9d57182a05ade838f84f60f7b508dce8"; }; latex-make = { revision = 60874; @@ -27969,14 +28304,14 @@ latex-refsheet = { version = "1.2"; }; latex-tools-dev = { - revision = 72549; + revision = 74216; shortdesc = "Development pre-release of the LaTeX tools bundle"; stripPrefix = 0; - sha512.doc = "ceb13e938cff4d810280605349c86ea5d2c7cd35d6f4c6afda4c58f990a02812421335e35c80ccd331c7219a8b2cd046e3bb5f0a240422b6f7f8c11b24d9aa55"; - sha512.source = "61ef3c7f4717c370e3ec8e6e7a104957e1e3ac354ac8434ea974d714ff490564d45f01e58b0dad6f1fdfeef5e7fca1d6c16fd279c6655c08d6ba765ced01e71e"; + sha512.doc = "9b09cfaed485cca3bf500f2fadd07fdd11a58bb2702d965dd77dc01bce82c416ebb6bfcf15d279c9d89a6034f9b60d1ec40e1cdf366a625c9408194cb3b5cac6"; + sha512.source = "6eb1898034f5725667a4ab74c18d2558c68606d1a34cdcf98ba091f05907f391fce24a74727cf2c07affaff4a43571d9a881223c0c37cf27ab5889d1693bb794"; license = [ "lppl13c" ]; - version = "2024-11-01_pre-release_4"; - sha512.run = "fa240d1538af068f25ba10a9c16bd7edfe5d67ac548f0e2fd64170e627e44b59ebb35df9ce546a1005bde8045ca042038ef203e45da1343d9d097317cb2695fb"; + version = "2025-06-01_pre-release_2"; + sha512.run = "6f75f56d09bc975132f3b90482916073512e96f8720e7651e877a49b847e0b9438fab0ed75cadaf7c41232b0fea500de8e45711aae3fe3fbb27b8f51573b0a2d"; }; latex-uni8 = { revision = 49729; @@ -27996,12 +28331,11 @@ latex-veryshortguide = { version = "0.7"; }; latex-via-exemplos = { - revision = 68627; + revision = 73369; shortdesc = "A LaTeX course written in brazilian portuguese language"; stripPrefix = 0; - sha512.doc = "605dba889bfa1ad23b2990b2f0f40db42947b718cd272d8f61243818d40ad9a552fb61f87ff4e3844e580d3acaaa9842c2484c62c5c5dfb4450755db3fb02758"; - license = [ "gpl2Plus" ]; - version = "0.5.10"; + sha512.doc = "f2685f12f18f2629b8894989b05a5dd06dfd0994444047876b5ae4673351058a66bd8b59512ade3c16fcda64e5ec6a7cfce1884febd1cf7da4a9fa53eb60c4d9"; + license = [ "lppl13c" ]; }; latex-web-companion = { revision = 29349; @@ -28064,14 +28398,14 @@ latex2nemeth.binfiles = [ "latex2nemeth" ]; latex2pydata = { - revision = 71283; + revision = 74446; shortdesc = "Write data to file in Python literal format"; stripPrefix = 0; - sha512.doc = "52b1ae2cd10d67a1ec3e0a787238d7fa30b153952ae3a4bee0cfa1f6297ab146f1301bbcee4dc62d60af63ea22a9cd3628b210b422dfd0f1032c042546fc7f99"; - sha512.source = "eefb1210b84b70f1066b36f18d8b45951fc59f9ca57f1fa044535e15721dc8daf7ce6e2d5f2f1b29c4d7af2353332bcdba323660b04a84dd3d97be01b92f0804"; + sha512.doc = "023f149640fcad944692e0872df77f7f2f36ef81a4c442976ad3585384a6a505c04b8393a8df02bd929662b32a62dac2cd7a8e3071042d0e75eae437a7484cfa"; + sha512.source = "e43ff29c55d94c4a5e6e9f6526db7dada377b2095b7da37ae6dd2e3f3fafe12ceeed06fb19be38c3b93211806045869d246f85fc2e4b63ab47d350251f610926"; license = [ "lppl13c" ]; - version = "0.2.0"; - sha512.run = "37ffe0d9c938aed61395b12a7a3d6570c729ddf47a3b609b2f006ef17832a080d78a3e6f01be13d6262d6052d18d53f4482f836ed1dffa88dce4358e98b7a5bb"; + version = "0.5.0"; + sha512.run = "920642877ad5c7ce683eaebf30ed1d2bd5ca296ce73f733a35d2a72fe750f8a26a3fb59b2d9b4d086eec085843e989a268585ea2ef70719dd2cd86e3ab164d7b"; }; latex4musicians = { revision = 49759; @@ -28107,14 +28441,14 @@ latexbangla = { sha512.run = "8b61b8aee0e95339b356fa85b9bb7ad3833ccf410267eb31a84a811c25c4e34ac350952fa26ed6461468bfeca37121e809ba560fbed7a0d8e747613708ff7795"; }; latexbug = { - revision = 71550; + revision = 72762; shortdesc = "Bug-classification for LaTeX related bugs"; stripPrefix = 0; - sha512.doc = "33e88f362b330f45865d05b166fde85fa6d1fe5d89d86c2eb6d8734a361615b1d6580957f3614eab364656adfe72e905bc7f8722d7f990b232b122432b25099c"; - sha512.source = "9fdb6918eb8c5a9dbb6ebf56cb339c25e60dca7d03805dc9e34f3c86ea7e49a029d8c3b30d9e5c1db6317309e8a2da66be7a28a5a2c2aa8b06c79610360a69d4"; + sha512.doc = "77250d1da1c4a2a51ff174fd0ba8067587436bfcad419ef477a75f8fe6eb0a618b2b4eb6e9129d5fa02b670f70254aeb34a2070d9c8be87b0a8dac85e0c8a35b"; + sha512.source = "88e24817535308f7bdb91ffc40237412a7ab4f2953d9912a3dbb8476d4e54a4dd971f0aeae789010c18dcd17f266f8705e327725f9c19390b4429488397ddc31"; license = [ "lppl13c" ]; - version = "1.0o"; - sha512.run = "19086502e950e8d8ffd81384924b3a78018c790406266428de74f724c6452ddaa5a1f1bb98384da64c0b886d77c3c960aea4bc435efbe6c45c226ee62fab753d"; + version = "1.0p"; + sha512.run = "a8e1dbf4a784d97c42286ca8596144e2226625e8908597cab533ec73e970148d683d579c4cdabcf2cb790dd4b37c8c8e87c81d4255ce404c47c414d1ebcfb73f"; }; latexcheat = { revision = 15878; @@ -28238,13 +28572,13 @@ latexindent.binfiles = [ "latexindent" ]; latexmk = { - revision = 70909; + revision = 73224; shortdesc = "Fully automated LaTeX document generation"; - sha512.doc = "645163e960d4b1c49ef0c50897ee25941d0c43d99eaced8b6079c1c070b3caa8d288d72fd9edcd5dc640a39e6bc7d2da4a418e67a475f21aa6afadfb15bd4533"; + sha512.doc = "010125ee3ff82594873cc447a9a23ad6e62afc5c2bc7828ee2fe5e23f03c475911902b843e7ae2817272c9a622a0bcfd3bae8c8aa671910714f010b6296c20bb"; hasManpages = true; license = [ "gpl2Only" ]; - version = "4.85"; - sha512.run = "be74224df53e6ad9a7d251a447cedef3c961ae2e96238950d5938c1b3b3eca8d61038092eb319ab3458555c45af221251069a5dc0a1e8099dab65a8249a2f053"; + version = "4.86a"; + sha512.run = "0614aef71d702873d6ebc7ea2ae62ff383b849a12a1f69465e8d700b822e2a3ce9f63e9175c904afa44ffd6840268de5f934f8a768ff003d760bd41671be42aa"; }; latexmk.binfiles = [ "latexmk" @@ -28432,13 +28766,13 @@ lecturer = { sha512.run = "e0c217ed089dccb7cb526e62456bf72d186bf8cdc69b2014bd4210b6f1225277d1afb514f381e4581727900c6ebf34780bb4df01c3682580cea0418fa9caa1db"; }; lectures = { - revision = 53642; + revision = 73727; shortdesc = "A document class for quickly drafting nice looking lecture notes"; stripPrefix = 0; - sha512.doc = "bc50485fd0a8782095bbc37b9185bbc61df2a6bdccaef359f2cedd553cedc14ffd0bb8e6690578f1d57b85e2efa650a68af3b579a7c360a737791ddd74373424"; + sha512.doc = "ddda36763cb6b3dab5179dea20d3d3834adc0aab0daedea70e5d8feae514ae342a5ae87e0b1954144d8ce462c42ebaf697859b074f0ec609ef3f1a39d75b2955"; license = [ "mit" ]; - version = "1.0.5"; - sha512.run = "e3fb80a67dcb5198503050d61266cbd3890c91c1c5c93042a17f2aa410223c3943e3dcb73d7d6e7a4d5888d87ae9613fc89025f0435c122ab44a8f822732250f"; + version = "1.0.6"; + sha512.run = "6991e77176ed217cdf5a24b6bf0286d94aa7e634e09b504ff6b571e82e73244bb34e58d9fa0b80c38858c929f6285e772c08c85d67d555077fa333313b79abce"; }; lectureslides = { revision = 62292; @@ -28498,23 +28832,23 @@ lengthconvert = { sha512.run = "7796d45d91e157f2e901a1a48a7841bf222f86540ac00d59250e3f47568ab86832bc115340c0b65b27c12eb1a39cc2729cffb5da71afc413dbae737341d8eb63"; }; lete-sans-math = { - revision = 71836; + revision = 73129; shortdesc = "Lato-based OpenType Math font for LuaTeX and XeTeX"; stripPrefix = 0; - sha512.doc = "4987de45ea573ef3af9c9ef7d0089b491a0c7f1350efc201f4ec9b980e0010499b078bc8c6c1de111b9d23016ef8f45068c20fbd9c8988bd6b370d0bad522715"; + sha512.doc = "bc68ff9d0cf7083adda496efa3e965d7efd80d58284d8e75c7a366b724cd75085eeee1ca7bf162ae7819019a59b9d5db2d6b4e9d51e1170cd26ff60cd9fae991"; license = [ "ofl" "lppl13c" ]; - version = "0.41"; - sha512.run = "c9fdbb1ecbff4e40cdbfa9c6516fe694bb0c82de11731dcf3f0caad49465fdf1ac1f2d090184d7cb16ebeb55ad6a16c96e59fb161cc4d7c9ee9a6dbf28ae28cb"; + version = "0.45"; + sha512.run = "d9f4fccfcb3469d7c13a2d2fabddc2c5e877790fd96cb63da4990632230a84a223d330d688aba5f32d6983dfafdaf2be6e10cca760c72f475c13edfd7bfe3633"; }; letgut = { - revision = 72638; + revision = 72713; shortdesc = "Class for the newsletter \"La Lettre GUTenberg\" of the French TeX User Group GUTenberg"; stripPrefix = 0; - sha512.doc = "66e98d44de32485c1dc276c89e3cf421d924b711cd706a5f5e434d55b78945fefa0af487e78741162068d7acd4fc2fbc0f310b44e9668003fdaf2314dc73c83a"; - sha512.source = "edb959b965cb52082d82b83c6c56287b36706af05c826b844a0ff35558fefd6f939846b130aac598a310fdebb2230c2e81e17f05877c28bea4b63c8df1b0f109"; + sha512.doc = "cae9f5c2c2f82c1d1a8b1a28a68f4c7f50ae66c0b7cd8f704595c26e83ac794fb3bfdecc9cc48d4e786a22b3babcf17d83ab6a992c428b800eb4b3f1dcc10881"; + sha512.source = "36e3f423dc683028e8e011bc6e2ea7cef21e7a91d4739e3d98c174c97aae2171bb03d9dc6fba33d884a6b44f4d66932967362a5d010acd32e9585e6dc7808e77"; license = [ "lppl13c" ]; - version = "0.9.11"; - sha512.run = "e61e8d76abaf9a8dcd8f307f53e09fa67921870711a5ca703f45696c38e227ed31e8733d78eebdecdc9b202cdfc9d74cb39d73f7766f41651f08c316cae5de4b"; + version = "0.9.12"; + sha512.run = "b803612a53dd66a65cd997dae4c820c4902ac9ad1d5d50ba6696235d7009639f057468fbee8b4aaf741416fda807e12d844f0a706d7a62be7cf5065776d96e89"; }; letltxmacro = { revision = 53022; @@ -28534,13 +28868,13 @@ letterspacing = { sha512.run = "30fdc0f87976feb698b9736e9deb6726746e4c25e4ed4a4637ff26699e171738be6447e8e2d02d154cf57944aa988208ee97859c0a7fac784d55fa6ef889b86c"; }; letterswitharrows = { - revision = 59993; + revision = 72723; shortdesc = "Draw arrows over math letters"; stripPrefix = 0; - sha512.doc = "a21ff5d9a4c2e409cd7a32207e1e162b263dff46919fdad25bd5fbc1cca86329efebf847ed24ff7401293d8a318bde9fe7fd2c9def69f39740d5e0686c0ab849"; - sha512.source = "50e2521b55a238cd6e461b3bcde326c5948573363988bf3bdcc428d04341728dbf73e891d09af65ca1832924cdbd0b0320bd94d662afdf78b3d1039ca3519231"; + sha512.doc = "57225393bbb5ea2032fad4264a1b95583f80fdd32e37d8c5f07eb182eed03de16b4e9ab7f07242f2209f9e08dc6e111f6f4106f8df3f7e7087fcee2aec8a459c"; + sha512.source = "e6a2a07e4caba824d8145599c0b4d09677404ceed566044d53c6a2b0bf83837a54036f0fb973bfcaecf9f4b165cb784b35d29d2530981932f2f115c11c4dfc5f"; license = [ "lppl13c" ]; - sha512.run = "dcfd59b7a51100a4e1d856d3cbc0d4f2ac258e745566b278e275d8ebd0273e7f96fa1431b681d42e10b1c7496596f1ecdd92753b8b58df4fe352c51b9b009bcb"; + sha512.run = "aa83d8d3df11c560a7d9e4ef41f9b505b43ace99c94eb7c46cc54af56a66f5f2857718cbae1a297995a9b632c77e27743c917a99b183983b2d7ce4358109c6bb"; }; lettre = { revision = 54722; @@ -28552,14 +28886,14 @@ lettre = { sha512.run = "308dc21e8be8d8f6952eadf9b5e9002fe32e8ea3b79ba679606badef75ae346721270e85e3fbcd269ee86b9ae049390164c57cfd73d7f2efe22fe82c7466a813"; }; lettrine = { - revision = 71627; + revision = 73660; shortdesc = "Typeset dropped capitals"; stripPrefix = 0; - sha512.doc = "451949ad0fd54a5ccc42faf6279fdf7b5f3b257bdd163d368be18cc9567aa371d3df0b9ac4e7198f8109cde928a92f38570c49e58b53f00e870992c2c72fc4be"; - sha512.source = "025cb9370bd475dda702d027b66978660dc0ac2ff727ce366e04f39ef37f7e3a45559448a3fbd3c0537174f0ded69430f76e691882bcacf71435239ca0d3d5bb"; + sha512.doc = "c7831e456f9626dca19515fbf0b4fd52707d518f82360a98b7cc92b189e228f1dce104b6793d38034e5aa2b85b60a99722ca39ffb690b9f47781892c8b3cf154"; + sha512.source = "fcef1e4ba1eb423ea62dc7a09f899403aae50d8cd91ca6d5729eb0feda5a822a690d241f7e292688633163ed8fd0397d2ce79a7638bf0fc0d726725cabfb83b3"; license = [ "lppl13c" ]; - version = "2.61"; - sha512.run = "a04eadb4d99ec400bf28f80635781724a8d2537aa992eb65d24911a0725c8f7de38f90c8497532b29bc732fab02bf1709b137d877096d705d889d1bba5047345"; + version = "2.80"; + sha512.run = "57a1702476226ef3b628ddcb764d4e2b0259407b90aa264ac8a4984f78005bfedd79612cc6542c6a2e9acd0ba13c95d03936ef0a59d9aa09fce150bd21e09a10"; }; levy = { revision = 21750; @@ -28665,7 +28999,7 @@ lhelp = { sha512.run = "3a5bb1d95c300e9546b67c48cc2c3e1a5c3089c4430d76172a8d7f3cdc59fe03de1fafc6a1babeacc9259444e09e85e02a64f3b3f8ddfe3883511482b9ff0985"; }; libertine = { - revision = 71061; + revision = 73037; shortdesc = "Use of Linux Libertine and Biolinum fonts with LaTeX"; stripPrefix = 0; deps = [ @@ -28677,10 +29011,10 @@ libertine = { fontMaps = [ "Map libertine.map" ]; - sha512.doc = "a8508e83443cbb679ca7ae58d5a4ca6dccb3ed8fbb90e07f41f7ecb5d1816906dbf3bbc56951cca323b1095304ccf4b0b22dddd6d605005a2ac51cb3927ce67c"; + sha512.doc = "4df41358232a62ad8895b8c6916650063e84fb7ec2fedc0969c0e7e7b638fb77b7b1a0dd507e5f5dd601eb41c78c73497b7062f5c462586458f9745338395cde"; license = [ "gpl1Only" "ofl" "lppl13c" ]; version = "5.3.0"; - sha512.run = "49df19c29244996fd111fab655f3ac65dd106e1d6efec5207c0e505778445ab3badc90a1b70608537f45c1e108dd6d906f6105a697cf92f79f9649e486c1d6cd"; + sha512.run = "0587264c060334f7850b3ef99e374d404072eaae03e420e9736d82419e5e81c9438b627223bddc746e2f7d477f0245b3cea14e84bea6ec38a2f0e5ec3f284e59"; }; libertinegc = { revision = 44616; @@ -28722,15 +29056,15 @@ libertinus-otf = { sha512.run = "74e8f653e1bfd28b11932b0a5e524e823dbc1759566a3a6fd3d74b854f40df7a78b5dd3845e2b8e217fe9608cdb116d1216a3139e21d4498bccf62b8d8e42742"; }; libertinus-type1 = { - revision = 72354; + revision = 73445; shortdesc = "Support for using Libertinus fonts with LaTeX/pdfLaTeX"; stripPrefix = 0; fontMaps = [ "Map libertinus.map" ]; - sha512.doc = "310181515d670306bef19e40fa28368eb62fbc655473239c6616c1dc5d93b3d1fc107e87d3de4e7ddddf5a1ff2d55f599da9f7721c168af6094273e1d225182d"; + sha512.doc = "2d63abd852a78ecdab8fe71216edd1711fa1fdca3426b9b42e93b49c92da22dc35a2ee981df8e84674464e25b1516f7f7a37c2453baee88a35e53700b52e17f1"; license = [ "gpl2Only" "ofl" "lppl13c" ]; - sha512.run = "99c0cdb0956a2ba108a0a5eecdb337f91b204b6b3e3e876cd73611dd395f57951f870a5539786c8b92ee38695989b1aba7c501c58d2f231939ac1ca8eedb8595"; + sha512.run = "fd1aaf68c72da6d47cf5c2e545425139cd4bd2de193d99fb0c0ce7a3af220f2d9f5b019305500fc8af72f969d511ed84c8269c38bbe6b27f194a1f3538f5aaf9"; }; libertinust1math = { revision = 71428; @@ -28821,13 +29155,22 @@ libris = { sha512.run = "e8f6c2df02d9eb9c3560c0098d13d7222887d97873c5e5264bfae15dd7bb238b8b2258c6a650863f7c8402799883f4ce9416732e0240625f2658a9d4d76c9270"; }; lie-hasse = { - revision = 71883; + revision = 73069; shortdesc = "Draw Hasse diagrams"; stripPrefix = 0; - sha512.doc = "655f73fcfb149b7500f9e15086da819a04a673ee89240802564cf3f4a463b9a4f422643f998e068c64f0e0197a64c85ca78213380e023b1920360745ad746ed1"; + sha512.doc = "6cbf19808cad21bc7f7ff423deaa87ee8a105c6a6cc750aa246b8ed6839c5d16c8bb78572cbdbcc59781167a9e45165ca7df9afa7d46bd70affa687891e326ea"; license = [ "lppl13c" ]; - version = "1.01"; - sha512.run = "325ba9084d35ee66b1dadb6569dc9a58aa716cb258f78c48f52f61069703575778b942d1377c16b449f2998d23757847420dd4a2a431427efd80436e9803c143"; + version = "1.02"; + sha512.run = "601c81ecac412f0035ad02e565801bbba1a12146543e6c6c42671c01dddce78f8305892bf8699906b1d2f32a6c0a911383f400603847c9bfc941df4fffdd007d"; +}; +liederbuch = { + revision = 73548; + shortdesc = "A LaTeX package for storing songs or other content, and repeated reuse in documents"; + stripPrefix = 0; + sha512.doc = "5e6482c0f7fdcde9e421b755e839e63ddcc81746e7af527db6ae2c5bdb000f7608f42bcfb69b469aeb08258d77bdccab433bedbb8723f9880d898698db7def80"; + license = [ "lppl13c" ]; + version = "1.1.0"; + sha512.run = "e4c7cda688137fa66ccfd9a220d797f3fe12de32d57c9316180a25c96c695fe4a75f275f648586a39cc07289d2f7e25f07b8ea21ba2eaebdeeeabf0bf614fa31"; }; liftarm = { revision = 71309; @@ -28912,13 +29255,13 @@ lineara = { sha512.run = "b87051ba4647ed2f0beb8e5bfe8419d8558421f509cb6eaa931f47a10488dfac4e36b3ece1cfdbf3e46eb431c3d15e7a7005f27522dbc4cfe6de52ce6127bea5"; }; linearregression = { - revision = 71466; + revision = 73123; shortdesc = "Calculate and display linear regressions"; stripPrefix = 0; - sha512.doc = "70f869a730b157c133fbdb82abb9a41909b922880bdf2656deee5c8d180f9e9ee0d956aec669edb29a93f9b928edb9c66d16ba4d193ce3d288310510600eb2f8"; - sha512.source = "172e7823b59bed040e309e26a4cfd4ff92feed01f7e373921a4b3878402ed9e61c84d076f885d0bd612699025c6a204729e2df6f0aee6168ea80f0ca7d59a0ce"; + sha512.doc = "90e743cb1f686c69c143c7fc8030fdb2a9bf83afed2591163f561d045f85a7ee1f08a3bea1c3908bcbae9305dc4cfc8ad82bdac773e7df4c0ff1c705a6ea4cd4"; + sha512.source = "72b00d1bfd6f02e832aea22dd59a9bb1ff3e8ce58e491497515aa51206d08a5d20873a9eb54f7ee0012df7da817fdbf5648da79786a8ff88c59b98d3a416dbbe"; license = [ "lppl13c" ]; - sha512.run = "e4272d0822cb2a1e31aa5f3a4b4567e5120c42dc5f85beff8c49afa162803a4bd974fb17cd6351866cf4da6825d92c2ee31da8f9f7b9939f59eaec7bc9bab129"; + sha512.run = "2640726e89942e54f4e18196a526516ae39fb6d764646c0555da852b2c23d3d0e0fcf3623e7dc9113099aeb19a517a20802d1e62a2da8c5e9acccf2c693dd85f"; }; linebreaker = { revision = 66639; @@ -28940,13 +29283,13 @@ linegoal = { sha512.run = "87a062513ff7674f315472cc46e13fbce99057c3b7083a2b9c93b92f09d538af29f5d1e3664dd5273080b9037ac232dc0d7491753b83136d2d3558ada1b81976"; }; lineno = { - revision = 67171; + revision = 73638; shortdesc = "Line numbers on paragraphs"; stripPrefix = 0; - sha512.doc = "ab4aacda9d0f4a9a2aefdf37b23067ad27eaf40500fd92f7a4c619f9c012a40ac0c69fae32c425d6c12d2b89e6d6c2ad9585fd75b2af8447c9f7d333473add73"; - license = [ "lppl13a" ]; - version = "5.3"; - sha512.run = "7171da9917c0218a0c55c43126ecfe07b9e55e9633b673c89ae18f08897bb1634cc8412cc3051ebf6640afc228e246f1e5549ddea45261a6ddee01d158f3b9e6"; + sha512.doc = "6521cc139b49fd8943f222dcc27c0e108f53f34f5fb618392980f4c9b681b96753b764ca473fd2f444078c1c161b007c34b02927636db75c042f4a4555f559b0"; + license = [ "lppl13c" ]; + version = "5.4"; + sha512.run = "4f3cb986c01f6ac220bc22358fa6091707e8620aaac8f397151cc168edb3a73645bcea14afc8c8d2cd5d23a95e4ffaefa5e10818b2babadbbb915e0ba9dcd579"; }; ling-macros = { revision = 42268; @@ -29005,13 +29348,13 @@ lipsum = { sha512.run = "24697be378aa490bf71194c8622400c11e27d5c6549caf2362250017ac97b4443986a4ad5f8d2d96aa53cfd7bcf5cd7ada0e1ddbbbfd27135e2a23bbad21563a"; }; lisp-on-tex = { - revision = 38722; + revision = 73165; shortdesc = "Execute LISP code in a LaTeX document"; stripPrefix = 0; - sha512.doc = "fb3a8ef4ada38d910b3055f408059daf700946c84b17873846175e6cd3075ad7f3889d2af154adc3a7898ac33646251bdbe0d8cda17ccf354dee526a96476432"; + sha512.doc = "7cd9d1291acc321691e113e2274ef215f36c29665afb343b48c3d035fb0c2eb88a5b28d2f5e5bb97b9eac4106132f8618cea5547199712430046856016f5340e"; license = [ "bsd3" ]; - version = "2.0"; - sha512.run = "67817d9894ac5bc8d456ce2b114eba81b0c444bf53422c4acb5066b42cd5cd55d73c46fb2b443db9fe3b13bebb58d6fd7f2bb31686dc4ac2295447285295c602"; + version = "2.1"; + sha512.run = "db97d06e8f54d06c86828320b1ade23d4df2849bc8a38a75b22edaa01b3b81f79cc66259a0af0ca09b0349cb5754c336f74aa07e13434527a37faa82c6459514"; }; listbib = { revision = 29349; @@ -29104,32 +29447,25 @@ listofsymbols = { version = "0.2"; sha512.run = "dd32fbcd59fa9ec599b0a06672d2e810b5b8172a96a4170cad03a93be3da21a02a036967d0e7e3a617bad6535aca2b1a34a114c383b5ed1aca22bc45239266d2"; }; -litebook = { - revision = 70777; - shortdesc = "A fresh cover and chapter design for books"; +listparskip = { + revision = 73155; + shortdesc = "Adjust vertical space around lists"; stripPrefix = 0; - sha512.doc = "00e6b919e237cf7a8955a1987d9f998f821bf748897e773771166db1aee0e4200c28573ea303477bbf0fc6322a8576c67b7e6e0f239e771137e7e3d863b24a59"; + sha512.doc = "18e3573f185b2605fc159831d19a0399db3cbe89a8152a9b7a7bc69196f5ed8669bd4346bb54304827e3494ff0f10dd45a33b7eb4f93902a497af2d5f2f8cab1"; + sha512.source = "e8a277fe253b5dab5b122cd02f2038dd4c46a5ab960fc52b46f39c6c61273577d41076f012cf57116f8afa509ddd3f0d23237fa45347eabbba8ee6625f52f045"; license = [ "lppl13c" ]; - version = "0.2b"; - sha512.run = "5a06afa5ce034d00cbd4563aa898a111144e4c47ae4088a71d1cbbd314a3e2e3988225a8e57650555505ee8bb1916df74d34948bab566f4f771f2c706c27e287"; -}; -litesolution = { - revision = 72036; - shortdesc = "A LaTeX class for typesetting solutions of problems in exams, textbooks, etc."; - stripPrefix = 0; - sha512.doc = "3d0c9e9712882431259ec003cf6365b7ab5c9c61d7f6792a9e5568533658935eb7b8da71af5ebb136819aea596b1b4b2b95b0e412c2f3ef8591e71b862d5195e"; - license = [ "lppl13c" ]; - version = "2.4a"; - sha512.run = "8dc6380f8b1adc91d5470e6faf8985f71397b58890c68ce33ce4e0349250697ce5d2a8ebb9ee70e80f7d6f99f56f29f1492b50325f60602dca8c2ee8f0252d9b"; + version = "1.0"; + sha512.run = "7d718507fbddc6b35bc4d0e3a5674cce8b29f5a932ec01e6727955b7edcdb0dfa5531ee5433564098a85c641d56485db1fcb142e02d5e7ec22b70dc3ec873d24"; }; litetable = { - revision = 72539; + revision = 74398; shortdesc = "Class schedules with colorful course blocks"; stripPrefix = 0; - sha512.doc = "e934a75fa9c9b4fcc1643c6039db38b059669bc52c6f8761256d5c01e45e8507eba960b70b54ed61529d1f7fcde8165099ce29496e0c461c6c573137a7ccfa7c"; + sha512.doc = "aaa77ea042a5234190dbf34b9c405a136cb37fabf292183b0f6b9e5a220e69625f80ea346cb192ccf69add8bb8df279f96f78bbce345c79691520ce7d204da58"; + sha512.source = "93d311847b1ba928a8247b1695408d7576af792225cd7930c44237e3daf8ef2c3f22ab975c77a6af4793d0a61d1948213fde8990313deb9a9b007f821ec1b273"; license = [ "lppl13c" ]; - version = "3.1D"; - sha512.run = "93f80d918f8b77a93a5f60daa1e5ad8a310a34160fba7dcf037cdd1e6ab3ccf1f0acda5de080c8b59302a48315929e45201be2daf6c5d3debba2ff8c9b2fb8b9"; + version = "3.3B"; + sha512.run = "d4021392a777876f237c1d94ef3ee87055d8f569e7d085ebdc1b0baf187d47bfe3b38594ee21d8ef07706751c794b0a1ac00fcb9852a3a832d56fff172ef242c"; }; lithuanian = { revision = 66461; @@ -29162,13 +29498,13 @@ lkproof = { sha512.run = "58c211cf1ed20b36e69ceffc8568fc1cbdb51cb812af79d16a64cbe8a8e7e672a2d49e672501b2cb23ef72c4a04c59017e17e538061159c8b9e797624f8334ca"; }; llncs = { - revision = 72613; + revision = 74290; shortdesc = "Document class and bibliography style for Lecture Notes in Computer Science (LNCS)"; stripPrefix = 0; - sha512.doc = "e5873cfcac09ea7e1e972ac21a68ef6aceb0b025900990e0df6cc13cc10998959b6a3b2a70f5823c684482332622a1a51cbf88e2fc446b73585ac14753130dca"; + sha512.doc = "9b7c01aca47baca90f1aad98b504729bcdd42751c3e0cc02a28fb3ee318cf6a9327fc204c4fbd6b06072c27bd82d138b38346034f14b3a42fab9dbc847b7c0f0"; license = [ "cc-by-40" ]; - version = "2.25"; - sha512.run = "ba2cdc32aa1e6317e76f9186578181919ddab6381e63e9a45b9cb990f8a621c60b91d46efb7e714c939d2fa311c11dab950866b557d2e3323ddf6b4eea67605a"; + version = "2.26"; + sha512.run = "f25fd627cf6b9c7afb45c415764ef45eee5f202270b05764365e09a103fa9c22a129af613317f9bbfbe85bdc721e5bc56dd3544df6eb999b26cf3d554aad09f2"; }; llncsconf = { revision = 63136; @@ -29211,14 +29547,14 @@ lmake = { sha512.run = "3613e9d53808b2d1e326175c28acb672c1f244b2e00ea1d544e1e05c73e2a93e49b5e8b187a8a73e87ffbb00c22235781983a2c0a733a6ae5598db12c278a763"; }; lni = { - revision = 71883; + revision = 73766; shortdesc = "Official class for the \"Lecture Notes in Informatics\""; stripPrefix = 0; - sha512.doc = "49ad18e0b77cfb018fc6a576a2144ddc747d173618fe03478c1aacc16b9ad74830582cffd7166414132d70a1e514f4145e5d775a61df1146043df10827bae46d"; - sha512.source = "d4d9e0a9d2f75ba80862264efddd1f786003de45509c37dd8fd13864afb33d4df453756f05fc84439c55af5ed2cdbfb53114bd91bbfea080bf3cf68a45c99f66"; + sha512.doc = "4ef203245669693a80a841133e36a4a9333a1101eb003972b2b178204d4f0ef3d30e07ee06c685edb403be4f52ea613d751ad0152ca20e9561b0a733ab1adb81"; + sha512.source = "74e22fb74be37ca0ec0b77e41287b6b0823f298db1f4d62fc892fa5d0d055a0ea42004a8cb3a43a29dd8b73c54f8558b4d36960936fe00944572ea3ea5fa2c63"; license = [ "lppl13c" ]; - version = "1.10"; - sha512.run = "ef3bd51f094b3d0730d70a0736d9e37dbefd9094ee4bfce92247f1e0a796fdde79b53554ddb31787791d460296ba5aae305b5ccd5ebc18b192caa3dd8d9ea012"; + version = "2.0"; + sha512.run = "f4e797b744457908b9f7aae074d56af30e0fbee0ae0913945b545d4c6266052dbdb7c73ee38e9260c50b1fe4b352afe1d8a1aa05fca0562b557ead6e80901172"; }; lobster2 = { revision = 64442; @@ -29296,13 +29632,13 @@ logix = { sha512.run = "29a2701ae91a5d7fec49e564b90b8a7e31374d2218680f4fa0c65c9df6dadae78c6599977e88cbf293fe2435d8b7403f41748abfb1cd5f9b00e94c76ff43e139"; }; logoetalab = { - revision = 68916; + revision = 73069; shortdesc = "Insert Licence Etalab 2.0 logo"; stripPrefix = 0; - sha512.doc = "93e17e5c624aa8a6f826294fc33de8a66731020696525821f4e14a5bfe0f3033cb6ae21abef41d408e627a6ca8d6e12ddfc7aa30d02152e6aadef3fb88fe92ce"; + sha512.doc = "e76556668801181010b9affaed4e7ffb53597840c9575dae2994e2f5c1e63f31342c4daa67a5f8ad21e5d44c3716d4aa479bde9bf6ed0257dcd0c56c529db8f8"; license = [ "lppl13c" "cc-by-20" ]; version = "0.1.1"; - sha512.run = "1b3f01a1acc23b17e30185b3bf2b4e965d047bffc7d87649a40e52e4fc9de36518e82335055c66f221cf10b7c6a1cfdf9f51641f5ea945aa0f7d7efd76780fac"; + sha512.run = "d66bdffdf302e3c07a5b963ec45ccb7be5744b463feeb8fc625cc5ad5b257ccf134b82ba3e05613cbba79c7c3ebcb016e22d8876a1550475a67c3f9097fda4aa"; }; logpap = { revision = 15878; @@ -29488,13 +29824,13 @@ lshort-bulgarian = { license = [ "publicDomain" ]; }; lshort-chinese = { - revision = 67025; + revision = 73160; catalogue = "lshort-zh-cn"; shortdesc = "Introduction to LaTeX, in Chinese"; stripPrefix = 0; - sha512.doc = "c220f086c2e0c9bd52ba3ee1eddd2afcb0aaed1c4fc4b9ebf854ce57b4720df7ab3c5475f3164cf740b3020c14c5682e1798e43c8ad9e39eba596a24b04644d3"; + sha512.doc = "5c425b3c76ea373d97693b81bbe4a6da423772271530e23ca1cc2160b463177f5a8e109e7010b5004b2dc627c2a5080b47d4c6506ea06c29ece97aa8d16c7ddd"; license = [ "fdl13Only" ]; - version = "6.04"; + version = "6.05"; }; lshort-czech = { revision = 55643; @@ -29567,10 +29903,10 @@ lshort-japanese = { license = [ "gpl1Only" ]; }; lshort-korean = { - revision = 58468; + revision = 73823; shortdesc = "Korean introduction to LaTeX"; stripPrefix = 0; - sha512.doc = "6789054257f176828b341fe9ad258b1f7100d2fc880aab68244842317b45cea872ee49031ad2c1d376011772fb39d2ef05a700f962279f5ce3a286270b77ee1d"; + sha512.doc = "18873f52d45c8b34f43232e5690cbc4b8921c55418be38b3da7cdd3e454358c8ee597601f93a15360f2a300a4528a63ff2d5f8b950fb37df5194c7b0f50eddb2"; license = [ "fdl13Only" ]; }; lshort-mongol = { @@ -29705,14 +30041,14 @@ lt3graph = { sha512.run = "9a3137a56952d18f41337f3ea1412180d6a0d7732178fe4855d23647d01648ddefd57859f786534c5bf39cb622da11e113a028135429ca38e6ea3bcfde41b5ca"; }; lt3luabridge = { - revision = 71704; + revision = 73139; shortdesc = "Execute Lua code in any TeX engine that exposes the shell"; stripPrefix = 0; - sha512.doc = "ca5b04b4f58712094a205f7508757c39cf56825fd1b1b7cccb4f1dfd792dcc636efa4bc5c434e478968a12b6dcd2f353c9f59b83b653a89f20a818afc3a969a5"; - sha512.source = "3e8cf1c424e9998fa158a440eab2ef7374c92bdf351c99f11dae850f12bde4773c73f62e7e8d358c0ba80d1e2afae0371f8e2ae83ec9f61f6dc1de886a1be442"; + sha512.doc = "27593cca35c0e2d02a9039958499a36982d2435d77fbd415d79411a93742f21290df7e39e12331d079f3039a8f1940f1157ee87bb45c86229d77eb81062510e6"; + sha512.source = "eb41165c4fc6fa41e3847ffc639fb632d9afb4f349caf8ef57073dd12db53bad63d3c5a49533ca0c658fef9aa6a548f841f25172cac293e6dcb228eca72019c1"; license = [ "lppl13c" ]; - version = "2.2.0"; - sha512.run = "90d02d6465a00fd66503db88ef9734f10d01644116af1b710f9b68844cc546b34389389496c18e4e783ed036b2c70da1a483454d6b0c1325d15723e87d401450"; + version = "2.2.1"; + sha512.run = "331b9f8d1e7627b54eaf55cc1593525d2acd4cef497f887b4f6c952d1821b5f23442173869988d6118b5bd56403137915304f19d7c3bd53235de90bc240a5bb9"; }; lt3rawobjects = { revision = 66619; @@ -29875,13 +30211,13 @@ lua-placeholders = { sha512.run = "c27e83e4776bbcff49b319b0bf9e69cf104f18018ea7c504b8ef118b1d2c4381dc5a5706bee5a7fa72401a1f073c1f01626455f4fb2b288fdcd436f59d591e5e"; }; lua-tinyyaml = { - revision = 66776; - shortdesc = "A tiny YAML (subset) parser for pure Lua"; + revision = 73671; + shortdesc = "A tiny YAML (subset) parser in pure Lua"; stripPrefix = 0; - sha512.doc = "1b0932800ff6fbad87c2a87e68e433d46de5a0c2543c8fb0c7b7b6f60749db98d9863ad4debdcd508bf1a613d32c8a8fa5d7e23f177517e4f7735f2c3b63c616"; + sha512.doc = "7c6036d51a022214ddb6390d7972e634c549bff97a4e3ce0a92dbd47262fce40a0542e3abc2e2d8f6b48e657f4a325e26047b2d2fd50ff79a04686a366f127d9"; license = [ "mit" ]; - version = "0.4.3"; - sha512.run = "3144093c160dd1bbfcef7c0d56a3ff2a6354ed2c5ad30a4201706dea66fb8cb19b4be71087c078c4e36d163e6a785827c378303bfd700c086a7ea6b9d7eb2135"; + version = "0.4.4"; + sha512.run = "8dc998562742e65727a8053c6b42e1ffd6bc6f618d873145b8d71b6243adfce41afebd8dfe68733b9977eb3def7ec837c3c264ec2350b40bf917d013ce7a1960"; }; lua-typo = { revision = 70978; @@ -30018,16 +30354,16 @@ luacomplex = { sha512.run = "dcbb87d1c5776f20aeebf0748d348ab748e98fdc95427404f252f55fd1df9dc607aace2f6b4bfa086016eec7c4bae295979773d3a70d20a9e32da47974911949"; }; luafindfont = { - revision = 72111; + revision = 73987; shortdesc = "Search fonts in the LuaTeX font database"; - sha512.doc = "0fd1953372b4e2247a93c0b5023890e9361838ac87ff4378bbacc4f4def74e4918c1d48e79310f110e8249ea33c019a421b9b6077660d1f71f97a4cc584dbf4d"; + sha512.doc = "f42283d47512a4f8aec22317d3065e8295c721e7064bc624d176ec919ee7fc369eddae915f480833ab5f7f45e1be34a9db5660394ba8b45dd79e80430074e138"; hasManpages = true; scriptExts = [ "lua" ]; license = [ "lppl13c" ]; - version = "0.14"; - sha512.run = "f3455d48010e701df7777c57ba9b765ee03d7be8ae934a075ed8b14e9ae9c439698cf5d6f77fa54e790157d20e945c03b9acb49ded46abed6bbda639a68c9585"; + version = "0.15"; + sha512.run = "569d367befa466309ff54397c677fc483edf76a5d0d91934584392ab79d4c7f9c6cab910162c10813be3e0cc3d7c33563d5db5bb690ac3160644485cdd167eb0"; }; luafindfont.binfiles = [ "luafindfont" @@ -30247,14 +30583,14 @@ luamesh = { sha512.run = "e30e6f2bef6958c2f76df6aae5ca5899b91f41fc35afdce24840e2d028222c31a0613ba3c7eef27629686137f15eac24d3b97b7e0fc33b5d91adb7b766c0279a"; }; luamml = { - revision = 72049; + revision = 74515; shortdesc = "Automatically generate MathML from LuaLaTeX math mode material"; stripPrefix = 0; - sha512.doc = "8a9c22183cc5c2934d0a79247a8f783cb101d6c1aa13a9ee8d032db8a46581db787b09b333ed70938f6643b25d13a1b5aab5c6540966bb4a37b140669e645ff8"; - sha512.source = "5bf83cd1a733de28755131377fec6ae50caa2069bfab0eac874f64da4831378077c61df2075cdce1ad415701a3fc3ae1358047c5efffc72f126c2f759dfa7402"; + sha512.doc = "5c2257d40065142d73d3565c87dc51540ffb1d094ea1757c63385c64924df25aaebb306d524120472ae6caf0df7699fb5df25cd132665f98c1bd4577b70426d3"; + sha512.source = "7becd4203fa7b6a2a90d6ba6b20a1982a9459e7bdd289f44aedd863a69e76d665d5556c10e005b1f90ced19e13f4ec7ce5108761030734904843685ba27f3357"; license = [ "lppl13c" ]; - version = "0.1.0"; - sha512.run = "c7b1ef5bff2e854e5d68ed9a45113cf4d82c813f9af8350b409137b2d9b62491223db62ece5eb767d07a85e555317a8c4112ebc03f1a5ba917f39f670e4616bf"; + version = "0.5.0"; + sha512.run = "ab567fa14cf2068ccc8aec11b338738ad0e586cf73d9dc1a508c6ff270ec03dee8e9c73f26e3bdc84988d80ebe79f5cb65293de5db5a259daeb63ca49c7a44ef"; }; luamodulartables = { revision = 68893; @@ -30266,14 +30602,14 @@ luamodulartables = { sha512.run = "0b390717c538a8c44cc7e8214908149c3705d5cb453d7776015eed27638ed0c0d16ea0b5be5abf2b6bec6e410b849f35796f574923303ebc883c75f7221f7634"; }; luamplib = { - revision = 71964; + revision = 74110; shortdesc = "Use LuaTeX's built-in MetaPost interpreter"; stripPrefix = 0; - sha512.doc = "d2d0675bd9c03b79ba21638b9d2bf5f6c87d6ebc75da74fadb2d92d3fc1e2a25c517d55675eb57677a6918f55062deefcc22d53c709fc61b68280f1df08ed122"; - sha512.source = "258755473d1fe0ba4e56c61b6ba1eadfea736234925a26d025051212308b5ffa41fb18b97a5d888d4f1061bc7e1403e1d30bc8358cd60d7a6c7e6ef2f2055e61"; + sha512.doc = "846252fbb7ad8e89a0985d3b8d740f3a92f571d6c509ba0c0f03434be460ea9e57f88061faa0f345ebc08a8bee0a9f25e5a55d0a362813d702d6ec0dd1fd6b95"; + sha512.source = "d723edadadae78cba8f20679bad952cb35581a3634fa1cd18d646d58838e6c62eb88d1daadc6bb9ca5f057f520d7e68bdaa94cd6cfa6f41716d480cc3926431a"; license = [ "gpl2Only" ]; - version = "2.34.5"; - sha512.run = "dc3d2bf9be904224db788916ede25f5d0e53b7794ac9319cf9c247dccac886d2fb2dcb42ac9215d12f43d708a80a07dab54ed2adcd1780c1da4cdcd0d0f9b387"; + version = "2.37.1"; + sha512.run = "78e53f342a59091a578db83d23c28a10c299b6a965274e90367a9219cbd88944109129866699c029cf174637889218cbdd96afd5cd453bbe7038de29244ac6e4"; }; luanumint = { revision = 68918; @@ -30294,7 +30630,7 @@ luaoptions = { sha512.run = "0169029e4eefcb746f48b266d590c7d9f3d4d376070c762139accf27adb8e48badce38769d22250519b3482b4752c55f66a165f4a6c59b20c3048738dcd65a72"; }; luaotfload = { - revision = 70232; + revision = 74331; shortdesc = "OpenType 'loader' for Plain TeX and LaTeX"; deps = [ "lm" @@ -30302,15 +30638,15 @@ luaotfload = { "lua-uni-algos" "lualibs" ]; - sha512.doc = "676e4238eb0a8914800f2ed1878d2af8a295932a2e6a6863cf78f607ce24033edf05fc753980276b1a7a6a412eaff3b51213aa583ae20baf01af52a55f31a84d"; + sha512.doc = "2274cb3a676207645702da2ccc0ab1ba0c0ba75ed145a24d11e4865626af8b1c22f768e85d1f873bda9fd3f61affd23bd1e0242621e9f07073a31ac15c957102"; hasManpages = true; - sha512.source = "36a6412bd1efc7ffe89f2e2d53e8d24d52dd0c2e16b88dc5477db063e1a28f798e2f44023bff8640dc87dbb9a694f3088ec3c76587ecbd9845ca73e3cd51e60d"; + sha512.source = "121ca1627aeed0659e4adfb912756701a94b87e76125bd8f1976ec0d7dd0c980645593ca70918384793a4ad311cba8810ef0de5cb3c963288a087fe4aa6c5061"; scriptExts = [ "lua" ]; license = [ "gpl2Only" ]; - version = "3.28"; - sha512.run = "72d27376dc6c6b6795df234f8744b403f6972f77424b898dd1dff1e3c42c702fbde2acf810c8af569f394c94dcb949ceef3ee331b8ded4db1101c7c396874efb"; + version = "3.29"; + sha512.run = "6e1d060f76ebb34b5f8037635e9b05410fd185e16f34254f0addda5fb1e5b3f68b15ee3fc7264a3a5fb5e200ed66eedecb5ed938f1847deed45d62e26fdeacf8"; }; luaotfload.binfiles = [ "luaotfload-tool" @@ -30390,6 +30726,14 @@ luasseq = { license = [ "lppl13c" ]; sha512.run = "b77936a1b92ec8b3889ec9ba8b356fa235da6eeca98d6a86f315723c64b4c0a7d8db2213cd9fdad4d2b38cfa8af1bc00c7861f15a9f4f1a809ec86bab8a16f77"; }; +luatbls = { + revision = 74021; + shortdesc = "Lua tables made accessible in LaTeX"; + stripPrefix = 0; + sha512.doc = "b689950ead8686791eefe19fa0829094092d2858119a199f444754a7ebb5971c6ba43881d8a76d1c44ef141d4d3b4d306167fabf7390d7e640b34181119462a1"; + license = [ "mit" ]; + sha512.run = "ecc05a45f3c20f08cf6314d8aea117f37e138a8cbc81cdd9925a0fc7db8acde13b281c3f3113920366fabdfd5e2a4fe77b308737781ae9f2afd999cdd4943c64"; +}; luatex = { revision = 71409; shortdesc = "The LuaTeX engine"; @@ -30454,26 +30798,26 @@ luatexbase = { sha512.run = "cb187dcd0f9e454a3b9d021b802ac6f7d09c3eee68adb5da31035f5b7bb36d2938ca940505ee08c8410ee0e5e5c81ffdd21617ea5ba0e9ca7b58abb6ede3defb"; }; luatexja = { - revision = 72546; + revision = 73790; shortdesc = "Typeset Japanese with Lua(La)TeX"; stripPrefix = 0; deps = [ "luatexbase" ]; - sha512.doc = "e08a1274c9257a051eaa3e076a384620c39873ea4dde5c938674bedb24c5199e699504e84bcd241a7e766df561b22bc9c8ad048a9acfc315be346916a7e9db3a"; - sha512.source = "ba80877c2c537bf6c6d3cd5270211c8344843c0c7622f8b3e44da41e152d8814c8b132851051e34416a872a0a265745dcca73697e0e80d8b34dbf938cb101a55"; + sha512.doc = "18b525b83106c772249582a6ed477399a41a93945be991b02dada8e25c6c017122fd6b075552ec2e29326115d720e1db09477c8e60c0d8693fbf4edbf60eed43"; + sha512.source = "5945fbc779ecc0deba896a358b3c688abf41de85f3a5248fec2d6f0bf854e4c764fc6ef13f447cab125f994223f47881473e596be8fef827f3d58f8801f0d63a"; license = [ "bsd3" ]; - version = "20241014.0"; - sha512.run = "8c5b90966454d57726f286a06719a9dc2062269ef16a25cb138a027dbf3f7c12dfd393d739d8a1b05433cc73115bd6434733a61fa3bcb396afa33c95003f82f2"; + version = "20250208.0"; + sha512.run = "c93df22a146580bcc756ad8e0f609da254dd5985b7f72f130fd78faf64ba5339b1219faa2896714b5807167bdf32f389c98ba7a15b3d8a729ae3e6f85ca701be"; }; luatexko = { - revision = 68243; + revision = 74359; shortdesc = "Typeset Korean with Lua(La)TeX"; stripPrefix = 0; - sha512.doc = "cd1d68f9fa8d5bc5491f4a58f465ea8ddc4a0c500f7c24c2034c75f33ad31d869d2d63d836ea6699b02b04b69406290e7f98eef1294ce8be0f9358f9b207c9ad"; + sha512.doc = "82f046b3f01a7bcedba3ea7e47914b545c46e42a2a72d29266f5b12dd83e30b354bde3fd7d26fecddebe815681efdd35ffb088adfab31662f48076cb73355b08"; license = [ "lppl13c" ]; - version = "3.6"; - sha512.run = "7815d0d6caada77e5d72c410a299de6349a81f635cf9f2ae5b61a73e5619808b8997de70a35a0a6e8cfa1250d413645a9f90f398582e061c92138dbca97d4117"; + version = "3.8"; + sha512.run = "cbdc79b1996ef8810004bd39106d767449eccfcd803dd35eeed2ee36d9e24657da5470dca6c5b8456f10f9f448f811faeecbc790a371e373571231832d36ea00"; }; luatextra = { revision = 20747; @@ -30485,6 +30829,15 @@ luatextra = { version = "1.0.1"; sha512.run = "03c95a5e42d8fc0ed88704799a36624ebb48b9c7606acbc09de29e5da845ede3f239a6dda43cbfb4377971cecb55b1f5280cf0ea1aae5057f3ab8df2e0870745"; }; +luatikz = { + revision = 73087; + shortdesc = "A 2D graphics library to draw TikZ graphics using the Lua programming language"; + stripPrefix = 0; + sha512.doc = "c6c034fd96e95860e56321a9847d3bf75f47adaba92300ccbaf0f362544920fd33bb0cde6d3f8138dc54c01412fc50a6dea832c36b090039de8c98f8d08a019c"; + license = [ "lppl13c" "mit" ]; + version = "2.12.0"; + sha512.run = "843df874ba2cb6d1b6ae11f6660db32e6c2ec8ed975fae506cfb2587c1a82312108dabef39886ad35ea51abe84e5d25ebfa841d70f399fc6d8caa52614d41699"; +}; luatodonotes = { revision = 53825; shortdesc = "Add editing annotations in a LuaLaTeX document"; @@ -30514,58 +30867,58 @@ luavlna = { sha512.run = "42239e3f975d17137ae3d6319e6d6f1f4f06cf8ae69c06d3e1b959739f2b8965936b4dc01cdae06aa87693dc52ba6da32ae1b075af989866fea99f623de846e9"; }; luaxml = { - revision = 72574; + revision = 72858; shortdesc = "Lua library for reading and serialising XML files"; stripPrefix = 0; - sha512.doc = "488ca1abb3d12b674b92d315322dcf020b70efff8f0d746e98cf78a88da0a50834b70185ac2fc64eedc2f483c268550839b6ff55440d421408aa598add37582b"; + sha512.doc = "65caf5ebb8afdeaa78537d4949c10a5402584a11afa61eafa58de0ab16f26fc390f26733e900c9bf587b5b365d920cab64dd5b7f44d6cbc2157d4d280d0e01ea"; license = [ "free" ]; - version = "0.2a"; - sha512.run = "a21c1b735b47f6582535590e983d36f68cb9d9e77be9f47d5a7530eba4e32744646424c431f6bc41ea8ee74358d24a74d7c06749994d052a2d16efa379ea36eb"; + version = "0.2b"; + sha512.run = "e3c3fa21688ea894e455e18738b796c50acfcfcd883454edf0c849a12c8120e8a118a989c478c6e9a7c3727177e054f86222301674ba3aedcaf70e0cf9faf1f3"; }; lutabulartools = { - revision = 67714; + revision = 73345; shortdesc = "Some useful LuaLaTeX-based tabular tools"; stripPrefix = 0; - sha512.doc = "9595cf869f480951f9d0d142abb05548e4f71d8af6d62c4ff0626ad9d9019d63b91333bfc8ba1f6948c9075d62fb7b7956658079fd17ea5e86f920eb7c6ed49b"; + sha512.doc = "745710f28d027be9c8c804bbbe98e3db1f84c31c94f2dd404619c6fffda9e47aea2ce85f005107b7bb2d958453bef11fbf6aff8f4f9e29eeaffa81859568ae1c"; license = [ "mit" ]; - sha512.run = "eeb781b572beed01f5a787a4d0351289c90751ff49a289952a150e3aa013b10f4b0f69fea546709ce9c6ee077a08a551ac9e03d192c1064205eb2af6e907be1d"; + sha512.run = "592eae01b2a30093f8c593d0670ac6efdac35574dbec4f67faf2cc66628fb273b67b8ff021626eff1ec6091fd9410e9f5140d6b4037ee17982333ad9866239f8"; }; luwiantype = { - revision = 71820; + revision = 73719; shortdesc = "Typesetting package for Hieroglyphic Luwian"; stripPrefix = 0; - sha512.doc = "6dbd6a7974b4193468ef5a58b9516f9312ea735f3ac5e8bcd3159c728a8a2c36d083905b449044243e4a7c45576d262b5ad7f1b9af2da5ce71e02dedd029a5cc"; + sha512.doc = "6394f13c5bc975be0448d9e7a18d4e3bb98e8d51b935ff8f8ea3369cf585e2ba5d1bc2f2b923f69e3bc2f2b3fe7088ced81f67d00b4c7c6ec3f30754cc76c514"; license = [ "lppl13c" "ofl" ]; - version = "1.2"; - sha512.run = "bd5ca94bae6f5d63731774527eb3357b1e1cc3c494df780fb8d07431a9e49f34be3e5a2c200e861781405c52b90eca31eda1b21c28f61322fa004df2bffaa20c"; + version = "1.3"; + sha512.run = "7a771b8e3340cbbf2666457b9b6226cb05121dc36d672896bc44fbb4222fdc73e437a0c50de521256651e9621cbf3a0690937142819d2fb9d07ebf4385da776d"; }; lwarp = { - revision = 70067; + revision = 73623; shortdesc = "Converts LaTeX to HTML"; - sha512.doc = "f52a445b50bfe27b9e2ea913b2f324272ddcb74c6da51fd762dc78098b69da86cbe9bed7e5b3e1fefdb52e53104ee348939bc23e93ef9005ed27dcceebb12d24"; - sha512.source = "722ab7abe5522dcb6c2c32b8b400d4900b1e73a1ae893808b2bfb688ea4b942ef6181dc3028d09f25465c6eafbaa6875b34c49f5e40edea2414fe5d98d2eaa8b"; + sha512.doc = "14180cc80262ccafbedcf9c148f8d8e345b3feb6a8166b6e0a37362adcd188c7604365982da77c06513983c185d549a4a1f4b031b7ceec5bd003e6ede5814272"; + sha512.source = "6b6a2b88e62c796276f59043d7caa70f89d61ae31c74d95051b11a592582d635a22db12a4ed40c953830b2e8476a8c07b99737198489250ec91cf35cb678a489"; scriptExts = [ "lua" ]; license = [ "lppl13c" ]; - version = "0.916"; - sha512.run = "500ca024e4894b1e1806be4dbc18d7a244c0194ec7e358c2da075ddfd597c1dd7aa01690afd50e288092f776bae5fa0cc87c355d3597373172f17fd37c3f1ced"; + version = "0.918"; + sha512.run = "8f2c0a6cf341afb03deacf12281c3d95e0663c5ebe1bbaa180173966946b63d1eac8e2d50c05e7ba3e188c442c6d27d285f5dc34539bc48cbb70e83b23c425ca"; }; lwarp.binfiles = [ "lwarpmk" ]; lxfonts = { - revision = 32354; + revision = 73728; shortdesc = "Set of slide fonts based on CM"; stripPrefix = 0; fontMaps = [ "MixedMap lxfonts.map" ]; - sha512.doc = "fed48ea91eb5ad414463d3b929dd4deb5cf433be63aa2753acc251aa1e8b85f0db7307a0ea96ea0bf9c4d9b14d0b90d26cde703bed2761a4a1b789ab3d117eba"; - sha512.source = "18da6f216135745887160dcc1df6ed72eb0e49f60a445e45326c84bed8fd98cd66316e21a6e0e7528d551917092f9715641fc68e02371b609690e00403ca5d96"; + sha512.doc = "6fd2d9c44914bff51dc3d745219d3361b3f681e1aa2e95eca36ce98de5e603cc63a029684f5961de01db90ed54c52214e13c9bc9c97f4e593f4954a376770632"; + sha512.source = "b90293678d5fb3f0ed69fb3de63b87617f318e1dc44cbf28dc4714dfea5b47b9691d0347f97c3a7263546e06d6c7084482b8fc066313a95be906e5e7e12f46de"; license = [ "lppl13c" ]; - version = "2.0b"; - sha512.run = "aa732f403af1adc898e6ac462412a59e4d2c8821ef47807ec5d8c1ce565a73299d472377117bca3fb30add468b546280b1603feff95d35090b338f87b279bdf4"; + version = "3.0"; + sha512.run = "a816d0f6fde8d3941b808065dc7f9bea6e6735c08e14eb9ca7247575d506043d8863c500590a95444a3828fcc46419aefc0559c5117fec8bb26a4244f5bfacd2"; }; ly1 = { revision = 63565; @@ -30679,14 +31032,14 @@ magra = { sha512.run = "2b182272dcf5bf3469ccc38daf9ad24081002d118de77d2dd012b136152f2147a63c6c8fad5ffe2f758efbfbf7665ae0c61ef6281cf16112b740da95d2334b63"; }; mahjong = { - revision = 58896; + revision = 73437; shortdesc = "Typeset Mahjong Tiles using MPSZ Notation"; stripPrefix = 0; - sha512.doc = "622a34f880eb02813e7f4c1f6eb7199194c3ee0e62df534e7832530c34f09e2abfa7f1d491b4840310841e230e3ab5080cbfa5370e9366c0f9b8fd9000b0ef38"; - sha512.source = "6b64551b9cf9d4e79875935d2b37af602be7d3b001a3ef441003136b950741adec8d4b8521ca9a49d744d2173c0b053f025af909fe320edf08f1b3d7c131055e"; + sha512.doc = "be90aac949faa92da431ce71ed92485ccc85d04bf328d2c8d1d4df31676f2ec1855153c3e6e34f4a34ca2a371fa7ab80fc676176b7e1c6d59af8bc6bcf7b00bf"; + sha512.source = "f05ea20d9261ebf19679871f57a2012251c97966b7817a93e08d8bc030ea3e811175bc70765a8b215fbf29cb556c84485638b0b0f9d828ecfd7c56ff4c29e805"; license = [ "mit" "cc-by-10" ]; - version = "1.0.1"; - sha512.run = "697c0a634304e4e94a6165fd033d906209fa6811cf6297868b76389165bf557f3b6abd419582d200bb252365f790ce53c98e1da75c8b6d3d061cb5d6b635ef38"; + version = "1.1"; + sha512.run = "90d476b8bf18a97123f0c471d395d192365d1ab197582a3319bc2fba61e1dc6ce0c25846409664403a4771dda34f255251d17d480fd26f149e1471b18d0b3f7c"; }; mailing = { revision = 71862; @@ -30709,18 +31062,18 @@ mailmerge = { sha512.run = "1930b0c554dfa36514d0c0b33749d506d6e5acfcf65e3c1dde3ed75a7c45bafb74db8d83f1b286c1a623acb32b2047dcab566ad85e3676c67c0ce1f7722d24f4"; }; make4ht = { - revision = 72626; + revision = 74150; shortdesc = "A build system for tex4ht"; deps = [ "tex4ht" ]; - sha512.doc = "b185a77e7f40c71bb1e86b2bd31706666c1e3e98a7d788b1712d18db87d2d77f1e18377e924eb40e0af725c1014ead78bb788d03fe99646766506db45af0c2f5"; + sha512.doc = "3d2dcbfe5896d76be4ee94d7746e5decd3f564c41f344c75e5fa408d705765399c227976771f8014ac5d50ef23f5d76049f4ca14250e60ea9acb5520c274c7e3"; scriptExts = [ "lua" ]; license = [ "lppl13c" ]; - version = "0.4b"; - sha512.run = "21e3481542217fbc41af0cbb79b6a2f225dedd2c805f9d5a3c863dc2b6cb2deafcffcdbe2aeb890ef265e94ab9e736a198a6c809096c7be6b061f9f31d0a9d67"; + version = "0.4c"; + sha512.run = "efb0e6df81fda6907731c3f4e2565af3f1ccb9f6ba8220110f9a252be39a0c4b32561afe0f3d2cfee7a5c38c8769255bdad5334f2ab91888dc99ecb82a0f7244"; }; make4ht.binfiles = [ "make4ht" @@ -30949,6 +31302,16 @@ margbib = { version = "1.0c"; sha512.run = "7f734e46e72badf838397305ca926f4589b9aba7a0e91e21313f6a733f7cd09db959f30e3694490633713b1a77c8d11a521b2892722496fb162d7c25c7b8641a"; }; +marginalia = { + revision = 74109; + shortdesc = "Non-floating marginal content with automatic placement for LuaLaTeX"; + stripPrefix = 0; + sha512.doc = "82eb9ae7d8e656fb499c2c1e84ad081f184cdadae025848bf93af527fdec8c4c244646b5ecf2c1c867ebfd604aeb2972da9170918acd70ff9936acea499d7228"; + sha512.source = "f32610b76756dc1ede841fc4808932621baf5c4a1b5e707b08a4b7a431ab72c9ded2b42be6ca8b50f5a7edf5ba66406ed5a6e9ac3d37adb7146060790b8d30c8"; + license = [ "lppl13c" ]; + version = "0.80.2"; + sha512.run = "546ff1601581aa99b9854e8463b2556f814a315afaea4d3d062c909b73459acf2358cb2bdd2dd3b2b39fa7e4b934b0eb6771e91785307cf5320299a8a2793fc2"; +}; marginfit = { revision = 48281; shortdesc = "Improved margin notes"; @@ -30978,21 +31341,37 @@ marginnote = { license = [ "lppl13c" ]; sha512.run = "6643a77d01d59bc371d301e738b59957bd63cfa0fc98a554f853d1599392ceb5e88663651563445633df704bbc3ef74510ebd6150c44911314225259982f114b"; }; -markdown = { - revision = 72484; - shortdesc = "Converting and rendering markdown documents inside TeX"; +maritime = { + revision = 74042; + shortdesc = "International maritime signal flags using TikZ"; stripPrefix = 0; + sha512.doc = "766196f2695b2ed6c63aa70acff804e85cad69c6d7ed97ccbd1bc01bc198ad2bdb5ff8de278f109ca18d0ee71987a13159e7e5ca24b1d70239a2db17ddf4e700"; + license = [ "mit" ]; + version = "1.0"; + sha512.run = "1c79259b07d1953a3a88326aa30f9645b97cc9941daeb0c28e19030d9e5d12cedef1c04f416a8d43eca04ce3528f93c192fbfdb0a900e433f7edf28b0278cc96"; +}; +markdown = { + revision = 74198; + shortdesc = "Converting and rendering markdown documents inside TeX"; deps = [ "l3kernel" "lt3luabridge" + "lua-tinyyaml" "lua-uni-algos" ]; - sha512.doc = "524b534a2acf7a6ea9cc60e30600239cc75567da18f72ff5df211c9a1e536aeed5f5229f98bfd26d78df70c01c05c2e9aa67b333bc11dd9de1f5465cd4af4912"; - sha512.source = "99f7bbbd0679c6c898295369a88206f445b927d8bb4bca35129efc67fc749476211e8c4f8746de1996cc7002e93ef6d550d60ee85535698629f387c2aac2214c"; + sha512.doc = "6c1dd1e512f1535e0d65158b2412ca2ef3a42a31bc17751d52955a2525a8addc70d980248af1cd75f2d2351c0116c29c86743865979aeaa20c16fe007769f8cc"; + hasManpages = true; + sha512.source = "2cf77a43662ad52f709b7b2c0b506a06056dd38d3e8d47eb2fd1eea18b25f0ee85d4bac6a2a56cadffa5f211ecd7ce8375293c746334020ad9f6e0f7da187879"; + scriptExts = [ + "lua" + ]; license = [ "lppl13c" ]; - version = "3.7.1-0-g8e726800"; - sha512.run = "895f84002c3b1dee6b468a88e900cbd8be488a12e02eb6b73e18d9fc0a2cd9f7fb876b8479b13f7382d7ba193b3f0752bc91a258f567c9f696352e2758088c7e"; + version = "3.11.0-0-ga9095584"; + sha512.run = "6dc6a8685ce61b6452b0e5d009672c305a5d195e4685e44190725b000eaece3a02cac23b7ba17ee92f99cd6abc6fc8867c02d5fdf9428fa6b6f60dc071ad3b21"; }; +markdown.binfiles = [ + "markdown2tex" +]; marvosym = { revision = 29349; shortdesc = "Martin Vogel's Symbols (marvosym) font"; @@ -31054,6 +31433,16 @@ math-into-latex-4 = { sha512.doc = "5fee7c89fc9f273817b23fa25260733ee0552df7bed0333bbe604c17bdecfc28d7e386478f7b42d3c2aef89f80ce7a1d35215fdc386ea47e4db3a334bc6a9597"; license = [ "free" ]; }; +math-operator = { + revision = 74357; + shortdesc = "Predefined and new math operators"; + stripPrefix = 0; + sha512.doc = "d88adfd5c6d216c291b19ec18d64d293cc833502e857892eb168f05a87ffbc2532de12fe9ee3fd3e39ac1c2fd1d20fe8445f93174328c660407fbdf4a4dc4003"; + sha512.source = "ca342a282ef18ceb32a1d4bb9038a0f69e905489820e32e1a438bf6db9c076b01c877f45f09fb517a0433263163ee554a082e011d634574d8ee31052595f3a15"; + license = [ "lppl13c" ]; + version = "1.0"; + sha512.run = "9a60e722b5278bf6127cca36efaeeb7246890068c99b20db51ff0a7cb9e98c8e9f9f74494ffc0fa102bec4db51d97c5e6ea0e878aaaee0d6f6d88be34ac518ca"; +}; mathabx = { revision = 15878; shortdesc = "Three series of mathematical symbols"; @@ -31077,13 +31466,16 @@ mathabx-type1 = { sha512.run = "ae2272ac7d79a3bb1a655000a2d5fa1c3d948363763abe194cbac4084d5ef60492648977660c3d9dfbc2c70bea3c207d031d2147097fb1d7af503aa80f257d1c"; }; mathalpha = { - revision = 61089; + revision = 73505; shortdesc = "General package for loading maths alphabets in LaTeX"; stripPrefix = 0; - sha512.doc = "5de9923e39ccf9b55f10f0b97067d001ead5598423174808d2a7636c96f8fbd2e8a8e6c0d66140f62d51b9263a736cb6106cf6db0e16e62ee5d9f3887baa3159"; + fontMaps = [ + "Map mathalpha.map" + ]; + sha512.doc = "1fdde4c427a2dfeeadd7df93b447d946e7f1f415ddddee8b34325b4e2de7300990093265cca4dfbfcecacfac34f067152bbe32141fb690f438a271f74af8105a"; license = [ "lppl13c" ]; - version = "1.143"; - sha512.run = "9c56ad5cabba0fc7ff7403882cd46161be0b4d7bcaf632e48eab5170b1350a1c780a9f98ed535466ae7c17a387a461fa4663ffd3c4fac5cb01ecb77bccdcfec6"; + version = "1.145"; + sha512.run = "a906a548fa4277f51fb92a79a85dd87a063ca69df99031fe3bcaef1bd6a3a95421712754c697b9e9a2fb29c32375f698734258cafbab3c8bcc8cee4bfb5cdd39"; }; mathastext = { revision = 72671; @@ -31163,14 +31555,14 @@ mathfam256 = { sha512.run = "20912d6df0f287c14300e4598400cc2da676f7e484757e3a9a0c41ef6861d7180cf7110fbc7b5668ba8a713cb66b9120736b64a1f5098df25379ebc7b14e44f5"; }; mathfixs = { - revision = 72653; + revision = 72887; shortdesc = "Fix various layout issues in math mode"; stripPrefix = 0; - sha512.doc = "dbce886bd7c13b3f6ab96a110298f84a4e080472a3366fb8a19f98b1e6e4b5c8fc62bd82817fc0a28824d8afd48e14f0187db054a1a601854c530239551ec734"; - sha512.source = "847718ee0616641e60037cb25c291a9a57b3c55add7399f2a5c120f7d4e3a64170989cf9086e00d4981a6d77feb40a9e1f5b4a05b0f0606bd3a42daa6d61a34a"; + sha512.doc = "37f0075e7e724a9473c9221b69e5385151eb1c33df832ab236030a95e5be89586e1fe7f2179dbe37da44f1c81a74ca0e7e2351a52c71125f014ad67cff96acc6"; + sha512.source = "97d26db1d86f1de7a5134e6c82476d09577959ef5d6d8d56eeaf4a7bbd4b4e8f9945ef7e0c6a26b1e3dfde3beebd7262cdc42ed323b1ccf3e04ad972c7e9a7ef"; license = [ "lppl13c" ]; - version = "1.11"; - sha512.run = "47a6268381b78d01e654dc928c1b0be3cb08e7adca94e5491ddc155ed16ef7cfd93f01dff3bbb586e935d3d7a8da5471c26718c846140125d02291a4e5a5856f"; + version = "1.12"; + sha512.run = "48de9684433b25fdafee59cba4bc6cbd0e90e17637a1678dfe852fb7b47a84f78c886910ae3651d1626f89334615b890ec8f26eb88ead9b0e3f4a19c1d655b32"; }; mathfont = { revision = 68241; @@ -31358,12 +31750,13 @@ mcexam = { sha512.run = "3c75869bd0e65798fa451d971ff441f3a42daa0647c31458631c388cd14cbb36fe4f4dc9178e59fdb307de590d201e8716b1a86dc9b995aa184090cbdc95c9d2"; }; mcf2graph = { - revision = 70154; + revision = 74041; shortdesc = "Draw chemical structure diagrams with MetaPost"; stripPrefix = 0; - sha512.doc = "9fc974b475090a83d9999f8832d19ef553873c73f257d7e9cf327e24483dec8ca68a56af4b840071edaeb6615a41c01128c917a6d95b5ce0a2618d967f86d012"; + sha512.doc = "0b9e3e0f9bfd31a20f1f4ecb5de7549975b01faf267587d34c96e2e5f7286a737f4e296b5624be654230544842ad8e8fb1af4787890ff594c5f6f7f5b250123d"; license = [ "mit" ]; - version = "5.12"; + version = "5.19"; + sha512.run = "a2af589b742b0d0a1c30dd4b7ddece42ca3f043e17e17dda308c606fc25e8ca458c8cd4053c42b38e04a3c0ebf096fe97699d2a44648cf3cd403fd1f530d6822"; }; mcite = { revision = 18173; @@ -31465,13 +31858,13 @@ media9 = { sha512.run = "9d9a8dab4404879fe2ecab5565e6748b6f1683adddbf76c10350018add8bebf49e6600517d6c3216ec0e9a395ea7882fd36a3c3ea647f089bb1e9576ccc949b5"; }; medmath = { - revision = 69510; + revision = 74214; shortdesc = "Better medium-size math commands"; stripPrefix = 0; - sha512.doc = "19f64ba210e9f3b7a03775cbd3de1b9fc1df69b9e29034f0e46a5ca5a480905565ecc484c6fc5b0b5b7eb9bcff79b8faa8a05a0bad1128f7c224ae732c2973f3"; + sha512.doc = "25445e44408a4b0c34674d4f7c12169e3c61c6968db8e91025800fda46af2d2b83b395b7b66d9ac808827e3c315338cf5bbb4037498e296afa031033197d7be5"; license = [ "lppl13c" ]; - version = "2024E"; - sha512.run = "29039ecd484047454355d009688d5ac4ab4ed5d79a90039025454d13985971659b33476cd0306da52c1afa1a5fa87855b37a8c32b072a094abec28af204abfc6"; + version = "2025A"; + sha512.run = "a54d30fc5117d4305c46f238da31714770d9afb4c5a6e7f685cb954448447393895640633f287b1beda578f5b6746b5d0dcf6f9dcbb265f9546c8d60718d01ea"; }; medstarbeamer = { revision = 38828; @@ -31517,14 +31910,14 @@ memexsupp = { sha512.run = "74931ebb1a146edadcde19d8c404ff8df750c4eb8f2f59fa83e6da9f8dc6567005d51f58e4b7bd2cdfa6b960adb072e9fee7b1842142076df88887c3c2b41051"; }; memoir = { - revision = 69600; + revision = 74490; shortdesc = "Typeset fiction, non-fiction and mathematical books"; stripPrefix = 0; - sha512.doc = "4e2b4f36a5a894ed7579e1018e0ca2309791716fb9e36623237c9c4021441893c634ffabdbb33bc23b63a599d4576bd1ce2f1c549d424c9d87c6df2b12e43a09"; - sha512.source = "31d3120456a4451e955c0476846c057591836de72c76b8de9b421d2e22d7f1018d01073e8f9354ae82d9603ca9fd153a617cf9699b31a1c79254eaf2094503ef"; + sha512.doc = "391f296454b6d4f2f60d232f10c531610e319c98029cd11eb86ce55da6f97c2bbad6052a1ae751c8019293a801a42499d7e9acc9bc3f7d2ff3895c1552da715f"; + sha512.source = "5b8190c0766cdc560f2db7a7d7c999c28c88997c085858b1cc6b57f6b443a6072dd33d2b627d341c56ecc6985dea053e253d5de307e22577f8f6633ec7e05e52"; license = [ "lppl13c" ]; - version = "3.8.2"; - sha512.run = "ef905bedb5b27fcc0e65e2b86ce9f949135e0bf4c857431a0af68eaf5a4472e69ffc687d243560d69a3727d8db2388ff9da7c86283e625964ffea677f7e80c0b"; + version = "3.8.3"; + sha512.run = "e32c42865950f2455d63f43c6d7ae4c773b2a7415b2318f42db9e6856a227d1cb35a601687f0af33a19ef4a5640c964daaf759499f0d098995711824b6dde781"; }; memoirchapterstyles = { revision = 59766; @@ -31535,17 +31928,17 @@ memoirchapterstyles = { version = "1.7e"; }; memoize = { - revision = 70841; + revision = 73025; shortdesc = "Externalization of graphics and memoization of compilation results in general"; - sha512.doc = "d5b43292ae79b65fcf5fccdf3521700356bb8b97706bf5d09730855bbea725d6daa280643692d758d8a4260a136e014ba5e45c5244d653721816537cf7f23c1a"; + sha512.doc = "c9edb59e0879a5346e7205523ff0c3a25f65b7200508a46c98a0e709c1190e00d94499cdbf1130f615127a9023060c9f62804205898c0ac1d338659985f1bfb5"; hasManpages = true; - sha512.source = "a2532e5782e8a3eab29cf538a997e16e61daa27e0474e06e595e34547e64927d32b032a2972e3d8959f422d1258265723cbeb6da746d945665b7fa660b199107"; + sha512.source = "0b130767f51438d1f9ab7359d4636fda15d776eeac9b1c2cf3bcfeff3845cdf1c35d2b215d4b87865595aa21cf5f9c22f1459c9d92bbffc4a30589f658c30c94"; scriptExts = [ "py" ]; license = [ "lppl13c" ]; - version = "1.3.0"; - sha512.run = "e1f119eaf369da3ac45b44bf5c76c977d1406e0ef2cf242931cc8d34e766a737bc5eb4592956f0efd31a5e6e6a63950813053792e1089e84868bcff9d9129731"; + version = "1.4.1"; + sha512.run = "6183a9bbe0078fa5714383dfde12c907aa79fd2d736dfe25a866b8d2d4ec65d8307066dc393b2a78a9ed2a1dc8693862811490c2f318a390582061609e2439ee"; }; memoize.binfiles = [ "memoize-clean.pl" @@ -31712,14 +32105,14 @@ metalogo = { sha512.run = "20d5a9b8454166535aa3aa80da7d2931937fc6a4d730c1ab70c856311c223d466e9fce2ed6e3b2fbf4b4fc75778d7d4c2649111df5f92dd58b6fc42b3ec72696"; }; metalogox = { - revision = 70491; + revision = 73571; shortdesc = "Adjust TeX logos, with font detection"; stripPrefix = 0; - sha512.doc = "f473c412ba92d4bcf8290680e310dad580f9dd5a57340bbe4ff1d92f7141b1b1eef98b235f5eff9fd9c0d1ec6ba4b850714efc923c55cb10bfb12be463f1fe4a"; - sha512.source = "7e9db056ba2468041cf71e1540f6bb5d330a85e70da25f1d0e695004311b00f537bfa3a3258191ee78fb57e8c8089da5ca9ba6ac6047e89f2dc4c4d902021c14"; + sha512.doc = "1f2ae6412827a2208c73107f4973baaa1cf0492663b98a5586fc16e45a6ec5000193a95354a6ea08fcc776863c54e58931dde988313af8365f4ac2f27f43c1ca"; + sha512.source = "83b12a872afec951004818eab0df7d4c0a9e1a3e1e63cc4d3a334a31b408956efe1899bfc26647d5039ac04b2871174e7e0562060d06c554017d9ca85219c8d2"; license = [ "lppl13c" ]; - version = "1.06"; - sha512.run = "cda2155a27f6edc225d749c5f92fd37a662ff1ad60eef3cf26528b8eb1eb609bc4241438fd77f2586cc2872d9b89beb15ae92a406b8b6b4ecbdd4c552543a7b9"; + version = "1.07"; + sha512.run = "0f383ea1652af002516b9c1eafca6c344fc038fd9ef25363c720f720ab7334f5d443858b557a780b05607e783095ce2880883d09cdf60cdb7ed51825f0a9a19a"; }; metanorma = { revision = 55010; @@ -32097,30 +32490,30 @@ mi-solns = { sha512.run = "ac5beb872c78675bc9df379f8a2afe533647a1c39781c57fed2cec6e610cafbbb45a4fdcbd9826cb123a584e121ff752633d6c990109bb1f619b1d9fac6906de"; }; miama = { - revision = 54512; + revision = 73481; shortdesc = "The Miama Nueva handwriting font with LaTeX support"; stripPrefix = 0; fontMaps = [ "Map miama.map" ]; - sha512.doc = "a76db9f49bcdc225d9206ebaa3b7ca42bc7148a44d1d66b72d2033b68fe9a1137eec265316d3a24077e3e3712687e80ea948d4f1c9cd819e6a4afb8c9bbf91df"; - sha512.source = "2b9e1a649f944ce6b36b1dc09d28112f7d5ea3c0a26a1f292576448171aa2f51449988ce85703ba7c2098f6dce62093ccf5af256bff1993268f31dc884bd3b63"; + sha512.doc = "be11511170f0c860a9ba2d148d33a9a32297ad5e4c14786a1ef2fe37628419a9a37441b203a0a6465e9b0371d239cece138d559f28a12d9a84e583b0f0b29a15"; + sha512.source = "d32bc3a0e51ff27a618cf9a072649967ce6d218ee78429d9c09546ccab49c02433be62ec512bcf9b0980b92c144a7ad168b8c783f608c736a91f421bc8380f51"; license = [ "ofl" "lppl13c" ]; - version = "1.1"; - sha512.run = "b9a5416b1de4cb487575894f3dacac8b07eda2b37b90fa0c5ca0ebc5d9d412c896fb7cd028c6af5627368c44d442670990949c9ceb9fe3a60179d3f70874135a"; + version = "1.2"; + sha512.run = "d0bff2752fc7e59b98caba1ef01f566203619871bbff5a630044f47cda34a0e8cf70190bbd092ec2da35594ed23150baf688c2107e80d1cd933035630e189102"; }; microtype = { - revision = 70805; + revision = 73935; shortdesc = "Subliminal refinements towards typographical perfection"; stripPrefix = 0; deps = [ "etoolbox" ]; - sha512.doc = "ab0bf753deed2ae61c0faf6fdc2293f80c2cc926399846b813512075683667dd7f0bca4b8180e39d50fb8193d0028dffb9ff5685a9730a4d7712ec0e0a8c195b"; - sha512.source = "3c32a38c90a1fa81f246ce819bf614c4a659c0ab5724a518a70504e2fa219fcbb2844d0a1a642eb9cea2b4b125923bb2035202184aeca8cdf55b75c2fb90d244"; + sha512.doc = "433a5032cd6894ca1953d38eab36d83eba57c5b8afd91a16418c1d3e47d1e7864a1a678f60259ad3389b147cef867e495192fe69378762bcece882fc40b2cb15"; + sha512.source = "25ea72d749c33dc66ef578c06e15f0589b7b74e59735cd38b55f0ba785060f0670ba363e33102c74c3fd46e8ecf1937ca65498260254cd52ddb6e6d947a43d3e"; license = [ "lppl13c" ]; - version = "3.1b"; - sha512.run = "104109a59963cd967bd86e3172489eb95efb0761765475846bf10da5d537a9fa1602294ee95d7dbcfdcac3bf9aca8faf0c0e4386fa79c8b1457ef7f0c589af6d"; + version = "3.2a"; + sha512.run = "e700a9270246be4de39f104238f7b4e84f1aa7811ddd6797f044969ba833b38b0a4d4b3e5365e5b0154a308c260533b9e3ceb062b7be3115f54db9ff6ef6eedf"; }; microtype-de = { revision = 54080; @@ -32215,13 +32608,13 @@ minifp = { sha512.run = "412bbd3466eee82a99b43d6f4a5998a0a22b20c2d51621368ecba1084010a5333bda9e221b07dcfc6ddea8810edd0dcf60c2be6f926ca0da33071e6a812108d9"; }; minim = { - revision = 70885; + revision = 73817; shortdesc = "A modern plain format for the LuaTeX engine"; stripPrefix = 0; - sha512.doc = "6c34a4e1485da74ad33ac0d85d6faf485f5d3070934e5e4b816a5f4e0be49efac37d6994e4fbfc8bb24efc135640639e0d1d46ce615bb7453fbe70ecfd4ac833"; + sha512.doc = "54d0aee24c5d60f6d36618c4526bf8d1e6b646aeb0a809a260adac94cc84d08d6baa68cf19efcc879b1ed5b84ee6c44c3a35902516f4f5e3c6e587ee838cdab8"; license = [ "eupl12" ]; - version = "2024-1.6"; - sha512.run = "788e48d9d623eee403c8ac4b0264360751b874fb10b87e39536571bd46d5bf5a9a2ee71d86022fb760daf6bfd0d1b2b1b34006994c6346a24b7989c351cac60e"; + version = "2025-1.7"; + sha512.run = "314da7dd79437cbeb3e3af4f433a3fa7f263b3c9757ef3ca37ec100ceee544b19f46b35f883f1fdd7f8d78540841af8ff2cd77aaad4ae3a99bef740e99d43ccc"; }; minim-hatching = { revision = 70885; @@ -32233,40 +32626,40 @@ minim-hatching = { sha512.run = "b487908c102e43777884e2414bf5ebd60bdebb5431481a312d26b6ed37d0e714fa16ffdbd6663fabddb366affab8070695182cd5ea74bb08c685669bbb24cb42"; }; minim-math = { - revision = 70885; + revision = 73817; shortdesc = "Extensive maths for LuaTeX"; stripPrefix = 0; - sha512.doc = "65dc0ba7588e9a861a2fb41986c34e90b79abcf258e54d4aa2fe96b4d9232c41fede6ad9c5bde184b304a47f9b8af250269aa77f0ea781cb3f1f3f069e01498e"; + sha512.doc = "1d10bca0021a11d874a8b5065c829a4aaededea9ffc60a021236c8d65fa30349bd55b007a6cd332864ae741e2f3e01e1fdac341f37f23bfdfa1dd45b0e05fcd4"; license = [ "eupl12" ]; - version = "2024-1.4"; - sha512.run = "7ccce42629a3d8782b46f72b1e851a229145453dd407d7379da40b72d3f1446729759c6329fb794c5f1084f19670f90684135b5d3444300d0cc1ccb9027b8cfc"; + version = "2025-1.5"; + sha512.run = "13462ae9606d8ed0cf1348f5778a2da46a4577a1b836b2b4eb86914a008589b318929652e8b803133b2ac95d62429e6973892ae5e4d1a03ece51f1d0f11fc453"; }; minim-mp = { - revision = 70885; + revision = 73817; shortdesc = "Low-level mplib integration for LuaTeX"; stripPrefix = 0; - sha512.doc = "ed17a8df340984427d6781923fbc4de6457049d502985dff7b3650a0f7a76ced8466c21116b0498b4372a55c5c05aba92228f2f84cb7ad15e4a8988eed235fb1"; + sha512.doc = "86cc27c1cb482634f5f7bbf0d4fcfbd2f88bfc2932875990b61165f957f10d53b5df2980ecc423f8ce6c1c1e970c30feedaee1554b478163dd86b1386458a4ea"; license = [ "eupl12" ]; - version = "2024-1.6"; - sha512.run = "e639e207dd67b167955116f320ae6699f4cd73c00ab897531945a3b8526b4e670ea6121a98f5f7db0d32de6a19e7544b2fae1182d068b2e6dd527333c31dea35"; + version = "2025-1.7"; + sha512.run = "7bcb78471683da5357d7fdfb48621b60889ccdf830d06587701a5be71fee5b4a53e83d4fe774a7dc7b860e3012c8ca264fb5e7995d31a6f11c29d0b3656318df"; }; minim-pdf = { - revision = 70885; + revision = 74215; shortdesc = "Low-level PDF integration for LuaTeX"; stripPrefix = 0; - sha512.doc = "757fa04d352e060533c1e10aa6b67e344bfb836c71dfd02a32d2ccbbb3f80e248b228cc24fff48d55b553baff5002d8d54f2e153e12c8ba11c4a42fff2a4ee6f"; + sha512.doc = "5d4edec0a9c93ad9e33d6d220832caac352d8076fc62597ec65ed384c5c5b1d2e639534d15bab0c403239b33bd4183235c6b058a6fe84525acb542957bc748cc"; license = [ "eupl12" ]; - version = "2024-1.5"; - sha512.run = "3208ca24379653b0df7bce800bd90b1fe14b33241f73d56227a5d7f1fd01620871910434a465b62453a647a9b5c207cce8b0c472b4bc9327b7e5138d5e2b9694"; + version = "2025-1.7"; + sha512.run = "520a0f926cb32bc65a82869d421dd7b57f6a24378580b9ad1222cc27b8f9e109a20239f9c3c0b967c9a770af411d670f3f83fe19256c14d63ff0b77d8550256a"; }; minim-xmp = { - revision = 70885; + revision = 73817; shortdesc = "Embed XMP metadata in PDF with LuaTeX"; stripPrefix = 0; - sha512.doc = "3347cba4822fa23b7d167c9232a13f24d98cd563198f6e1b0ea472636b874f8fb87b00f92fbeee767015541bbeb9e2fd8f3019aa3cb01662e7cf3ac8ab2e141b"; + sha512.doc = "94e273cfab125b3c606ea45758512d00d0c6d30a344dc69a3437f92d85deff847cc6fa0076a29a22f0704243703748caf9b0e66ee792e43dfb46a059c395770a"; license = [ "eupl12" ]; - version = "2024-1.3"; - sha512.run = "439c8b7434a7fb3125459c6ebec420715eb20b14bfd025673b3646c67b838b6afbe688795130b81001203900f413f3b2a1987e08ef105dea7763e2156becc1ae"; + version = "2025-1.4"; + sha512.run = "5e32c52be9443d0c73b22280b0cee8f3c5d97b4b40f2d9965097de990277d2e9f415624815708150dcb3948871df02f2e8db9f22409091b4e86bd4ef46a82d8c"; }; minimalist = { revision = 70302; @@ -32316,7 +32709,7 @@ minorrevision = { sha512.run = "d76224254aa18dd80f9bab56f055fde5bb7ee6b5c3dd88e6ce19667c939fb2dbd1e5cb987522a3f1c50082f46ee20cf918f1e01fb00f588ce11d30d300fcf574"; }; minted = { - revision = 72494; + revision = 74490; shortdesc = "Highlighted source code for LaTeX"; deps = [ "catchfile" @@ -32331,14 +32724,15 @@ minted = { "tools" "xcolor" ]; - sha512.doc = "3efbab375b8607fd8bd67db43afbaab74e1b00da90b17a35723ff9e6eaf61681eb9eede812b736879f815ba1eb7fb2a9b8801e3f962fba9b2505367149bd4aba"; - sha512.source = "e5c2836b06eeb8d707e4b7047e9c2cb25fe5f2c97b0dc07f31e8c8b75b791bc54437bd821eb8a9a2b8f8c1955af30df3d2ae068edd12b403cf242a43cce0bbee"; + sha512.doc = "c2561959378d0ab54f12ac5248d9e8d7c9b4633e89415c0f9898a11aeb1f05d6da201f0d0425858d3e9caf8eadc75372f06333f9f0771abcc12b8f8fbd97875e"; + hasManpages = true; + sha512.source = "4b59d5c4ef4554aee87f6beddee91c6309da1782b1f093f2d6d8e8038d71179af271d760140fbe386a021a7e595a1dba2948d1c5c426c519198bb0c7ebab3c70"; scriptExts = [ "py" ]; license = [ "lppl13c" "lppl13c" "bsd3" ]; - version = "3.1.2"; - sha512.run = "c19fb363d024fc89f0dc506b5680d4ef6f7f7d074260a691d0245e1acdf8ce56970f657b12ec7dce0af0740126232686b0e8e728a3465e35c3399faf3f63cc31"; + version = "3.6.0"; + sha512.run = "5a47e801d6df7cf71f983bf47c2d8674ae062bb711882b909a04d65363f760515aa6af5b242a579b7f6710b26dc3cc5f15aef77a4f81ab5f3fdc69912e340c42"; }; minted.binfiles = [ "latexminted" @@ -32384,13 +32778,13 @@ missaali = { sha512.run = "552f53302060b3f4c764a669feea4fe1dbadfa3abf53c226f9fde2d0e876bc8992ff2dbd4be6cd3e261ab0e01ed4d1ad2b5a38c2cfb780c4fc099a79ae52b46f"; }; mitthesis = { - revision = 72223; + revision = 73622; shortdesc = "A LaTeX template for an MIT thesis"; stripPrefix = 0; - sha512.doc = "718a6f2807f59c46aa2aaab36867a6fe6bc22e5d99761092eb2bf7ef044e904999fb9d213ea3bc403821b777cf59d2a0127b79d6df777525a35ccecc4fb0499f"; + sha512.doc = "3940e264575cf3f85f160dca5310b4bc4ff4d13b3d9da1e5d1bcb40496247eb33b02ef3275a93d0acb7880b803bcfeaba2c6a0eb1e3a995b8d06e8c8e07a7c3a"; license = [ "mit" ]; - version = "1.16"; - sha512.run = "f25da4d18e9411f7924b2e1d3b39cbfbc12907c2b0d26e6a2f4ef066fb50b9127bf6da1dc693858d62a36462dade60aaa06ff7b7f1143aeb8b1c44b71d107d69"; + version = "1.19"; + sha512.run = "2f7c56d2e26e1de2d0d237c7515fcb957dba02efc5c167f27528c71c6632ad98973558c4c79662687b8da53729f210495e7e8b2acc01c8a7bee0079623abec8e"; }; mkgrkindex = { revision = 26313; @@ -32711,14 +33105,14 @@ modulus = { sha512.run = "e5dde62c2e0730befb63612bfd6ea3626463db85b74291df5937d8f7e1995f6b63c8bc6d7e08536ae761457ab1e9a0ddeccf11afa4108910561075dcc03201f6"; }; moloch = { - revision = 71883; - shortdesc = "Beamer based on Metropolis theme"; + revision = 73490; + shortdesc = "Beamer theme based on Metropolis"; stripPrefix = 0; - sha512.doc = "d1e8db5d6c956690ebab4072fef837b0b79e740c25db1c08a26e1c86791cff3f652d80fe73e5061f392a8813480cf64b19dbbf57c7c0559085018bd46986aab3"; - sha512.source = "08fecee109f4d2f4cea88083548fc1e8dbb90d2539d1d0306f344ddc5d60ebb5f15fa1b3250130ffd21d2656973f537bcba1bb4db4aa7754eb322e36b655e6f2"; + sha512.doc = "d80646555ef2849dae9791cc145eabd65e37883f4daacc214500bf80e7ec490fcb17ae014211b0e46cdbbe73d2b4e74a15c1ec86a90593f795c12c02b0b97238"; + sha512.source = "d3bb626ce724f8b273bb365126dc7f355acac762756e10af2f0357b37c2d8b0bd813ef949fe9a4dd489d32723c38c6627b911bbad2deab4382af446c25148de7"; license = [ "cc-by-sa-40" ]; - version = "0.4.0"; - sha512.run = "401b0c35e291fb22f85b0f1e0befcb9d093256158a5028002e2769c549ffe640c53fc764ce39450f23d37209523caefcbb7915fbf49d190845005c0e2c6a3dc1"; + version = "0.6.0"; + sha512.run = "f2699dab424d1bff60913864688fe595bba0f0f7c03934486be00102be1df6c9b31bde33173a9bcd0e8fd4b1cac68cf049cbeef3fc143c2262a06b9917696759"; }; mongolian-babel = { revision = 15878; @@ -32787,14 +33181,14 @@ moreenum = { sha512.run = "069ef44faaa8847a07ad00dae31c1b63278d59a560ed90823100cd601850a798f574d8210c07854a8b1a90165efb3bba852e100e53aee496f78395e3d6defade"; }; morefloats = { - revision = 37927; + revision = 73637; shortdesc = "Increase the number of simultaneous LaTeX floats"; stripPrefix = 0; - sha512.doc = "f542aecb6d3868559cee66a7c153dc80cb6aacebae40c0cd0dd120c4230cd358b4d2787286cb3e7bdfb5565949861a35af65ca616369585b8f28462a2b1dbcf6"; - sha512.source = "7f527c20294826a6d7e1c3ff390ca02f521e9b6824db41d078b4132201d1d7575cb43eebda9e66e8226ba2a641db692ae2d1f1ccac5c4f027851b75100e261db"; + sha512.doc = "f31b88209d9c816c37dbb3f8f0f09ffc4c400e549309cfcbf56c84421fa34e4a5a582cbb500a76cd00628b3713a980f2962391d53038500e60cb2bda08750bbe"; + sha512.source = "4c7739f39b933b0c301c2bce9651d0415e7cb4b8c4b4805fece9edb777893e82b3c69844fd9b59249508dc3e26444f56bb0b22862d5f99419758e4608059ad64"; license = [ "lppl13c" ]; - version = "1.0h"; - sha512.run = "28fd471aa854852cc2a48597dda19cadda3c92c589d0419b8d36e044f9c04e406037f162e1d02c1f4b20a6288efe4a689fe4e03aafbfc6b06cf14019f7e880f0"; + version = "1.1a"; + sha512.run = "9ea43da0116605b850c57da9758c1b664c65e9e0a101d4e5265596677f857181759b355aa1fdbd326a1ab7fa9ff3644e4c90811872268f3d7ed9765d59bdf85e"; }; morehype = { revision = 38815; @@ -32875,13 +33269,22 @@ movie15 = { sha512.run = "a45726b24f76683c44b0f006d720695c14ef51a260fa00f3223a075e48173638dbc9d9d361fb4e1f8f567cbe80f65d990aae485b669901a50d5b18750640b103"; }; mp-geom2d = { - revision = 72638; + revision = 74173; shortdesc = "Flat geometry with MetaPost"; stripPrefix = 0; - sha512.doc = "8e2bca493714eef7293b43e08c17b4a1d5adcff247c2eb27a753c5cb01a5002d12649fe40c69db83e39aa7ce3eec4facaa96c89cb4b8b7052f35fbad580f139b"; + sha512.doc = "988a4a8f1e21f6f5017354e9e7e935d2a3af9b831b94cb500b502e0a6621cecb0203643e15c9efbc9266773964b5a6a6c7303c1115edafc5e0d6d7efa3bab310"; license = [ "lppl13c" ]; - version = "1.1"; - sha512.run = "f95b73dd85a6c3dee8eb47bd48d01d271e4329c4468ef14ea6761254300712065e20977ed09cc2dced98af84c1b01a1b12e3ee4629c2e84b8e5190a33f875be0"; + version = "1.2"; + sha512.run = "38e7bf209a49678c1a3e9befc7f2f70dd7e570f5dd8fcdfa81c711dba28086a9937464a5cd2f3cb7c4b744a7182ee6729a1fe054832808523367e04a1bcba270"; +}; +mp-neuralnetwork = { + revision = 73627; + shortdesc = "Drawing artificial neural networks with MetaPost and METAOBJ"; + stripPrefix = 0; + sha512.doc = "d4429f035993678dc00f3b350c95446cb89b85d10c5a16d5018af9bf60b2d958001432c06ab125252f0ea859ebe56dfe54d7a3442709060c9810d6569fa525d8"; + license = [ "lppl13c" ]; + version = "0.1"; + sha512.run = "a05c274e3b23d8b4a4302b9676363aa190f921d0e6f64503f09c8b3183381381ba7fd8e0883442cb2418155aa71f19210a72f99e01187f1d7c8e69d77417d655"; }; mp3d = { revision = 29349; @@ -32920,13 +33323,13 @@ mpattern = { sha512.run = "1efc3f1f1c93456a3038ae5037ad5dcc4b177c57852f7db475a7ce6d2002559b370ba22dcc6d312c68ba75c03523cdf0df8546fff8dab032832d3ff3148b5d65"; }; mpchess = { - revision = 72664; + revision = 73149; shortdesc = "Drawing chess boards and positions with MetaPost"; stripPrefix = 0; - sha512.doc = "1ebb4633b16a3c165648eb413130b51f96e9d8b4743c4ce7f2c0e1aa0c0af84055d426d566bcb2836164bb35b6b5acc8a419a5e4799d4a27539068d0c081fe7e"; + sha512.doc = "35fddb3f0336b3cb3d858c78b00bb1e604b79cffe6668a6eb327bee771955618b917d83cb866810c45573068a6a6b8adedaa4d1b8e023372d6e87ef4244bd2e2"; license = [ "lppl13c" "gpl2Plus" ]; - version = "0.8"; - sha512.run = "2cf36bfc12156811ecf709a821efbe3c5a0a3b3976fca2fa7c2835dd4c73574758f16d4fd53db9a50b379821a2ef565c3419b8a80e6287a798e91643d0ac1d5c"; + version = "0.9"; + sha512.run = "ca2d0551f1bc1d8c8a4e6e93e699742b63e048dc92cabebe24c64efb495a2a8d2a9eed73324d92d8d2e6cc4b807ff99115bf909f4943cd3c575d3b64bc2b3356"; }; mpcolornames = { revision = 23252; @@ -33238,14 +33641,14 @@ multiple-choice = { sha512.run = "975e7ba809ff551faacfeb8c40f0965da34068b4d4d2d0d14d9334996a245682e74ee05a4ef99fab064263c14c0ee4e7fc50372184c2db7ea90572eb9f4beaeb"; }; multirow = { - revision = 58396; + revision = 72833; shortdesc = "Create tabular cells spanning multiple rows"; stripPrefix = 0; - sha512.doc = "c02af3deb73b076662da0f45769dc57a7e11546e225f0df76f1fb163251e070b09203c4434382b7d4c3ad110460d0a1b6b0b384079b4a7cb54d105173fc7c575"; - sha512.source = "0b6880a377534734eec1945b91a8479bbbaccb61c3da5b4986e53ed0d9e0837f88ddc6c1718a36482070a12dfb490c0295123684707ad531213b219f314d2d1d"; + sha512.doc = "f3435790c6eea975dd01114f66afbcbe99774ab40f5f772fdf47e5224f527ea338823f6e3ffd42d73abc01378b91e6d8e40467feb538f49f0311b7f1d307dc3c"; + sha512.source = "dc264415391c4e5412fe2ff6834c03b24fa255360e0b1b5ebfa05082b2d64d3e288b116083fd0480e041d04232587d41eacce877abffbb778e72f3e98916ec17"; license = [ "lppl13c" ]; - version = "2.8"; - sha512.run = "7591c7994fcac6fe351189c1364b448ac8b82e88bdaa50ec87c72123961a1bddfc02b397d5955eb96b9d47b4bcc9b6c1352eab0016b1dec24e034a95c53323fd"; + version = "2.9"; + sha512.run = "f9b987023756805c8c982d42c40a1f77211364c3591b0ce521c9538e959d3171ea97b1549136d3b1aa28504940531d8996bad655074d3ed058d34d40776b0397"; }; multitoc = { revision = 71520; @@ -33477,7 +33880,7 @@ nag = { sha512.run = "a2d239ed1e12fd1b082c8df5531c9b83cf55c39b13781aa01848f3fd06136a9522598abf9e63580a93fb12ad7c392061b14d5e96b4d4f4dcf8180180280224a0"; }; naive-ebnf = { - revision = 72652; + revision = 72843; shortdesc = "EBNF in plain text"; stripPrefix = 0; deps = [ @@ -33485,21 +33888,21 @@ naive-ebnf = { "l3kernel" "pgfopts" ]; - sha512.doc = "b016db38503a2a2f3027d8f04c8bc770ab60b2d7c0619d2e6c6b4fdfdf873dfb4aea349e95a0981fa769e5548a50753dddb1ac7c217b2f72eb2a0600244d1a24"; - sha512.source = "f963b574de1715a3876b93dc2a6ab7eb48e55efddacc7e936bac39cbf49af7b15e6a6868219d3da902269afa04e4270ee3c2e86bb25db24eba62b273caeac8fd"; + sha512.doc = "06f8b69dc76f7c497b9c0647c966997c4c9724913882e20b3d6df4092df1423f57d4fbd90089c07a59b0bbc0bd2b3e5806e53e64e85ed11dba2eb575fed6561e"; + sha512.source = "a67d51de98cb2ea920812f304b507d9c4304013eb69e012da779e469f1d44394b1d9bde1fb0cc5f2191634ea1fb7f8c93712b7e6371b1bf91d485c8732b5679e"; license = [ "mit" ]; - version = "0.0.17"; - sha512.run = "f6db6ed77dae32af24648b836c121a46f24e4c60c7aaed6cb3774620be337979c54c5cb4825b0d775fc6fc01450a3345d132cee94f8f4fc4882f39c26b1e7a68"; + version = "0.0.18"; + sha512.run = "d4765a03de5504bcb32a24d34dae7b5f7c517add2c519ad90b3f7bbd5446c8776940b5a18195fffecf35bde29cff12fcd16dff76a6b0e1807ca3270d139e8278"; }; nameauth = { - revision = 69758; + revision = 73749; shortdesc = "Name authority mechanism for consistency in body text and index"; stripPrefix = 0; - sha512.doc = "f8d9f727c25cf50b31d28a3e4a53a7694c5462997f60060e7a2db15e38b14554df00f5afcc3675c5b6bbab477a11f499e79e7a98988b7bc0ef0146a43da5c239"; - sha512.source = "73615d907733c3252cae3e861a531fc57dc15b2b2ac0149b976f0a192d75c4463fdbed60cd25a19231b5e10e1d017d1e1ce27a4006488ed02ad2dd185e693342"; + sha512.doc = "b03f9b510615a4e2fdf5b881bda0a385206bfc825b7239a1084c1d74628a951c9887ed4d9e045d1d325d1f777deece244d824772de509c336fb860187c8b3f19"; + sha512.source = "3791aa4a650040354aff96a6c222d303c7d96a1ff7d03871fdbe45c0b0c9d0647bda10d3bf318ca4c8ddf2cdf5c273b600e9b14f2ff17ae5f99faa1377590544"; license = [ "lppl13c" ]; - version = "4.0"; - sha512.run = "2b27daa9547563ba455b9b3722c8726c1ea5c71d1c4976857add784efd95202cbdd2ed631096e85a0408deefa8e43c95dbb8ad7c0b6f1ef3da1f8476737c341f"; + version = "4.1"; + sha512.run = "813eba30d6a51ec3e14979fe931eb7d70679cd2cc71c1a36708f566b1a34a5925ee506bafce13e955bc317a737a42c33e465edc6afa6f9a804e8a88280bef61a"; }; namedef = { revision = 55881; @@ -33692,6 +34095,15 @@ needspace = { version = "1.3d"; sha512.run = "663b2ffe30b1d9a588183916ccb0e3fecf3098d3e67f2a40fc49e1db1e5c1a892bfb56eb177bccd923415dfe51d4a225e2017be3b2f3f7185071836cb2e04391"; }; +neoschool = { + revision = 73374; + shortdesc = "LaTeX class for teachers"; + stripPrefix = 0; + sha512.doc = "d0ebc1ab4e65626015434bd0c008ec3db282acf2d0d5ca553f6cddbbdfa772d2521c6ecca0d36f1c09297655b8ea3f40027372f0b988a87635a37a515bc25180"; + license = [ "lppl13c" ]; + version = "1.0.0"; + sha512.run = "39ebe7ace41769dee450c01edeae1b7a8a065d0bf13fe9e431a288da2ed516aa4412ac90225d13fb2425ebcfc5e8ef9fb6084319c99e78cdffafc76813db1838"; +}; nestquot = { revision = 27323; shortdesc = "Alternate quotes between double and single with nesting"; @@ -33736,13 +34148,13 @@ newcommand = { version = "2.0"; }; newcomputermodern = { - revision = 72225; + revision = 73535; shortdesc = "Computer Modern fonts including matching non-latin alphabets"; stripPrefix = 0; - sha512.doc = "93d506c5e71620a26c949af0ad08362343aec19a3d78d81c848d04d5dbc0b30f7ded405890da14aaf38878a36b255544c6d6aacee052db77be3e38166ec18eb2"; + sha512.doc = "aa99f90b743f0ce70c2795c9dfb7ac94fa5e254bb8559ee191dfbc03af69b239cb6a68f4c6707eb2e8f3016a10228689dfc86fc6e6100cb242c04600ac9532d6"; license = [ "gfl" ]; - version = "6.0.0"; - sha512.run = "04ad83bf9ab93abbb6eb9fd6d6ecad166b35c846f113a80c7e0dca2abe35b45c8b408e8d7cb75bcf2d43e3702dde617f5b4b17916e0fb50eb458c61c66f10b5e"; + version = "7.0.1"; + sha512.run = "64362b90ded39ec337613724979e46d13315baf4fef77875259d004c7f675d4fcc37771a181f8219b13b286463dd4a1d48e3dc95d6d5dfc7f036200a0a2f9103"; }; newenviron = { revision = 29331; @@ -33794,17 +34206,17 @@ newpax = { sha512.run = "88888718c7ddd02cd3fa3286ee63d7d527d836f0df15250d9ddde12be475275bd7517f4a0562f30d738d4a007d61c4a417a7f03c8fb628b3fc981e7a6f643ba0"; }; newpx = { - revision = 69792; + revision = 73890; shortdesc = "Alternative uses of the PX fonts, with improved metrics"; stripPrefix = 0; fontMaps = [ "Map newpx.map" ]; - sha512.doc = "cb36134e0c83fdaf46e1fc8c729886489666432c4515b636e260471466a9e11471044221e8089a5f614b45799e827a7c6854cad5aaa903522dbd3259c084527a"; - sha512.source = "5c7891ad23116e78142ad6c5a8679bec069e964ac3201e162eab24f16ed2b226ca9515c7cf95c82ee6b89b2c3ada3b2fd51a2c62228729431d0d64cd14aafceb"; + sha512.doc = "2cef5d9e3b446c9ec8b4a778f49d8c8edb8c6874363a79b8f4d5b748989a59b585f1ca5abcafd5220374ae98459808da3bfaed376da8dd94575ce6431d345930"; + sha512.source = "cfd75caca3946ccc9160081a48625fa47764c52367d04891aec7488651872ef1817fe6c8697c88b41dc8b8e7381d5f37e26391d6441cf491fe947fff7b6461fc"; license = [ "lppl13c" "gfl" ]; - version = "1.536"; - sha512.run = "7023670ddda48854ab02918914ed1d9e4e3cb8eaf4b05bb1bec78661e506915e601f508760032d2a4e7ecffb2fea892ef9b1665e8f3a879cf1f7ad9ffc04b874"; + version = "1.541"; + sha512.run = "5f1c0f5b3b7912bbc2d7d60496ccfe4b35a56000019687b5b553ad11918114567d48556643a079244a497aa90fbac8b3465d92a5e9bba9d5d1d175f3e55968e9"; }; newsletr = { revision = 15878; @@ -33825,7 +34237,7 @@ newspaper = { sha512.run = "227fd249bba9deea4f191c59060c49d2d1cb8e367bb3007d3b123c17dd4328206962946ce3f637c8e6ae079a9c95244ce9027b0c9f83e0901801dde066a0405a"; }; newtx = { - revision = 72368; + revision = 73393; shortdesc = "Alternative uses of the TX fonts, with improved metrics"; stripPrefix = 0; deps = [ @@ -33834,10 +34246,10 @@ newtx = { fontMaps = [ "Map newtx.map" ]; - sha512.doc = "8b460454e35703c88f56134fd377ace2980f0ca5df9068450bb6352f30d93c14009b757c1e25745dd11ae2e525be2d7bc122bdb481c177852f7c3b60d658168e"; + sha512.doc = "84f5dacf0357abd9e2b98538608fd6430eff2fd51fae2bbb497277e3fe9c6c86b72ff347bc3d82c61a560b942692fe523c77b4615d7b55ad44fcb56b9b0a0a4d"; license = [ "lppl13c" ]; - version = "1.754"; - sha512.run = "8067a2718561b47a376668124693485bee17ab10a884fe4b38693cf7cd542c890025261f2ee63a3d8193ae5a338f04704b4224af350cd484e3f41004ee24e6f9"; + version = "1.756"; + sha512.run = "c506b1f9320d1a377f3c84f2a56dca250e76037eea57e188dc5477c5197b2a16c25cb0c265b985ae423365d8fd87caec9897ad41bb8cae0b568c0d5dc80cb173"; }; newtxsf = { revision = 69597; @@ -33943,14 +34355,14 @@ niceframe-type1 = { sha512.run = "58f4595ad99b3d3558cb3d16afd4e76b9f9ccb736377997befe22f8ec30a0f0ad9364261c2db984a488da477c1727c2e872eb2126a62254830df2470cc9f0932"; }; nicematrix = { - revision = 72644; + revision = 74466; shortdesc = "Improve the typesetting of mathematical matrices with PGF"; stripPrefix = 0; - sha512.doc = "d50025e3406ffd3cfb439cd501f19e0b8f0eba78c4477ff9242d8b405e0c085dc19da5ebab73dc27484637c6e3f250f81f70d61c685adb468a7051ecbfb7c97b"; - sha512.source = "b1457c4a2eb16b349094054887427fb54cd9e10d5102a2bbd52f1d5aa81c0a254cd9b649e26a2a2c15402457d4314f269d35149cde90369fcb9fc6cc02a951f5"; + sha512.doc = "fb526656ed94e62024d6e580c860ae442be02c9729b75b0cadfb163bc41ed3bd75e67ca8c3761ca87082f76e85f524d0b4cbfe33ade60182118a648988b10e99"; + sha512.source = "52ddac01711630b973ab12217ce2f0453f893e6aa78f8ee37fee76b8970e64321c704a7fda4a41c02dc0081c9058ca1f97b2d8ad582e7b48d6fbd4cf53fd7d10"; license = [ "lppl13c" ]; - version = "6.29"; - sha512.run = "51a8f7f58af64b2bb8707d29ddfe9d4fa041cd633c46a8f7eaaf8c3f620692216f700a553040264042d063898922fac6c62046d6c85f9920fe94470d1edca0ec"; + version = "7.1a"; + sha512.run = "791804f4987c55b5414410fb4312ef24c0b1b28861b9a89dab0ec3ba86a2690684379ea13db7e2b973b12b49ce92a7217e04bb9d021754912964ad3c217d2d7e"; }; nicetext = { revision = 38914; @@ -33988,7 +34400,7 @@ nihbiosketch = { sha512.run = "ce64ef60a007e8a955dd48f9f9f748a738aa57829116f060b3fe353308244db0a2c1d56d139e2b1cc1a6ee4f243eb7ea2339a2c927966d7418e6b553600b9e53"; }; nimbus15 = { - revision = 58839; + revision = 72894; shortdesc = "Support files for Nimbus 2015 Core fonts"; stripPrefix = 0; deps = [ @@ -33997,10 +34409,10 @@ nimbus15 = { fontMaps = [ "Map nimbus15.map" ]; - sha512.doc = "8fb9ece6ca17549572a0d79a541397c6545dc01ac0422a5270314bba1cb83b1451fb0f56e34f449cc3d3de326e063e4ea1f2ea03a0fbda7342e9d0a101fb5ed1"; + sha512.doc = "28dc0788816c0db4e0a902c024c54c4131279a9dbf19a9753917b515b774d8092fbaabfe917eefe9f87730dca81d30298e2b72defe73cf795de2454f491502fd"; license = [ "free" "lppl13c" ]; - version = "1.014"; - sha512.run = "9e39f92dea1fa293d6249d16877dd6b2d990d1d48cfd31f4ac1d66233b97ff178d2b70f428978a084fc9a50b9dd994adb6a8ad29375e54f5d5ccf6ca7ed62f64"; + version = "1.015"; + sha512.run = "128f36e310f3785b2f66e9d56bfca840548c8e5636ea97f97c95940e4f1e797e981fc1ab74fcaa91e7a29f7b66621661adc21193707fecdef3a0da9cd78d7b24"; }; nimsticks = { revision = 64118; @@ -34042,14 +34454,14 @@ njustthesis = { sha512.run = "829c4af6651ce3119dcfb0f6975289bc6cc4a8a7dee4a382ec8f63c1b876cd972452b766ed13e6aec1fb4d4613255a9ef206f1b7d8c03207c00a52876f22533c"; }; njuthesis = { - revision = 71034; + revision = 73206; shortdesc = "LaTeX thesis template for Nanjing University"; stripPrefix = 0; - sha512.doc = "cf0fe2a90196483cf64477631ab7d993a0f2d40185f7d45a32a94f6dd864a08c945d12bd3b1b950826e6716819623109ddf32eea680b0facaddb45ad76ea9fa5"; - sha512.source = "b52498d550a95ce8010f0227ed24b81dc9b98bccbb7e5d6e5b778e6325ee2ebbe1b773c93213d0506219c2951a40abd4f9aaceefe3be3f51a36765d85020fced"; + sha512.doc = "bf5b2de170ff7c649a35e6c8acb815664504c61fa8ecc6931b019b41e96f508df650d267e1d79e2d16b6b579ad62949d1f4811e1b2b34649900ac95eb07b6472"; + sha512.source = "69e6d7693287f5b7e6ba53c2e477a4cf52358e242899d468baa826f55a6742ef261d7e9a92d06e808025d31093d88e2168cf30828a29df3810f3997cebe08d86"; license = [ "lppl13c" ]; - version = "1.4.1"; - sha512.run = "64cd94fc6aef77d8bf2320ca9a37e69663fade50c970f203943001e89f997b8782f7d5c6eb60b990e5a026f731049d8e3c7f5714aefc49b798e7dfe323a704a0"; + version = "1.4.2"; + sha512.run = "856b650b8e15e51e791bd3f03d2fac26e9192f9f1fa858a4435278702719b49af53ef9fc5e73981df0f9b050b9fe58d0f7f58afb7cecd6a18e5bea299ad02eee"; }; njuvisual = { revision = 65261; @@ -34081,13 +34493,13 @@ nl-interval = { sha512.run = "486597624d640ccd13b4cf4e913b5735b0f2a36910f563b87c6ebc6f38e2ad8df99591fe8dfcb503750eb6a98204ded9bc80d3cc0f8e2441257d6f9bd2167cb9"; }; nlctdoc = { - revision = 68448; + revision = 74447; shortdesc = "Package documentation class"; stripPrefix = 0; - sha512.doc = "e887bbbc705456c084c26b1bd02677a185e7c7ac615b9711821233e6ee3a62de91c4cfdd3bbc353b0775b9fb99dc42e3447d7ef51492f4abf0c519ff1af42af6"; + sha512.doc = "d353ae4dce20b3a94306ac1f428b661702765f29f81973a116ba651750307a771307c4f09b9b7c7c7f66995fd57a38fdc723fc117a1a807d1c7a2573ffbf26df"; license = [ "lppl13c" ]; - version = "1.10"; - sha512.run = "ef7f443bab4a6608b506ff65bd885965c23607aa5a93a721a021e741eb85a757de021eec7b8b247c9b5a41cad3f3f06a90ce44c143bfbe6ab79ec253eba06264"; + version = "1.13"; + sha512.run = "2017c6977308ecf9b8c54d59dba275f12352e7e6e970e1e529335fe040fc43c58421699a2af9d9f42015b8853fd3f3aea9ee88d3a54f7cf533fcf331bc9d6a70"; }; nmbib = { revision = 71138; @@ -34128,6 +34540,15 @@ noconflict = { version = "1.0"; sha512.run = "660ea2bc008866130d0955eabecf0afa1e21ce38fcaa0ff0d4364ebc32ea8af6a2ba57c80b340f824b14f0488d2b40e5c7ddcf663e37d6170a7ac0aa740ca260"; }; +nodepthtext = { + revision = 73069; + shortdesc = "Change small texts to remove the depth of the letters"; + stripPrefix = 0; + sha512.doc = "0fc68ff9f2251995d9c1268db372ec2c286260a260522899b39d4e9ed3f6a4e6e0c342fab948035e541359a2bee080f2e922bc1c25aa9bcfe36e7c0be594542a"; + license = [ "lppl13c" ]; + version = "0.1.0"; + sha512.run = "86cbdff9947255bbafa6831ff4051442af519c8edcbe6f36b6770395d7d10c77227b0f049a5dd0a263797776dbd514bbb4af635ba14afd7ea54c1b0f7480cb6a"; +}; nodetree = { revision = 72318; shortdesc = "Visualize node lists in a tree view"; @@ -34258,13 +34679,14 @@ nostarch = { sha512.run = "3646dcc196a2b0fc4389d8c7ddbce263126ec88f33749e7b290bdd5ef1800cc8142c35fd87635c7df2b0768c3be03a25bf4e3b84162119c859f278d70bfd4fa4"; }; notebeamer = { - revision = 72554; + revision = 74397; shortdesc = "A template for printing presentations on notepaper"; stripPrefix = 0; - sha512.doc = "f034c6a838fe25c237d0443c707dd8fef11503eede19b99dfc3367f945214f5d4f739f240023676829839654c66ba102c83c343194e205457d2975d97558b046"; + sha512.doc = "03516f7fabacbe45c9a2619d484a31e49b5801198ff18bfbaac0380bea0e1042ff29a34d55669dfb031b3a804923cff4b1a40530ffc107d87523fbc8e2d7fdcc"; + sha512.source = "65a0dff34b85a2044bcd6d90663e05590d2744db26476bd459b87fd68d1788bde06879c8245d61f0a6816fc54ca0882d98a7dee4babf77cfb010b1c174a43830"; license = [ "lppl13c" ]; - version = "4.0A"; - sha512.run = "0c17e017cdf6856ebb2aca7ea010635e0b6d94051bd0b781a25cc00fbc71b87fbb89ee05ead383e1293a9b6c50439fecfd0b528d46382090be86a80c5cf2d24a"; + version = "4.1C"; + sha512.run = "fd2fb93abeeeb44d01da559a03353fc5ede1a40677b2ba9b3efb32e4d705c83da29947e10b282ed211b254a862156080f32e5ca2d0d5dec970e2879f51d39775"; }; notes = { revision = 42428; @@ -34390,6 +34812,16 @@ nrc = { version = "2.01a"; sha512.run = "2d93fc25d0305b8bee0e5e9ae61bba492bc265e023980a411ffa521f15746c6d73940e352c886ed5dbe08502f472a63559191aea44c3801518bca8b28d0b753a"; }; +nstc-proposal = { + revision = 72795; + shortdesc = "LaTeX classes for preparing grant proposals to National Science and Technology Council, Taiwan"; + stripPrefix = 0; + sha512.doc = "e4e2ec263e0da1e71c0964ec95fd0211cf2c414bf298a40b3cfbef0778fce64cb385769f00291551fd1ab94d88b436d526bedf5aeda33d291bd38b7f29e17f51"; + sha512.source = "e124b7bc357ea3b21b13525a19ac6807927475600d439462879976dfa785ca9f71ed5f0b700e0895c07d216d9dc4bb0bdb3b2545c15e7fc0ce40584d1ebcfeb4"; + license = [ "lppl13c" ]; + version = "1.0"; + sha512.run = "55dd03fcdf0f3bca7144aba6b9e172cae1c976e3d80867014a071d7a00b6710aed4d027834ab6305d45293ddf2dd32697006a3ffe15b5196a1636f17ff4991d7"; +}; ntgclass = { revision = 65522; shortdesc = "\"European\" versions of standard classes"; @@ -34491,13 +34923,13 @@ numerica-plus = { sha512.run = "803e50eefdeedbfdf610f4084eb8574246a3f0c56e647a1105df410254fe7d965faadb397690aa8df08e488c5462af2404293f7deae6f8ae5810bb34488f29fb"; }; numerica-tables = { - revision = 68193; + revision = 72911; shortdesc = "Create multi-column tables of mathematical functions"; stripPrefix = 0; - sha512.doc = "f926645cf5f512dc655e46f6fdeb54b5c12050d66e9408690e0980843a291d2056a51915a44f2fbef6564f85344eea46ecbbf1859d79443952e989e6b8ad5e07"; + sha512.doc = "0f44cddd04deb73cfc6e72ccec519150c18c29d6987185b423891a5d06f0a0e23238d892792758ba7aa5a5b33da776d0c0dc6964230a4c372dd86c889d7a554d"; license = [ "lppl13c" ]; - version = "3.1.0"; - sha512.run = "1244ae95394a7e28ff9281d1eb4f81de88a7e83e7dc880ad6c185591b2aeb3fb826113f83881811e19385aad5dceecb79d99fcab53f6d313b63b31235228643a"; + version = "3.2.0"; + sha512.run = "73378f81a8fca500d568d9efc9b713a8a29d1f1fd5ba2ca9f65dd00f89773f79ced7f4a3dda4bba298226526afa0d52162bdde6028a8eb2f17ca821f6a462973"; }; numericplots = { revision = 31729; @@ -34838,6 +35270,16 @@ omegaware.binfiles = [ "wopl2ofm" "wovf2ovp" ]; +omgtudoc-asoiu = { + revision = 74196; + shortdesc = "A class for documents of the ASOIU department at Omsk State Technical University"; + stripPrefix = 0; + sha512.doc = "349fdccd6d445d22d887e9e0840c4bc0934115a57c14093283d10b63b1bb8c3564647406d7d54890f1afb5468b1e325524b6debac7aa721c0dd402b327996dba"; + sha512.source = "48832dcfdefcf003965186bd73cfd7898a2b3e4847e2faaff7fea0390e8722fe9da999f9c0b2495ebb1a5be0c876059a410da3faa29664c32f6663d46aa49b21"; + license = [ "lppl13c" ]; + version = "1.1b"; + sha512.run = "27ea0069ba8f9761b0472aa5324e43e01712e7f7a5042df4f324137a5d2982ce7a15b6e12e47ec84c75d05c72329d060c3c8f9315b35d33e7c802390f39bed83"; +}; onedown = { revision = 69067; shortdesc = "Typeset Bridge Diagrams"; @@ -34926,7 +35368,7 @@ opteng = { sha512.run = "1af8edfbde5ac2abae770765a437bb42d5852877438d283d8021493c621e94d09bd62d9012556024ddecbeaddd838b37ae9abd0486d73e2698956ef49ab585e9"; }; optex = { - revision = 71642; + revision = 74490; shortdesc = "LuaTeX format based on Plain TeX and OPmac"; deps = [ "amsfonts" @@ -34948,11 +35390,11 @@ optex = { fmttriggers = [ "amsfonts" "cm" "ec" "hyphen-base" "lm" "rsfs" "unicode-data" ]; } ]; - sha512.doc = "f96fa42f25ec4dd7c6e39a8a41feded2350cecccb0869809f43d865fb6537e17d1401728256767a31824ee9803ed4ac1d3bb23d9428959cff129f168598de466"; + sha512.doc = "4f47e048849ca8c43f6401ffdbc99d3a1dc5d57fddc0f8a566829be0b03d4219976242fd47355d8bd2e1612937f05fdfb7e298488cc0e3e88e321efa2a89b2d7"; hasManpages = true; license = [ "publicDomain" ]; - version = "1.15"; - sha512.run = "8a9dd87cddc97a8f25eda3419c17cb6f6dc962ea120d3717e7491e81c83f002bda2ad19b2fb63a01fdc5e70cccf5117fa386241ef67dbba991738d09add7e769"; + version = "1.17"; + sha512.run = "9dd7f877fa7051b0a581f73b78b79315b5455074823d012eca7dfe767336bfe642a8b4ceb0d96885932ee4c5eab8841df2cfad1f2eae61e43d30c6503dfde6cb"; }; optex.binfiles = [ "optex" @@ -35042,16 +35484,6 @@ oscola = { version = "1.7"; sha512.run = "831e450ea6fa77f521eca76aaf281a0f7425e28d889c7bc919cd04c52a78c3a0665abf011ec4ef722f47e737c1dfb48f8aac231aa3f370d594cf5300d84c2456"; }; -osda = { - revision = 71147; - shortdesc = "Commands for Proceedings of the Workshop on Open-Source Design Automation"; - stripPrefix = 0; - sha512.doc = "055d31d2873d1bf3493d64476e6521b4c98a7e36d081743ef692f7cd571de33a4ed791550ac93b4466630078d22ea0ed3b883acfa504a1f2c8a77d5fff730bec"; - sha512.source = "b418ba437b5d90c16a84c8e09da63f1fb5f5ab2838aea80fc816b24f5db289277928e38b60970fca27dad3df3cb34fc18fe713e326f40af6e070f032027095b9"; - license = [ "lppl13c" "unfree" ]; - version = "1.4.0"; - sha512.run = "d7cfd315d963f0e5889265a03278de20b0510e8ea957d0de3b5a986d796506a4474011d8169b0b12410f42c759a854be2077ec0830d9c5157917498dc99706c8"; -}; oststud = { revision = 67217; shortdesc = "Templates for the student organization at OST FH, Switzerland"; @@ -35133,13 +35565,13 @@ outerhbox = { sha512.run = "954af6a75833dc388c430faf538415457d0526b85060602b93584a45e6b0ff9bb83ab1d2117ef58817f08b138146873ff74ab045f174e949a0c9fb9f042b1121"; }; outilsgeomtikz = { - revision = 72145; + revision = 73069; shortdesc = "Some geometric tools, with TikZ"; stripPrefix = 0; - sha512.doc = "22cecda0c351b825e3c763075277c58df35f0b7a218e8c2d35b2cfc940c3fccbcefaa7dcecdd584278c6b7d5c512ceb009eedc59f4e8d836266541d7bfe2b22f"; + sha512.doc = "666953b9f3b7fb12e465ac2ea80f8ce3bf796a76ac8e408a771882f7a1ecabba8d2e0af66f2effdf1776c5a3f7cfb75174c9d913d5d233d2ad14218770c63b77"; license = [ "lppl13c" ]; version = "0.1.6"; - sha512.run = "88b010ee1ee7807602d80f043e8f2199be63b25a518205b0092b24912d5c5242b7c7539be19b1b69ad1890218bdb1afeb06759c83459aede19dd5e9a4093b7c8"; + sha512.run = "49df5e78ff0f6f44c6900f33f8e39d120fb23d04e460dbb37e08f6eb960f447b04ead79bfd9b3ddffde9d6c1aaffe5b4b53df629c73e3de496183f136545de86"; }; outline = { revision = 18360; @@ -35177,15 +35609,28 @@ outlining = { version = "0.1"; sha512.run = "0d2b7dbe710d1ccd54a70cfbf6464a3ee5ad0fab8ccfa61306d5d5d83252c0f3b64f1caba6b5e8e75f7e6237fdfc675981acb67fbb730282978071e76e92ee40"; }; +outoruby = { + revision = 74395; + shortdesc = "Ruby with line break support for Japanese text"; + stripPrefix = 0; + deps = [ + "pxrubrica" + ]; + sha512.doc = "884a55f79c9f776d38fcf7a34b383b33c375bf8187c5f00326b9591cc4b0b45c37509ae313ddf2e392c621597d7ff11a5804154d7061d8a8aa7eb58d5a717d85"; + sha512.source = "491dab24d748750766d858a18c2f3f77d409b42746f01055460fc5d87ceaed04eb06afed43defe73ceaf83942813f38e69bba8ec7204d3d91a2119e167ff0227"; + license = [ "gpl3Only" ]; + version = "0.0.0"; + sha512.run = "69472ea1d1b8ef8f33e5502b63d419393ff8e114ce3d04eb876295e1de6026eb8689bbd9da8e9d67d4d315bccb92b7dc6ba6a5996a740df65383240525cf4204"; +}; overarrows = { - revision = 71774; + revision = 73702; shortdesc = "Custom extensible arrows over math expressions"; stripPrefix = 0; - sha512.doc = "3a0a5401c39078ea324e5c43c7db1c85f2d8b39d7d9c03fa2ddcb1a76d8ecb16057011ad46896d25633fdebc964aab4f0574560e77b18e9c202d76117fa140ba"; - sha512.source = "93c4bc3ed1a62690ae035b36309b2800aa28f220e54f6ca5f56ec302d5c82f862e36f6ff9fac9d42a801f653f34a57e895ea20f595a76139d91bccf7744afd70"; + sha512.doc = "026f6dc28b5eba6fb8be069b381f3f131faf7dd019d8050457d8c6d3ba6ddb01225eef8e50dea527ee7303d571b1f04cf40e6c47aafc7faee36ef5756adfe6b4"; + sha512.source = "fa40b69df895f7d4fd92ea2892056e54c91839c2f6c74415f2467025868dc98e2c435d322c09f758a9fd55e2934a4187c615bc6f2877f6782c2c90908aeabee9"; license = [ "lppl13c" ]; - version = "1.2"; - sha512.run = "71c85e5d0058702ce49e3a7f03002a14732d8831055986f6bedc3acdcd4341c8e5fc22954e22cefc2835b74828986eb6058bb97be0d2e256f549fad14bcfb3f0"; + version = "1.3"; + sha512.run = "e1b6d3743b7ae746b470d1a457baedd3258f4f4acdad7c4340f18bb9174e7cc236718960af98b50990b92e637ec8a32f8e126cbeca8a55e5b743d8b00e5f7c54"; }; overlays = { revision = 57866; @@ -35226,14 +35671,28 @@ pacioli = { license = [ "lppl13c" ]; sha512.run = "a82b391630b5f572d8ded331ae98f480fb0cf7f3eaefdcab3100bc839e2b026f012320e334e82d04e01a27657f36927a4d1570086899ad637f8c47ddd0f22b2f"; }; -padauk = { - revision = 42617; - shortdesc = "A high-quality TrueType font that supports the many diverse languages that use the Myanmar script"; +packdoc = { + revision = 73661; + shortdesc = "Document LaTeX packages in a consistent way"; stripPrefix = 0; - sha512.doc = "ffa9d45c971b7fe4fbc55644be4093268f842e13a2ffb1713be401cc88934dae86f012741951f30580a94a57f35b85cac9525869e0abca5601278d48a19782c0"; - license = [ "ofl" ]; - version = "3.002"; - sha512.run = "fec57c3e7bd299671ae8d6489723a4d33c54b11223f5f37f3f3b3cc148fcbb6d9a9aa46587ab83e414221cde3a7d0e4493877d90e9536952d9069a4cec7c758f"; + deps = [ + "enumitem" + "etoolbox" + "geometry" + "hyperref" + "marginnote" + "minted" + "nowidow" + "pgfopts" + "ragged2e" + "snaptodo" + "tcolorbox" + "tools" + ]; + sha512.doc = "389ed91ebf377791f7d56f43c58d2c362c57bcb131b36ed366d8c578c9f64827dc069dbcc4b7a480a16cf9947cd05539bc7757f8ef99c0e7364755d38baa5b29"; + license = [ "lppl13c" ]; + version = "0.1"; + sha512.run = "10864671337fd6a2a9a5b364bd6f6f18586a30f99d539b73e727d9fe7e3a3246e9c9ccea5ab7f5887bddd987fd9ab3d95dd7fd92b1e508ba45817b147c42c17d"; }; padcount = { revision = 47621; @@ -35246,14 +35705,14 @@ padcount = { sha512.run = "9378dbaa1d3a569a3cb4bd70fa1b5a6dcdb0fe089d3a2c3eecef4cfdb776607f42b7fb018461c00781f8b022dd962e790146297f5df29889db13794e25c1cbb0"; }; pagecolor = { - revision = 66885; + revision = 73636; shortdesc = "Interrogate page color"; stripPrefix = 0; - sha512.doc = "ff3cad39418f1a6a1b4e31788d79eb83d33cf7d04fcc8f5ad4703b60db1a581ab2de158f0b4d24d42c13fd2ddd6c85ad4eb3f9f4db09927ee2c97eb7d4e4a063"; - sha512.source = "4fa8f8d617bf8cb1d8a2399ddc88ee37778f1a7de904385351fdad3c4267c1d27e8b6157a206ee0b434991da0a508c42afd71fcc4cea81477e44849c15f81384"; + sha512.doc = "b47938c8ea0250ab39a731956756c481645f48d22b3236f743a38c70a86c892079376be1a5d40e2d1a85c13f9b71f85fc1a02d8206cc1aa7ff134e87b7a50e1b"; + sha512.source = "dbb2444d545ac42c69ec64bf5e54b184e657faf8c2d86d255f91da61c99242075e528d55339867bfb73dfebcbeb6a57e7632aa360ad763dce95d154eda25bb2b"; license = [ "lppl13c" ]; - version = "1.2c"; - sha512.run = "7cd71dac6790eaf48afb107310961bbe37f04199b70316009f6e62c064c23f0bc7e4601765fdc03c98b1a39c35f9f53a7b83023e5f29ec0a273d7130b13802e2"; + version = "1.2d"; + sha512.run = "f300b2c0a56e48427f0291e63c3aecdc96fcf8b01438d9b5b97aaea33364515549e4478b41c3527a977db81002ad0a7bbe6718fe2a54acf9a18688f173a7a41c"; }; pagecont = { revision = 15878; @@ -35327,14 +35786,14 @@ pagesel = { sha512.run = "c07cd3b48fd5cd59ca685b1ae39da7e7d8774348241c26d29a74b41ee6c29fdae0c01a47a79aa669cf6651b0b83a5b79f8424c139c17db5bca20d30186e5b655"; }; pageslts = { - revision = 39164; + revision = 73400; shortdesc = "Variants of last page labels"; stripPrefix = 0; - sha512.doc = "58fe6250af4ecdd6d62c231778c89e0b049995feface3af66dc73b920f4dcdca8838d3274a7648caf2b38746fbdaaddd1b4f87577c77dabad2096e9c8b681619"; - sha512.source = "99db221ae4c7795ca4093b7708aac14fededf3c55aaf314433602906d8b0f3d9c074fc0b8cc6807474e81e510f35bca486db3aa525e95a5486c7ff379cdd5e18"; + sha512.doc = "f674d0e0f3b9f8260443c6341829940cab00c72c56765fae23b3c541f1851a5744bbc88275784c9a6921ca548860a52990e4237abe3ea00f184ec2b7ccf81b70"; + sha512.source = "e7f2df5c7282db73bd99b45261beef79e28688564e2d20ca4400444e76c55d022aea32903a6259b064a459e9688f01d3117815c54cfc516c20c6192f4e46bd8a"; license = [ "lppl13c" ]; - version = "1.2f"; - sha512.run = "7db146bce45ee5ceeec5904e8f3ed6efe0010885b657b0f74546644c3ce2a018deafa95a11390da3d8a62eef16508b82c3efa9d02ac1662cbed18e905cf869b5"; + version = "2.0d"; + sha512.run = "b6047cbe4f5020163be4a3de82e79a7e76d8fc09e2860cb97544d05229985bc835ce10740c44a049a0c0cbcef1bd9e097e3b87285383b23ef5d31ab173e6d35f"; }; palatino = { revision = 61719; @@ -35368,13 +35827,13 @@ pangram = { sha512.run = "1a74fb3bb7d1a4c9dfdb594bcbfef7b716affa55bbc7010fed6937708f9ca0d9f644c2d56a557737b56c1b8386de90a4b4df699aa50631c1e94f1e4e3c9d3465"; }; panneauxroute = { - revision = 72287; + revision = 73069; shortdesc = "Commands to display French road signs (vector graphics)"; stripPrefix = 0; - sha512.doc = "50bc39e648f39069295a5285d8a6b4be5797546fba5ad083cfe737922bb8ff9fc289b6c79f4db4e34d4001ee242919c5b1062f5aa15f4eb099ec2e6e0e807287"; + sha512.doc = "9eb130720e99f6c2baaef38420b577165787759d1db04a4ef73a2865d8f7593005468506d0fee0297d98a51cf7cafad157f4ac2942d6953e69c5970484a71c01"; license = [ "lppl13c" "cc-by-sa-30" ]; version = "0.1.2"; - sha512.run = "0b478c44335bd93b28ed3930c65a129cb771cdfd6140d6e2aa3eded1d4e0506439eeba7be95f90f6db90c870b7c4e707e41b09ef290bf023594fa96c9e061d63"; + sha512.run = "d9c866e17a24e66f1b30cb0bc0da35c54a60918aec4bb615494734b955ca001a57b8bd330c67edaccab2ebc91b5a36576122c781a9545615a4bb663855888778"; }; paper = { revision = 34521; @@ -35416,13 +35875,13 @@ papertex = { sha512.run = "489718b18bff9055917d9aa1329c34218282c2dec743c4a136625b6c39dc5102bc85d7da6dfb5e2b6a0f4bfe5a8fe27341ba9c7cd205cb8435ed3bc81a7a5c1c"; }; papiergurvan = { - revision = 68239; + revision = 73069; shortdesc = "Commands to work with Gurvan Paper"; stripPrefix = 0; - sha512.doc = "c9b4f46772ca50c8ca89d7d3d35719d8b2a7dd7ffc9d09a39569500047640404d1d3937ebbd4b3380a4e13cf56fc2f722d444f71afe464df332a69dfcc6049e0"; + sha512.doc = "93d6fd9ece5e4cca06310081675912a3eeab66447819d6526f0b65958246bb6aed1e70deb12ad4f6eae118b1d5517b3b54a521e601c050e8991b0c375eb283a6"; license = [ "lppl13c" ]; version = "0.1.0"; - sha512.run = "0f79f739273caf08126817ac44fa0c02bef9fc2e2bdad32eee12d1e377bca14618b426bc71f4f9cf734a5e63c319ac019de2c7959d25a0e31f594aedf1ec6d98"; + sha512.run = "1ae608c0c0f0273bcb95e6ddaf39bf482c69d40d25945530ae4fdd7d5c4cba5b61046f7a28b5b93727f6a0ca62c302a51dc58d5d02b47f23d28bbb1c30f95b2f"; }; paracol = { revision = 72651; @@ -35873,13 +36332,13 @@ pdfextra = { sha512.run = "84a84fe75512fce734c9c6ad3eb2b44091ed07ab69e202b64d0d86f143166a4ab511350120b75a8f71f5c88b8d9b175fde9b5621bea23aa5017e28f0c5c2e2f5"; }; pdfjam = { - revision = 71641; + revision = 73677; shortdesc = "Shell scripts interfacing to pdfpages"; - sha512.doc = "49cac6319b3c7ec12b7b1b68790616b311a2a5eb9cb3c9b06d53432977866fb612eb50864470c8fb62ab9b5c6aaefe522783316e769a1dd2bfebdeb116d10ecd"; + sha512.doc = "8d1dfab5e22b76c6a183b4949c9713951cffb21618ef3da94a2dacb2fb07419ee175251f6e2895316fdc9ed1e7e197fbd22f1c4a1ab99c8770e018b6728cca64"; hasManpages = true; license = [ "gpl2Plus" ]; - version = "3.12"; - sha512.run = "8958507b64e83edffe5f4ede0ab37bd151794ad432d3035d3164fe838003a6e0c27b344e926859a8ac0882d679c4ac6346474676a890187223e1968bd193e3bf"; + version = "4.1"; + sha512.run = "e54347e4fab67ddc52a5082b13c54113437ceb1d42fe6912e4b71b670abc2ef48473bd47af749b1c156a8a32098683fa53a178d916bac9e78df8342d339a7f91"; }; pdfjam.binfiles = [ "pdfjam" @@ -35906,14 +36365,14 @@ pdflscape = { sha512.run = "13c581f774e61de70e97b40c54a59054b9ab0a9fd6e1b71d94fc5d0e072aa96661d8b72bc99c083b322df974f75b2f415a6fcd8bc23f95d2d999a03ffc0a3188"; }; pdfmanagement-testphase = { - revision = 72484; + revision = 74019; shortdesc = "LaTeX PDF management testphase bundle"; stripPrefix = 0; - sha512.doc = "88e0cbe19b0a6061999081d6dfbecf880d76e6564ffdd41f0e3b3a96797afde2a116c8ad5c085b0868b7172b741521c5bdcc9af20a55d5ebe10bcc87d5f79110"; - sha512.source = "0bf5449771b49bb0d6797e494d33b9c6e5dbe729315e6393a5f017a3a6f321ecae17efbe596d63175d6c9b30faf82142c522a775ec9bc52ebd90f25c51ff2526"; + sha512.doc = "894d446dac3f4d3a75d854875ddd2bc8b6e521fff0a8be4fdfd42d067c9938a7c31e972e11342bf4ca4f08c397e37e77edd0d944bf2f7670d1fa8eb598d2a0f8"; + sha512.source = "c87f18ff6b5674f030e3f911b095bb02306119822cc07688f309fdc5045959ce12b5f54f998da45232d11d1844b17d12f004ea5820ceec4ca327b50749d8ca31"; license = [ "lppl13c" ]; - version = "0.96m"; - sha512.run = "ed4be97eade5db1b70e780d0b0c79b381c5adfc7f32b69de52078f51ee5986304813d121d01e5b2ff8a69e956d0d8d2cd800e94e46b3209787876c57fe1347dc"; + version = "0.96p"; + sha512.run = "91c765267cd40f3b06170a18e575908494637db48caabed1f3b6148e1efc4eecf1d705cbd5e6e21c004fbf99dfbc2ccae4ba3c5915076a96ae4c1f85adb451de"; }; pdfmarginpar = { revision = 23492; @@ -35953,7 +36412,7 @@ pdfpagediff = { sha512.run = "ce28e8160b14d0833b57445392237dceab536108a9d96942dcc0adf5305c149ba08269d697ab8508d8ba05dbc59dd972dd242cf7c4cd12e3d3e857eb885e5277"; }; pdfpages = { - revision = 72174; + revision = 73673; shortdesc = "Include PDF documents in LaTeX"; stripPrefix = 0; deps = [ @@ -35962,11 +36421,11 @@ pdfpages = { "oberdiek" "tools" ]; - sha512.doc = "5ec21e032009d1b9fc1f4cccd66df0e682639df5d1ad8c3c3e9a638e53c370750c95e1cf513a45e7e9fbc3cd2d0457e16cf1f199f5320405c74526dc71544466"; - sha512.source = "cc9062a6ecbbeb70cf4eccaea0444e3a7a1491a3fb59e0aed4df6e8e541c0c7a604fe6df06c2875aa5ea2f4b02ea25b928231864809567ac887c0d0006998b74"; + sha512.doc = "7eb5975880f3518961614533ca675c8430d69529c4625ce4f07a876efbbb92881e10ac6ad76396a0fff840ca390444644be4caad013e3e34e73382b45c03132d"; + sha512.source = "2bfa3d48c7037ba88fb8e4c51cdb591cb94cd749fd46fd687e0865410c5a3dc401e8986cc1c87706af071ae61f6958109d4b129eaceb43f4de55610667714dd9"; license = [ "lppl13c" ]; - version = "0.6b"; - sha512.run = "c4eef62d32741204fee0cca16e951c3dbc502f6cb31ae6cbe88cd71a88e8c4125a7e58060595fc15d0c04ffe163dee1d9a13f8e2fb2f2d5611571166b7f91034"; + version = "0.6e"; + sha512.run = "2bab2fcb2d9556896e71c37f7f5a58981603fcae51b4b8b44e576d9ce36043100e3838828ee5caecdeffe337070ef54a6504022117d841983fb7973c62fd9758"; }; pdfpc = { revision = 68610; @@ -36193,21 +36652,30 @@ pedigree-perl = { pedigree-perl.binfiles = [ "pedigree" ]; +pegmatch = { + revision = 74045; + shortdesc = "Parsing Expression Grammars for TeX"; + stripPrefix = 0; + sha512.doc = "790cc103dbff2667a896cc7e04e6ba0c8a1b93ae585484300c56b63f0af5146b24ab8ca097e555d5f3e96a52b39e64ea4815743bccfa0582a1c95ac832b0d2f5"; + license = [ "lppl13c" ]; + version = "2025B"; + sha512.run = "cc97284bb116d12070801a9549dbd1ff28bb7f70a5cfa452b79b9efb3be4fa49048f6f8b878e752199b614cb08045f5c20af49e2fa07fa1603575b1d1dbf35ad"; +}; penlight = { - revision = 72301; + revision = 73362; shortdesc = "Penlight Lua libraries made available to LuaLaTeX users"; stripPrefix = 0; - sha512.doc = "0641be8253322c2b9289c542c1f2f50da0246f7207f874196e9b577201ff721228b690ebf5e4295f105ae9ef3851834245c83c2b470d3bdd696ecd4f24f62a83"; + sha512.doc = "76343a2593280c1a58d4e6acdcd3fbdc8e0a8a2caf43f50b5108bbfb20b3ec4a04eee401b3c4fbc6f4a072e3d01fbbbf1088d2e798f6253a45996c17b240b6c3"; license = [ "mit" ]; - sha512.run = "7809178769a9ecb2474555153088ed1ddff824516a6afad4a4df8b86f06e08d2bf2f2d3e37bf7b5e014968251362d731031951520d03d0f69269313c31d5a9a4"; + sha512.run = "f2075929978f71b8d5d35bbffaebc2d7267ebead119eaf51b16ed202f0039dfd4c615266f8d4aa1b82941930b48b0df13c8a24aa84c5e7a50fb6667b0a132231"; }; penlightplus = { - revision = 72426; + revision = 74020; shortdesc = "Additions to the Penlight Lua libraries"; stripPrefix = 0; - sha512.doc = "3c2f5fc928bc3d12adb2eeacc2f656d1654e6fdb6d63e55762134820318f45bc941740668304a4d1c310ede73160462b9edfb3ba68b6ffa3afda507b03002174"; + sha512.doc = "d5f201311080d1513bba7620272ee01561cb90081e3f7f5393610e2e9b529dc6e7302c47fb5da6cc0705a8e17f3f5c1324d2683323020c9f2c970c199a666381"; license = [ "mit" ]; - sha512.run = "e04ffcc29e56681bf31b66e4ef8ce435bff50a3f2fadad10ed9961f5be29329b270a1e8b317ab1a90140b82f3f23763777611ae9302c2405801043aac92f841b"; + sha512.run = "b8b28bad53658567a3ab07b62ccd1aaff72fffdff5627138a9a70326e63455cb53293b582e5a5a6be589a991147eb78e9262c40a0f2bc22e3eec2ff3f80fed13"; }; perception = { revision = 48861; @@ -36227,14 +36695,14 @@ perfectcut = { sha512.run = "5c3963a08f1041e78f871084531187214f3735b15409cbdcb4491046feba1fbe44887b23f450d40eb3a697a49e0ecace584b96cb10a7f959e28afc642259b5e2"; }; perltex = { - revision = 52162; + revision = 73044; shortdesc = "Define LaTeX macros in terms of Perl code"; - sha512.doc = "d39c93f4bf3da08266bb0f10b06582db2bf96bee73faafdb191af3770c7c24abde407774f21d3c97b1f2453a8a9bd24576acaf0606796d7439334b8b1e42ac7d"; + sha512.doc = "ef65053a4ee0e90e2e8ad310a9d7729d122d293323643f8cd25b2a8f2127d1666dac85f66515a8bc7ef068dea1bea72e6b14507203ea37ed3c19b56cb43e051f"; hasManpages = true; - sha512.source = "99a8e27c23a7056496c56e734fefa1e921a002d7b86c153b3a209f7c3d7c415dac05e77b0ce5bc8685bd622243d6ed53be4a7f570a3ed487c3d55baa5b5af06e"; + sha512.source = "d65dde4fb6dbbb8491e5a4ba373a1075c2b89949365d2b3afa74c2ddac293da45b874e69b3f3c1143f83439b21c4f7a618ef04d81b77735590e896d34621f08d"; license = [ "lppl13c" ]; - version = "2.2"; - sha512.run = "af7cd6b065f2405a514d20cb386b34399742a42286002ab3e0f795b64dcb434ae97470ce9cbf25cb27a9b124ebe56844b47c7cf89e1f83a4bd35f1bfcc98163a"; + version = "2.3"; + sha512.run = "32c565bcd743f6372aa9065fad8ca8ac8c411216a1f9411f4fad36ef5163c976a6963b3e56a9667ea4661962d3bd418ad8b58b7a62e960cd15baf9efc4e63ed7"; }; perltex.binfiles = [ "perltex" @@ -36337,13 +36805,13 @@ pgf-interference = { sha512.run = "569dc2b0f5b11d93aa447d54649df07c3df375dcdaab509229d0304bb25523bc45062916089b15776b727a9c05205688a161bc79cfb4abbc466a243b2c8c57a4"; }; pgf-periodictable = { - revision = 72236; + revision = 73891; shortdesc = "Create custom periodic tables of elements"; stripPrefix = 0; - sha512.doc = "28954040e089ff5f143087342cf7469bd8de80c675508a08d0efba9c59ff887b85cda6ad29b7dcb08d8649c6ddddcf14d5514ca5e38bed37f3781bb18b4e300d"; + sha512.doc = "d928790048ab4f64591837c8ca2dc187b4f2348ed43c952ed1f23a3b78816a4345fb04751c289f482bb350236100bf5ff2f99fb87d0eba7c297563175246144c"; license = [ "lppl13c" ]; - version = "2.1.4"; - sha512.run = "2859fe3ea28229d16236bd6b479b753580c7f7cbeee8a094760e64660f5174b2a495f96f6306baeb194a4356a4991ba63a84c43152517de78c707f16f0579637"; + version = "2.1.5"; + sha512.run = "b86da035962b7fd1bd801b69b86196a688a13eae73eb995aadc2b8c43ea758a857e45e7e107c390637cc34503edb37aa343d10414b51db24ba1c2a93c3ea625d"; }; pgf-pie = { revision = 63603; @@ -36435,14 +36903,14 @@ pgfkeyx = { sha512.run = "c2adb44ef34930aef1d78aed2025a2dc17c69ed641b59af29bcb93c9c9532785090f30834d52c415116ab4a9477d83e5a46d1509e6bd41f47fd4e37cc8ff2933"; }; pgfmath-xfp = { - revision = 59268; + revision = 73423; shortdesc = "Define pgfmath functions using xfp"; stripPrefix = 0; - sha512.doc = "f48114bf89d4d5aeca399c44bf6a6fb26567d7692de319e7d457d3b753df8e302871e9901d98bf8697680125fb8fad56ac8675dd339bc420b439aaa4cc93dbb0"; - sha512.source = "18571bdab8756f25c357ceab0cd82f242007c22ae0b6b5cec17ece221137607a6d245ece8dd90c427d0eceda63749f0d75e77c2974e9dfa8509a1bd34768b5c7"; + sha512.doc = "3da3b151d8ec52c9aba1a10a2d7ed8027882dace5969ddccc35fefed9165933b07eee65433d8572c0c66f8c8841e3840fe83e65af93450d03396ad4d96987e66"; + sha512.source = "1271a730b193d5882ca8330e5c2b6c87f7ec13e79e8c3039463a3bcf3b4a84cb049112a3e2f6dcc8abecf4f896fb4f0d8886d0293888f715637194abfb04ab5e"; license = [ "lppl13c" ]; - version = "1.0"; - sha512.run = "c82fdb2b540dc37393610199581416b4256d9cf382da4238625b9ae29f6d7ea6150925c6837ae1f4b55fa10239f8563fb8abd042d5533080de7283246ee69ed5"; + version = "1.0a"; + sha512.run = "270b909af59fe28038fb3f9c2680ad6f41c767b325710b0154cffe551f03037251b243d0b07a50f271ea7871722c12115d7dcaf5a2fe88727f449c7fcf2718c2"; }; pgfmolbio = { revision = 71551; @@ -36737,13 +37205,22 @@ physconst = { sha512.run = "3655aa79c067d01831e6f30d85f13ba7b06742d4731f2f2bbea8066205256fd4f6a5d3290812e667bde8805b9bcad82c4713d49e3eb357cde56a1f50ad065877"; }; physics = { - revision = 28590; + revision = 74250; shortdesc = "Macros supporting the Mathematics of Physics"; stripPrefix = 0; - sha512.doc = "40a85407502116954024d51361dcbfdf36cac07aae382ada1f96d413f9b838ea5a11d7014722b5641a75b6c9bb8a5c6c134c8c0d424788f47f45fc80b277b3ca"; + sha512.doc = "732f010aa23ec26b87bfbf7920c253dd919b6d5c5831e3093c79d42444fe2c91f614efb05fb116b6cb85caa83012f2a4fa38461c1c0e98e0ec2b5473dc6a02e7"; license = [ "lppl13c" ]; version = "1.3"; - sha512.run = "e394a7f8eda4583cf196dccbd9d52122d0ee630a411630f11d432018c5e9696a9b3feacfa2f881d82090df165a73ee0fa610ad86422123a9e1502ccf4b695be0"; + sha512.run = "622167d2ff82cda9489e57d96efae4fb254a2fe088ebb5e4b9b293aef33404d0db6860455ebda4ea20c7278c4ab5e993e501f9632d44e9635393f0805bf8e64f"; +}; +physics-patch = { + revision = 74074; + shortdesc = "Patches for the physics package, and integration of physics and siunitx packages"; + stripPrefix = 0; + sha512.doc = "b71ff8b77dc038f955e17abe263cb767ca9aebcf5d0d37dfa52044476400976a04969f065f01c02706d382387cdf0f9119216045bbde2bc824e006f0b2eff884"; + license = [ "lppl13c" ]; + version = "2.4"; + sha512.run = "0ce4396354038e638c4c1e645d638eff8feb0d997c455bc7b430e83a0ce2435165fb60a12abd5fe9602547598e453fb5bc7d8adf8440b4f6f04076e67f62da09"; }; physics2 = { revision = 69369; @@ -36817,13 +37294,13 @@ pictexsum = { license = [ "free" ]; }; pictochrono = { - revision = 69855; + revision = 73069; shortdesc = "Insert \"chronometer pictograms\" with a duration"; stripPrefix = 0; - sha512.doc = "2d797a69487c939a3f4a8e4a076109cf9e416e8dbe61553a3dc9981cacda87f0b6f0a5beed3ee193d51424740bacf5c56eba96f1448a94584ffc8e894fe43a92"; + sha512.doc = "f83902dab9c195c60cea42679eabde5fd30fb6716b2ae9b5ae28394690183932de76a0459a74be4a14dd2be7cbdadceaad5a5ea4e6f1d435c2b1ce8876ff85af"; license = [ "lppl13c" ]; version = "0.1.0"; - sha512.run = "48f04578b0080ba075f9303800713ed4c4cb637dfd993c3bda03ec24bb9359504436dcd3e09724924f37ce5e5b688cab1f5a6db7eee48d760fbf2bb49e064ea4"; + sha512.run = "1a0442018564dbc10eb94cb5b3c2429e46abfc618f663881a5b4a1acb2a41024050dd97360d46fd6b66ef83f4df266696966065b5af2a4fc688e9446a3f75ba4"; }; picture = { revision = 54867; @@ -36891,14 +37368,14 @@ pitex = { sha512.run = "dcc4280ef914ba66210ce471dc276042070b3246bc95ecb93b3d8af55393f49921a1d5e6851223299831344503dfc77fc2893f4cf1b78351dad40058979c20aa"; }; piton = { - revision = 72587; + revision = 74448; shortdesc = "Typeset informatic listings with LPEG of LuaLaTeX"; stripPrefix = 0; - sha512.doc = "034d98d7d685c55cd87f6cac247c42fc4d0f43d4399a56f4a06232a54ff0d97167e77de53b3e9e57c78be3ec84e0f76af36ca8f87415c7de8c02f159bc15fbc0"; - sha512.source = "cb1210069a495631c3d6bcee0b73b875fb4fd8a1fb8f6a923dc36d7f6c5266f52c0d7a4432e5c49305719e2f269fab6134856948fb1612c3c184e67b2e267bd7"; + sha512.doc = "b9704557a60ddb4d2c4dca35be4d7e312c33d2843161158d929c9023ea9ac162e7028fd0f477b6fb55272acb12ef7dcf20b7727a807f734de5b7c949102204bb"; + sha512.source = "bd2afa1f0047856ad65f875c02c460d5bed3c7c01321f734e81230fb9d5c0172f07a68201989766890b73bad91ffab63087416217d23536ac918ad96c932858d"; license = [ "lppl13c" ]; - version = "4.1"; - sha512.run = "6af26521d9bddf0fe07c9c12ffdeb0a521a8a19f17236a87d23f30e48860ad97b6a5127df173b18c7930f0503de93e8cd823ac73f462765221da09592f3ea7c7"; + version = "4.2c"; + sha512.run = "4ece4767108b0a652c2e424827391a375351d7b76c9cd3ab8ab65728086b361bf937cf005d4b324bf9b8bd981712370ffd6e25db232c0a842a20269bcf90c699"; }; pittetd = { revision = 15878; @@ -36920,13 +37397,13 @@ pixelart = { sha512.run = "0643246fbed81ac008f675b9cff8d3194f8eed02937816c41887ad84268850cab50e5c6a7c8df5148f04cbb43c6ab80d5fa4d960d541b42f505f95f554fa0602"; }; pixelarttikz = { - revision = 70964; + revision = 73309; shortdesc = "Work with PixelArts, with TikZ"; stripPrefix = 0; - sha512.doc = "ef091d7df64a57d25b972603c312d957653dcc2db31d56f6d2845adb2bc222daf605df9bc0b9cc665646ba0c0f4943524a98f6f9f312d1ee552325b591fb805d"; + sha512.doc = "17911549ac88c43561e2bae7de4856cea624758f988245dda605a0c4b13cf0d3195512e7824f00f3086350683b9be2fc8c2582cc097092a1e0ef1922475d362b"; license = [ "lppl13c" ]; - version = "0.1.4"; - sha512.run = "ec525456932e618735270f098c05b08108524b9e77c66b5a542bb6cae68e4a7e25d2a9efee559dded1c584f1be78b9cd2f78ccc4ae02be3c7159f885fd1bdbf7"; + version = "0.1.6"; + sha512.run = "bfbb9e9f9a4cccee9bca1fb4c29fa7b0a2125095ba872f9fbb32e01dea5a4af89a9fceddb187cf9cbe6151fc73a653d09d8a464675b74c8727d6ccf475a37b4e"; }; pkfix = { revision = 26032; @@ -37053,13 +37530,13 @@ plantslabels = { sha512.run = "7e1724b32035ee32325c491bce57ead23f40ad7377b4c1d5572499fef920b874bd57298e654429203cbea726b8d645a0899807547db80825be163538c1d91537"; }; plantuml = { - revision = 72315; + revision = 73377; shortdesc = "Support for rendering UML diagrams using PlantUML"; stripPrefix = 0; - sha512.doc = "fd24814def7e77e073b54b3602c47ba7cbce484082e716d1a9f4426fb364430ef40da2f157685238b4de87e526ad7dda30296f90a7dc27e372a77c24d7ad3916"; + sha512.doc = "5b5f49a9b831135f1d98dace94466169f96492680cdfe90e2f60c8fde9b1c47c77710b7feccf16521a432aadd2ecd67f973c411664a99df9eb0149b5fb7af827"; license = [ "lppl13c" ]; version = "0.4.0"; - sha512.run = "0326db34d3382da78732cb0679ca4f55ccf3767e0100be07f073bca0d9755300a8c343ab4ef9947b22a6b4386ca0db8e65c795798c300a5eb10710e267988735"; + sha512.run = "5cd1fcf64c34bc4a8f4c2a9f2397ab3e95724119814bb1df5161a801ac0fb1b61fe1f48401e17d7c567cda451a46a984a00faea3714f159b28a87320473d8470"; }; plari = { revision = 15878; @@ -37183,24 +37660,24 @@ playfair = { sha512.run = "2c75ccda034c607fa67993922e498347cf8a708c31360ac63d8304ebcf538e2012529864c6c3102a63b0320db68101fddae021ec396efaf0396d4d609cd0d711"; }; plex = { - revision = 69154; + revision = 73028; shortdesc = "Support for IBM Plex fonts"; stripPrefix = 0; fontMaps = [ "Map plex.map" ]; - sha512.doc = "175abcc07f213d5837070171b7fc483aec2c26b80f530ca7ad7a6f571de028c833e32d71a4c465fbfbb803afcba934e68df560944b8b54b20827d31cd21fa9f0"; + sha512.doc = "8a97ca3a24c795d98d5026dca31f1cb02d4dea511573277bdd0109d6f5abe369312d290ff13bbc359def9eddf7410cc67e7950325dbd053a3a650ffcfb51b0fb"; license = [ "ofl" "lppl13c" ]; - sha512.run = "4180d4b5ff2d6843ac375a52bc3c63570638cc29f7d3bbda476dee962998293ce4b201817e056d5e87c20bd8280336b65bc689a8e1580ab8aa6f24164002732c"; + sha512.run = "4452a3ee60a0d7a8392a1d621bd4d761a93e786e16cf93aa4ebcc20c6e024b67f43d9aa81b3af1f55a894f83ad516fc2de65f0c1171ad6a0c8d7ba2789984b98"; }; plex-otf = { - revision = 68238; + revision = 73766; shortdesc = "Support for the OpenType font IBM Plex"; stripPrefix = 0; - sha512.doc = "226ddb9c201dabf158e0e9a5480995539d20d14ef34f5ea9498f9fe5966a1f7eaed00e1bac62fe17eeb710d0d3f68f9397fa568ee1a91076552130661dd6e3f7"; + sha512.doc = "cc08af93af1190e322fdc53c49ad6c553309882005ffe746b7545808781e950635225e6a781dbe0b4275887332d7f7d0baaf8913b59fc370890aff0b89468fee"; license = [ "lppl13c" ]; - version = "0.08a"; - sha512.run = "1dadbb3073ccdf40e496f89cdbd31af8ef37e810178eeb7aee49e9c1abdef42f28e58bf12988a59b9aee95384de842cae8a827e8ad8968c7ef37e8442e596d21"; + version = "0.11"; + sha512.run = "ccd65978bacfdaa7fa98df35605cbcca3692193436e04898bc37f6026b54fc0ac5285143bd194eb28a9ff1111e56f4b5e44c4bd57620f3dceae76fa1605e88a0"; }; plimsoll = { revision = 56605; @@ -37274,13 +37751,13 @@ pmboxdraw = { sha512.run = "d229b15e57fa76a9e8e9b903b5fbbb99d81d3c8a2b1818d71c103df7f2a1e9bcf79aa8396b6ab7a2ce054371d212375b968a4a5d572fa8686223baa8dccf4eff"; }; pmdraw = { - revision = 72486; + revision = 73626; shortdesc = "Draw elements of the diagram monoids"; stripPrefix = 0; - sha512.doc = "d0380c05bb83f7e2932496d51c5cff375a3d7643ba3cee6f9f66da36685b3b04a2be4824a889bbf4ed6bc06766f9f2f3b8849a9a631a4f4afdc17a85fcdd4968"; + sha512.doc = "ba62936e7da1ff68a453a37c70cd08b049fd87f1b369f2a8d2505d58834a73d1089fa8eaa0b321e973abfe4170bd90000accb0240471d076981f1d2541de7107"; license = [ "lppl13c" ]; - version = "1.5"; - sha512.run = "aac8a1244486cd9e61457da330e888aaae6acff2902eb57fdc3fcc53b7928133ecb9ac784235b450242453276ce4d5da88dd4f920df7d30a24686610d65c924c"; + version = "1.7"; + sha512.run = "c046e4933ce41330688513bc95a309d491043052060df833dce63e08733568f84db5c19352f6efeb2a0b6fca0000272e8987c88d1fe8c2ac7cbd3a679b901c74"; }; pmgraph = { revision = 15878; @@ -37292,13 +37769,13 @@ pmgraph = { sha512.run = "b6e9f00789ad102b6cdcfb0fe48e5ca4f6976a7c207088c0c3e8b0c2d4fa376bbb932500d42133571a6e18747615c77eb6df2b4872ba86f853e3069ef198a671"; }; pmhanguljamo = { - revision = 71464; + revision = 73892; shortdesc = "Poor man's Hangul Jamo input method"; stripPrefix = 0; - sha512.doc = "087ccf6af505675b39e70f4b0abac0a4792172f2039e8163ad07afdcb8c49cba4c745e856c0d70aa04ab56dc5f750c687bc8fdcefbd7d3ba8e18d8f78a3c33cb"; + sha512.doc = "0e62f52f12a2b3c90ebc6af0f69f4dd707a5bace33c3fdaf7d10c72ee44c4f842a22a198b696827e17900347f3d325eea72f6b4217a3db4486ae08b008a24d64"; license = [ "lppl13c" ]; - version = "1.1"; - sha512.run = "e094d3fd300aadb404156f53b2c71772cf86292a64ba254ce96a74ac7579a3747894d750a77159464985d34d08c33482c7c37dd92c59352c269e5478865e363e"; + version = "1.1.2"; + sha512.run = "f6783de25b8e9d66c0306348a6246c4f306e4ade49a07b85c569309c743d0b1dad687839393e63c921eb40b93a237a5e61004aea06fcee340659125c62264697"; }; pmx = { revision = 65926; @@ -37413,7 +37890,7 @@ poltawski = { sha512.run = "620708dd3f1d2d8b2601377486631c2bdc779d06d2016e1c9ab5869afe00cb88dcb1ebd055b6859ad3e3dd25200c1079b723613283f048c7cd7354977b66b8b9"; }; polyglossia = { - revision = 72368; + revision = 73666; shortdesc = "An alternative to babel for XeLaTeX and LuaLaTeX"; stripPrefix = 0; deps = [ @@ -37424,10 +37901,10 @@ polyglossia = { "makecmds" "xkeyval" ]; - sha512.doc = "d9302ce57f07c09c2478960b59a8b0f07c9e957cf17a2b12578cf0febd0b5f1fc066892a115f57ed5496dcf8b398a8a2edb1497cbf20ec92de41d92d140fba60"; + sha512.doc = "ef2bcf5fe55f0c585f597923fd0b6fbd81a827f983bbba077052c00208b2b8eceb7852a93d86691cacebda51fcdb2a3c40f5e3c6edfb603ad7ee5aa70e2a7a44"; license = [ "mit" "lppl13c" "cc0" ]; - version = "2.3"; - sha512.run = "5875de0f388ab4676cba7b203d6378975ba646ed275dfa80f7de954ac62afb1b4cb533b05f0afbb7fa021950877b5b9e569969b9e0853daf9d50ac9990ae4045"; + version = "2.4"; + sha512.run = "6aed911f1a5b04ef84891f43d83c1f37ba65f38a128994e21b59631d7baabd1f655206b54d6aa13cc655c1c7589c051d98bbfb06be8744f276f286fc01db8281"; }; polyhedra = { revision = 68770; @@ -37514,23 +37991,23 @@ poster-mac = { sha512.run = "f685c2c6d7d2795cf80702c0f8b4da6661a6d076dfbefeeeb071f21ffebd4420c7777681e550ed8ce05726a4392f526da42cecd6e3f26b5dc8ba775494589297"; }; postit = { - revision = 67344; + revision = 74291; shortdesc = "A LaTeX package for displaying Post-it notes"; stripPrefix = 0; - sha512.doc = "2754e847a190afa3ac22166365a0ea12557d939fe4d2f06dc0c34a518da82dfbf7ab33c8ab1ddea5d3d95dae13c013f238abcabcf6444d956393fe61b00f4a6d"; + sha512.doc = "73c5d0e1ec427c60028f6be7cc27c413cff413a675f8570cf178b428c4a4285832549a26354f62137ba5de5ec52ad6b5fe85121d3822bc99e84e6a1fe20d3254"; license = [ "lppl13c" ]; - version = "0.1.3"; - sha512.run = "cb825667ddd1379b07870c388915abf36efa1249036795d3cd5ed7f41a87c046c00c7e292e542dad6a8b3b3090f327c5cff5e173220d49cc829f0fe206676aae"; + version = "0.1.4"; + sha512.run = "1beb713a2459b05c8aba47342aa5f26ba050ddc38d14cdab397c877713f4219d008ff4830d7b411aa7a52bd18d7430b888fb7eaa036511e8ca4fec83b04dccf7"; }; postnotes = { - revision = 72568; + revision = 73045; shortdesc = "Endnotes for LaTeX"; stripPrefix = 0; - sha512.doc = "87d0a23260a83448acc9b9d57fed4f3d0966810e263ec356fe58c77bf599061fdaee5ba87c19d027e62bdb538f497f103cf19114fc79a6c9cbdad9914b2a40c0"; - sha512.source = "24eabd8981a01023c44eceba5f15a9654ce4bc2d3a43aecf99ab94d88196ec6ed6cefe9f7026a0faef282532542ed1d498f1f1476ef7c1604c57b8a648dfe1c8"; + sha512.doc = "870fe1f56a721d838097a4ae5e0f0ac515d7e050badae936680f491141d9780e98ef30c90b9b60bada5b43994d67e021a691c118781c317642051591434e7868"; + sha512.source = "58e6a03ff55750caf57a7a1cb1b7b18beb89abe934b459032d3cc2119cb983fcf6a4ea6653e32ce225808e29fce7b98461cbfb244455b2201eb403874827ab53"; license = [ "lppl13c" ]; - version = "0.3.0"; - sha512.run = "e9c5a37557bf20f22fb8112d1f7095463cdb27d01a1a718c46a5277ac2a84157fc36b45cfa31f9231d034bcda7214e9f1b99a5f59757d836677d75aee97bcf8c"; + version = "0.5.1"; + sha512.run = "be76188a36df44f6d0e69978c58586d70032812d124db5683394e2aa79da4f2810ab2639d26da63fbe14cf27dba8a4a6ce365f07c074ff639e9b5fbdd1ae25af"; }; powerdot = { revision = 59272; @@ -37561,14 +38038,20 @@ powerdot-tuliplab = { sha512.run = "91a8008d0675ea36676682d741ffad1e2f842ae37b47da628bade8391b2c775d7a756d31d5169e087ca0c4c0b0e958a2bb34d5143f905439e9572a6e72c4dbf2"; }; ppmcheckpdf = { - revision = 69527; + revision = 74170; shortdesc = "Convert PDF to PNG and compare PNG files after l3build"; - stripPrefix = 0; - sha512.doc = "5bf1e2df2c702a3b447787cfdc77b243578f6c59ea4c46ac352628dc647e55da9837375d5d960e17d8baf3d1fe538abb81cd33f08e6b0f501159be8f84131ef5"; + sha512.doc = "a2fc16f2720064bd574540efb3ddd45b95c3b66b5499814383130df394c2f5b2626b637f41a4247f652de4d1758440969607f4c46c781028e8a1dcd528fa20f1"; + hasManpages = true; + scriptExts = [ + "lua" + ]; license = [ "lppl13c" ]; - version = "2024B"; - sha512.run = "9c6612db37dafa8ab2771e42443f528806542b0c949b67adc861440bbcc85492a726524f543406daadde3d66d20bd32eb521cb96c719f948732c3a84e4702d7e"; + version = "2025A"; + sha512.run = "9821d317a836e9a100204b4f80de08cf31df56b379a12c6bed3e6948cb70f84829e2f43a02a7ec9e37845bb64dc870014b558d94171cd5c38d8058868aa69bef"; }; +ppmcheckpdf.binfiles = [ + "ppmcheckpdf" +]; ppr-prv = { revision = 15878; shortdesc = "Prosper preview"; @@ -37723,13 +38206,13 @@ prftree = { sha512.run = "d73717b68ce3d12108a76a3850f3a09b9e1100969e79c745b7b08340175ea9599f10f928809fcdbf8ffbece3a60baa41d84dae182ace8b85ff511082f1db70d4"; }; principia = { - revision = 66625; + revision = 73662; shortdesc = "Notations for typesetting the \"Principia Mathematica\""; stripPrefix = 0; - sha512.doc = "8dbf4e19a3c688278c52299731ca24fef83d08886a179f15cbc58038fe92d5ddd6e57bce1451a0af686593f98adf9ed3f52ef0b20cd68f65df52b8b6a2576dc3"; + sha512.doc = "8764fe64347d9db53be90a66be818b796895fec8d611be461cc53a5837dff107c1e217eb0d838d71f004afe379f6b88c819005454e62addee185a715688dcd3d"; license = [ "lppl13c" ]; - version = "2.0"; - sha512.run = "ef88cb4dd25ec8cd3d50a7f152698e771c8b5f1fa18adad21d55bcd3a8088a38b09eb19873c6a3d1883101d27f318bc092c9c1219a2be76bbc07bfd2eee9711b"; + version = "3.2"; + sha512.run = "d4980793089d0433629f19ea0253468d575570e824337d1a693d6050b2716a72cfaf3fd554f669e3d1a446cca74cb59d25c6f0b14b8a987692d6a67701462576"; }; printlen = { revision = 19847; @@ -37740,6 +38223,15 @@ printlen = { version = "1.1a"; sha512.run = "bbb48c169f31a1f93024195056c323ce67afa1fcc00f309ef1b820dd40e0b86ca98d05f6cd4af66379682813a3807f24295a803fdc91d8b9f19972e1520d5eaf"; }; +prisma-flow-diagram = { + revision = 73530; + shortdesc = "This package provides an abstraction for creating PRISMA 2009 flow diagrams in LaTeX"; + stripPrefix = 0; + sha512.doc = "29b0b52204c35b24a4f8367342a10d97f6d63ef1d86561f30ab02543572808633d7d8fee508735c8b15011b798bddeb81c69823c56db33a15e3c601a9815f896"; + license = [ "lppl13c" ]; + version = "1.0.0"; + sha512.run = "495d626ba82f18668a78ad662efd9e16f64d1e753f14432856c39ebe94172933834f1564ea44d0d189013ff1a5de228c960d6dbb62d267946050d04515a8c3b7"; +}; proba = { revision = 15878; shortdesc = "Shortcuts commands to symbols used in probability texts"; @@ -37808,31 +38300,31 @@ proflabo = { sha512.run = "7270b65b821c303e84eec760126ad421dd65fbb5ff81309142690f8820c4865c3b1ff39b22b2cf700a10920b973e18085a1e73ea3f6c9d90da984d48a19bbca7"; }; proflycee = { - revision = 72645; + revision = 73860; shortdesc = "A LaTeX package for French maths teachers in high school"; stripPrefix = 0; - sha512.doc = "1d36f34b73f3ded0b40453c179c0866e9d65b448a432593655c68d488fae1d6aa649d2ee84715112509a2c5a1b237dfaed3f5f7c75293f6caae68999246c2526"; + sha512.doc = "202fef8483d66158735fe9ef84e537ff42109c5f137cfbe419a8282dc0ebc1d21e758a00e3d77f66a9476a5109f9f5fff95a27eff36e79b9cd5970303bded1d2"; license = [ "lppl13c" "cc0" "cc-by-sa-30" ]; - version = "3.10e"; - sha512.run = "256d58efd9f4c835d0a0c1c0a9d8ca842313bcaf919cc1442df94d654e9acb270b5458cb91a9ce8b02634a029e433631fcebb71a018d9484ad681191631ce944"; + version = "3.11a"; + sha512.run = "9506b5a607109c56f81b04412960f598b20cac23d9378d297903f667071ade4850cb8550e6515cb4a3f006b8ba4bce1a977cbd2b10e002732dbaea52ec332258"; }; profmaquette = { - revision = 72622; + revision = 73827; shortdesc = "Use exercises in different types of documents"; stripPrefix = 0; - sha512.doc = "2ed2b52f83e5bb65719586c313393bbdb744e65647514a8249cdd0528edd36550e2fb1dd18e8bbf6a694a9c80fd279fcbeeba09f3c6ce7c0995b0a3aba5cfb6d"; + sha512.doc = "e08faa043a2a6ad40333402add991d341659df52922bbab2396cae40ec156fbebd224eb970a995300e0e6e1af018984b6bdee5e4ef3992b82ffdb89074875931"; license = [ "lppl13c" ]; - version = "0.99-i"; - sha512.run = "07974cfeb2154a21c4e82da66406ee6c90fab941668782187fa1dfe7dea3783203f9c015eaa700fd913ddc7a43c3220621d0740a649d0575a73a436c5b4775e6"; + version = "0.99-o"; + sha512.run = "7ebd515db06afe1d174d6fc9d491fcc3bd2000d829e1a0e3303f0a65501c5bca7607056f6e20176a866c31a9ebea8ab7cfb0e233e3e81d73f906ac97aaace470"; }; profsio = { - revision = 71302; + revision = 73718; shortdesc = "Commands (with TikZ) to work with French \"BTS SIO\" maths themes"; stripPrefix = 0; - sha512.doc = "527621885cdb8863f6792bbea6a7df13ada83335b5f5a7386f9ac6689cf8b2a383c988da9716bc2e50c3ea04a896b779a15acda52b029d4316434606a7e42017"; + sha512.doc = "f3939e1bd9dcc2b626e05e9dfb8a247bf86ed856b5e6de096e20612083d8f621c15be37c091d8f81b9753924fdd6a22ab5936285b11c56445ffef8b11a8f00b6"; license = [ "lppl13c" ]; - version = "0.2.8"; - sha512.run = "303bfb0f93d9dd936cc1d3521a7ea423297e15c2563117177f2434f2cb9f64873bd23b9855973c39e096f567f737e3ddd1b96ae399fbdb84ca599bbce7c348ea"; + version = "0.3.0"; + sha512.run = "8a00465b448fe3b6ea29792a504b519bea20defe94f31a01070ada1ea56550a25757cabcdb129e3e07e9a0dc83c3384e2731af84c748a5c20585feb2e631a650"; }; program = { revision = 44214; @@ -37862,16 +38354,25 @@ progressbar = { sha512.run = "d12161aa891ea45cec2a4511c48a1c338de5acd512e426a24988b79b7d9d1734479a1cd93e3e8ee11da67858d97260b71ca35a3a7a3dbbcd2bae746221a7bafa"; }; projlib = { - revision = 70305; + revision = 72789; shortdesc = "A collection of facilitative tools"; stripPrefix = 0; deps = [ "create-theorem" ]; - sha512.doc = "66c3d9262589ee023643bc6c78560ccaa65bf39b44e114c8707ed8a98c1eeddca4c4693f158f4b577133a72218bcbbb28dffe933ccdd14b0ad60fb34502252f8"; - sha512.source = "4303b5cb9c762f7098cd547d4a2d37300d5f8717ee251a196efe916cd57a242440c831567347b89a7d20292b8366f903832c240520cdb31af5adde0b6a6d3ead"; + sha512.doc = "b228f6b725c4bb593772ebc7a56b083ea2f9ef34ce9b2b45fb233be56dca57e2aafba7978e2a07bedad9cfa47d98f7258f8df62f51c889c0a36374358ea3d543"; + sha512.source = "bbea46f08a4af6b8f89f40400fb1e66b1abe2a24c3e17d120b947271db9636fa99d796d1385975801181aa81d901617f6dd8a6c40d8b9340f0ad1c63220cf4df"; license = [ "lppl13c" ]; - sha512.run = "a67e36643b1329bf5b295b5be477738478ca963ddbae7670bdc69532c4a12427388dfb16a72eea6095f58e96b083cc5de2a7f9ee1994ec491b270e6a1212a0f3"; + sha512.run = "44f91e13c400b6929315bfa7f156d40866e46c48ab361bcf5cfe7a8cb8bbb62cb30fa7c14b3a7dd3a279be3a7f1d9eea80ae090ce047b1f61b0b74b5612578aa"; +}; +pronunciation = { + revision = 73701; + shortdesc = "American English Pronunciation"; + stripPrefix = 0; + sha512.doc = "2b7204458601914ae6f69c5e9af9b1fd479a9f231014fdf4d5d80554391f7b610be51129f476389b4952b612f9c0c7c070865208a011c68db8634c7bfe7c03b9"; + license = [ "lppl13c" ]; + version = "1.0.2"; + sha512.run = "a3fcb75c408c952be58b45ab5fcc01207074d11dbd22bc047717d52391b9934706c697b1c14c3e942fdd16f0221258739bccd384c4c4b7a6a80cad5a07a01fba"; }; proof-at-the-end = { revision = 69602; @@ -38441,13 +38942,13 @@ pst-gantt = { sha512.run = "61b59f922129de60bf954145a0c83a5bb4c0232270b8213b45856a69ca56f32a9525d70ba86e51f95fa1c8836d4922a0dec971dea16f13f0c2f83c80fbfefc56"; }; pst-geo = { - revision = 60387; + revision = 74250; shortdesc = "Geographical Projections"; stripPrefix = 0; - sha512.doc = "7dde4c2584eb3c538a21fadfb9c49db02ad190b0778b64a4a51be7b777b4971302151a4f6ee7c5fb29f6c156c34a420b1734471f550d541bd2eb87877ab1543e"; + sha512.doc = "f27684a2c1961cf14098974805fa2e6fdb145d37a5327ee19ba4f9a041821496bbfd4ce51940fdf9ca4da7c12f22a6c80f75b7d329963f6f755f36d25f93fc2a"; license = [ "lppl13c" ]; - version = "0.07"; - sha512.run = "4e97b80679129df2cf52a8998e1b131b7ed5ebd21046219843af1ca81272a84c3a8fca72810622a7215385207eb541cd2bfac65b791920da61c233f969423c3b"; + version = "0.09"; + sha512.run = "dc44de927491efc6fa570340497e8b4c132678137f5b1bf7ed3d20512ee2e33197c4da030aa345e59e73e1dc26dbdd5abc3f60ba6e46f80dadac1a8a39a32d9e"; }; pst-geometrictools = { revision = 70953; @@ -38663,13 +39164,13 @@ pst-optexp = { sha512.run = "a72c425dc808ab5a4507691c9a86ad2193c08f8e88d62ea558d2559b68e18e9dfd8e0295bc18fd66e3cf41236c17b85086dc218e46317c09867b5eaf024564fe"; }; pst-optic = { - revision = 71545; + revision = 72694; shortdesc = "Drawing optics diagrams"; stripPrefix = 0; - sha512.doc = "c68e4010c0b6fb8cf1a1b76c9ce25ec857e84de84f869264be896aaefefe6b33704549aec325ba55fae848db8a6aea1ea46b809b006fb476b92d2229a8eb12c2"; + sha512.doc = "d6241c0b60d1c827be14612827eb254dc69f7ff36557f3b2c0f061c52805c96f9982753db3544691c352340e0f4ce31b32216ca95053c637d90d483806d11ba2"; license = [ "lppl13c" ]; - version = "1.04"; - sha512.run = "0d854556c5643637dcbc4d84c312ddf7e3aef7dea81e3964749ff44a66d1bff59ed72a950c8d6dcaf3c405982a48a3afdb282051a8eb0700dda843878fe525e3"; + version = "1.05"; + sha512.run = "e9961530a19bd9815a634170a3f0bc9f4bbff25d444ab01c22861f912a0df0121d860e8eb1d23b3078a84f149690170d671c734ba3426bb38cd4f0cf144e266f"; }; pst-osci = { revision = 68781; @@ -39020,14 +39521,14 @@ pstool = { sha512.run = "a97af35dfce4a137af97071b49e58c31739e6f271afc62a455db473e573148d25fc27937ce680c6f400a200151ffd73867d5dd8781b12a63c68b7bf256cff5d1"; }; pstricks = { - revision = 71883; + revision = 72868; catalogue = "pstricks-base"; shortdesc = "PostScript macros for TeX"; stripPrefix = 0; - sha512.doc = "c4b5c169b6c2abd9837ebb3c2ad92e88ae4c375220eabe84778a27684538fc25f7a1620fe1127901a32b40b4bb54791169b3ce759ca113a648eeda5d98f97c7f"; + sha512.doc = "99bad68aac2d5e3055cbff9f8900b403cecaa5538799074cbad836a465aaeb546d307afc480d6cde162a4be735927e81324ed326cf5368b886eefc22f7324a02"; license = [ "lppl13c" ]; - version = "3.20"; - sha512.run = "7a5536d5adf7c3bc25e2b5685fbc4ab7be939d118ef74bc8242c126b72aad987059f11a1bf541dc85bc7d458c093c194cb7a6cc95f13826ce012e94b5ada6565"; + version = "3.21"; + sha512.run = "4eb2ba617f0483474ebfb711c4e1fd5bff179a1abaa6f35a8cff998e2f94ab3489fed09ab7d740655092a1815ad07560f13c3c9107b638bdab3d0f8510ec8667"; }; pstricks-add = { revision = 66887; @@ -39293,13 +39794,13 @@ pxchfon = { sha512.run = "73c9660dbba04d86615e135d18c35d02299114f28474bc1d3ed7c6cb89a06564422651981d57684f71494b6a2e44e0bd47521f8b3edacb2aab8d1295860b0e28"; }; pxcjkcat = { - revision = 63967; + revision = 74250; shortdesc = "LaTeX interface for the CJK category codes of upTeX"; stripPrefix = 0; - sha512.doc = "69fe6721aa9aa17aa1aac44680e7a520b7fd002c8fd06d2ccdde0e4d20a17875b9b585394159528fb9bf2c6e817c8e3762efce21a938217a199e49094592ec50"; + sha512.doc = "dcecafecd36d738d14b6123e34c6ea1dcce07bac05903f593500feb28ac13904dd8b6ff8f2dda38d0b7882830c865b1b3ede68a4d75e3020c4f90e68e4b1cb97"; license = [ "mit" ]; - version = "1.4"; - sha512.run = "81a71b6cfdd280f65f392ad602291d468a8ffeda440609f513166b88bc1af298d6be546e953e4f3a9abac3f0bae235c12b124e11258c53c1abf778f3f78f3559"; + version = "1.6"; + sha512.run = "ad67f59af38955bcd7fec35d229d41367b3ab0b2e7485c91d6c07c187940473b9089781c4413f9669ed875c2a50044635fe1a5f5d6f826bf9ecd8408f003fb9b"; }; pxfonts = { revision = 15878; @@ -39420,13 +39921,13 @@ pyluatex = { sha512.run = "7d400d0cd1af26732effc31e2b7a7e0cb501d712230805204362bb5fc456d379258ca2075f4c902dd6d4bb6004ba154d47ebd6cbbc5febae8d07c113987b1a60"; }; pynotebook = { - revision = 70818; + revision = 73069; shortdesc = "pynotebook presents (raw, Markdown or Python) codes (and execution with LuaLaTeX) as in a Jupyter Notebook"; stripPrefix = 0; - sha512.doc = "bb8281d656bfa4a6a3be3eaca378b94c7e7cd432129a5e7a123435730c260f5334acf5528b5965beb766b485f013f19972cf9c38b8a64a9c8acfcd49c83d7881"; + sha512.doc = "267d7ff451a1537602e171ac5c696d6b8ba428c4dbdaa7dbf707c2872cd129737f84dd55b78fc21fa793faeb7cdfce4a630bf0b7786be13f7f90f86f001ed016"; license = [ "lppl13c" ]; version = "0.1.3"; - sha512.run = "1a6e04d766bcec060aa1f62b2dd52dcc1f9a5c70a35e757f295d895bc41a8dddb3bb3f8afc1a9f924d5c9d932dbdf75d8f86bf500ac8588b710297a1a2fd87bb"; + sha512.run = "004e8705c4a676c6c96a1d9a3e5a9bc9fa32d74303d3deb43eea58070f85f2fdb42ec2c2c676f10be2cb5ca476ad669fbba5331ad6765037a7c7b0b1b1d97059"; }; python = { revision = 60162; @@ -39553,13 +40054,13 @@ qsharp = { sha512.run = "29aa0808112111d088f8795ec87ca3df6f2e10f0a8e91347ddc7101733aadc72ba90356f7e4b39fce6484e04975d3e151205a5d5272789ecd414cd0a6afc243b"; }; qstest = { - revision = 15878; + revision = 73069; shortdesc = "Bundle for unit tests and pattern matching"; stripPrefix = 0; - sha512.doc = "a2e138b5de9012b637cc98b18e5aa64b2c9384f03beceda724c86f1e81e03b6da6b19de27fe15724463edc61520d035495f2f039a2d541b4761c44c55473d1c9"; - sha512.source = "1ff5ae66e8620b298f4cb5ca4d53e420ed0e89e476edae48f1f37fb1785e8bf4693da410cf2149d690734ad11fcd669152ffa7a560bde94e923e772560f8ca19"; + sha512.doc = "bab5b94c2ea4e91802f881716cd8b04c5f08b6f6b7905dbbabe527da19b95313dcda05919452c01ec9ad760cc449d816fa5ced0405ed65836e85e8fdac67cbdd"; + sha512.source = "233eebe93e44397930c1ff19dc86a73da17a5a059fac9b7d15ce661e3ccbf24d1efcd374ff81e61dfc34c17ddd88737955f8fa04be372ebaa0d517fe2b46cbd8"; license = [ "lppl13c" ]; - sha512.run = "1461a7e5a88a75d1976b8bf0b6b9a685c7e68bd5983ea1549b277627e20b8e7d0b890536c8e8357e168914220c168cc2be2e9a688b512e16d613107c50622f79"; + sha512.run = "55e3afd572a8131fd6dde9c4d23c717f03da5253509e297770acbd4b37e6863369d65d58ef3dd5282605f13b37b4edf64dea1a1576be85e1d3a7967a5caa8a6b"; }; qsymbols = { revision = 15878; @@ -39653,13 +40154,13 @@ quiz2socrative = { sha512.run = "f4fba8eb850a90288a9b3e7f4571f5df560e09e7cba608f7bf2bb3090db5a2c6bc7fc7240ef2e3cef9d37fe1a0105e74c4c63c39a7c1793a1fedc6f86772eac5"; }; quizztex = { - revision = 72256; + revision = 73069; shortdesc = "Create quizzes like in TV shows"; stripPrefix = 0; - sha512.doc = "98df000f994e70b148d44a572a4bf159a0a35ffe68ef22aefbb17e345b869bb0d7cc5cd72e1b01d91c264bdad58afcd599bfff25b0356b33821ea6fb141eb6c5"; + sha512.doc = "997c1efe3901adeb85c4835088bf604a95b8417a48f45c7427e3cc62120663c3d92569097f1657ecf336c7d27e333fd6cf36589be9d0391c116661841b7c8be1"; license = [ "lppl13c" ]; version = "0.1.4"; - sha512.run = "cbfa0d27489f2812fdbed0826ea4a27dd3b7b1ac5c82544d9f84f1019cbac2a00e756fb9e5f65e4b15474fd759d499a44328b73326542bc287b6f72becbaba24"; + sha512.run = "8d52e371184e5399e9742eda1dd0e247ad52ef0509ee6663aeb973a1d22dd45029da63d15b4f57fbc7155f40c0716225fdb589f94885321297db8b51c1183bfe"; }; quotchap = { revision = 56926; @@ -39824,13 +40325,13 @@ randexam = { sha512.run = "213cd729017cf53e23699081e6583a3016c2782192f79eb14947f89d330e3775b35c264cd64fe5117964b040ae98c9835fa9a7c8c7af2979502190fac85bbe9c"; }; randintlist = { - revision = 72646; + revision = 73304; shortdesc = "Creating random integer number lists , with repeating and sorting options"; stripPrefix = 0; - sha512.doc = "87e0dc33e98caa6efda1a8b9986bb8f7816ca086f4785b07c54c0dd64d1aca649cf1515e9e473253b3d173997a2432fda6e900277d704aad49311f1f6e582a56"; + sha512.doc = "0eb4499465bb2beed7aac8f433a3c257e090bdebe62793930986b778403dbcd59999c91ba41694082e643667b8b2dd764e443a7cda671794b4b70324fe7e1a1a"; license = [ "lppl13c" ]; - version = "0.1.2"; - sha512.run = "5e8159106d0d13dbfaf1481f1d71a3e5078de82490456dc2a73ae77d1fbcec363e706c5441880fa39f93f410f342430ee9f685c59ea66d9be50178463b0cf275"; + version = "0.1.3"; + sha512.run = "f43abacddbaa68d2c45e141e0af1a62c7f91e5381a82c6d8c04d97628743c60e61a126571923da51cfd8e25ce71cbf5f736c6f99330227ed431b8aa5c34ee28a"; }; random = { revision = 54723; @@ -39984,6 +40485,16 @@ realtranspose = { version = "1.1"; sha512.run = "413eb0a65d79521c81417afdb2d7f0ed8bc625d107d2fa19db84ae04a1f27f2da8f07fea27139dee411e1850d8646d63412eb581b08a9c4dd69c886457027cd1"; }; +rebuttal = { + revision = 72851; + shortdesc = "Markup for structured journal and conference paper rebuttals"; + stripPrefix = 0; + sha512.doc = "f5e2b3273ef46ce6e426a828519ca0c8216a2e0a50a4b03647e8def91971a8370b6ac57d09a2daab62fe8b5d60ca3a8ab29e5ff8d50c961cd67fa1c9b963f8c4"; + sha512.source = "249f464016efa0e56cd64644db7c96a581e90094cba18c3f75107b324e12705326661098321fcc408db1d699f64a3837d125ff3a2811596dc4165e208efab7af"; + license = [ "lppl13c" ]; + version = "0.1.1"; + sha512.run = "2e9bf822adebccb51d5495309c15c472bcc300154cb04cb1feb759fdfbfa4a8ed49f57e4628cee9e8ee44a20bfd2cea20f54969b737781d3971a80121591a220"; +}; rec-thy = { revision = 70806; shortdesc = "Commands to typeset recursion theory papers"; @@ -40021,13 +40532,13 @@ recipecard = { sha512.run = "62778e7429aaa8e4bed6546c748a7e135c9edc4909508723e7931284c619d502e9efb0e6fa54c8c1d242858355c6d95bdc87959400c18a5648ef105035ace26f"; }; recorder-fingering = { - revision = 68595; + revision = 73711; shortdesc = "Package to display recorder fingering diagrams"; stripPrefix = 0; - sha512.doc = "ce1782952b53171c686d0f76d9f48a127e6c6bd6c1c2b0eccb00fb8968f31c809118f6bcce0503a61997907feb7d677ad23692c68427bf8666124bb0b040585c"; + sha512.doc = "135c8891223d407ae05b8d1380b4d2c98adfa7b4105a52385c250c5020498fe974fe7fdbbf4ab61e2147870744a1c4b913786b76089e65d09c01c9966d69913c"; license = [ "lppl13c" ]; - version = "1.3b"; - sha512.run = "1a97324ac1264d293a05207a667255e5711cc13b6acc02acd5a170d776d357dae9158491bd0adf96a11e17fbdde1d24809940d323f417f31c5b73c55c7758031"; + version = "1.4"; + sha512.run = "547ccf717c5b66c1891e42ca150fc36c6b40b46799333a7a4dfa6261800c4256c678b1715c96664c0841f25a48ec3b30390d8a2f0106744aa4617844a831baec"; }; rectopma = { revision = 70885; @@ -40138,14 +40649,14 @@ register = { sha512.run = "709694065b22e33c9d3f8d859ba8632672bd5e3fcf6102d0915c203b4fa6773e0e78f02b1af537b3ff2eabab5dffdae40e0dce63232037c37d4e50ff325e8116"; }; regstats = { - revision = 66795; + revision = 73635; shortdesc = "Information about register use"; stripPrefix = 0; - sha512.doc = "8c9f9156e513a4f29c7d362146056fd69f7eabac72e2747c1c93821c9ed69753630da257e1a250b415074c21c1793e4f5c57ea4022338b104871379717da37c3"; - sha512.source = "0a2b173393405c825dec83d5151b1cadd31a1e5b9b20210b7e46982836807a2e7e9c294cb3c184af2464334d43f9a5792f7ebd6c868ccba3f0b7879d34d747b7"; + sha512.doc = "427139d31fd56877da7dbc2a08dc99946d4a5fd0746995c473bf021b8228ed95966054726221c0914e9fca05bd928fd89d5516760fdf154d3279a6b2a93a0b5c"; + sha512.source = "3197829335cb10e8cfc621f087714cc3eef1feb4a4b24a6cbbf4e631f2e85d811516189b1515c57c46e845073b64694007aa62cc8ced4de8b2b6b20668a92f15"; license = [ "lppl13c" ]; - version = "1.1a"; - sha512.run = "4eaec929726cc9bce1481d4edd4222468c05aa30272b24e26b0c9737154316430ef91203531fbb94e3432fe06042de22d30a6253c1eaef6f1c9287b4f0049460"; + version = "1.1b"; + sha512.run = "3475a9d025bac5d33c1be800ded7ec859d10a15e2755521173060a737ba215352eda4c0a87d9c1093fcf3dd405a73a68477fbc5144cbd6e1d45149c604bdf99b"; }; regulatory = { revision = 72197; @@ -40157,14 +40668,14 @@ regulatory = { sha512.run = "48e1ada8d74bbd1fa8b3cf4071f26fb5019c03663186df2fb8fc7b1642c2c27157250ed8f785dcaeed210ef887267182d81b1098fd236a7db731ae11c0a513bd"; }; reledmac = { - revision = 71890; + revision = 73819; shortdesc = "Typeset scholarly editions"; stripPrefix = 0; - sha512.doc = "c80e937dcd6f189e48a52738afef85a4347890f0da419b0a69e6010b48acdb0936adbd510b42909703ff6a8595b0c819e824ec46202db1f36e6fb2cc77216715"; - sha512.source = "078e4f79280732196fb932c0c26c7a91b48d359b183c11df47cd0ac05ad9ee9826f905170f81c6a19aba180bb71b02501d82a1d7e561987066418086e0a99620"; + sha512.doc = "8d501c97da7ad7761cd864e991f284e5674b3400b0016bc3e0788cfe890589a73f41c4471bb12b0dc10ce582d592a4388892500079040430c2fbdf088074a858"; + sha512.source = "9dad6ef91764d81c3b32673635b5fc167c0f756815be04640e01341e57bb096cbf5431ab2a855dc9b8f6caff4a1bc031968bf17d700f4e95b84df91169eee07a"; license = [ "lppl13c" ]; version = "2.40.1"; - sha512.run = "9978086db11d4c7ec5ce5a9621b95286ddb8e837b0e2950ec1d4c8bf6ed4f6c3a20c94379302d65677cce5901162624e2fb839e2ddbc1e873c264f1ff479cf94"; + sha512.run = "f98ceb2bcaa54eaee64ae2bb9c7845ba03f74bdb84d4de05ce54e6664e40a40f4c2648b5a22aa38131c88fdd5bd7338ec44e585987fecf04031188ceeba936d0"; }; relenc = { revision = 22050; @@ -40265,13 +40776,13 @@ resmes = { sha512.run = "b55b0ed4883dacc78d7d4406fff05ac80421259e85297ae8050b6a77539fd38655caa6afe6afb7c3d8654d9da0d965d7cfe52cbbcc6ed9f7be4d87aa9cd6abc4"; }; resolsysteme = { - revision = 71707; + revision = 73069; shortdesc = "Work on linear systems using xint or pyluatex"; stripPrefix = 0; - sha512.doc = "f552daeecfcba58d3c890b477505f7f18a4237617eb32a8ad994888798c0b7abefddfa03fbd8ab6991d183cb1a79903481082de29ca45226b00eaa5764a2cdea"; + sha512.doc = "9c33d5a8a300c440be9de3d071af69241112d4e6a971afc670fc4091070e20e314b6f7ed917781939d0bba7ae67140bd19dd888ac4f7f0d5a8f3eacdef374b1e"; license = [ "lppl13c" ]; version = "0.1.8"; - sha512.run = "07fb4c6a469ba6f4f36f34045028d6b9afac9419706fb1531160bf6a7919d6eb9aac37210020b7d30bed12584b1a6854b49d707c4a00d7faddef66a1481b81fd"; + sha512.run = "8d4ae90bcf4e2228268d6b291891a39fa4b47c86ec1260e43f48cbb00960e23342ef6e22002cd676ba4a50506d546d68bb2333e3eef3057378e06e61da69408b"; }; resphilosophica = { revision = 50935; @@ -40528,14 +41039,14 @@ rojud = { sha512.run = "cd7065dc6a916941a0fd05ea342d29499b6f7496d1934e06c49e7ea1a99c5be5cd515bbcbc2b5935ff8132adcc7b94e653d55de967700410ace55697f6fc156e"; }; romanbar = { - revision = 25005; + revision = 73634; shortdesc = "Write roman number with \"bars\""; stripPrefix = 0; - sha512.doc = "a5fc8c5d6e6a584de4394c59f9bacddc23fbec8d4639a0476cc0814404f1413774fa2d6bae3d8438cad2eeaacb56405680c0c6bcc152a5e4155ecb73de72f07b"; - sha512.source = "9a96ef043dc3542251fab1dc299742b5c322518c61de8d365c290926f2365e5bd6b80a57fcaee19a30ad504ab51b2dcf71170303ab92eac97fe3db4a76dce08c"; + sha512.doc = "3ee6d97e1ed978852c6001b51a1cde49c37f9b95e4bcc85b2f3606724870b960618e5b1d683bc4a3943b1d8cf0618ccfcfb7dc5033127a716b0cd897428b77e5"; + sha512.source = "738b964758a224bde6c3e06b2e8e4b3c35a93f580edaf5388769288339cc85feaf7341d3cb35b4e7f5baf6accbe4ae709a084b788cfe9e004dd41514dd559674"; license = [ "lppl13c" ]; - version = "1.0f"; - sha512.run = "205ed0508765e58397953f28e6a1172d8684f8063fbaaf4d741f4f092e1f652879b414a3225c87bac01e4d41f01c2b0a44632e0cb3088c5c174fdbe42cf25272"; + version = "1.0g"; + sha512.run = "434e463bdecf30fb880a61e1428f8046495afd96489ba4c502328497fdd993c1f8e5fd0f5ca9c6c755640742316313bc845c4dfe5fe7ffe8c2532cfe5b5d9cc7"; }; romanbarpagenumber = { revision = 36236; @@ -40649,13 +41160,13 @@ roundrect = { sha512.run = "01cdc4c8443c50a91dd408c52122e8ae65257344176227a508cb082f92d61bc02756d47e27f75d7862d3c87c26add2003604956ad00b448f63b4f6417c520ba6"; }; rpgicons = { - revision = 71994; + revision = 73609; shortdesc = "Icons for tabletop role-playing games"; stripPrefix = 0; - sha512.doc = "e397dc8a3475d59414cf0dbeae48983f3d9023c87d24406798ce204a49264460c5d8085099dc64d86ab38f07f6b1d52f478139a3a6b805f4d93fef69da1225a2"; + sha512.doc = "1c28bb34b5457aa010013aeffd0eb863522f01beb8186185c439e3749b4556c5441bdf88de59135469823a1cef443e502887d7253ee6175cad7fe2c42c0d4e26"; license = [ "lppl13c" ]; - version = "1.8.4"; - sha512.run = "a88cb5ae9b27dd5d3a62ff5baa4cb12a893765972329ccde8a5b8efb6f3bb2ff9c1d0a0f941bdd0e2f1affa19c2ceb1f3d0666c2838311839f34340a6409e80a"; + version = "1.8.6"; + sha512.run = "5a1987499d38dbea817c37c8aaa41d420aa163fb2ee5c90ae3fa32e56925001eba7fc8bf3d99c5ea7279202a6cfd8cfe60253d9b2113c921ff5c931e967d222a"; }; rrgtrees = { revision = 27322; @@ -40728,14 +41239,14 @@ rtklage = { sha512.run = "6e39e34a7c293f503949da66f1d5ebc65ae0388dc56e87992e9fc4daff1a250196afe68150be14ee2ec3242393ce9e5ea7b681cba31b7ed1c2d58526f6506554"; }; rub-kunstgeschichte = { - revision = 72213; + revision = 73739; shortdesc = "A class for the art history institute at Ruhr University Bochum"; stripPrefix = 0; - sha512.doc = "9dfec559a665412c23df13fa97f55671ea7d6f2dd564cecc9e924b2658283dd11cab08f18a59a63990f372770285a63d2b2291a16e77771eae07f9a4ab4dc5bc"; - sha512.source = "64c3a263a300ee63b747e8ef2a6fedea2b26048b33414a68782dacef0983046b5a6afec671a1188e656325f5ab58948a51f3b444da387b16a069bcf182f134df"; + sha512.doc = "a5550497f57f218b82c2c9beda741cc75e0699d2018c479babc8dc014f4908d506e5db14724a3efebac02e94837b63679d9ea769c2606617038e4d3f6fcbc6cd"; + sha512.source = "7db09086a087f6b9072d01ee44ac207802a59b4251b32a4d8d2f4930b4f24e08e71316fc0148421c8368cc05894d3eb34276427ef5f55ff9879cb6bf65a76827"; license = [ "lppl13c" ]; - version = "0.2.0"; - sha512.run = "f3da2273d073f598e05bbad6416531a9fe34cad44e05f61e63d77d35f772af49fadff994255b5efb2812ae2d8203ba6b974a18985bb2fca8fee07d728504694a"; + version = "0.5.0"; + sha512.run = "d502703baceba0ea9b2a7b12c241e746888e67cb3304c7bc0dc53e7f5bfe880f70a26ddde0c174bffa92615f1ac63e67ce248ba6bfc9a7a17216ecc0fb048ff6"; }; rubik = { revision = 46791; @@ -40787,13 +41298,13 @@ rulercompass = { sha512.run = "8f2e8d9a4d61c3c79e3ef29ae554db2696b9c374fe10f59fe2a4baea33c679a0678a95c30ea1d4310662bb5af6a1b02d88db7bb43610545b1ffb39fba19b5001"; }; runcode = { - revision = 69471; + revision = 73500; shortdesc = "Execute foreign source code and embed the result in the pdf file"; stripPrefix = 0; - sha512.doc = "fe6b6af9efe7564e6c3ac6040f08ce30f17159b7a56ca983a9e8f97217706d75dc481daccc0c2594422d3c578edf0f00e5a72f5b06f7eecc8ea81f79ad27ac4e"; + sha512.doc = "effefe4b406e187b2979823fb8e9e4244f5ddc41b644b51bb7ffded59b63b9f120c367b8580d97a1f8b1441607452bec12d7e7438995540b728db99d06785ef1"; license = [ "lppl13c" ]; - version = "2.3"; - sha512.run = "bedab511e29b368c929f688742dc59c36ee6416a8f362c2a24847dedf0eae472e64c060f26287c55b9b881804213ec57eb04249d9c031458fb3d642c01255e03"; + version = "2.4"; + sha512.run = "db402fba7699af3c0d711580c4928d4c95ae262574226276f157c619780376635439e13b9511a406cb181a2fc92060d15aabe7eef6643a8a3360bfbd3694426c"; }; runtexshebang = { revision = 68882; @@ -40911,14 +41422,14 @@ sanitize-umlaut = { sha512.run = "2f9514b9424a72762c9b4bfbe2bceca10dfe4e75a42e9fe2e26d6808d14fa2aab62a03f26becec8e80b00c658d4452e95c3b84bf692d64cc287693b2542ec3b5"; }; sankey = { - revision = 61874; + revision = 73396; shortdesc = "Draw Sankey diagrams with TikZ"; stripPrefix = 0; - sha512.doc = "a3d18d1a43f22470ea5498423c10246c780116769b0493356174c8e9acc6d9aaa32657f7582b795d2cd720fdbb6786319090303548661f899a650da4a0442629"; - sha512.source = "92b3d428919f217c8c869d3896829e324670647c29321bd868753e3b408c5e227acdc15097c81dee01b3319c08fcd94da1cb5e11ceb5d5775a90235a54e997bf"; + sha512.doc = "6c5c982213139c3437909bbecccb9d95d62c7218da4c84284e834c873e16b9ce18bfb7b9117bf0f73b65367051d5ed484e8cb91f24213b1fa347e87e9becc787"; + sha512.source = "34e4dd38fc0c0f3dfed141db5f5f95c4a67d765aec71719da88d164f09409fc452cf24e58cdb39a53daa6cb4ae4ccae8281b7a5e1a6a2fde9678e82232db6e6c"; license = [ "lppl13c" "gpl1Only" ]; - version = "3.0.1"; - sha512.run = "8a77f2ea3b4c2167d823a839fe2fda2c633ffeb775678e6fa9cb84558dad547f4fb03c3fda6c1f85c4984628ce1515ec874482e8a223385bf1c24b2c30dfb362"; + version = "3.0.2"; + sha512.run = "2e57e0a83c4b4c328fa1bebbb50e9ebf624bf1f5383a0b87b05ee6ae5ffda025975498c518db61bf48f18c3649d89f799088d4c6142abc3690b90e401c8cf24b"; }; sanskrit = { revision = 64502; @@ -41085,6 +41596,15 @@ scalerel = { version = "1.8"; sha512.run = "0b0a996bbed0fc185714f84e32c76e5a9277137d3d8dcc6b12b516afa97f3c80b2684c3c22af8717bb3e6acca267a3862c1244df7cb71eca61b10074fe1c3a89"; }; +scaletextbullet = { + revision = 73937; + shortdesc = "Resize the \\textbullet without changing its vertical center"; + stripPrefix = 0; + sha512.doc = "b70ab33f3f3919d83a4ad358caa8c052032b8072d87018d625a3105151ac96114c00cfbf9575d5d7167fda4366f3979230ca4c7b048e64365034855a8ab159b5"; + license = [ "lppl13c" ]; + version = "2.0.0"; + sha512.run = "d4078aef96b807ba82e3d1d4db3ca629b89891399fb10363eccfb0a94a2913da771cfc2fb88c364ec0fcb7dfe2da257ec305a7016948b9d032efd194bceb9df5"; +}; scanpages = { revision = 42633; shortdesc = "Support importing and embellishing scanned documents"; @@ -41171,7 +41691,7 @@ scheme-bookpub = { hasCatalogue = false; }; scheme-context = { - revision = 59636; + revision = 73338; shortdesc = "ConTeXt scheme"; stripPrefix = 0; deps = [ @@ -41182,7 +41702,6 @@ scheme-context = { "collection-metapost" "dejavu" "eulervm" - "gentium-tug" "iwona" "kurier" "ly1" @@ -41397,7 +41916,7 @@ scheme-small = { hasCatalogue = false; }; scheme-tetex = { - revision = 59715; + revision = 74023; shortdesc = "teTeX scheme (more than medium, but nowhere near full)"; stripPrefix = 0; deps = [ @@ -41457,7 +41976,6 @@ scheme-tetex = { "supertabular" "tamethebeast" "tds" - "tex-refs" "tie" "web" "xpdfopen" @@ -41486,14 +42004,14 @@ scholax = { sha512.run = "f7062ca975c2801c220c6c34844d87e410e501442313974c77281aaa0927b27fdfbd2328676405cd1820c809e0354edd332e9fba0d04fa1e9a8d28f91543905c"; }; schooldocs = { - revision = 69659; + revision = 73466; shortdesc = "Various layout styles for school documents"; stripPrefix = 0; - sha512.doc = "c67955fe6568f0a661a2b6ea4b186d133f393420ce20c2d38dc461ee0d551ec91eccd0da94492effe4faac8c5934dd6e59853af07dae9d415073874fcb8e8fdd"; - sha512.source = "1569b42e84b56ec417435d157a1c1999a9cf9686f72dcfbaa4d365a3efab15802390e594448d5f3816bb6a03b459b63dd85942fd16d0eafb597dd4c232f67d02"; + sha512.doc = "6c0ec869554b3e974edd568522394f5bdec7b262998dfcdcc76aee5ab80df2f8e22eee25b08486dd2393b464b7d04f329a708e30dc7fe6eec348999586da9172"; + sha512.source = "44116948f7d05fe1e176528d40cca32ad579d8f5f75eee68fdb5dca85958c2bbd9d9fc4ebe25b56c1c2cf642cd3941c2f06635941eb850ed38a695d918aaaf4f"; license = [ "lppl13c" ]; - version = "1.5"; - sha512.run = "eb9f95e2026935a9fde3c6a72600a8eb6683ae68ffcb48798c05f3cdcc4f1064fcfd72738dd734a1561de563e044913aa82294b88984cb84ae49947387592f4b"; + version = "1.6"; + sha512.run = "937810f9c71a11ae32e1c858eca65593f89ab4f1a8d72a7fca3c264761a027c67409d116cfb6d534002d0f530dbf8f1596bca1db11edb87473cf6c145f587837"; }; schule = { revision = 70846; @@ -41523,14 +42041,14 @@ schulschriften = { sha512.run = "d24778c0ae93d06b42bc8d7eb8d84ab6e0f42b33352f2dbd79586a4ed9bb21fe99a61dc0eab375e56a20624fa5ad63ade3446d685dcf063d46c0f60264c431f3"; }; schwalbe-chess = { - revision = 63708; + revision = 73582; shortdesc = "Typeset the German chess magazine \"Die Schwalbe\""; stripPrefix = 0; - sha512.doc = "2df38380cc26d4321d8b18facdc6c427d1986143ae1ef8227a2d536af2fda5f6bfb73ccc395156a7f018c9c9af20b3b89bc994d9021bb9ff3fe5d771f3a6bc59"; - sha512.source = "a75dd975edceca279cf120a08d0666e9227af96732ff3d71dd82068b0c185842902244baebb074ad1ab611fed8064772cc65dc2353a9a79633f8bbe21955dc95"; - license = [ "lppl12" ]; - version = "2.12"; - sha512.run = "ad2f033f018767556e8e4c2b76f1d2c80e14780cc4b483e73bd165c0cfab11453514065597fd7dbce05e8acfd4c307219156abcbb3d59ccead70df61a128961a"; + sha512.doc = "79a10ef61dfd4ec0438e5b22498c2c62ce7958a06de7facbf5afce563852877adcf042f8eca38e922830e49b444da95a9c2b5bf21f5e647aacca328250fbf185"; + sha512.source = "7feb75513ca35da1d30029512e02f46a81ceed935259d3cecbdcd58c4d1906ac41cedc85118804ee8dc90f97ba96d0fa28634a20baa1c66d993fd41addb813fa"; + license = [ "lppl13c" ]; + version = "2.13"; + sha512.run = "df2f41445eef6fa9a64787d9e7464be5b53276a7ade01802d81cc324ef62f9e140414ea168fe69fbf494eee068c84ace1ed567399612a3476b12ee56ee5e908d"; }; scientific-thesis-cover = { revision = 47923; @@ -41581,13 +42099,13 @@ scontents = { sha512.run = "39b17762b4803864c40e1d32b5b1ed5c60dab7e902858c2009e6b915c79f2132f01d5d7043c3d2f0a10dc853c236b2d7e5ac0b16def5e326a678c3fa21a0e07e"; }; scrabble = { - revision = 69599; + revision = 73069; shortdesc = "Commands for Scrabble boards"; stripPrefix = 0; - sha512.doc = "e3d922722c51b71f9ac74e914cf189ffa8e8f53fea4eff7addd2ce5c7d99ac3ab360b50a3212a9ebf353114f1dcc82cedd5a9315b48f4828b1340a9867ef69fc"; + sha512.doc = "0a613927318bfa354e39fb0fff547d64b8a4ddafba7a28146338c0d52fd2b7649ffa4a895c1bbafaa43a5df49a9bc64a3b3e307e13b02288d29aa3293db316c3"; license = [ "lppl13c" ]; version = "0.1.6"; - sha512.run = "89ff7d5440c04e7910d3c001be2d4df7d08a53a47d05b161545fb8446977a8f2695cc722854ef040b59b334804297005baee9f2d3572b767d680925191abf101"; + sha512.run = "93753161a99ef71542ee8e6b2c6da33aac8b7d102f3f8ae64e18a3a6539b0ac014ea2be04f672f6e73b5d0ccdedfb8919fdf75742ace16e5fa5c0869b0714220"; }; scrambledenvs = { revision = 60615; @@ -41656,14 +42174,14 @@ scrhack = { sha512.run = "dce52d235515f779d603ae190328b7b4e60b2d3500c7321ea7b0bb1cf5fa0043a3a36d0d2bddfb9e29f5d8502709b82c3783d6b07dec762c94764e1a0d377092"; }; scripture = { - revision = 69232; + revision = 73276; shortdesc = "A LaTeX style for typesetting Bible quotations"; stripPrefix = 0; - sha512.doc = "1de0de0b83915b59b54b234daf51ea77aef3bc58a80251c7b055708b7eb8d457806d2b897cd3771f6a303e8137b5f5543dc06c97be94142edf44558cc92a1277"; - sha512.source = "555f72881eb6d76d9362598cc0e30f67cfe2dfc8747f68e5214258fb127947965e45f0bcd1eac5e173c83e7a4e25e3bb0ef6615fe31cac5f6e3f23814e7266c1"; + sha512.doc = "0051d624fd921be5fb4bb3f0aee11433ef42823c36e68ea27339ae9a75c8cfd544d85efaf6cf4519053833458087b578b2f0a7552ea461aa1d3036a7adcd264c"; + sha512.source = "83a729d0b693eb8156e90a754d372d64656454ccfce8341587f563cf7cb526fff5fb415390e836c0031d435e86f392d07e99ac9fa1a74da9f93b86985b2bc193"; license = [ "lppl13c" ]; - version = "2.0"; - sha512.run = "3b3e30f0c5bbc99a49c9aec873f2ad93535d8c1f3fa79f91619d30fdca347dcf1bad30485463ce875e4511ed857e358824197059732c2538bffebd97b017554d"; + version = "2.1"; + sha512.run = "b0ac693bf036156d05a4063cb73ba7d559931c92fab8d9ef905a2286602b46c3a7233940f566defa92e5a6ef74d6cb4831ca706db2fb2d61954f4f2dad119ce3"; }; scrjrnl = { revision = 27810; @@ -41676,14 +42194,14 @@ scrjrnl = { sha512.run = "39198edddb3a3ce24bdc0d9cc6f5d7ff204b142c200a9ce36060bb016f1e1e1750b83210a91f1eec90a205c5a4923704bdc0e44876c462eb768355407597a05c"; }; scrlayer-fancyhdr = { - revision = 63844; - shortdesc = "Combining package fancyhdr with KOMA-Script's scrlayer"; + revision = 73859; + shortdesc = "Combining fancyhdr with KOMA-Script's scrlayer"; stripPrefix = 0; - sha512.doc = "d4711f5178d0e654f80d2771519d6ddeca8b883f9bf3d0ba6e9524ad4541a9fbf9179fb69c356d1ab0050b051c28cb074680a6322fef41ee765ebef8fe476651"; - sha512.source = "4d0ae176e9d191b3773a39d7d4982e6957ae95fcc8b06f4233764e57b8954aab4ff0186415f1d8ed988c1473a8850fb99515c0966dd2ce8a7c8d99e0ddff5d65"; + sha512.doc = "179c4419144f65761465efe811d9b8ff3f9ff41649c0bba0fd2c7696efa04109360be43074369eab1b2f587f2b45f9bca2dd344fe74d0be6da36a00df2392549"; + sha512.source = "2c87719976320f50dd5781c22bd4703a9c8e91bb7a00e7a8477735d88e9d8cd9524a20e388e97a8e009c05e2dbc61e7afc5ffc5c5ad2daea9064715efc7129b7"; license = [ "lppl13c" ]; - version = "0.2.2"; - sha512.run = "4cd49bec1f3bec3bef5c54964b06fa78cb21cfe431a05741e69cfac59577a2d24cc5b32b6abd739a96a93441e8cab0db80640e5015dc70729ff32c27d26805f2"; + version = "0.4"; + sha512.run = "274996ef9e6fede46476719b0967148ad78b00078691354bb8a5d7c96ec58b3313c52d6c21cc2cb6559df09211c57901d05b57f05bc13770e88c982f04f2e26f"; }; scrlttr2copy = { revision = 56733; @@ -42064,14 +42582,14 @@ setspace = { sha512.run = "9462cb011a2a13a962c08d7d962c120f2b459630f8ec1f96704c2878facf01a37118e9c94ff9cefcc9ac0e0e3c1bbedc158aaca24dcf13cad0973a6544e79651"; }; setspaceenhanced = { - revision = 68493; + revision = 72852; shortdesc = "An enhancement of the setspace package"; stripPrefix = 0; - sha512.doc = "d9356a26bed9405fb9cb45eda3769dd5360418c02fb6442cb4dd64da5e70e9785b167e8406fc772fb7ca1cfc574b23a375916d0c5dd6a1afb09668f5e6c743e0"; - sha512.source = "5f16118ffc9b7572a18c485915a677b822c26ed0c4f885292c6779f91c0a9b6fb3d4f88dabb94798715efd880f6577349ede1936720ce2c6274c35671e2f0aa5"; + sha512.doc = "b1880a8558eb760d851ceedb497dbbeed3502ad037daced9b9110350598233938845ac7951782e915bb53f6969616ba2ba4f5e4954c3bee411f0262a6b0f988a"; + sha512.source = "01f5ef19ba762d1895fd5dc97a5a5f0e5cb5a01c442a677c0a5f4f80c92d965c705a1254b47f12b4ec216b5a756b3420d1dc6e576542e9308559c1d3f3816424"; license = [ "lppl13c" ]; - version = "1.02"; - sha512.run = "594fc089440a356201122b33160a16785dcabbb2eeb1fdb2fdbbc1e53c83f0ffcbfc7b9c6be623e6a5e4ff23b933f25120ba1ecce72e73d8e32e1939a2744f8c"; + version = "1.04"; + sha512.run = "ce7ef4d7d21215f2033cab65e27affdf4833748265848ae2d37b5eeacf22f6db37689a4343cace165e354ec11604442c35215ed97ec297a3511a7e86dd6838ce"; }; seu-ml-assign = { revision = 62933; @@ -42419,14 +42937,14 @@ sidenotes = { sha512.run = "9833a4e34171bcad549d47dbba77b9b2546adf3518c88389414d71781c17f00a7c02c390bbdae2467ea93dca07f1e38622f5874e3fe494751e453094d2025fd4"; }; sidenotesplus = { - revision = 69176; + revision = 74147; shortdesc = "Place referenced notes, alerts, figures and tables into the document margin"; stripPrefix = 0; - sha512.doc = "d712e51374969ab345d8f641e4ee860bbd72e5f4aa759b0b00cb538c768f9e790265074003715252f8e6c8a6ca56a5513b0f4c2dc0c3d55214aa80a994ff5c08"; - sha512.source = "c87cbc1558e5985583116a4d587aba0a7f7f6a8e7103bbd5d2c146d250fbea2c5449515787080c49ed949a28071f49036bbc4fd343d4e8d063d5ddf50e42986e"; + sha512.doc = "536452894dabe21c59c6b4d12704add61db4a4d05b308c8249ecb1bdf1a4f2fb0963194567d1e7f379316cae3a920ce726ed08bb7273de065e8dad02809c607c"; + sha512.source = "97f76153de7b4c557c52e08f5fca6441c8b988a336d37b824e6f7b48fea5ded0ee7e118ba7581028c91d90ba7aa63ecfb33078f7d645854b4359529751850f65"; license = [ "lppl13c" ]; - version = "1.04"; - sha512.run = "d7d7be2971798a869308564095617484713471f4b1e46b5729f40871eaa3216285cb063d19a7d85a6db3f4b492c4af290c3c6d392d7a7fb78b4e7761255c0a83"; + version = "1.05"; + sha512.run = "70c8f12264a466828836a96e7aac7bf5b3b35e1d8337a803b277b767c8eb927c58e37965d909ea98de4fef1cf3c93c81efe1a0a4c41de7e5a9245d4499dad14c"; }; sides = { revision = 15878; @@ -42467,13 +42985,13 @@ sillypage = { sha512.run = "6be568f3e8f73903849837975e659df5238e4bbc47c26e3f54d628e06186b0fed2db3fc165fcafe69bd6a78903d99011930a243249a8f7fd124885277f2d242d"; }; sim-os-menus = { - revision = 72484; + revision = 73969; shortdesc = "Insert 'terminal' or 'context menu' or 'viewers' like in an OS"; stripPrefix = 0; - sha512.doc = "4d311f4938e700e685eb758703b88a697cb0cd46d97afdaa3fb188efdfa84f7e661c2852117b77f0c5880e29b73011cab832d15768c99233ef2857803d342b9a"; + sha512.doc = "6384a316f1d97033294d8e1ad5db593a584700457398f9b925e8a3bfa2b5db89d7f413132632e486fe9a0c7138f03f7efc4470006f6b8dc3721999035bd4dd7a"; license = [ "lppl13c" ]; - version = "0.1.3"; - sha512.run = "106d2823fa3f9ef04d2480f5266195add97869cc883082c492c93a60eed45eda9b33b51e294a19d9ddb5f5d49fca2129044b63f56edfa94089d7bbcc1ce3f764"; + version = "0.1.4"; + sha512.run = "7cdd112053173d14699abc5ffe7976219e9fe9311b3875538010d864d5f63210fa17a770fa84962c9789c77cf5d34e9ebcc201d383b513aa25b0c090b35e19d4"; }; simple-resume-cv = { revision = 43057; @@ -42521,16 +43039,16 @@ simplecv = { sha512.run = "c67e9200925ac86386efaab35a8edbf20f0fda700c00c3b0350eadbe62f39fc02f502493a73acc768a4727ad1162561d7baf38193d57d1fefb4c8083ebe38c35"; }; simpleicons = { - revision = 72659; + revision = 74515; shortdesc = "Simple Icons for LaTeX"; stripPrefix = 0; fontMaps = [ "Map simpleicons.map" ]; - sha512.doc = "7c3f7f89b3f1154345a941391e6fa7fcdee336134e7acd2fb26275538c812eb8eea926a5ebcd1a3019dcc7962955b49ac9bf3c9dacd3b0be7319956e026a2a7d"; - license = [ "cc-by-10" ]; - version = "13.14.1"; - sha512.run = "1c8dcff7e15d5132e3a240b01208d3e8251dddd7477a65332418e36097d1c9b8fb7f3b06e51f8048b5c3f21acfb4c6426324ad73b0e7f8bafbf12cec07692ede"; + sha512.doc = "f42300c6e7cdf8393cfa389a677e89d53bec2aae37746f4c1f9638066e0a3ad85c1ff320b8c5dda69fd587e497038a93296b08c1991e6b981fbe0764d717b99d"; + license = [ "cc0" ]; + version = "14.9.0"; + sha512.run = "f1389f10116c27fb2d693430ab593f135d27ae4bc76e0ddfb7eff477524c529d4c59b4eac4ae9538f66aef44bb8da4c23dada40604c3fee84382687f342afdcc"; }; simpleinvoice = { revision = 45673; @@ -42653,24 +43171,24 @@ siunits = { sha512.run = "01b2b83edba4482a6d0434efd4590b3b0fbbb596da6075632a215d60a16cc48d66f0f47d3ca61a0e73290e933952cac15fa2048f6ac12112dc603956f123f5b2"; }; siunitx = { - revision = 72484; + revision = 74329; shortdesc = "A comprehensive (SI) units package"; stripPrefix = 0; - sha512.doc = "26ed73a8d66f04e2d627311861542aba20e0cfc52eb31f7c71487f19011d0f01e3f7ae4c0e53a99f425f686043e23848c00225bc73d66cbaa77af88edefcbd1b"; - sha512.source = "41f0006b2dceaf3929102958775a4d91e0395886d4160b693071afd4950b4365fc7926a68976947196442e396822e567447fcbed196f1fafb7c2f0d9485794c3"; + sha512.doc = "85f8607b55e2889a40058bfb459995487e07152ee865dcd7c3cb70de29e48be96b537f1c3ec29f9cf243a4ad7e399741d707170ac75aeb29084e3f74c2c8e206"; + sha512.source = "2cdb06dd0a4e42abed51179488abe66186a21899194eebe2c549da402de578d3147818ad336b2986bd710c39d752b439c01d3085abedb2c51a2ae5be40844802"; license = [ "lppl13c" ]; - version = "3.3.22"; - sha512.run = "e108169ea9e84f0265d04bc1573587d6fb0c81e71646743f3ef734b03938d48dad54cc905b9a79f5d6e0bb320be9a6924d50fa537f4f62a13ae7a73bae53c202"; + version = "3.4.6"; + sha512.run = "af0126e7e7a56b25ead60a33c9bf1ad37dda876af295902caca7f87308dab2eb37224b4bcd9892b2d0db11c4514dc092d986f24dcbf173adb6a62581e8685c5c"; }; sjtutex = { - revision = 72606; + revision = 73938; shortdesc = "LaTeX classes for Shanghai Jiao Tong University"; stripPrefix = 0; - sha512.doc = "9ad1b1fb0f4875777e5e03437611a435412280767ba6375371ceb89aa7373afca552ed7af5eca55574770a4fdd390d063cc2615cc26763f6701c94057fd46e3e"; - sha512.source = "a050fd630fbfed26f5fe5d18d093aa542e58f3f67a6669b8e3f3eeafa53989464b2fe149896e4f6c19e0b9aa8cf9099d68cdb4d4df9a5598076d60afbf9a979f"; + sha512.doc = "5ba1f48719c941c3a6319fb59b866a100249438c39d3798cdf6cb3f77685e23ce1d9a67bc427cd9f056b69cf534f8a0c403131cfeea385529c1095f0182f4e3d"; + sha512.source = "ffe992c6baf6ef68507ab92374bcc07e78ce51b6d7efc8918920d1451c97bbc7ed8758570db47e86e53f1614f7ac983f0e200abc9ae451517f35444146766716"; license = [ "lppl13c" ]; - version = "2.1.4"; - sha512.run = "da007a5494ff80b358695501c56a2ebe969adfbd2112190873a73737254cb1c672ce2f9f4f19f1d6f495ef75526bea388bd7492abe27c94e73bb1ada8397bae5"; + version = "2.2"; + sha512.run = "f0661a6722cbf85aed4d711a094d1a9602a9cc711f3abce80ea4650eb3bb9a3384c82e278bb23a16d6f6990b64c57477e8cbe69b69e5bfb8c37d56b65daefd15"; }; skak = { revision = 61719; @@ -42703,23 +43221,23 @@ skb = { sha512.run = "5c2e0e7310898e258505cf438ad91650fbcef6b720e9d05b9ddd241ceca3eea0ccc3a71b6ac38acee58d8e205b8352ad7abbdc277596ac74f6a5cf0ca805a0d7"; }; skdoc = { - revision = 56950; + revision = 73385; shortdesc = "Documentation and extraction for packages and document classes"; stripPrefix = 0; - sha512.doc = "481e590c14396f3318999524157f8e5a8dafd0b6f553414d3ee09cb0dec6d356c2b422b6598b613ec4d29b35f27a59024dc9e5bcb49ea2643205f37c616788d6"; - sha512.source = "70343ccef329a3dce81aca0c0253b42450e7eae4560b58d69d9f12d7ef32d25023d5f09208f22f7d65414a089d2992c28079dfb708ab701803cb42fe41480691"; + sha512.doc = "45ef8e05a003b0e735e521a384b611fa9eab3afd3eed8c2d31778af8e779b7bc60e4f813a014b762b025ea6b72d521b4ace1384269f9d47c18d05f108160ee73"; + sha512.source = "9c47e6a49a1073134df72a88eb9be20f6d560b05bdd29d8992a73ceece255417ba603e45130a332d00a18aacb33391e087a8e13e5e9d23d5e587365151eb8477"; license = [ "lppl13c" ]; - version = "1.5d"; - sha512.run = "d00944f58e9842c0d1841b73fb1936dc14655f07d51c60140581d597a93a0e9ce9fe65941cc343979e549620edec6a8339cca6089df068d932e1344556c3449c"; + version = "1.5e"; + sha512.run = "cdc3d89650bf5c95609016b4688103d3937ff0e7e355af44f9119e48f1c52831ffc5a240193113708785e7710c943b41a546d9a39d7c4fbccc973456a719307e"; }; skeldoc = { - revision = 57922; + revision = 73465; shortdesc = "Placeholders for unfinished documents"; stripPrefix = 0; - sha512.doc = "13cb76835ff1eed119d8514aae495d6adaf8b4c3db17c660af29624247cba9c37d4f6991d6a99c566972e4032f14d62c21fb4f31b856c49de40d0a87def1cf95"; + sha512.doc = "2acf2021c616bbb110cfbef186aa301f0272fcba2ee98a43e6a5135feef722fd20cf7b282d2f80fdb790707e59933d1ccbfea1d19373c238ec8dbcd6209198f4"; license = [ "mit" ]; - version = "0.1.2"; - sha512.run = "2bc1374e969e5b32e9a88b8240a94eac90066514c8dfcb91196a13a3774d200cb8a412fd490b581ba18e9e0047596d30296206b0607316554a361b6103ee33f3"; + version = "0.1.3"; + sha512.run = "d92bd79327b3b8114f51e66b5e385663a766c4e2792841393e6ac3ab1f9c434978200c203add6e9353b5eeeb8335df4ccd7aa018e42d52cd096e7d2d6f1b48be"; }; skeycommand = { revision = 24652; @@ -43052,13 +43570,13 @@ spath3 = { sha512.run = "c3d28d96a5ec1c0d3b0f7e29a974f90a92add95de81655f5b5d4ad465e7bb9ba7874feec4dd8071715a25d2ee01f94c14a81a2fae68838dbe3321cea9a0c7f64"; }; spbmark = { - revision = 72647; + revision = 73790; shortdesc = "Customize superscripts and subscripts"; stripPrefix = 0; - sha512.doc = "58d70f426704e83b8e6db164e7280025b8711e485f178877b5cc085848b68e5c50cf9dc740101fc670f7ba1a2efa5132a857acddc9a4e3feaa843115a279278c"; + sha512.doc = "7dea0e5bd273bf4bd19239f6f8895b02d629b091725b6465e063945b50fb233edb2d956fdc26a3078fa38e9e6bad9be48d75e283920c1a2a39ffea51614a7758"; license = [ "cc-by-40" ]; - version = "1.46q"; - sha512.run = "729d40d2b96182b36e11f957087b9f030e1d53f1b2826f2cd61b0bca5a67164e19ee530ae89ba453c87a08a15d85c200ee84d42c6776ee0fddacdda9e604a44a"; + version = "1.46x"; + sha512.run = "2102b7657e772e3cb0ba649998e84d4ee49da2220a99af9689b6899f828cea112bb2a8bba228dbb9ac732db23476798ff4ebd04244597e87df13d235ead15de3"; }; spectral = { revision = 64528; @@ -43081,23 +43599,23 @@ spectralsequences = { sha512.run = "797f7ded1824a025337a12b47a8b85d16d69b8e0f7999015c0b8618ce639f97a5883f1a694a22b56de4a237901e1a43b7cb0f387bb02f567301e59203b16d31b"; }; spelatex = { - revision = 72638; + revision = 73664; shortdesc = "Create PDF documents with hyperlinks to audiofragments"; stripPrefix = 0; - sha512.doc = "b869b5d6633b0013b1aa42dfc6089b638edd4dcc514ec950d6be825d9ebbc231a7719e634fcba79093a05e9486191be92a3e29136f2b48937b21822df46c21a8"; - sha512.source = "84b15eb44fdb266a707898467066bd8d79de34461ad81da0050bf11630ad549da2fb4f62b4d924ba64d8327f10f3084e4c9483aa9a89d976eda2ea3208f9cf2b"; + sha512.doc = "7943b6c7862579f435fbe9e7218066380d8f1b67f10b16f0213fa16f2e874732b55f4e9056dc8da41b9af339dfbf75ed7bbf5d4e25b9635c49fd8daf3732d30a"; + sha512.source = "4d92d6885c313a7abf9846c6578588a7314310baf3419f3634a0180d20379122dbd47b0b380de75f128359b8e3af8e09cd2a62db643b9e52eaad0997c58c7a93"; license = [ "lppl13c" ]; - version = "0.93"; - sha512.run = "89640dc27dccad9cae516cdb3099033f58c688cf1e16d92efe538b0c8d3a87cfca98e322afb1653d296d443e69f67065bbcba1995cc4c5e5274242c960509d64"; + version = "0.95"; + sha512.run = "fff6ed826b87ed31e8eddc46cd6e5dd8d5948c7be8f4d6077ee9629e241e4672a992faec0d8972285ce6fa052a60ffdc965b5d0e826aa128a299059343eb215f"; }; spelling = { - revision = 30715; + revision = 73571; shortdesc = "Support for spell-checking of LuaTeX documents"; stripPrefix = 0; - sha512.doc = "a51b8fb45701d318dd9b9736830b83ac34c84b781d61a3a247263167d527aad7cdb6e1917ce260d09e0304fba38bb2e2a25288f75aa2335bef479918036e1221"; + sha512.doc = "fe7d016911f69b232a3cc5c2f25fd1e6a657ece02dd8728f4006ca53db9c656163e943e02975b94396030bf7591f30ed7be133f671c25b28e8c5c8bf5369e2b0"; license = [ "lppl13c" ]; version = "0.41"; - sha512.run = "ec32c627f52e1cc08f893aff21d43519ac30169772e82793525cfd61c302883c9c0c8444f2d51cd03a94f55e1ad589afac1a404a47b87ebbe7855acde887e511"; + sha512.run = "32f5ee6cee0b5bd52c1151fa63556b1f09b40fc138be8d6c4ebc1ac7cab7fed083b090ff9cda2af87a25e1f2a405288374a4ce987a823a07175b6f358ab00911"; }; sphack = { revision = 20842; @@ -43196,13 +43714,13 @@ spotcolor = { sha512.run = "6748982e7007323414dd8ca5f1ede105bb2bfd0b0f8d2f83c8731926628c094c8c08f0cf4ddadbaa209e182f8af83ed6fb761142ecbb97371752473b33c44ffa"; }; spreadtab = { - revision = 68256; + revision = 74330; shortdesc = "Spreadsheet features for LaTeX tabular environments"; stripPrefix = 0; - sha512.doc = "a2b57066ab198d88be6736572276593cb2b31a9c6392f74c68358d39a8c88077266b2138730225b6ef54245a6f084aa73dad5bbd31a77fdd8b60f53f7342e25f"; + sha512.doc = "e35b4236d94171208ec4fd0f85f60e93f8c866261c6190e0e3881379a4abe4c32e1a71d849b0fe0f313b81dfc074051131ad7af2cca151a17753a1ee62da96a8"; license = [ "lppl13c" ]; - version = "0.52"; - sha512.run = "f808d82cde55b9b8fbe0cafe9f2e67acb19547e85f8d48965ecc6c8ea70302b9ebcf4097330707780fddaf1d9b2a2a12512fe4026a0d660c5a376fbcffdb6f19"; + version = "0.6"; + sha512.run = "a2593936584abb59963c53222a3ffe8a4f69cd5740f8ee604d6ae82302349a883ee75c0f7c8c571aa0e48375b9650c49ba07e73811dd8f387ffaa8f9cc6248e7"; }; spverbatim = { revision = 15878; @@ -43280,13 +43798,13 @@ srcredact.binfiles = [ "srcredact" ]; srdp-mathematik = { - revision = 70807; + revision = 74490; shortdesc = "Typeset Austrian SRDP in mathematics"; stripPrefix = 0; - sha512.doc = "40e6ee4f5b4e8aca87dc0f8eef99d5e26b187a6ffc6c73d564e37b5f628b20cfa2be75bf9967a39529db084879b29c58a03c74b7d9c1ffbd1f90806a801e7142"; + sha512.doc = "bd94519d4e70e223aae28b754efadda5b4cedcf0335dd6b82538bb11b6e5b429d758900379728fcf62a713826432131d54cc017730d627143a7efc973aa12a8f"; license = [ "lppl13c" ]; - version = "1.13.0"; - sha512.run = "55bb972bf338196f7eeada73878f6c6041c2bc90d5eca98590a2ac0346754fe68bdc54f6de554285a47f93ef822611fba3e8bccf39e8ec9ea09f9e78b4f89693"; + version = "1.13.2"; + sha512.run = "ac84aace7aa112bfd93570b53ce0f4d4e92d82d1633eb30d512aba4e8d6d572225eecc8b5e2fb28e219bb1951f03bcfac740a12f98c2479ea5a08aacbd86aec0"; }; sseq = { revision = 31585; @@ -43348,7 +43866,7 @@ stage = { sha512.run = "8472bc96265ea7fd3be748f147238b6852079ba002f9c7548f5a5e8cb0f34a8155a799635ee5e31b22bb30554795a6fd08e62312b25ce83e727e10f6ccd13f37"; }; standalone = { - revision = 64677; + revision = 74250; shortdesc = "Compile TeX pictures stand-alone or as part of a document"; stripPrefix = 0; deps = [ @@ -43358,11 +43876,11 @@ standalone = { "gincltex" "xkeyval" ]; - sha512.doc = "358fb3b29f4c2d37d03b7d98ee02b35ff8571ffaf30b8d3fa1a9b0f74965ca4b0bcbf2a7172b8771dd3f1240c7dad1acccc7710dad302411dc43a301149597cd"; - sha512.source = "a29880dfca00e77b19ee828333c72f7c95a26470b8edd5ecea53bae3300868266ad4aa0db2bc6e16f72c14493b43659434ef4880b025b5bccad3305d0ea18b33"; + sha512.doc = "2f54b2ba3d27002f8b5df31e2f6f6d9700a83a7bbce1cef5180fa980dc12d5b18e3affa00194b6aa627246b7e2b31a660656765f64801866c32609c55db17112"; + sha512.source = "762c6178e3aadfe7c63f50d15b98ab11e337c750ac2edaf5731c27ef43d9909b8267eedbe872aab558ef07e1267e268f20c62adaeca34f43e72459ef9a0d3efa"; license = [ "lppl13c" ]; - version = "1.3b"; - sha512.run = "8e74a676232ffe9fbe93ee3a1095c0c29cd65bd23f8e4602308d8fc1abfde9025c01e8ba379782d4c79d3349b4298806419735c624436a7b0c93e2170c592efb"; + version = "1.5a"; + sha512.run = "d21b0f70d21a18bf4fbd71f82b2420cf3331d689454f5e7e86317c0fdcf46b6ad5f662c09b61204a7a340e46db9abab56ac6fde8f9b13c42387703f65e0314eb"; }; standardsectioning = { revision = 71479; @@ -43396,13 +43914,13 @@ starfont = { sha512.run = "1f45f97813f5e51b45e1cbd3246b877aad823895a4b087294d0754c560db5796d8b4f9d09972b5c90c4c569db82a2d70bd1c39a9dfe6e1fcc4e0deeceb44f876"; }; starray = { - revision = 70796; + revision = 73989; shortdesc = "A structured array (of properties) based on expl3"; stripPrefix = 0; - sha512.doc = "e3f561570ebe677939812e283cc547c288c96ade92368a186a8888cff60f0b354d248a97805bb63513a60afa216cb2d2fc492519b5574a557e049c88a9a66a61"; + sha512.doc = "dbbe1be9fd774c7a68f96011046680b0db4e834fbdb1c78904173af834b1bf8a8879ce966d6f0297ca4bf763d4586e579bf87c2e9ebbb28215803f22cec15ff9"; license = [ "lppl13c" "gpl1Only" ]; - version = "1.9"; - sha512.run = "13f8dfcd752136712a52a79d30a20f56dee2ab4bb23e1f7cad63073584049abd482a77f2cdf094ad30d222075985f8f58bc35c6d637da96daa10ee7fb63af187"; + version = "1.9b"; + sha512.run = "389a9ad27cedce7c4af5c220fd66d37b2280e7e28d09f827a878103be9d099cd1a7d0e5c046b8468ba887b21f5994dfbfa37e8bcdcc50b96c7e4839f9e57aa64"; }; startex = { revision = 69742; @@ -43627,6 +44145,15 @@ stmaryrd = { license = [ "lppl13c" ]; sha512.run = "8abe58b84fff2f4fd6846b6c267f3b245fb1dfc2f38d0db54ce7cd9d456abd07627247613073f09dcf7e11e3e9c5940d8ff657327232ce638abc6babcc5b3d77"; }; +stocksize = { + revision = 72957; + shortdesc = "A flexible and easy interface to paper (stock) dimensions"; + stripPrefix = 0; + sha512.doc = "6996c7ebefff554187f3acef9548da262ac8c01113bef606320af1075c22d6454ad6fd0cf74426bf9bf415463a66a75983d26889e8432c1cb97ea303df503a55"; + license = [ "lppl13c" ]; + version = "1.0.3"; + sha512.run = "2013e9c64bb951e4a813804790e848eccac3890460de22ebd76b4dd9e2e6bce269c08e481ea35790e12ae27df8dbb862c4b0ed05eb2efd84beb7a2874d2abda8"; +}; storebox = { revision = 64967; shortdesc = "Storing information for reuse"; @@ -43929,14 +44456,14 @@ sudokubundle = { sha512.run = "da5c7954dda7fb8076d9b2fbd8a379e416a162ce0039a0566799bba0ddea975f3b951b7615cf50819440b46c419277a080b6e1c3c514e73483b4f81420a4b6d4"; }; suftesi = { - revision = 68204; + revision = 73055; shortdesc = "A document class for typesetting theses, books and articles"; stripPrefix = 0; - sha512.doc = "af2b5317858ab9d19723c668fc6af548fb4bac805cca26e7dac31872e54c35c768c228763681db34722f2a1c4222e2f1fa45e5263b183ddd51e848e643b7f47b"; - sha512.source = "298a0a6a4d627d662c4a8ca6dc7312238dd36dd546c768fc16402fa6f630a224884d8223c30b69abd4f28ae7a19d02870b01ca71608ff37dc548ec3d5f854c95"; + sha512.doc = "1c04c9b0622a2b177da50dfbed2e2c83acb57f104204e9a7c9746641bcc32edde4f5e700c1b20fe44d1e08d366d60bc9912bca56bfbf75ffb70916f0bf61bbd2"; + sha512.source = "799da472fc8f794bed8611a67d3b134dc56f8e1baa49396a3dcfe63e5ea500bce285cf9b5c814aa439f7d09967d38a61aebfdd038fb6949ba79f83db5fb923e2"; license = [ "lppl13c" ]; - version = "3.2.1"; - sha512.run = "627d002ed932ed3f55382b50e4f19c2e98284602bf3095f352f1ad3120f2586b7ebf12653279a98c794e34b97829bf30bea4fbcd06c4657c94cec96be233b3b7"; + version = "3.2.6"; + sha512.run = "b7a27f3bfde1d67115f49d936b8b9f773e1d6d041fd1b4054c5ff89f03a6ea1ab314abf127131e3324beab9da31d30fd0f696d6e900877b4a3f2564b7448b221"; }; sugconf = { revision = 58752; @@ -44152,13 +44679,13 @@ symbol = { sha512.run = "1a2d3239cf7c9910b19db527d5c2b43af2b399114b3186505e790a139ae5ef82c2ff1ecd5adc858a46febaf2e46e028037ba65bd5b84fec0737edd89d5061c09"; }; sympycalc = { - revision = 67087; + revision = 73069; shortdesc = "Work with SymPy and PyLuaTeX"; stripPrefix = 0; - sha512.doc = "52d163772f25442b32a5ac240d15ab2d606e4907c79682cd37ff45389beb41fc2eaefec9b85d0736e3490d0f4cd1d60a42091cf24aba1ede8aded1cf7a786a0a"; + sha512.doc = "f9fc7e78b28826488b0d6c7c4d673c134e766cbd083b16750db121df545a64af5b45344c3426386cd12542c282f78ff794ad0e314f337fdd4639835116773984"; license = [ "lppl13c" ]; version = "0.1.1"; - sha512.run = "98c46fc7727bbb8fdda4038f56482d5fbf1c88e3e869b5865f45392dfbeb5be545f754e6ba109b55e66c96d6cf733ac97b472edbd38e3c21c2f937ac9136f19f"; + sha512.run = "1c941abab942a60cb10be6f8a09b19d1eea62eb4b995b27428c5bc57311f9ce8011e9218cf6a996d8ff0e2e0f716c82025cddd53f59bf22717df278b25e714e5"; }; sympytexpackage = { revision = 57090; @@ -44239,13 +44766,13 @@ synttree = { sha512.run = "3fa23536373a41957d985e5a0aac744473459d195c1e7e00e60f2b4aeab15d8f150bc76fab05068d5ae4994ce52ba4dc35380ab042cc9917a23962b2f0a7094a"; }; systeme = { - revision = 66655; + revision = 74043; shortdesc = "Format systems of equations"; stripPrefix = 0; - sha512.doc = "97bc9240c34251e6b3cf0fe53fb5c5914e0bfc2cf852ca70aaa72213ac9e5ac7d55738f63e73aa8ebc4e320a3874b3ec84c3a0465b188c2fa263648306faeaee"; + sha512.doc = "0f74f45dd17cc1a5d334818c6c4931e337071d0e9b548ada9a25afb9c26dd71747fac0ca9375f32da9a10824e5e6738de662ea88f07eeda4a2586eb93d2ebb66"; license = [ "lppl13c" ]; - version = "0.34"; - sha512.run = "ed93847bd9d5b9158026e364d98f7102e4040d19f8fe198565b8e6a9573ba1796a89b69f76dae76c40acd9ac96392aa75d2ccc006f8419b699f8f4c7b35c737a"; + version = "0.35"; + sha512.run = "a37e218d7c22175e8aa54ce352e5ba51831e72e936128bbee6f7c42c74e9af8d2736830ae4c4b07f061d2e1d7cda12b80dbbd1af1e8109c0c64684f44fec77e0"; }; t-angles = { revision = 71991; @@ -44457,6 +44984,14 @@ tabularray = { version = "2024A"; sha512.run = "dfa32e47c9d360c44063791618e026ad0177a2c16df0608bbecfbed0e823c630f44e708a322f24404a5a465ab11ed5a9982a6e9cc514a7d3430ac5c9ecff508a"; }; +tabularray-abnt = { + revision = 73487; + shortdesc = "An ABNT (Brazilian standard) theme for tabularray"; + stripPrefix = 0; + sha512.doc = "4cf10d3ea305fa09a9ef9d53275f999a83acf7820f7e1e01fe777055127bb0a660b2a21033672658cda325393add2403e46f1d348677924580af744f29378dfe"; + license = [ "lppl13c" ]; + sha512.run = "ac87e5d477d6ea83d7fcb20f7094a92ce844032a447695e5054936e2a8c0433e0a4f7d7d4f399ede5949f8974873b7df1a68a549be10c9e68c69e1e2a84eb998"; +}; tabulary = { revision = 71463; shortdesc = "Tabular with variable width columns balanced"; @@ -44499,14 +45034,14 @@ tagpair = { sha512.run = "146c2e957965fb7ad9976a4b3b6c40d28b8d0cdaf0c8b9627f51dd55ba88b32ad7490bf000bb853a416b5dcc091243b9d6e92999431327a05879adcf89809d7f"; }; tagpdf = { - revision = 72314; + revision = 74470; shortdesc = "Code for PDF tagging using pdfLaTeX and LuaLaTeX"; stripPrefix = 0; - sha512.doc = "375b052d16e7bcb84bfcf93a77173b51e6a82c7dee5bbef6dfc651f5894de445d1491519cf8b14a1ad092be407ba2fdbf99d3b7ee2739679516d5242419953e3"; - sha512.source = "69a69805d8ca1fbeae20a73b6ca271438fe4c2a4ddef95c7c1f808f74ac7fd7f44a98a1835fcd84a2055c8cbb4b8614b65ee3e69543f3e6bed9633193318e2b9"; + sha512.doc = "e8218cb9f22b2039b0afbbbf1d903063a066b883086e7387f7e8b9fe0f032819db56435a416d5d69e1ae4d6ff5c289de0d5f89ad2d6fa6e8e944cd1fda504d6c"; + sha512.source = "087965e28db60bd225a7521ec0a8ddb4fc70c818b9d6ce76d0908e083c359df820d9f2403f460de79e88b28a456943386cfa7f98080e6425106900a60ad3d300"; license = [ "lppl13c" ]; - version = "0.99f"; - sha512.run = "63ee4e7f9858ece755dd74c74a42989da82ba3c8d42df912a6c4ae44c7f948b2967de77d3c3b798d069ca28f0fe71dfe6cb7286e91dcb42c8963be874f878057"; + version = "0.99o"; + sha512.run = "5700d6a70b9497bc213dac23f96088198ad64c310ab85c4c7464454c4024e70947c74242748cb3f4665835155bb6bf823a7e591d51ffa17756e9286837e49b92"; }; talk = { revision = 42428; @@ -44564,13 +45099,13 @@ tangocolors = { sha512.run = "f33e7b7bf60f7e10f6b58e24a53c374ffe84a48a44bd6e0259dd741c91f94e61f71c6e6689e204017eff1b0050aba4e6eb5715b3978ec633ab0fb41317b1c835"; }; tangramtikz = { - revision = 66183; + revision = 73592; shortdesc = "Tangram puzzles, with TikZ"; stripPrefix = 0; - sha512.doc = "45435423e7b0a7d7aaf9db5cdbc682b9f62721b7fb333c64cd76a773fd67bb7faebe1bb11a6424c15a495f2c2269a78698a7846f2e8902c16023f2af91c9be9f"; + sha512.doc = "26e1fa98946c7c2fc944887bae41e9b41b219fba5cdf28ce1c3ddedfd6bc775e8af178fd07cf3104016fd1a676b35a532094ba5e10f92c3da1b41da0fe237af8"; license = [ "lppl13c" ]; - version = "0.1.5"; - sha512.run = "81446f01dd97ef332003f8cce4becb670fe3fa284e540c0dcefd6627b03efcc87874d12c7c7e399947a269cd4fd66deff2064cd1ba64cd34d6cac2b4c587e802"; + version = "0.1.7"; + sha512.run = "a31f095c6748d28f7a0ff6b249adcf380e423bc29a0a0dc2efce938fd2ff60c27521944d964d92b46007b95deb991ce0214cc5ab8c9b33e833acf76bc3826534"; }; tap = { revision = 31731; @@ -44833,14 +45368,14 @@ termsim = { sha512.run = "132615cbdbe257f2c7643414ef4b577053425e457a2e2ee2a9b4d8d56a7e6758db587b7f5223ef1a324931f5468ac5365b7dde7b971312bc8b8ea069ee5efb9e"; }; testhyphens = { - revision = 38928; + revision = 73486; shortdesc = "Testing hyphenation patterns"; stripPrefix = 0; - sha512.doc = "44cc1d9afa4e12ef2dc1f7be2d7718fa33b80e5ee16c7396053690bfea6246f444b50cb044d314ec677436a3559ff1ba9fa227acb446db37bacaa2829c309b2b"; - sha512.source = "2f84528ee4ca5d8434b0042f7b24908ff97c45f27580a5b59bfe226b195c295d4fa546fe240acb981db6deba970e2b020d38c00e6bbf5a0cc1b3caf2b3cbd506"; + sha512.doc = "64c335ed88b0a781e52f2a4dff2389ae802e12f08680d7402d57a8c8b3afafba0532d6a26aaa108ec4cb1fa751670434505f277ed13dae46fe1a48e204c469ed"; + sha512.source = "7ada1c915d6c35491f37f0c3e5909f31df5652630f854631caa60ba8560ce0a2d029095265c7a5669e08900af8879af97a14cd1dd6c7c4d21fc000d4eead2c18"; license = [ "lppl13c" ]; - version = "0.7"; - sha512.run = "c16a9299721c571ce9bdc91e4ed4cc54c973b43fed5189d2f377b2a9143d94d3eeba6bd6b728e3df92a5436b3e2c5e07a21d4a6af0210bf87784d40d96caa42c"; + version = "1.0"; + sha512.run = "a711fac406dae40b5f2fcf99ba025aec45e28f6e4bc5c792805285f9604f3f7442e0aa9ef1dc92085949fb3b04859c66842be484ba4b02025b0280023f6b7350"; }; testidx = { revision = 60966; @@ -44990,15 +45525,6 @@ tex-ps = { license = [ "publicDomain" ]; sha512.run = "cc616b501be7c0724646d5e0f326a5729df8f4cb0c4070f92bdd3b5b370e496efd6208b3ec8b2387713810b9764c75525689f434b7f482a83fb0b8e9b0383cb6"; }; -tex-refs = { - revision = 57349; - catalogue = "tex-references"; - shortdesc = "References for TeX and Friends"; - stripPrefix = 0; - sha512.doc = "f033d8d8bfafdece7b79c8417bce19dde484adbaa958497c0b4426448e6ebbfe8dcda07a34c336c3abe038447ea9e5177bce4660c9b8be36b0f94d02fc7a41d5"; - license = [ "free" ]; - version = "0.4.8"; -}; tex-virtual-academy-pl = { revision = 67718; shortdesc = "TeX usage web pages, in Polish"; @@ -45019,34 +45545,34 @@ tex.binfiles = [ "tex" ]; tex4ebook = { - revision = 70112; + revision = 74151; shortdesc = "Converter from LaTeX to ebook formats"; deps = [ "make4ht" "tex4ht" ]; - sha512.doc = "5592bf5f765d55f0a131870ac334f14b9b5c46d52d0d185eb5bd0e13f9f675ea7165608bb9037ff5694bf7fb5313cc215677b83aaaef44ad68b43bab8c4a9c2c"; + sha512.doc = "1b80ba54fc37975c1ac9f13e9a12c2db4089b9e97136c38f753010399a25ed26bc043998c92a7b04e3d878ec16282c8f614475b520abd73f41ca396475b2f1a2"; scriptExts = [ "lua" ]; license = [ "lppl13c" ]; - version = "0.4"; - sha512.run = "2a0ae5bf0959e517db009b66dab91d01a846ca37a1eda4450b7fe91931fac9aa7415cccbc793a6744e5a34ff9f02fb7b22df44ef8a1fcd045fc1dd48d405a203"; + version = "0.4a"; + sha512.run = "bc366586e7c2a76d652562f23fbbd8ceead6ab05e82a4c16b99fabe5428bf328c3dfcc92a987f4204cc22d8583a308147a109f960575e3aceabbd9951904008d"; }; tex4ebook.binfiles = [ "tex4ebook" ]; tex4ht = { - revision = 72661; + revision = 74473; shortdesc = "Convert (La)TeX to HTML/XML"; - sha512.doc = "12b22da55dbd91c6b3b512db0875d774d00bbfab40b9c70bbd0821dc21255ea8238cea9aa7be775c9400a2c5815feb52405e533a32e49079473b211b45603f86"; - sha512.source = "9138dfa69ef36db25b55ba22e2f930546352da9d7ae2c78ae2d433e5019e3b4e66fadba433d61d1b91b9091f0ed16c7e02b39862d16255fa76bb56bb4539da89"; + sha512.doc = "06dde3271b341467fd102933b0ae67a8634c307839a86bf49dd8d3550f45f08670dd6410efa241d89f66770f51a903aeba9eb7a98fd1956ec8095960a7ffa42b"; + sha512.source = "04695449d69e9c5eac9eac2be1806e3f75c16a630820bee3a256ed9e54217307c57bb1898d4843c56f6e3e7840a60306f9cae0220df441cdb8e44dfb9a973bf6"; scriptExts = [ "jar" "lua" ]; license = [ "lppl13c" ]; - sha512.run = "a8b20c005122e9a27a26f2c2905753b39e1681c0e3f444bf14ca7808f71511d752e8cdb451c5a635e058b2e20baa983e6f297cd7941e1e1befc4f1fc45879363"; + sha512.run = "a1dabb003315ed2964642de61adeb3a6e61d98a0e977c2509c200fe48298c61bb0e482167e9ae2ca35633015b9aad681f4711515852af85e12de90200e44b3f7"; }; tex4ht.binfiles = [ "ht" @@ -45126,13 +45652,12 @@ texdate = { sha512.run = "c6f34d5ab0c54f799669c4c44e8c6e00381796ca76b9d2e8352a749effe65b9ffd6ebd139998ab9267d1e54da6471f5f38cc6931f7ff046882261cd5e5440bc7"; }; texdef = { - revision = 64967; + revision = 74068; shortdesc = "Display the definitions of TeX commands"; - sha512.doc = "bf84f04183654db606a7ebcd30d4986bca69e633439511cc7d9cf57a3a1210231ed158d2bcd86c5014065d355ec94faf3d5f9ab08be568eadc6637ae9cb72aaf"; - sha512.source = "d8c20d77f5b5c68e0acf2fc26a8a0d142aec1377554c3f6b6cf469aef28ae2b82ab4c6844ed8414cad073dada8a035175d6e48b53699daf029ca181cea41f112"; + sha512.doc = "621dcb8ce17693ff2a6d3973d82ab7205a61df85ee84e66a014dcbc5fe1a5d8d51e6d4859d1d1e30483c300f63734e94b29c770cc93630de4e7da9ccd9443f8c"; license = [ "gpl3Only" ]; - version = "1.9"; - sha512.run = "ad6b67da367b1cef01db4e7d912685ccfde58babd7dc4868325624114d85e89f5daf3a47fd855dc084ffff66e332ca85c5d77f682d7bfe1b507c43e0a0612977"; + version = "1.10"; + sha512.run = "65b52f307beec057100bccdaa772f41c71530f7da884de23e72b3dbbd8a31ab12a3e9affff88a52d3b6cedbd2afd7d0f26dde8f48905335022fbb76aa41ac5d8"; }; texdef.binfiles = [ "latexdef" @@ -45172,19 +45697,19 @@ texdirflatten.binfiles = [ "texdirflatten" ]; texdoc = { - revision = 70579; + revision = 73900; shortdesc = "Documentation access for TeX Live"; deps = [ "kpathsea" ]; - sha512.doc = "3a7f76a98d99c764e23736c3a51cd3d59709661bce3f76ed3026646a2fed9719c18522acef5866c122360012ec1560cd88bfd6d9d124fc305488b2e6d0de5f93"; + sha512.doc = "8b1c2b942706cbe86522c1ab19b438d0a94f48653b2102f7ef3b38c17153c81a1f5609e4f489d4f66e43bd2b4643147c5e47ef4a4d21aabf2fa2eb97c3cb9adb"; hasManpages = true; scriptExts = [ "tlu" ]; license = [ "gpl1Only" ]; - version = "4.1"; - sha512.run = "3daed05e952c6f756469e2375f853f12683e51750b6b214e26a8be830b3f3e45007a6c00aade64e98ee4958c76bdf14c9d6472b488c19f80642dc416ed136071"; + version = "4.1.1"; + sha512.run = "06b2bfcad3aad7a90bc774f6379218030859c46b1be558f5d96e725e21abb5bc8c3269de10662d84f800973394a241e509e8ff4b3812f7634c665cb6bdf9e36c"; }; texdoc.binfiles = [ "texdoc" @@ -45215,17 +45740,17 @@ texdraw = { sha512.run = "f4d160e494b1579743a83b2a0926df9e8dd69fdaa79d3f4f97e0ed5f4ece31ab380ff6994a1c9015e0af9b842bdfb9b066442ca4b3018df6659922af9f746b0b"; }; texfindpkg = { - revision = 67027; + revision = 72937; shortdesc = "Query or install TeX packages and their dependencies"; - sha512.doc = "452df8270ee53864594cef99a7ce0fbb6b325547de0ebcecbecb4463646706fa9e726fd433f31c4f6c44d2bb915431aecd7150921043e50f6b3a2ac5e51eeb70"; + sha512.doc = "5d961c02dffb6730249ca9879aac2e00dc682f03076c5be415e365b91b9027b6c731741173f35bb2d286b80995dcbb89e98bc5737ba4bd0acba1b47653a117b2"; hasManpages = true; - sha512.source = "d784abf4241ccd65c8c910c16171b30d686a53933043d8f6ecf787866e5508d4e89866c90fe2627ae4b536ed7647006f6ce257c8b47676adb77221d08b6ef690"; + sha512.source = "18f83e80ab1b06e65ad107f35c0f22e67d49b3ad541f89a16f23e9a5c16a5d2cc48c219c930e08261477e8027d95a749672e75a0f3730f068bddaa39921b3f5c"; scriptExts = [ "lua" ]; license = [ "gpl3Only" ]; - version = "2023E"; - sha512.run = "a6fee1faade94bc462dd4fd0e567b7716d0dd057e0c973b9a498949e701bd054fa4fce1cb8717f1d052ab03ef9b894e2f222e2e9a70957215f7266bcbef15f57"; + version = "2024A"; + sha512.run = "f652830e91e0493d0d67bf1d4715afbdc37dcdc731872d3328646bd0801100c7d77f5010c7b4fbb763f905e3af7effec8fd6e6d49c15e1e3886d017ab4d3d1e4"; }; texfindpkg.binfiles = [ "texfindpkg" @@ -45259,18 +45784,18 @@ texilikecover = { sha512.run = "fc73ce5601a10d638ea78fe815978d395001a73be75084539498644ac7f3fea0f3a57e95bd80e5f38659891adfd9c817e6068acfe04972a836938d733e0d4382"; }; texinfo = { - revision = 69809; + revision = 73706; shortdesc = "Texinfo documentation system"; stripPrefix = 0; license = [ "gpl1Only" ]; version = "6.8"; - sha512.run = "336f1e5d94d3726816654ce0abeb7656aaec5dc6abd3238dd76ef1b697984e1285c38d0fb2299323c55d3a3a70e402d1aa5e6b6ff54bdc804bba6d7b74017d1e"; + sha512.run = "92a91868f915032205d4744f5fe42f87bfc789f5912d6f98acfc3c46fea0c9f73bf5f157c45d310e867ac3c566053a236177b76d7b0744611a305e14738560a9"; }; texlive-common = { - revision = 71543; + revision = 73495; shortdesc = "TeX Live documentation (common elements)"; stripPrefix = 0; - sha512.doc = "4c04b3494649f2e2092e26356f057e89eeeeb75533b1b953b89fd154da40c64b4456d5492ca79fdf91f3c8fb097a4f2bbc4ef7802ffaed43369ee77471564560"; + sha512.doc = "6fe3b91787532f0c4aa5ffddcc48095da4069bf8c087e723af4a76e5f3ebe90fba67bc728568aa886c37d16c6d8a9d03884a19765615935ae1e7b88b6415833b"; hasCatalogue = false; }; texlive-cz = { @@ -45288,10 +45813,10 @@ texlive-de = { hasCatalogue = false; }; texlive-en = { - revision = 71152; + revision = 73024; shortdesc = "TeX Live manual (English)"; stripPrefix = 0; - sha512.doc = "598d8229c0ae50fc4697909b7305ef614e5d3d8a884e5375c87da32b138c071b54dd0766a4a8080fe9863e3793e480c5c89afd8231f795560cbfe718a8bea16b"; + sha512.doc = "be9aa0ced0fe28bb2ede4906948a37150afb07476c26be65af34e10ec4d8ecff0007a7843ab628590a16756229292e8af8235f6a621a3e56ee959162ac5eb6fb"; hasInfo = true; hasCatalogue = false; }; @@ -45324,11 +45849,11 @@ texlive-ja = { hasCatalogue = false; }; texlive-msg-translations = { - revision = 71858; + revision = 73789; shortdesc = "translations of the TeX Live installer and TeX Live Manager"; hasRunfiles = false; hasCatalogue = false; - sha512.run = "98ed0f6d958972c9b85a346f603b79d595a4aebc452f356ff0dfaa9f6009ce30f19f312db30e9523a380c864b7913f393c2ff9cd794463f3f99ea79b14c82c33"; + sha512.run = "3debe80405e6cca1d821651caf933916a78d82dde75e4ac95bf327dde354f790c6022e94444f4b28917401a83a4deafbc069a978cf5d19b571e7ba09b7447804"; hasTlpkg = true; }; texlive-pl = { @@ -45346,7 +45871,7 @@ texlive-ru = { hasCatalogue = false; }; texlive-scripts = { - revision = 72673; + revision = 74525; shortdesc = "TeX Live infrastructure programs"; deps = [ "texlive.infra" @@ -45354,14 +45879,14 @@ texlive-scripts = { fontMaps = [ "Map mathpple.map" ]; - sha512.doc = "6e474ea6414464d5c7d54d60dbd47bbb082105cbcbe862689e5e74d46aef93a562a70105b268e19867bce276f42e10a9097f7f7d5cd2ac78d1a14d5d49f0df2f"; + sha512.doc = "f99b63974506dc6f76f5c96be51a254a316b6fe88c956c28ab7d692046e8cfffb009a0bd3844ac77130a7e7c6f3bc228b0a58e6575126628e8d5405ba16d689b"; hasManpages = true; scriptExts = [ "lua" "tcl" ]; hasCatalogue = false; - sha512.run = "c4e9258d9e8c147e2805cd1b303595ac6a972f3c5ec832e13d574e02e89a21e6509ccca6ce0176a705abb2ccf492c0326315c0dea2470f01f3c7e31b70d26254"; + sha512.run = "96a4a6b73bdc209c09e1ed026bb31e5393f15bfb3765c5898fb72a791950ffdacdd3e6eee2bbf53ade414e24cb25d115fcc6e43d22baa03b437dc085480e4db7"; hasTlpkg = true; }; texlive-scripts-extra = { @@ -45422,12 +45947,12 @@ texlive-zh-cn = { hasCatalogue = false; }; "texlive.infra" = { - revision = 71593; + revision = 73495; shortdesc = "basic TeX Live infrastructure"; - sha512.doc = "68d24fd95c863d1074a38a894de1eb6babf9a929931a623ee7c077c56eb0c396c8ab238d14c955c11881127ead148dce283424d98eaef6432839dda3c8e9c9cc"; + sha512.doc = "cbcc65f82095599b16c7c6857085d3d0f5444458a0f70d995f99b26a50bdb5b62cc32d018092aa35729fb10927f471f10e58ddd2986b49e451521dfc04647b4d"; hasManpages = true; hasCatalogue = false; - sha512.run = "e1430f17cab7c13a3d7009ab5b8dbf523818f476746344ce8ad83001c3d7acfd81ec1b6cb6f9f47ed7858d972e1af37d4f0cbc9368212626fcb3bc5c6b9fcb8d"; + sha512.run = "87b3b17475fc4002c5d125619c2fb59b87acd61782dd74ad8834f695161222001ebb06e5e1da7393de3ac280421cbd7cf182b56fac059f842673e66c20ad8380"; hasTlpkg = true; }; "texlive.infra".binfiles = [ @@ -45479,13 +46004,13 @@ texlogos = { sha512.run = "d3b5f5ea0dd90e925bffc1ac0f790848d1c2abe50003e2591c8efb219b4a205d48e4420d2000b3de15b1ff9d4d0bd9e083ba1694d4ee34febd68f8db0df16ea2"; }; texlogsieve = { - revision = 69436; + revision = 74449; shortdesc = "Filter and summarize LaTeX log files"; - sha512.doc = "47d11f611bc3a440dab6dea06cc55053802d2b78133eec21af4eb8d44e74b013a4dd8df0667b946afcbdd8132821ab1429f30f74da610bc1e1283793d465c454"; + sha512.doc = "ba421c3c87db9f5b7c19e9d7b5cea5855dcd07390f8329c0e1ce3c9fb8010cf6c56e946bb21b0fcbd6d9ffd4578ec7651e95f743644a7e7eba9e57e28b1a2795"; hasManpages = true; license = [ "gpl3Plus" ]; - version = "1.4.1"; - sha512.run = "a4e94f5674cc2bb54f03e285aa18a19d3c389455f2ab15e40998aed6d211435bde3fcf549c989364673bc77a93458e4146b0e662d4bd139e18880a36d4445832"; + version = "1.5.0"; + sha512.run = "0790feb597fd54e48891fcba5be0618c019761da90f93ee00cc117209bd1485d88a7151ac2bd5bbaafce480610a63797dc1f2249c6c236114d8d265c5786cd24"; }; texlogsieve.binfiles = [ "texlogsieve" @@ -45629,14 +46154,14 @@ texsurgery = { sha512.run = "39c270382bb228beeb9ec61f744f66805c76a7fb1522158a59daa5dbbf29b3f4151c20d7dbadf404cab8ca023456b9988d45e53f65a1396da9259832390a0980"; }; textcase = { - revision = 67755; + revision = 74071; shortdesc = "Case conversion ignoring mathematics, etc"; stripPrefix = 0; - sha512.doc = "c8b42e576dc6458441703344724bb1ee8f441e79da8d59b1ccb0b6280de878ae65ac48e628f3230ee2094ee285a58636a6e37c29e4458d5f164c36cf4ec93d6c"; - sha512.source = "1e7e5e16c982ae65aab5cdb4c83e770336dc38833f6027de701114da45c0b45a1ef21dd3096de3933401a13222438a533397661d5654acb991c0ef5d6a8c29ee"; + sha512.doc = "fc4996dd114fd81394076e3e97dca97a87f28d4f819cee423837241cb53053264cb97830cf72abfdef33024b766472f53a7c8d23285f936de99576344519c03b"; + sha512.source = "5a9c67b9b46447fb06522af3244e2ca2cff4a3b6fe57b95b25a9db7496fa98650e52d788e8211e7baae008dabfb264ec604f8732fa3a6033cbd7c36812ad73aa"; license = [ "lppl13c" ]; - version = "1.04"; - sha512.run = "1a4a29b33270f5100109f42f4caf529d3203a6bd1a934a06fba6ed3ed082f0bbdeecfeb7ff158182c88ca7d724422c83be2d170bba78738cb7417fecb13f65da"; + version = "1.05"; + sha512.run = "3ea3ea15e68525bbf9048d6ed8fa143e2d8fa890487486131cf311448e470fdba697ce19d4f0beb1b459a747d9248cb7e21d74bc3ce6ab40470fe23cdcdb63c5"; }; textcsc = { revision = 67193; @@ -45839,13 +46364,13 @@ theatre = { version = "0.1"; }; thematicpuzzle = { - revision = 69356; + revision = 73069; shortdesc = "Horizontal banners in a puzzle style"; stripPrefix = 0; - sha512.doc = "cc3aad57de0a8f2ed5bcd46d391820a2d8d316d7fd75d5d4abb8a6532fcf05d6643aad83570413dae441d14956747265e7137b05fe5512423d8fb3c1fdff5f89"; + sha512.doc = "7b6e7d9518f467351cf93a3472f6ada5fb7a8c0822f1da294f1523be8deb189fd0a443fc94fe9bd7dd76d4050daae07589b3449b7c6c51b7ab73659207fd3cd6"; license = [ "lppl13c" ]; version = "0.1.1"; - sha512.run = "3dc42fb8b0d1b5aa3f68af6efa29a683e4a2d7b14f9e8b79aa56cecb15356cd8a9ad6487267b2ca978363ed7e8b5988f3efbfb2136774e8c5d9be25ef65f0bd9"; + sha512.run = "2f84175443b69d8890e948a82741670cf37ff431e8059f8be4a52d6e33d399f5aee345fb235098a47acb46601aa448dff69809414948fd7c15e5f51b3a05aa82"; }; theoremref = { revision = 54512; @@ -45921,15 +46446,6 @@ thmbox = { license = [ "lppl13c" ]; sha512.run = "83ceeb0cf84ff75afb734f41be5a5309692c6804a5a20627c54cc8760f8ac5e205cf1a24097c8b8624823668796092d620f5ffbc488f63b87e7cbf9365279aac"; }; -thmlist = { - revision = 70780; - shortdesc = "A LaTeX package for adding theorem environments quickly"; - stripPrefix = 0; - sha512.doc = "adad39c3910725ff52168a6625fe3993471b928313b0e636bd860f98aeac2c215696ed221a43061e6d6e2d9740ca96da5cd6b9ab847d4af55f961c435cbd7043"; - license = [ "lppl13c" ]; - version = "0.1b"; - sha512.run = "7ec892614ca8244bcb3036681a4b7d4cc4d9064be4a569c1541fd00d3e2312acf928c3a9d2c3e87374fb21d7407612366e657b47719953ecf6b18ce7cff66e9f"; -}; thmtools = { revision = 67018; shortdesc = "Extensions to theorem environments"; @@ -46149,6 +46665,14 @@ tikz-bbox = { version = "0.1"; sha512.run = "e68c3c6922c8529bea0b7c25bafc488d7aa41ad81afacae0f674caf637a1638dc8666bd16628b123063d94031d4cd4691ca127bbb648c1fb5a20d72ca8a41fbd"; }; +tikz-bpmn = { + revision = 73368; + shortdesc = "A TikZ library for creating BPMN models"; + stripPrefix = 0; + sha512.doc = "69b239119dc6e739aa93149bf1358020ef95c419b71d58e588016ea4dcc9d30eec7cb0d3978d55a7ec57577958318ac157f3215fe3176ee22ec77eb513bee479"; + license = [ "lppl13c" ]; + sha512.run = "edcb3f7fdfa6815e712fb2cdf43587941d4be0a558a29ad86b55edf1f7dd82df401fd88f28e70f2aa4cc2ab3622067412b6b4258c3b1faa855cde9c945e70ebf"; +}; tikz-cd = { revision = 59133; shortdesc = "Create commutative diagrams with TikZ"; @@ -46159,13 +46683,13 @@ tikz-cd = { sha512.run = "abe5952a90172dd74ddfd02834ec9fc632f26da00450c310eab2528d5b52750e80225219b75e778d1f87b2279e654bb743804da19ec7da91f12e4105f9ec3447"; }; tikz-decofonts = { - revision = 72545; - shortdesc = "Simple decoration fontes, made with TikZ, for short texts"; + revision = 73717; + shortdesc = "Simple decoration fonts, made with TikZ, for short texts"; stripPrefix = 0; - sha512.doc = "c85ab0f66474a93cd67d709338692db89f5eea9e415cc767006c621913895f61235b9727acef0ff8c6a4294db851c1950cfa747156ce8982f26aafafe5fc9d19"; + sha512.doc = "2328cedbdad3aa271ff21d233a1a1252a82102b4422f18a059b136fe545ec79f60ea8777e24b8c8f937a5b38c45990d9bf1cda1eef2811938cd2c9fcfb047498"; license = [ "lppl13c" "cc-by-sa-40" ]; - version = "0.1.0"; - sha512.run = "a909de0a450ec94b8664022e23f4eed40ba8ca75418884048e0a0638bcbebf013af8bd178f44c054d679dec8f005590f74564cc6fc42ab69f461bf150f3c3a9c"; + version = "0.1.2"; + sha512.run = "98f5620b46f5311dacdc2f814242a948c830bb8d65e9acee24a70088c6709bf9a8423776e12b3ba3bfc6c58e5fd137a8d56b72986c914196b818b5b9538885d2"; }; tikz-dependency = { revision = 54512; @@ -46428,6 +46952,15 @@ tikz-trackschematic = { version = "0.7.1"; sha512.run = "421966536c63307c7fe9c194ebd4d5f8a724f99b9baba20a44e867382b1c08f934c9e88d02d834221671ec6e18d392e6ef4595b5a7bec9a18da03b84bbe06a71"; }; +tikz-triminos = { + revision = 73533; + shortdesc = "Create triminos, made with TikZ"; + stripPrefix = 0; + sha512.doc = "ab5563a7ab31ce8d2b20b618575a2c4aada2234e65bee1dcaeef25e4fdcf95708a08b8192dff3bc87bf0a073bb0b7a96a0530c231ec429c454f3d4230eba92ee"; + license = [ "lppl13c" ]; + version = "0.1.0"; + sha512.run = "dd1c774d64459e3026f7cc12573c25bba1b9494123016962f630ebac39bb29b58e55ac85b5e88c6203d47c70ed1f1c50dda57a871fb85f2002276244ad30d978"; +}; tikz-truchet = { revision = 50020; shortdesc = "Draw Truchet tiles"; @@ -46438,25 +46971,25 @@ tikz-truchet = { sha512.run = "74cc5a05cd9558c68cbb7987671fe1e02a9a076049aad96d4c95d7471ff04e48f03c500f58b85bd8eead46e1af592a54ffe1ef0b0ea0644f4479a332a63dec4a"; }; tikz2d-fr = { - revision = 67239; + revision = 73069; shortdesc = "Work with some 2D TikZ commands (French)"; stripPrefix = 0; - sha512.doc = "4951babe22ffa5985e3533970b88a8a92f626e18b34e8f7f11051db21accd2977a926fd7e668ecd018324fa62c8b539fe52c279f8ceddd5a037b76dcf03f399c"; + sha512.doc = "fa8b5857a12307ddf01a05dc6a7c41d6ecd90d6e8c9946dcb3bfabc801121b426ccb349df3a9c35c56395571ecd67f0e92a1bf0b1f3ce6d4503a92787f4c32fa"; license = [ "lppl13c" ]; version = "0.1.1"; - sha512.run = "87cf1fd8343df4c6960e4bc004da9154f98146b57a723022e5a81db506805ebdd60db1edafc03d9d787f151cb333c1d141c5407023493bba316b8b41bc245537"; + sha512.run = "38afba0ab250aef69bdb2b71286885a739cf2174db5a6ccad1c1f7fc4445737908f08cffc2607625cae6dbd28592076a039e281d76ee942319d475e3a49bdde1"; }; tikz3d-fr = { - revision = 72297; + revision = 73199; shortdesc = "Work with some 3D figures"; stripPrefix = 0; - sha512.doc = "8c761c28822a57bb9e16b0f3e3474aae7435e8b6e888e773e82637651fd100d4ae856bb5360b45643f3db3802ec64644119346ad8200f4204da7c2c4a858a69a"; + sha512.doc = "e22172b92bd21cfcb6716b692705e17a642728624408405a6b39eb0f04cecb9eb81b2307e7eb24b2a1c47da53e2aec762eb0a0e58a08eaf32abe714a7010ebfe"; license = [ "lppl13c" ]; version = "0.1.3"; - sha512.run = "1049d83c9aec7f2c2127cdae48b0480ed4b5871e9e975832759b4e50ddd08868f09a69790011cf79d013bac376332c65ffe52bbd71254ed7d487bc5fa6658364"; + sha512.run = "669d56d2feae847ea66b2b0e12c34cb930b2c403f540b0795fd239ababd8c93914fa06eec2147889d69a5bc896d6766c8fe779fcd9aa2a158ea773dd63fb499f"; }; tikzbricks = { - revision = 71933; + revision = 73140; shortdesc = "Drawing bricks with TikZ"; stripPrefix = 0; deps = [ @@ -46465,10 +46998,19 @@ tikzbricks = { "pgf" "tikz-3dplot" ]; - sha512.doc = "6b20fb8862c923e2f2bc99813ff68f22b7b02251b52a27adcab989ab593c202a25448c524a7fd2e5d880a3b3e53afb9fa8b86ff7c4361673cf3ba1b633c94dfa"; + sha512.doc = "de11a1ed73c2954cfcfa69cb314a5b39972ecca0eee8b558098e178290c74e9a13e4189682720eb1b2ea8970079805f7f35c8816fe6603c2e4b70fa9bb0b2014"; license = [ "lppl13c" ]; - version = "0.5"; - sha512.run = "466c917f578b07748064f47b5e1af8b299a4dfc209b9ad0a33d67e8153db64e2fe7317a7438d918452a04b016ca95c924291b733576c7b5377ea35d5028fb59b"; + version = "0.6"; + sha512.run = "dad02c4171f828a959d35354ca33c4d025a5cf25dbed170e21f5f7a4158aa1348bb9892ebe5d4ac9031ac2b4cab99002247e20cb8709f7b6eba101fb5b0ba4a3"; +}; +tikzcalendarnotes = { + revision = 74419; + shortdesc = "Highlighting, Marking and Annotating dates in a TikZ calendar in a systematic way"; + stripPrefix = 0; + sha512.doc = "1e4090ba8abb178c23e85a37e4d09ca0c9e82a829b1a30acdad017c4d957e395dbf4fe1dc6849266a5a5a47a65267c824e8e84ea66e89c422c814583e3cccf3f"; + license = [ "lppl13c" "gpl3Plus" ]; + version = "1.0"; + sha512.run = "aa8c4e36694e1b5b7fe02bd7658a7ca9a9d9e7d3b87db426da07e9acbbfa2d6daa6de42a1f9c8d8cfae89b9689c53fbcc5dd7a64ea958a751cc56d604e4ca138"; }; tikzcodeblocks = { revision = 54758; @@ -46480,16 +47022,16 @@ tikzcodeblocks = { sha512.run = "a19ee68d5d59d936f1882bdf1de5851b9cac48debc4754025d214cc6838173fd7090631b08dd1916043520e97cd479087ad4548c991c0631856510ee912a42dc"; }; tikzdotncross = { - revision = 72638; - shortdesc = "Small set of macros for defining/marking coordinates and crossing (jumps) paths"; + revision = 73605; + shortdesc = "Marking coordinates and crossing paths"; stripPrefix = 0; - sha512.doc = "555f8aebb269114472aa03bd0f82f1c2d9c662fb27689addee2ac24d0983af4b594e30a3f1c7c7d29ad26ca520e0d6ab66dd3d439667f9410abe5deb3250fc1a"; + sha512.doc = "cc4ab8501daa03d431e7da80b9e4185ee627f4df7b755677312ef9e4fb6494b14c20f150064e360d097812192554c879bafcead019b88720ab5c19c25a2a0731"; license = [ "lppl13c" "gpl3Plus" ]; - version = "1.2"; - sha512.run = "7ec6caa81cc1e94c99c5996987439a4b6216e9ab82a490c812d1e6cf0e02ed7bd8d64aa6be3efd8f8050bf895e69bf18996cf2c1fe335c1656684efe2812ddbc"; + version = "1.2c"; + sha512.run = "df274d75d417d108b1ef95eeee5d59e22aaa630c1c9f26a76352d72eb721a51b226ea44f66a70b8b7dbe7daec4b96ae1a071ba8f78f52f4b7511118dae3246d8"; }; tikzducks = { - revision = 71098; + revision = 73659; shortdesc = "A little fun package for using rubber ducks in TikZ"; stripPrefix = 0; deps = [ @@ -46497,10 +47039,10 @@ tikzducks = { "iftex" "pgf" ]; - sha512.doc = "a883a763d2541f712df90caa05be87bb914d9638fd792abd2c22411441a6581bb4219db81653650010a7066024dc0e95ef150c60263b8de019a0bf25abce8139"; + sha512.doc = "f216884ea42d27e134d6b8b401cd1131b3cee62b94eb4c3ae7d6eeabafd064938f4dfa61274a50c4dff2b67ed358068064f66c3b98c27cca071e7ad4465cba62"; license = [ "lppl13c" ]; - version = "1.8"; - sha512.run = "7642729995ec6a7e7577ed1aa9e9a7baeff87f047aa77b0ca2c6988dc3a4aa85f712d455a27504cf5f64b3cab5ebcc7a67d54a24ce9059e028521bfc3ca9e653"; + version = "2.0"; + sha512.run = "a48d74b5530e0db102956a5570d14eaa704e5dc5a0bf99ea669b9487575b2be5cc081b4a19a2b25c954313b95016c9a2470e34ea5fa12e19e3ee407eb983c1d3"; }; tikzfill = { revision = 67847; @@ -46522,13 +47064,19 @@ tikzinclude = { sha512.run = "1559c739ee5ce26c531ed1c989a2d986ee6da05880e6dcb8f14018c71c638028517d1c2374cb452421c92f5d430d4560ae4463732926c56ff33407941e70ffc3"; }; tikzlings = { - revision = 63628; + revision = 73322; shortdesc = "A collection of cute little animals and similar creatures"; stripPrefix = 0; - sha512.doc = "0a728af74191084ad20d20ad2165bc7690ee805831541b5f2281117961fb9fa54e6f214a4ad570b63019fc8e7dae57c6a28ef37b18088a37f4fb4ca580c37b6b"; + deps = [ + "epstopdf-pkg" + "iftex" + "pgf" + "pgf-blur" + ]; + sha512.doc = "b60eb60ee67756b5dab434c8d558ebae59024cd79b56b339b8c7117ee1a6a63af3090172faa5ea04dbfd2aa4b0c0ca6d7e63e7533bb0ec9b6af0076b62ffca2f"; license = [ "lppl13c" ]; - version = "1.0"; - sha512.run = "c838782065c705dfd919708c281d97f1e399df4775ed1410473d392b0f1cd2c8e293cf608cdde5e3cc50a26c51ba6bff3c79b5e02216ae3d3318ab92cc0d6a11"; + version = "2.2"; + sha512.run = "4b11448b8326cd6efadb4203a5000248833ea6fdf6ea8f134dc7cfa3e13eefbfe9c77fe29c1aaa7c922187abf1db2cd96f18c4632e83a240d53bb7a4ba6026f0"; }; tikzmark = { revision = 64819; @@ -46541,16 +47089,16 @@ tikzmark = { sha512.run = "21196deccbed47e7bd2a95adbe92e197f1073afd26da98ab92494e46ab7cef325c6005d8bcdffaa53a42de440cdf10c5d20370fa0a5f43894defc1a01a284310"; }; tikzmarmots = { - revision = 71076; + revision = 73100; shortdesc = "Drawing little marmots in TikZ"; stripPrefix = 0; deps = [ "tikzlings" ]; - sha512.doc = "4656888e6af523f8be1d65ce4519f68543de3417b4aa94efa41425392153dc40eb3ce61cf102794b99b53fd6ad877d36869c2edcc05307002f0f053475d72e81"; + sha512.doc = "333994653cb01cacf8b6aa0e96ca37da65ba8d73941d330c762cede130e8baf204b077ff36857691324bb749da2c1c397e12f13d2f0579b76a9476551bf3e446"; license = [ "lppl13c" ]; - version = "2.1"; - sha512.run = "dc57cb59eb19447a0726cf4eda6edb026edc07efdde582eacde41615606b9fa430c6dda138187fe55980de4e62b59d70b60b4f515dfa48e5d6454ea8921fb1d4"; + version = "2.2"; + sha512.run = "627048f098d2525123ab090e2328ad93c3a3c573d2629a58d21f8438c33fa4437e60cb49f2a9b5581778b4f379b425ab022289e169ca080d53730f36397be4f5"; }; tikzorbital = { revision = 36439; @@ -46599,13 +47147,13 @@ tikzpfeile = { sha512.run = "9da38e2e02c651e2f89a0e9ea917fc5147626026acc7302b7e32aa2cbee072f91311fbab73e44852a2c237290de76e560f2b45e88639936b542e6986d90a9b4d"; }; tikzpingus = { - revision = 68310; + revision = 72990; shortdesc = "Penguins with TikZ"; stripPrefix = 0; - sha512.doc = "1748e17af7b3190e19a0c446e78f5b40b6a135633850d610179f33927650c8cd92babca86e4fd10408586d1fd81814cbb54985ab0fadfbfd05219b033e4323c6"; + sha512.doc = "4931a649171d1ea46852a4621fed831a00410c8efec10b9acee319c870b8734b2d98fbc3d58762a242910bee1c18c4b012bb95092dd11cd94496b899a4d442b9"; license = [ "gpl3Only" ]; - version = "1.1"; - sha512.run = "78041352e86e68eb99f875a1c8bf7d4a50c527a4b405e4c93e9da6ecd716bbb0c5fad053fff80229723b4550345077371a52132258cb9d251c319f743767cb7f"; + version = "1.2"; + sha512.run = "4d05519b0f0ed87a90f4fbad696a3f05b65bf025bc7fd96b2906a98d470f35a022021816fd3413e512dca5a44d881983f54cf2c1fc076984df1bf73b4363c1c7"; }; tikzposter = { revision = 32732; @@ -46627,13 +47175,13 @@ tikzquads = { sha512.run = "b15f61c3649c4489b4acb9fe439993ca957c122988fbf7023baca79fc263a2d5278f36bf18319b96ec5661993f8094c88c43d81ef44d35865388f1f3821958d7"; }; tikzquests = { - revision = 69388; + revision = 73386; shortdesc = "A parametric questions' repositories framework"; stripPrefix = 0; - sha512.doc = "433c1202106723c397b383edc37ecff762ce7910b4adf2e70a5ea2d2c823cac2f96147227eeffc71bcc2658b18ce875c780f91d8997f40ab823ab09eb1d84354"; + sha512.doc = "0680471a488e08055bba043d695d6b2d1467d927cedf80127e876511d7008e468e830c1ce8dcaf8b522d6b19354f16659f6fe38f53141f1bbf34cc4b75cff5d6"; license = [ "lppl13c" "gpl3Plus" ]; - version = "1.1"; - sha512.run = "616098fcc9f7867458edd525fc71d83786080b1f4ead9a007083d8347add52499b2fdf2c969213e06d43ffc59e9eb4d17bd7872404f1481138229c4f15c1aec9"; + version = "1.2"; + sha512.run = "21caaab0019d093d1d4e6eafb7afc7a04941c676d4c25191c49183b4f520cb83e8718e39f62421b94bf50e2b078bb9ca8bf04538d01cbfdaef2537bba04091ba"; }; tikzscale = { revision = 30637; @@ -46668,13 +47216,13 @@ tikztosvg.binfiles = [ "tikztosvg" ]; tikzviolinplots = { - revision = 66659; + revision = 74311; shortdesc = "Draws violin plots from data"; stripPrefix = 0; - sha512.doc = "5c7cd0990935fb05fa418ace90299532e3dea64e74789dafdff6aa9306e417a3fb170a2b5068045fe5069a08c4ccd97bf4c98ebf5f2102a2c9ca2564090ee52e"; + sha512.doc = "af109c657ae5692d2261d0d8a78fa4d65d7ba95be718d10585989c7a079d7e0f26b411b51b24663d5a372022fcde577050cf61cd495db254d809ae80f78a7475"; license = [ "lppl13c" ]; - version = "0.7.2"; - sha512.run = "00fde57102ed13eafb247859de00c62829ce60de361794afb9103e501033140baf9b474fa147b7282727f7294a0b337897985460526f573532d90117d5f8e552"; + version = "0.8.0"; + sha512.run = "f93a5aaecf1280e2d7bacf7185c4c3556f41c54c85f1d91e963af179c5f798d5dc4b9b4799803ae018a0980cf1ade9c744c87f4a58883a679abf8be558b2ba17"; }; tile-graphic = { revision = 55325; @@ -46705,6 +47253,25 @@ timbreicmc = { version = "2.0"; sha512.run = "01e0e06769810e07389006e9443a836de76e95fea6133e7aab1f47cc554c3912a8aeb43bbf33d06cf9f3a8550a9eb9ec23830ab96ebbb84629ec957d7050e9a9"; }; +timechart = { + revision = 74011; + shortdesc = "A package for drawing chronological charts"; + stripPrefix = 0; + sha512.doc = "8d6f970207ba60a21b2c3043c69963e722aec8fb40046088a076570b5713662da8f9a569ea1ea155c9e66fa706d8543e63350ed75b9a707229b07e497c390892"; + sha512.source = "52e16bc0a80a559aa3cb017982328ea2aed1ac39d7cd2bea994b1927cf07afa0d31c49c3d416bcf7503aa1fc4397ee639893cf764e28cb1af57e201e3ef20d60"; + license = [ "lppl13c" ]; + version = "0.51"; + sha512.run = "53c3067a39ec5e8ff710ba80f9ccc8e96377f1ff0a5de88360a072862aa5f6b09b872f1e72d140ed17fef5c85c7b79368ad6c90d5eddd8a07d2892e6dfb38c8a"; +}; +timeop = { + revision = 73069; + shortdesc = "Calculates and displays arithmetic operations with durations"; + stripPrefix = 0; + sha512.doc = "7070dcb24a33f85082956c105fa060d36313e18b6f6b9af2f8ddb9e2af80e9c4598280c37016e01163b144077ceb98148ba79931b0673150153718a81431f42f"; + license = [ "lppl13c" ]; + version = "0.1.0"; + sha512.run = "9dd80dc39e085ef3da604aabc14f14478ee5987f551acfc52cbd7d71e0bd776fa1b0e5eab9895f6549a96b0bcf750134cf0aa08037a1eebd5cfd2c924e81d2ca"; +}; times = { revision = 61719; catalogue = "urw-base35"; @@ -46831,13 +47398,13 @@ titleref = { sha512.run = "73905fbe96bc095f602339e0c943048d775bf2a89ef9de3b7149dae7b76aef04e5c77803555450d931f3a4dfef16f5e72597a4d06052d4a852623516edd978f5"; }; titlesec = { - revision = 68677; + revision = 73302; shortdesc = "Select alternative section titles"; stripPrefix = 0; - sha512.doc = "b29c7b4dbeaee946e404166a4b1f4848ecffc4cc238534cf0c7248b1964146893125a9f5f8f87d6c2ea21c1e61304454bf7eb57d95842397363b88d438636363"; + sha512.doc = "db06c719281a91056972b04572eb560e93829bd5d62ae98a98296a5cd612d953619c62b33063fbaac422ad42fa82c3050eebadb1843e60b28715c6f11335cc2c"; license = [ "mit" ]; - version = "2.16"; - sha512.run = "b738823380d594dcef104e3b7fa05d9df233385ddbadf6fc6bb45e8346311f5f58f5f605dcb4b6541f88b57a27b73236eb77a1d128430c6ede675625e2ec051a"; + version = "2.17"; + sha512.run = "40e89aec1b26b2078a4f6ab3a32366c11eca92e8ef6546be0b300d8a6aa5e3127a251bf6a9528e12298bcebce79433af7e3e935eeca5b1d5bac497daf263cc8c"; }; titling = { revision = 15878; @@ -46868,13 +47435,13 @@ tkz-berge = { sha512.run = "1772cc37537ca421022c5b68536ddcd6cf0d5e88d428cd7682e7773a8290c4b2ad90a11b07dd8c4a4edce69497b63d9a87b5f113bc5857dd8e59e7b80d1340ff"; }; tkz-bernoulli = { - revision = 68780; + revision = 73069; shortdesc = "Draw Bernoulli trees with TikZ"; stripPrefix = 0; - sha512.doc = "ea1d787fc049cf42605d6adf107892aa4afdcceb32c874382453836d30b956e1599e2b9286a0e64b823d55005bf8ae2e81259d881b69172f6af5db4e01aab581"; + sha512.doc = "63a0db6f1794b0b6b16c15d0dc6dfdcf0e127a6901ae0c13137afb6c66a42facc0785610efb4bb58de042bbb5bf3d778b79703d6fcb7bb09fb501e7e4852da3d"; license = [ "lppl13c" ]; version = "0.1.3"; - sha512.run = "0824d03ce5cca5be08cd648ac3629094eb4607681601b5d75a56069df687054b5e88c3645367c0728de8f7cf43971b32286eff4b18dd094c620ce37e6c957880"; + sha512.run = "dfabd7394ecaa4e6a3e892d6a6e78a78ba9ec256f50bf9e508700ffa76b6230a2054a7fa3bdd4ec3938121b9648b4a8b9da22da3e773f8e5e8982865a61ccdad"; }; tkz-doc = { revision = 68665; @@ -46886,13 +47453,13 @@ tkz-doc = { sha512.run = "ba4c220f4a53089f8e6cde73cbdd7e1b8eb68f4828217dd5dbd3360086bb946fbfc30a993c678bb8c6e4987579016f610875fb2edc796fd19968c3940a0f4402"; }; tkz-elements = { - revision = 71827; + revision = 74468; shortdesc = "A Lua library for drawing Euclidean geometry with TikZ or tkz-euclide"; stripPrefix = 0; - sha512.doc = "1e7516f892489d3f3264a19a4c148c0cfcc794ebf33e7466f887bdd2692b4569ac98e200c7c75f733dbeca8f75ce7cfc741b1ffacfb36d5dc673cd16c6429c22"; + sha512.doc = "6854261884e314987a7f2ddbc1b2dc68aed1eae4a883fd547a6f035b778a8f918ec7a0a9d112fa82e66902eb4e409a6e5de3e455b021b7a57b9ef4c63f3135a9"; license = [ "lppl13c" ]; - version = "2.30c"; - sha512.run = "30cdcb160c2025235e39b4daa0a25bf00d154ef0de55aea6cac0a6c2ce23d7a93ccacb9d570118e34ba8a2858645dedb4b0df0caf28e5cc06f9a253f7ec22004"; + version = "3.34c"; + sha512.run = "588de2d1e10facafa62723b6d2d4cc78616a2171d43ff9bdb3232311cd380957711bdb5c1b7bc6a45b1abc16d0a454a2cae15ad705565306310a385f1d00ac23"; }; tkz-euclide = { revision = 71131; @@ -46922,13 +47489,13 @@ tkz-graph = { sha512.run = "04cf17f69862b2ec068dfc061fb019b54352cab3fdebb3111de3c28bf15047e06c236d979e9a9a92140c2a59ac9c0813ed7006d0411737b1f04f71c3a5916cda"; }; tkz-grapheur = { - revision = 72526; + revision = 72701; shortdesc = "A LaTeX package with tools for graph plotting (and TikZ)"; stripPrefix = 0; - sha512.doc = "853efeae8ce6d7ec2546239902aaddae3ba722bd79f14cbd8389ad1cc0586bb4934935a9d62fff7c5c16e3739210064e7b45c6eb2ddd4013b3c9a56227e81fc6"; + sha512.doc = "c5c639f807f95a32e379b02f78705e25400e5fb328a1ed0d9288cafe9fb7f0a9377ecfb573fc05211bea5ca45717d7e7d3aa923944431dbc790fca652b44a141"; license = [ "lppl13c" ]; - version = "0.1.9"; - sha512.run = "ad6cfb3937e35c035e37e351a780783f073dad7647afb88f0ee84c3a7c88be486002cdd22aec23eed29f08f0733983ae059bb3ef64f03178a323cce12d313fb8"; + version = "0.2.0"; + sha512.run = "6154795a1be13077622a27979d044a99a99a7a58d1be3cd7a841618b95984cd9f554b17bf082aa3039e9c7aa7a5c70c904415b942118effb691dd2f2e3a4669e"; }; tkz-orm = { revision = 61719; @@ -47012,14 +47579,14 @@ tlmgrbasics = { license = [ "gpl2Plus" ]; }; tlshell = { - revision = 70419; + revision = 73297; shortdesc = "GUI frontend (tcl/tk-based) for tlmgr"; - sha512.doc = "133264f19b6e4eee2412c3edb68459e639ea4c6f816ac9e8b72b0c7860173d0a535793a73eb58a5b02c33d240d9fe18633f2fdc794c74af1540610b81e1e0742"; + sha512.doc = "3167ea5be54ace5149d511544d4004a8fee5262aa14019c3eb0498bbb37a04c2e2b8426e474b60684f05c1d83161973df70c214c5a02cc573298c16aeed6b79b"; scriptExts = [ "tcl" ]; hasCatalogue = false; - sha512.run = "30ab3e5b6bc9dfd736044c634b65ac15b0501d2489b443a92df28648d71f2cdc98e7f3f58fcdc738c2e0b11cc11eee7a845451289392e91fae48defa789e120a"; + sha512.run = "f7b23636432949310c62c89970107e875c600538f110590f6aec49b912781de6d7f1b0667041afd12bec224f25ba2a72af9d5f5b405d380bd064fcb06a2a5b53"; hasTlpkg = true; }; tlshell.binfiles = [ @@ -47143,15 +47710,14 @@ toolbox = { sha512.run = "af5320de678474075998f9497be0b766e826b0105b344939a66c5c1377e7c345623e2de18b73cb43f93c8edc241fca7a99fff1ca4b6bd3dfba52bf2ff476f18f"; }; tools = { - revision = 71523; + revision = 72739; catalogue = "latex-tools"; shortdesc = "The LaTeX standard tools bundle"; stripPrefix = 0; - sha512.doc = "1d57776535abf3b4b8a4ebc35e066938400d98e50db67909c451488896825d6a5d3acab8dac0b32d421a79936da986bbaf817003cfc099702e0938a6c5eafbac"; - sha512.source = "4d26dc8ffb40ab2cbadbcfc0442887b67291172987909118ea318a76f77050134f777239be5c95144cf1c3fdb7003a97b4cb24f7ea35c04c65e0c93a56fcb485"; + sha512.doc = "c462f5a95f1310d7bf51d35ed2d1b7c92a11ca283d1ca292fdb90b74cbb7c545768615582d269342f82fe0bf620d03ff4ca61bd17599861071b21cf41424da38"; + sha512.source = "0452e38de1e293344cb9306a2659af542cef4dd3b773ed5e8893ccc4eb707713f5835a7ef43d8ea955f7f466d0486d11adde3075bfe77c478a9bc3f68d8e84ef"; license = [ "lppl13c" ]; - version = "2024-06-01a"; - sha512.run = "43982deca3efedede52a441c1b9969a8aae1c5bab5d40bbfdf057efa3857bfcc1be176042c029b8fb8b2166d7b178831af3a8e58ab39d3d8b193ee40c963588f"; + sha512.run = "a6f9ea3cdb3639fb8d99ca452717ac3cd141a118461fa91a7b7389c5befb25d5a1d8cb7d91b792f3c5cf2f9e68a678a11e9f5a5983decca8c77916ba1ea3f27f"; }; topfloat = { revision = 19084; @@ -47181,14 +47747,14 @@ topletter = { sha512.run = "1c583621d738ff203ef755c4ab6d4ad520fe25204c882b3b5b1dc719590cc4ae117502008f0b2ef67486f33127e6eab92a2177aed42a8e011c9309632ce1fda1"; }; toptesi = { - revision = 56276; + revision = 73464; shortdesc = "Bundle for typesetting multilanguage theses"; stripPrefix = 0; - sha512.doc = "7dd70306861e8528cd4c645893a3cb81c20a6f82db2237e595573226c77f8df71ecfa57909b9675e19e441301fecf38f1b1c4bb7b4ed2705a4e132d4bf19b436"; - sha512.source = "f127b3ece0428207e503bf2f9258da2c4128b524069c45c4d7b188ac06ef52527d04020a8f002c72a878a9cf5caa358323e5db9e0b65c46d6fafadc657ec014f"; + sha512.doc = "fc4c216adec91f03f648ebbaff5ad35695c48355af19d66b1b90359dbc1136e9af0d6cc72e372c3526b9b2e2a8a0f1fec73a8b3d510a0985331c78ab67c54654"; + sha512.source = "ec85f9830dfb7d0b094d3f14f888aa11d5750d6e573d72470d323c05fb29666698ceb033b6f29ed3fc0ca60e15857371165a121762e322f731d0303869e22cea"; license = [ "lppl13c" ]; - version = "6.4.06"; - sha512.run = "be7a920e195b9ffd3fcfc0bbe1647d1b47fb98743ec69ea9b23783f052d9c10c26acdea42d4d2c7501bd57d3853f53642a5328a1c6954294a2cd38d8aeeaaac2"; + version = "6.4.07"; + sha512.run = "68f194a9c3ce9fa8c21e82ffe4ce481fde9e4ae27a7e9609e9f5f2c911f4142576dfc5a6265bdd062bd3d6747e5069e4ec8affce5d6be9285c150a7854a82196"; }; totalcount = { revision = 67201; @@ -47251,14 +47817,14 @@ tqft = { sha512.run = "a99a9627d986626ecfc1d6378214f8525f12cada984de0f8881262e92eb71d87d0932813d3a9b85a798f0fce7ced9d06416e494c15bdb49ee54f2ddf1f4f9e98"; }; tracklang = { - revision = 65263; + revision = 74443; shortdesc = "Language and dialect tracker"; stripPrefix = 0; - sha512.doc = "42dd6cef4ebe9212277ed9cebdcf9875a73981ff88ebd19a5bb43296605087cceeb4095f5de1eef53b70f8edeea5268ce327d16545c55411c20880673f7fd651"; - sha512.source = "1ef4767d6a2a6f221d64544dfe3bc7c6db411b1b525dd887279d8454e7425122d1b0b7ee7b7ee65f2d006a12b76eb1b9f5fb23263da16937894209cb864ecb3e"; + sha512.doc = "2f0e3fd9254a3103c5d2987dc704688c73fb10f80117861609caa6b59a0d456a85f496ccbc27794abe9e390d9f165f8becd19c584e0557fc120fcafbeab8fb30"; + sha512.source = "c29c0081446730d72b3d099e56e2c28771055dbeff134d8a4177252e989c7b7ad90e89317e5b5f610713749522af812a548dcc87de93f181f32b7eaac0026fd7"; license = [ "lppl13c" ]; - version = "1.6.1"; - sha512.run = "a8cb03ea2fd0063ad3e0784c1fb6085e623f08d2a8a8e1e5907a13b0d08c2a99c7e1f6d0e357dabdd4e655122b572dca2eee5855bb5fe9ca500715a4b8b4790f"; + version = "1.6.5"; + sha512.run = "7084f0438dbe2d40e23c390c80bcbe8a99df4b9dc27d57c82c0a0d7e920dc8ceed2c002d10c9c75badecd922add186c6e0753262d4bf9d1e4998f121a06656e4"; }; trajan = { revision = 15878; @@ -47476,13 +48042,13 @@ trivfloat = { sha512.run = "25e07373c53a6d4c92a5f2f19fa0d70c86202435863b8b3cd036f2d12f74a477a33cca6508794f67256a877117bea821a11b9bff235e1a894c90b71810bbcca4"; }; trivialpursuit = { - revision = 72615; + revision = 73069; shortdesc = "Insert Trivial Pursuit board game"; stripPrefix = 0; - sha512.doc = "46ac63edb5ce75114c7d9e030de3a18d83075d80e61b784f678ff01df11da0424ef679038cff429404fa04250014f935fba93e8c4945785dad15f01495ac4e4e"; + sha512.doc = "f06a41a8b2fbf0f8e446fe6d7d62e4ab4932c15ece7b2fd1493e5e9d2b5255f16e509db0b2c0da4cfe2e21c4df6a29f5a8c1ac26911a06a521d181c7c99f2a28"; license = [ "lppl13c" ]; version = "0.1.2"; - sha512.run = "5d1cb65245e87c3cf89d1d9cf6ec6c2fe9de0b247b53dfcd68a434988ea1be80e0c1f8fbf18de9281947059e501c4579ba45e2115886c02ba186b6eb7334600d"; + sha512.run = "1d2ba96c7c8edf2e8af2967a2c3a3b4dd34f8dc2d4a337d8b57c50cd2f94bef3e86f9414b9eed378d8d66d577740462af5c3ffa63f5609d9e867ad6392ed7af2"; }; trsym = { revision = 18732; @@ -47554,13 +48120,14 @@ tucv = { sha512.run = "957485431ecbdd31f180b36e7519c4bee8379f477b765ff5cebe57ffa3c95caa5556ed057943eb052d61e720074dc78035fe05b0023115caceb05bd2c3757183"; }; tuda-ci = { - revision = 71696; + revision = 74426; shortdesc = "LaTeX templates of Technische Universitat Darmstadt"; stripPrefix = 0; - sha512.doc = "4bf0c5264bf641bccae46467f5e39b7c088afa9ebe9987546a808824ae416c99329762fb147837d8a5753589b4ff37474d0120fbea461dbc1d9f825f8424212c"; + sha512.doc = "b0b84e13675d1d501d97b04182b59043edf35475d4478ee3786920055dd446f0b990ddff43b0bd51eb9b895ce88802d2b7b46429337bf25c30ba26d9b80abb39"; + sha512.source = "d61d17c8b185cf260f68ce48b2d787e51c3c8a8049afffe64b2d1d72a7a1dc877edc56a34ce6a95ad86678a401bd2f59965b5c057a62ed18b43726e90de170cd"; license = [ "lppl13c" ]; - version = "3.41"; - sha512.run = "2fb31edecce8381636843368bc8577869cda2c4e01a7f452f11628639fe95030d928135b286489d30e925b041919bac6ca63eb4c7e806ed29f472fcd7da92b53"; + version = "4.02"; + sha512.run = "8ad89a808a1d97d497cfdb8ce6436c652007078d19a235b2dde5821df2ef606f1afe869b5d9503f33d593e17055c7fa28e7695b890d548e46fc2e8170d46a10f"; }; tudscr = { revision = 64085; @@ -47607,23 +48174,23 @@ tufte-latex = { sha512.run = "6dd01a5a6faf37439ca9aab23534f99050b84bfac16df48545417ee03e72700344c25b2de3262e8e28406da705d50296473a815fa14b701c609b3715f01405d1"; }; tugboat = { - revision = 70959; + revision = 72711; shortdesc = "LaTeX macros for TUGboat articles"; stripPrefix = 0; - sha512.doc = "fb419036a3d5924257fa854df59b4d4e8a8d9d3130cec46f5ea3312b87e089aaf93f395db338f89d5653516d6bde5ead0f4bd842f96161db7e37f6c034e8c2a2"; - sha512.source = "ffa1aa19508b9a3dc69a6c7b165a08b3eff73d7517f99626044c676ac21a5ae55ce96250de9fbd9c8aa24521c6611ebe5152b1d4c9db9aaec6ad68d58ea4c9dd"; + sha512.doc = "eb138526c9de6d93be4df1a2dd51943f62190fa4321859d84ceb049669a6fcac4e97b732d66fa85c76555ee90461bac46e19f1f10778677e775e2947a8df16ea"; + sha512.source = "6357d7084f17ff08e90674f38d5be0bde565e27fb30ed4bc8b9ca15643f17a2e9d47511140c60044f43fc3ceaf7d6b8155ce110b3627baea2f7700654c448230"; license = [ "lppl13c" ]; - version = "2.32"; - sha512.run = "8534fdb228060d3693d678f969185e559c5a1f09644bb3e5676c3553fc52103f1993fc2b0e799402fd5f70a86d30b2a3e6098c76929a6531cb297562cf728eeb"; + version = "2.34"; + sha512.run = "1216bd48fbff316d27b9c3b3bfc9408dc116b7c741b14752d674582ea4c4bb1ffd7fa95d3d53bff2e88339d22836339b81d398198ba7e4b979a8afdb94ebbc51"; }; tugboat-plain = { - revision = 70960; + revision = 72675; shortdesc = "Plain TeX macros for TUGboat"; stripPrefix = 0; - sha512.doc = "a3bc01b29c10b28e1635c010269f809965f61e012c07bf16821a29541a6127aaad76a7c3d2a686812037bae897f363c3af4d45d252f6ba9b4ac8cf7a60e94bbe"; + sha512.doc = "64435ccbf6be7d4cb3dec523217ee383b810cf67c45f5745ecc785aa7cd4163607df8d0e2b5200f7af9c3650c6884718899d04938947613231c16007171043fa"; license = [ "free" ]; - version = "1.30"; - sha512.run = "414127530c61079dacd1a50bf776a0a6296a2fb451de712a8c70b79c171b4427139a53e6b4b28abe3b9405b2db8c298a390d7c2fdeb316750ece3e9b8b1f5869"; + version = "1.31"; + sha512.run = "d4cf21d3dbc8be3e4c68efe79eb1fb4f2482615d20edb49bc8d49b41114ffa0ecd3f3a263626422fa4f0083b01d4b6b86091538fbcfa00234382a07c9a83d1d2"; }; tui = { revision = 27253; @@ -47634,6 +48201,15 @@ tui = { version = "1.9"; sha512.run = "59e8af51c39984a42247435ad893c3b8e37eb9dc53634e0a5f30733ee0c973690b66d805079a0f5cf61762abe7fceb1f2dc91691df9be26f72a1a8edd2524ba3"; }; +tuple = { + revision = 73174; + shortdesc = "Expandable operations for tuples of numbers"; + stripPrefix = 0; + sha512.doc = "2855da70fe880ee85f77fb6a548a9782b01d3da152bf61f9242a41c75df8c61ad80268ac4fccbfa8a4a64e6abcec0f86d63b0641d1ec00a51b953b92a3b7a63a"; + license = [ "lppl13c" ]; + version = "0.2"; + sha512.run = "f02cc79797b610d8698f5abaed665597a32abb4e51af3ce4aaac96fa189fda9baf9c377ed8dc0819a30d23863cf8914d31c12ec45ad601aaa8673bc2629ea316"; +}; turabian = { revision = 36298; shortdesc = "Create Turabian-formatted material using LaTeX"; @@ -47672,22 +48248,22 @@ turnstile = { sha512.run = "164b6b8f053b2daf93e8253df850c4aad793521848a93053f6b3879db5badc0b88b5f8f44487e5525c60e7ba7deadce53b2cecb00b7330b22b0815e01cb68338"; }; turnthepage = { - revision = 29803; + revision = 72902; shortdesc = "Provide \"turn page\" instructions"; stripPrefix = 0; - sha512.doc = "4af8dc61e53df587f19b61f6260e7a7820a8334f2841a63f2ecc05b7197eb69596dc36163b39cdaff9258651241a334b6e3a814699065c8ce4f861fba6110f83"; + sha512.doc = "4033467f66fa676bdde4cb208bf183565542772794115e40fca77c80b1cf3d07acab7a757d1930443c6ab99c474465bfc66928abb1ac45bbe6d1459386174608"; license = [ "lppl13c" ]; - version = "1.3a"; - sha512.run = "446b0516264eac6b880048e16cf4ad7bb529718c726233fc645b8c32d625f3f6b505b72beef81994b61ddc77ec8ecfece907347be4f9e18a79fa36c2aef91b5d"; + version = "2.0a"; + sha512.run = "b8be9a4a2026969c424dee2bf484eb4030800aa960d3a77a9ae2c8dd87e51907c0b3fdf0e99267cfce98fe8a920f9504eb7a16b7d93e2ec74273148ef7f0138f"; }; tutodoc = { - revision = 72596; + revision = 73166; shortdesc = "Typeset tutorial-like documentations"; stripPrefix = 0; - sha512.doc = "adcd993e1e0cf876d09c51926798bf5cba1af0bb2671865086fc26dfb0057a6a839e82a83c907130d98823c5c0717a39891688e9b375b258c19fe9d8bd76195d"; + sha512.doc = "128d93ffc129c6d1a5181d1d7876de7789d91ed540ca26303e5a2fbde767bdb0b8385fa6d5d2a5015b30864d51f995928e056b35e6c7d7ade151b3ed16ee3755"; license = [ "gpl3Only" ]; - version = "1.5.0"; - sha512.run = "d528f0a4e1a205fb4a54d2753274c0543d62d68dd3df1bfdefc27228d45042105e2787c1cd1c24a403eee842c99cc8cd24707c864924a98faba7dcbca5287f27"; + version = "1.7.1"; + sha512.run = "5abd19df727408fcababe2c586972606ec600c026f536b836b7a051ab90dad7866f01b5475a6bf5d7c098ecab701e6acb3900ed7a181120e03c773f4cb080764"; }; twemoji-colr = { revision = 71991; @@ -47835,13 +48411,13 @@ typeoutfileinfo.binfiles = [ "typeoutfileinfo" ]; typewriter = { - revision = 46641; + revision = 73899; shortdesc = "Typeset with a randomly variable monospace font"; stripPrefix = 0; - sha512.doc = "12376247fd8500e7c147609bf47acab379e36126976ea9f2dc0a352b8b0d779b1cd43bd1394f3961b1a7fa894a8b6448b0369f612d8bbf8d1bec3175e850f89c"; + sha512.doc = "5f1922e1dd9ff95f8475cadf27f7bb6ec79b8833384b2da9bc33b560b89e2c493a267fa9c72c4d462edf99e59accc57ae65fb767f843f156f150d4b73299a43d"; license = [ "lppl13c" ]; - version = "1.1"; - sha512.run = "f8b9edca6a860f0acf0d676fff381276594f7c13fb13da2e54caf5513a8a65fde378b4c16dc621d89d25d7492318b006d7c5d863c1f96a0a246064c0dad1f2d8"; + version = "1.3"; + sha512.run = "96132e440fbe98ce82caf159a7eaae785810d00a293022ccb1664a2ede3dee94ce716fb7035a09bcc3645250fa3abe616a63bdeb93598d6a11b5e588c8613bba"; }; typicons = { revision = 37623; @@ -47919,6 +48495,15 @@ uafthesis = { version = "12.12"; sha512.run = "52e0fde63c966392a235239725e2db7cea70a300837cf53003f961d32f54787d8c4e70ee76577889ea543f884ed5ec281b345bc9e83872e5a131e55429f7afe0"; }; +ualberta = { + revision = 73818; + shortdesc = "A LaTeX template for the University of Alberta"; + stripPrefix = 0; + sha512.doc = "ea9855a49ad65aecbb3fdc4d95366490f4c332b0bbe2ac35a2386de24fafed04df259600cdf5a3df11e8bfc835715aba7be8c0bd38a718c2e5924eab478ae2eb"; + license = [ "mit" ]; + version = "2.0.0"; + sha512.run = "65063ebd15c208d30033bdb38d0305b0be451f7f52ff9b1b3db14b17574439218a3fd0dd09b1dd56021e73e3a3a2edb575b2985980c46b9ca0402f488b64d5fc"; +}; uantwerpendocs = { revision = 72118; shortdesc = "Course texts, master theses, and exams in University of Antwerp style"; @@ -47985,14 +48570,14 @@ ucharclasses = { sha512.run = "41e9f5323b62d529f0b0ddd1ae9c5d613df19190a2a666e1c1b35cadd8bd5411487ecee1419b7dc7f06183181f68ecbb8bf813537c6e711f926fa99fa74f249b"; }; ucph-revy = { - revision = 72484; + revision = 73167; shortdesc = "Musical script formatting"; stripPrefix = 0; - sha512.doc = "37054315206042910e36a791c3a21366c201342716b390bd60a03245cf40d331cf92ed9438c136bf154763ebfc7371aaddc7030523061c84a81673d343763237"; - sha512.source = "7d2bb37bfd0ca27c90c7cc5e4bcf0a8680d3ec9c0db4cad1f5ee73be0f69eba1880e9d9725f28324c43d1c55907b931f1f552f2bf500bb89b3bb8671a216af27"; + sha512.doc = "a49b09e173ed8a511c488c1c41643381f5fb4ea07f3a3a10e98006f2debe45bd2a31c3008d367216fd7027dc0695c4801d87a4d82bc225873322eb0ba4997d1d"; + sha512.source = "544e6bb8bfe4c7db8c2588608ec5d2c296d3b9a5b0a7944af6c7c6ca775b12d34aca0b7141f29e32f56e0a75c75e399eec073130fe2f614d35f124901d378fd5"; license = [ "lppl13c" ]; - version = "1.0.2"; - sha512.run = "4fc20fb7efe54be8aa804a677714abae0f630913f973e44f7f59529a94bbb40e1e847162d2560bec2fd2f5966eb07ed2112814ec998bddc5d70dda1f9cc29c12"; + version = "1.1.0"; + sha512.run = "cb6b9368ccc80c098cc3bf458f1bd0e816c9070c23d13d9c6dfcbad27c91c676d8607cb5547ba5f709e1218d42a067cc58f6c5fb3293bc7e118dc4f7104e99bb"; }; ucs = { revision = 68759; @@ -48278,13 +48863,13 @@ unamthesis = { sha512.run = "f48e7aab2c445c5e257bb39ea4dd880cf9334a5b1dcbf429e8d4420edbdc4621aa59548f31770d67698bfb4e59e239dbcddc959c1b010e012ad16971ee7956f0"; }; unbtex = { - revision = 72488; + revision = 73390; shortdesc = "A class for theses at University of Brasilia (UnB)"; stripPrefix = 0; - sha512.doc = "5b71c84c2423e6832a7b54a92b0195122af329a0660691f75d6798b4f35f52a5d0ae6d738fa90b31e5ad0cc641d1dfdd1f962a307b799d8f7f540b56bdfb0da4"; + sha512.doc = "f4986e745989b2bcff6e77e7d999bac90c09cbfc27665d60fcd87cfc6342731dc5285b80a83188b71f34014e672c2846ce7c6b735c16c30775bf59a2a1ff9e3c"; license = [ "lppl13c" ]; - version = "1.5.3"; - sha512.run = "482996906cd7a673ddb66b08da9b68d5631c0e56c8ceefb8073d70d7c98d1c85bae40cf37cc3c2d6fad5a9c7485745971b37e842a4f3a6ab80e5269c073fb091"; + version = "1.5.4"; + sha512.run = "a90da480f41b8d253b2551e72a01713c3c8b87efddb369d3aa6db0f26c46d658c25e5838c413f30e26844d83338db26ba7ec2ec7fb24743ea0b94aa7be28da55"; }; undar-digitacion = { revision = 69742; @@ -48331,14 +48916,14 @@ underscore = { sha512.run = "4fdc57d0a36aa5646c6b960b7579a8111441659469df32beaae06f54e6e835456810b1d9b5d36036510befd5e80b5b481b9179a6b24364bf8f858ebc97039ab2"; }; undolabl = { - revision = 65846; + revision = 73633; shortdesc = "Override existing labels"; stripPrefix = 0; - sha512.doc = "dff0446c4efbc3ea2a8e379718ec977c53aa54c46c6703cc774db74e9e3d85c49dc83cbe0f1d8cd6450899af5929480968fea873333aea321d8742cb328105e1"; - sha512.source = "b5c0b41e71540e0a0b5cd7baacd702403b4611446a208186caa8f98eb840ae093b852e7b64451488ab7bdba4f3f5bcb8fadb79a9c81015de4989ffed1ea1a743"; + sha512.doc = "0d4ec06a63f87f8a1f0b4a050953cecce0ba49f8f5fa01a7f905d4184611ebf61a1f9503aaea4f3d35e2cab6bc92e1438e03bd30c9609e2cc1d51a5b5b7674ca"; + sha512.source = "551ebff86e31e37429ace73abc53c669ae70dfbe8a738367d0521f5a4cb6437cdab8198a72ba1f9efd9e59d46fb2fbbe498c74d8be7ab1d0acb740ac91ec6d1b"; license = [ "lppl13c" ]; - version = "1.0m"; - sha512.run = "7a2a13c7cf9a5920278bfcc57c6670a3abe704ffe01f3d90e253dc974c601da9a65366e7dc49785c398e3040771f45fa67365ba4e2b32426380c70556e4337a0"; + version = "1.0o"; + sha512.run = "809321a17a3bd433f8373290fb5a78ae4cf99ce888b3cabb2874fd3fab635092224c0455805e3ccc241e6899fbede9b65f3b8044825914b273c8639dfd277929"; }; unfonts-core = { revision = 56291; @@ -48384,6 +48969,15 @@ uni-wtal-lin = { version = "0.2"; sha512.run = "803107d89b4ce6fe120bb528c684a65db3a9c70433abfd6bcebe2a5d05e6c7680256a407ef5f0515a56915c5c1e0637a183cc866631558e32afd96a0e45139ce"; }; +unibidi-lua = { + revision = 73554; + shortdesc = "Unicode bidi algorithm implementation for various LuaTeX formats"; + stripPrefix = 0; + sha512.doc = "46cfa2f7f26606974944fd122d2a8ea2c35f94bfc1154f4b06b7c92ae5dfc153910a33690004f585f8bc99c2e46f8cbf28283ba360b88b3e9760ceafb310727b"; + license = [ "gpl2Only" ]; + version = "0.1"; + sha512.run = "bcb45c00765b8fa7c5c1257b1d42ecd233aae269c61077f2b0b2d1f90095010144193dac5fd935a607b493cd7eda97f729cf6c03b86715fa546496f10ac4dc99"; +}; unicode-alphabets = { revision = 66225; shortdesc = "Macros for using characters from Unicode's Private Use Area"; @@ -48402,13 +48996,13 @@ unicode-bidi = { sha512.run = "35e32b9959e698ab0d32ef578376fdeaac54c1acb9abc584e742a7caafbb2cf82364d58d73ad07de4cd273a5c9c60e4468df74fc4c21fb6552ddb5be725e384d"; }; unicode-data = { - revision = 68311; + revision = 73362; shortdesc = "Unicode data and loaders for TeX"; stripPrefix = 0; - sha512.doc = "a8e147ba4d30bf80e1c1bdfba67bb3a0ff9f765c5d41734aca1708adb58c5c357a17401383faab827477fc837ac1dbbdcb55ee0b3146acc737c094d6984709d4"; + sha512.doc = "42bed9f0a972c4b787148e67f66449aa316a6fe7256bc3391d3ab29eabad73008a69285973542f0733cd2cad2d5b5eaf32ed2650836eeb3deec0b2aa5f51074c"; license = [ "lppl13c" ]; - version = "1.17"; - sha512.run = "9e74ad2fd167a913e004aa77c705f0f8b3ab3d8e717384ee150db076660bda4e2651bea97292ef9e747d4e2519d9ffaa113947dd5241f830c3e4d653ee061d71"; + version = "1.18"; + sha512.run = "401602a9159bfe02cdbc1edecf3b978e6c5aa8ab4ffc7b1e41ea37de7b7f79ca101b9a4235fd80471bfa7372ff6ef023b759f91761327038752bb1b0a8528c0b"; }; unicode-math = { revision = 67919; @@ -48722,12 +49316,12 @@ uplatex.binfiles = [ "uplatex-dev" ]; upmendex = { - revision = 66381; + revision = 74250; shortdesc = "Multilingual index processor"; - sha512.doc = "ec4d1670ff84680fcab88e29ca5f4306f44450ccca9cba06282ad34bd026f74b46d166724a06a313957ca8d798b0c296e848bb248ad416597a99afb16b4b5a0c"; + sha512.doc = "1c3b8564b4678c59e8f66b8c7374fcf6668957b7abeb971f92698772015fe5693f778abbc012502dd5617af09b5ac8d04c601fc2de5b61bcdb7efa5c417fa9c8"; hasManpages = true; license = [ "bsd3" ]; - version = "1.07"; + version = "1.11"; }; upmendex.binfiles = [ "upmendex" @@ -48799,12 +49393,12 @@ uptex = { license = [ "free" ]; }; uptex-base = { - revision = 72534; + revision = 73291; shortdesc = "Plain TeX formats and documents for upTeX"; stripPrefix = 0; - sha512.doc = "a5a15f24664c47fa7937dc34a78123eb2fb887b15a9a6d6b900f6e591aae9c9944639a6d5e85a274bde883f86f1ee82e99a9ed3bd6c06cd0f1cc14f7b028e3ff"; + sha512.doc = "b2ccc882719cd13cb11dec6e09acfab618c0f4cae230f8ad5a21d7dd8e8723e9c57faf19054ddb473a499bab2ad7aa4acec575f6f3cf3aac216d86735eb4000f"; license = [ "bsd3" ]; - sha512.run = "b360f154a64a902a46cb1365835a8a46e4d964ac1bbef77a7c3fe032d3790351b3f1c30a57e82e6830f823dd93b4a0e554706a3323ca3b1730868c2ae4f59253"; + sha512.run = "563db2105f64a1ac97437fcf28027034994f08899db2413e9e2e2be81c493895a095b9220c89520dc1451701dac8c5acc77707ef4398ecb9ebb97dd2019a297e"; }; uptex-fonts = { revision = 68297; @@ -49149,13 +49743,13 @@ vdmlisting = { sha512.run = "4c4b5deda36fab8ac8cadfea2093da188284cb26eb9874f27ffbedab1235d4e7bdf48e977a714fb33f0ef2c5cf4c0b92c14767c565efa6842cabf451af51c1de"; }; vectorlogos = { - revision = 70819; + revision = 73069; shortdesc = "Vectorial logos (GeoGebra, Emacs, Scratch, ...) with 'inline' support"; stripPrefix = 0; - sha512.doc = "1579048f3d615cce1381d576d3bad5e08d365719c15b3d336c82a46e2d081d61ff0d2062403a311a08332f65b0c24ecb8f684aa87c9e2b727e5b71520ed0c683"; + sha512.doc = "8d844d094ac6272bf10bb89b411559a591a001e6af9130c5dc89977a0cfde3813ff119cc826e44c164929f47c110e45a2a096f59ce1ff95ca3858091a575539b"; license = [ "lppl13c" "cc-by-30" "cc-by-40" "free" "gpl2Only" ]; version = "0.1.3"; - sha512.run = "41540232043a828a387e57ab4509dff92c76494a9b0c736feffce47bd283fd5969eaf383006aa10861149309250141359520fcc86f5daab51e2ac09e742c2a7f"; + sha512.run = "5412756ed6520a58282071b55a19952f8a0bb3a72df83a5f0ae721683cc8469f36d02fcc121e644e69bb6b597cf6415e23e1b76d8b757a41251b0d1bca7e54b9"; }; velthuis = { revision = 66186; @@ -49267,24 +49861,24 @@ verifica = { sha512.run = "8c3258fdf2040e00495b56605f88160b5179743a7ae3abc6334e734ba9f1fb122bf2e4847fd9a577c1221c9e22dcfa650f15612d7a005b3719ce6c92df180bb3"; }; verifiche = { - revision = 69726; + revision = 72983; shortdesc = "A LaTeX package to typeset (Italian) high school tests"; stripPrefix = 0; - sha512.doc = "dfc3fc5a5bc8ccede3bb487a17941ac6e28879c03ea9e398475c058aae07230e2831bc9dae3195effd331abe79eb5f6ea8962da85a9775273810da80d8ada70d"; - sha512.source = "f46df8dc9759ced453752b53003d9377748346f8fbc02ea07a61b8ea44fc51eb6d0290c9b1a940ef74cf1999ec5597794237e0b28bb28b80c331b19c0defc14f"; + sha512.doc = "f2e4310fa4ce37f16e07a0f9a0adf2dd81750c49901cf2d6f6f95c5903c2bffd6aebac6e07f251cf746dbc1e7cb9020617fc17b490a4005cad401115f4fb2e2b"; + sha512.source = "4be18ef698dd918cce4c631991125830ea058e8d94a4e89c0fd8110cb2a5af5b5dcecfd12d4c1b24f00dde67f1a00f1926ae9467b1b63b61386d9a9611ff4c47"; license = [ "lppl13c" ]; - version = "7.1"; - sha512.run = "6201051c81c5a002423d3a9959e847223350c83ff03dca7792a727f2ff7f0405d20d2499827f5e96ea8e1f2e7855b887b0c2b35180ea2153a5c2126d36e21410"; + version = "8.0"; + sha512.run = "8b5c6a0c0c1592e14ab0ad949a0c90ca17dcbb83d863944747aff68f944e88dee9e03424a3e5092786e30fe29d2f019b5e431ae9e204b48afe52a52ec2ffe7e4"; }; verifycommand = { - revision = 72180; + revision = 74515; shortdesc = "Verifies definitions are unchanged, such as before patching"; stripPrefix = 0; - sha512.doc = "9ffe28c424dd6bb5894b33a698982e78560b45643963a90841d90096acfcf1bf2433dd4bc61da0bda3cea10733f5bac7189f9998dfd7286bb10f93c84e565aac"; - sha512.source = "0e2a4151739d4a2bdc9bd3d5f20ad328e3d31a2eb8e9580bfb575dddfbd03d45d607481736324199146c636060119256fb6bb937c4818c14a4e7e4a03c8f249e"; + sha512.doc = "808c1d10900c31fb5da843e33411b14eb9568a0e323e5a66a8dbeec9d13d8fa79c6b07beb657ff63958afe92b5dffb91c4c9fdbc5641313dd4ec9b9ca655e29e"; + sha512.source = "6fbe09a8c52f748174c7fdd32e292c0663750fa968e1c4aa8058aab42eaec27f854e821fc13e0137d04399779ddd96d8ab918fed378d3d9316ab7ac541b585df"; license = [ "lppl13c" ]; - version = "1.10"; - sha512.run = "3bc024262a95fadab561eca323414815afad5c0e4af81e0bb6f636d9806947912ba7baa404706f229068839465cccdd0a7bbd007d7e0d56d6f6034a5d99edd2d"; + version = "1.11"; + sha512.run = "c576f07f9646f63fbd9ad1b76f900bc14a5b12b6f79f7cccad5701c5b144e685568053d27d4cd3c9246b2e1f61ef1282a61286741599c54bac8ee96490d9a484"; }; verse = { revision = 69835; @@ -49525,23 +50119,23 @@ wallpaper = { sha512.run = "45647b8f8ebab9706437be2ce63f3506638fcc794839ff366210db4c35a3e16b2a39127fcacd0d97df356180770b6808e80e63ea1a50e69fc591cc0992e1787b"; }; wargame = { - revision = 69692; + revision = 72903; shortdesc = "A LaTeX package to prepare hex'n'counter wargames"; stripPrefix = 0; - sha512.doc = "dc1a5d8ce42661ebe5f0bf9cdba69ae66f8fe592bc48c8036ed60cd75b07a84e18c5d92fa4c4730155c5858f7ade450d59934db4e55a6ddc6a3d93ea0c78a0ef"; - sha512.source = "c7a04ae48a204f6e4c3819f8f4781ba65f4a71c72e011e4aa83680818f35bdf1b5cf57f92e58ad7eca366a677f2101d1c58e362869156c61d53e0028f250ef9f"; + sha512.doc = "31996118470475a2052de529268060a08928dcac6af41cab8e5e08fe93ac87e005d9399ce431b86d0a866cfddeb786eddfc6286b87ade9867056a192eb1c18b6"; + sha512.source = "8f15055fb39ee61ac11eb19cafa01900d20645ffd5ef909251f4623b6dc4440bb88db23a0d4bec8559769e53a782eabf60da0c4a9ae7abfa8a06b459c74cfd1f"; license = [ "cc-by-sa-40" ]; - version = "0.6"; - sha512.run = "8302254134c342db781f4bfdfafd92dd3484e2a0e91dca2bf43113665bc3c44c0bf50637bb702f33fe243108bf1902283059a923e64bacdcdf7c9a5bfecc8836"; + version = "0.8"; + sha512.run = "c874be4b481f83a50eb8cb2eead7d5293cd4b351098a98e62f67ed8710025aac16e38636907c4961240e6b46a4f815b5eccf2db7d79adcbe5c72237f56ebd657"; }; warning = { - revision = 66616; + revision = 73265; shortdesc = "Global warnings at the end of the logfile"; stripPrefix = 0; - sha512.doc = "561c4aa05df7143f68067d22b337f1754482c40eb851356f70887dab86b3944116f2e7d9f3a83e4439c7b0f6d6db0ca61371ee049758173c35b70468bd0166af"; + sha512.doc = "0b2e80aa1946a5136c3561fd4494baf2f758ffa0c6719a8d3dec46439ddab8179c6278899c42c936f9c71655fc92d37694c260cc270a166b99fdca8c997b0ad0"; license = [ "lppl13c" ]; - version = "0.10"; - sha512.run = "443a02ce9aa004379aac94091c4f3014042cf2826d12bcffaa92f24ebd3a023ef314d05aec00947db74175e03e432fb80b7060b51c4fc310d14c15ac86606abe"; + version = "0.11"; + sha512.run = "21458ecf0d38d9b70b1c259591c6646d4d443b7393e5326503c9358dc263a383bb6e0aaed498d1350a68d16ce8c8e76a2854c72df5ba148516d0d59bf6100125"; }; warpcol = { revision = 15878; @@ -49643,6 +50237,15 @@ weiqi = { version = "0.1"; sha512.run = "7102186b0326dece11772847b9f3ae986c4ed7a078281533a0d5f65ed9342555efa554090fafacfba6e8d1684b1d3b16faea0a304cdb1dd12341ec1f88cfd126"; }; +whatsnote = { + revision = 72966; + shortdesc = "A LaTeX class designed for taking notes or writing books"; + stripPrefix = 0; + sha512.doc = "13d948adfdb4cc2aa08165f25f395a034fdd58eab62d7efa73c8d59fbba8394e5c52040cbfe263e3077732096479d512c1ab425ebe660f2a9a0b94726cfd2446"; + license = [ "lppl13c" ]; + version = "3.0B"; + sha512.run = "735fa48d528edcd7884da1f3d131d154e105afa361c93f7b4bf16b55f950ed9887f9ef30847ced898795383bb91da81914eb962570ac51165a73b7f7c73bf588"; +}; wheelchart = { revision = 71928; shortdesc = "Diagrams with circular or other shapes using TikZ and LaTeX3"; @@ -49800,18 +50403,18 @@ wrapfig = { sha512.run = "afa6eed496f63dda436a9a57c9f056ae88fb7985328d58d81fddde743a737b1ec69a5409941a76a28840d938397928925500628b2e11859713871977545278e2"; }; wrapfig2 = { - revision = 70838; + revision = 74396; shortdesc = "Wrap text around figures"; stripPrefix = 0; deps = [ "float" "pict2e" ]; - sha512.doc = "1db05fcfcacf27ed6d045e42a6650960fdac3146527f2e205213e18a4b1fefbf0324e3f69d0bf3961a51ff377ccc08f760644eb7983f75c4d5cf5a244d042dec"; - sha512.source = "254c333cde5435a6893757cacac6eafba6816c80584e5196707d9dff1a1f49b8d5c64f292fb0fdb590577dea18fb466aae543b0194b07423704a7a2df382ac8e"; + sha512.doc = "e0a279804c6c0fe08fa6cc0c69010c31ca6ee4f8a4771690fdb282374963e19d5a34c12fdd33b02b862c4e78bbf4f72e1e019f2f32189f10d52c72f01ed76c0e"; + sha512.source = "d6f2d0cc643f898f6357ad8a9f73e0586593659cec0c60a766385ceaad9616a7c160e2d91b77b9bd821d3c6bf5d1f71570a48bc0fb53b62f183afc55eb17c739"; license = [ "lppl13c" ]; - version = "7.0.0"; - sha512.run = "951cdea831e8f283cb1ade741fc10c84404c80a57b31f677a7ba324963ef3d337acb2c0dc78c1a7e9a003bb5a001361a267b1e345e08e43a0ec80cba10cf7db6"; + version = "7.0.2"; + sha512.run = "cac6b17c2cb255a1611f2e7ff4487b1b0b938bdb4f2e517677cfa3c6701920eb86b8f169757a352df4cae987a0fb4dc75554927f35a09dd40bc4d72138e9b498"; }; wrapstuff = { revision = 64058; @@ -49832,13 +50435,13 @@ wrapstuff-doc-en = { version = "0.3"; }; writeongrid = { - revision = 72162; + revision = 73069; shortdesc = "Write on grid lines"; stripPrefix = 0; - sha512.doc = "27c038e059fa4982198fb6ecb17ebe86d1eca2cee278897a4340e63df726cb085fc54b2999065b8b7bf84e69063560992d394f50ec0c30eb9db6a327a7e5a1dc"; + sha512.doc = "b0ba5bd7328158657324a1996a01fdd2b164d9683531fbf71bf44289ed05d70bd52ee75e62dc4366c90db64c2630320b52b5f7836a42d4214adf0c5028630107"; license = [ "lppl13c" ]; - version = "0.1.7"; - sha512.run = "664ef56d056466d14cf1d04ac952b348edf969fa6b6b277ac37ba000caa0a7ea9ef81e0a0e46f36ea2cf0087cf564b08968653ce0f8988fc1587fe94807e79dd"; + version = "0.1.8"; + sha512.run = "304d2397564b03b437f494460c75d4f41050ec6ed47d0e3ac281cc0ac913532b08a4aa986a6be03fa7dd274eb751acf451c45ad34ed147d8eda42765332d63c3"; }; wsemclassic = { revision = 31532; @@ -49908,13 +50511,13 @@ xcharter = { sha512.run = "10215b476401e94c1910272dc9873530f519f3389827d3079abed0fe58f264a721b0c96e4144594cbdbf4c96e1837b9cbeafee7ab9198d1bfdb7e04241c66599"; }; xcharter-math = { - revision = 72658; + revision = 74016; shortdesc = "XCharter-based OpenType Math font for LuaTeX and XeTeX"; stripPrefix = 0; - sha512.doc = "25c9f5d19696441b11f267cef388f30079bae6b4be7024db6d13303b162a3ad772ff29706f2b443b82afb4ad1d26147913d0fde451ce856c733c0f0a3ae3a8b9"; + sha512.doc = "fc6b43cdb28e856fb558dc80fad8a8c6fb6923ec14288d51fea2f8ae250319790c091ba559b18e478569c00aa4e35e0edea6f6d329842a465526b41ec6c9921c"; license = [ "ofl" "lppl13c" ]; - version = "0.64"; - sha512.run = "ba50fd386cb1ce831533901a6590e915b7ea41afb304b8b957c85b71745cb342270dad353d4e13b65d166cfa1943db6c3f516a274e28c7a5492d9b6dff33d93f"; + version = "0.65"; + sha512.run = "03b58a07515dbb7628b941d63fcb9fb8b27e47fc53b4ba2e6f0bf1aaaa6dd0446f2b4ab38475758eaecfdf524cb3b41930b87fab566e53965e405e4d941bb16b"; }; xcite = { revision = 53486; @@ -49976,13 +50579,13 @@ xcolor-solarized = { sha512.run = "fe743e9aa394c6a8a75f8c9e87cb7349d87df114a8c5753a157d4dd129a677af6a0381969f7719712a9abbb9fc720e0d19f8e7ffcc2bd7ba09ee8cb3df3c8d95"; }; xcomment = { - revision = 20031; + revision = 72759; shortdesc = "Allows selected environments to be included/excluded"; stripPrefix = 0; - sha512.doc = "d3b4d70cd88923e25595acf726afa6eea2efff4550455ed2eff48411621f212059ffedc3a82e4ac15359420a00c69b55e3625d11f8e8d4111eeb87cc3a6e8cfe"; + sha512.doc = "97bd8874c11f26b7c06408dd3a50d36c0be5e1e50ab52005335ddb4754e0aa0064f450057d2105b05a181c2d9f94a65dac54e71fc3aa4d83a140e3ae8c1d43bb"; license = [ "lppl13c" ]; - version = "1.3"; - sha512.run = "ad19a29caaaa4da90c740a18f3b3bf63666303f8047210197e17c270082d483e33085c9249d7143ba65f343f6bf3b52c6974021f954831c5196708824e21b843"; + version = "1.40"; + sha512.run = "e27b253d0ff8bd8c9eaf07c272cbb9017dab30bc1f1542f0f00e5d1f29cdca36c1fd1ea65c71310aba6395f49578385eb92b47075a371d65e89c6523ae97800c"; }; xcookybooky = { revision = 36435; @@ -50025,14 +50628,14 @@ xduthesis = { sha512.run = "af32af87d621a3ad64ff6565a02190288e0f97526973a1a3a185c077aef8926f56e9754fb866812f0cc7f515b54fbf7583fec10c17d6f9299d1e186c9a8542e0"; }; xduts = { - revision = 66661; + revision = 74069; shortdesc = "Xidian University TeX Suite"; stripPrefix = 0; - sha512.doc = "7e89d160b992eba61328618ea463014c52f861eb1b952f05aec2860878c226d0354470522468ef79c710486c0ced8bfe76eee296035a752178fafcd380f957a4"; - sha512.source = "3227078ea75cbc6d23aae9086f51bf86b2d7fc42d237767ed90f915a6d2255f6e2f816c49d77caa1d85fe0f623d99d3e76dd458db699b458df5c28f3fc5fc092"; + sha512.doc = "01b6dcca80f00bbfd4c803a2a774ee4d7669b7aa6657c4480ee7aa115411f4a0c308bc378755006096443c767984abb6d59483ad217d0088dd311a3235225d20"; + sha512.source = "59aa037f099d65aa08b5187bff4187a7c8e8dfa43b435e7cc371580234af67742255fef54812f11c00ffe9d7db25da29ad73f53a2fe871d57822b44ff1a6f437"; license = [ "lppl13c" ]; - version = "6.1.4.2"; - sha512.run = "8c2b0b04ff619c18961014213db4a509af10d46cdd5177706021675eda7d408be01a3f9c9aeb18556b59535dd9cf8de7d9147c36c57350ee3fe8e02e61f416d5"; + version = "6.2.5.0"; + sha512.run = "ef6fa3668906120adf9aeb940652d742e081cca10c087056a31f7254d7b53832081ec9090543275baa8e46fa6944ec7e636bcbb177df567f9e64058e5208343e"; }; xdvi = { revision = 62387; @@ -50156,14 +50759,14 @@ xellipsis = { sha512.run = "3bff74473b4e7fdc7a349fd54e7703b77282381d9ff5eac233d5eb7cefe98f4abc5ea4fd309b8693bd7245471c565545e0ab437a5f8e5cc1b89368c914078d54"; }; xepersian = { - revision = 68117; + revision = 73697; shortdesc = "Persian for LaTeX, using XeTeX"; stripPrefix = 0; - sha512.doc = "dc2f7a06a6122baf9f2284412edf4231eba88f6968f86eb06e47a3e3f3cac14f833ccdb8f69e95b17a05cdc9c3244c361e8d581b6ca65a715a82662ae722fd35"; - sha512.source = "6cc50aa2d511d744499620b010066916913aedb63ed871f93ab8cdb45380da206dee76c4d8ceaf01be5df971e0437ffd8b469a3ae793810043515a966fdb40a7"; + sha512.doc = "0be1b134435c0162616b2e7e8e8758a6968082357c53734f2cec3dbd7d0a8174529df9fe9224705aef0e95d0b015ba599d4c49b4852bf217933a291cd86ea4d3"; + sha512.source = "9899d5b6cf8b43707af7a2e006bfdf3462a700a512d2b9c7f5d3f4033a6585de56f1cf77a09a65fda2cda847c893ca7184e8e61a5f555dd3bf9e5569b4d47b94"; license = [ "lppl13c" ]; - version = "25.0"; - sha512.run = "aba7b248b1ed6fc557e51c267d3da21a3f3473cb0b0d997ef7d899b3ec518a099a173a163c53aaa7ff29e13aa2f1dbebb65775af828c85fcb9e4e91476d6e1ca"; + version = "25.2.2"; + sha512.run = "419d8000f6d623764795945a58be4efaee97a80b0ff54368f62345e211277820e4ceee451ea4b0834de9a5c23db9d3ed1867be92ced96366ca2fb336f2a3026e"; }; xepersian-hm = { revision = 56272; @@ -50296,13 +50899,13 @@ xetexfontinfo = { sha512.run = "8099f45c704ea74e5bbd90b1817c3ad06cffe3d6da0a997f8471e72cff364d346a3cc2e6f156b51bf7bc3ba149e5c755423418d58be89e1872f84db9c1eef039"; }; xetexko = { - revision = 70315; + revision = 74270; shortdesc = "Typeset Korean with Xe(La)TeX"; stripPrefix = 0; - sha512.doc = "91d0b10c8bb3fc1d5189d0de5fa411982f7017ffe9e6d8d572f7de8d9c6cc1eb01b5feae9f23cd0b3b6139ebbcdd4a74fae4c7607c066b0e428cb87060a20a41"; + sha512.doc = "c083f76a4d4ee22b32f19068402a13adc086c135bfba1e9b498b593eaf13d90d117ad29a01634d3e46cd4976d13ff6c9d2e7a88e9f149a7bfd8a7998fc18f171"; license = [ "lppl13c" ]; - version = "4.3"; - sha512.run = "b9bc7a5328b655bb99c4cf34bf219f28da42c05881cfc4020fdd10f536e03b7ed8a70208c4f1a016be6a2e79e5c4faccfe53ad9b22f285ba5eb3e655cbe66658"; + version = "4.4"; + sha512.run = "b9d02ca89ba197d53832b61d858fd9b808899c69621f931abd530aa1e6d2da1b95bf9b7cedc525d26d7158053b1b7fb0e12ef4317b52c9c886e8a7b9347247dd"; }; xetexref = { revision = 70299; @@ -50352,14 +50955,14 @@ xfrac = { sha512.run = "bf1baf5132f29bc139f00cfe15ee7035894d57baa3fbc30978165ad2d1527d44262ffcdb3536cf3066cdd9fa1c02412f8948158cb6d603e8222e2385e5b19ce8"; }; xgreek = { - revision = 69652; + revision = 73620; shortdesc = "Greek Language Support for XeLaTeX and LuaLaTeX"; stripPrefix = 0; - sha512.doc = "0221363435657925da4f8edc62b08b9114beca5cee39c410d57b1661a6b6f084761a0ce0be76968193d950b427aea5e16844b099a386420865765b569dd4bf8f"; - sha512.source = "34ae0948d3ed0343ebb4007997e3dd0c536f6893d757a83082a031e2dd5b3f4f13eb6cbb6ccfbe38b879e6a2521bf13d9e5a10a0c278c5caef1300114f26179c"; + sha512.doc = "7d76298e120a340ba32b4f847024cf0b9aecd82686271a8212ea7ce405bfce82225232ccd11a232e8713274c4828b97ea8d11b6edfe34dd59c1543cb2ace09ab"; + sha512.source = "728b6805076157721c43e1d49516288a2b6a2ea7efee483ebc73d1aac8fc12923d2a2762add52819584cc2bee37f2fa085caeaedef1f426c166006ca7424081e"; license = [ "lppl13c" ]; - version = "3.4.0"; - sha512.run = "b7531fd3f5c42080990022689e5e4d43a0d16f9fd206e389bdaa0aa8c9345e062dc0a14d3086fa0b6c8b641a646edde9b7031af91664f1dde56e5581f2019882"; + version = "3.5.0"; + sha512.run = "1eb617156d3792a4704b6ef61a1aeec39c589a6513482fe7dbfb12d345f0e91e18ca0a10b51244a3a2194b3f5f2550f94e76d9fc84a34d63a150fe5bbe0bf22b"; }; xhfill = { revision = 22575; @@ -50404,15 +51007,15 @@ ximera = { sha512.run = "7815d213c4c1e1be5277b65c94dc24392af298eece6f841e8ae37e430c100fb191e3e11bc7b0a8e06a1df8680c8c321886dcb99019ec10d9db669500ed82737a"; }; xindex = { - revision = 72605; + revision = 73644; shortdesc = "Unicode-compatible index generation"; - sha512.doc = "afaab35db0d71e31b5a83052a30a6ce3fcdaf46ea5c4ce32b78e3e6e8aad60443a4de41a339d85a96987c9002c06b2f2a9d00684e7dfd5f1ed18cff40acefaea"; + sha512.doc = "32b8b112b659b1766946297f18a0c49beeb895e102d5baa03ac8b273f522384e3430791251211560837a8ccabf703fdbdfe55bdf4c2a481209af928bb72462f1"; scriptExts = [ "lua" ]; license = [ "lppl13c" ]; - version = "0.62"; - sha512.run = "718f9ed903b17f867c58cda7ae631feb8cf2da3fe6a756ded7ed2c2196644c1cb7f21b25a0d5307dfb83a4a15a2c52aabe96843169b86a3776008d539d3889ac"; + version = "0.64"; + sha512.run = "9041652ccf4844fb8749a206fa7a620e8d1098eecf5d3995f5ee69bb756093f109f13d926b7e278abe849c82cb2b7c9792b3fd04dd3ef2a86bc66a79e3e062eb"; }; xindex.binfiles = [ "xindex" @@ -50526,13 +51129,13 @@ xlop = { sha512.run = "6d1ebe5d3870a07175b5c07840dd2170f2309790d1b828df69b716aa83db1a35ff70d265a33d8fc0f6ebe0c4385b7fccee8445ab93b2649d3b27bb65e41f87d5"; }; xltabular = { - revision = 56855; + revision = 74358; shortdesc = "Longtable support with possible X-column specifier"; stripPrefix = 0; - sha512.doc = "daa1f1ee3092d545b3949afa781e40a576a8a3ab1c20e40237d83c14455fcece353dee03161ed1725d3f54c8963ba94c683ae0874a8668c8e5c27ad3b58f227b"; + sha512.doc = "86beb6b5d365ff0ef8cec5e710f62e7d346c93bf278cc8a7156651ca388bc4bdfdaae97ff3bd33108fb1d7b9b1c8316851fa79864a0ed509762d872c55855d50"; license = [ "lppl13c" ]; - version = "0.2e"; - sha512.run = "6e49b4a2adc351394bf5ab5cc04d532c36196919a4de8be1ecdcc22c6f226a2d035987df9aa70144d701d9fdeae1dfa07280458a934e289a5d1b5976b2be3ce1"; + version = "2.0i"; + sha512.run = "8da2b13384bb00c584ce83698d7a8d8b1ecb21caea3d1badd42498174dcabf32309b6d5c4a7110321d6b2670609dd66f895f173a9c033856b83d78e364fa2ea9"; }; xltxtra = { revision = 56594; @@ -50907,12 +51510,12 @@ yaletter = { sha512.run = "28765f3b6296ea3b9daf671543b7b2cf371bf2aefb4f3eefe6e95d50ee9a11516a7ec14fec5d15305e8f52d0089072cf10ce9dd4cba30c8fb60fa75365ff0d22"; }; yamlvars = { - revision = 72052; + revision = 73941; shortdesc = "A YAML parser and tool for easy LaTeX definition creation"; stripPrefix = 0; - sha512.doc = "3ab36e7fca6de70b1b34b631071baf6f670cfb5a0a63598900a8ef259b9d8bcccacc5293c447f08372a72c8779c9c09a6217815cefe086e244e5af5b614521f4"; + sha512.doc = "73c5ee9ababc75facb893415814cab05c0307f8eca42e1c1127f9a96c5db1b37f3fae61e928c693506938f6ce9499295f54544e8ff44fd6e1a980e9a819b1cd9"; license = [ "mit" ]; - sha512.run = "0ff941b72eb06b676c47c7ae8cfbbc662defbd47d7171725eb9821058388971daf1422b0a3c06285a43776821d5f931da835cd247f21f23b2a51b11aa13acbd2"; + sha512.run = "d1cd3cad2b51fd178df25b45211224c8570974ef6e0ddbcfe7a294177769590d283b39316df9f13501a93780142c8a24eb9327688bd9ce7f64e8b6f8c12bdd6a"; }; yannisgr = { revision = 22613; @@ -50951,7 +51554,7 @@ yazd-thesis = { sha512.run = "d19e817cc925a0ea08e1b15f3a2b1d6ee4b7a8f9ac420dfa7b6db7cc55b5a24777125a0be7923707606b215ec95044fdf16a2f8a5e5682d8403cf6857dc3252e"; }; yb-book = { - revision = 70740; + revision = 73700; shortdesc = "Template for YB Branded Books"; stripPrefix = 0; deps = [ @@ -50960,24 +51563,33 @@ yb-book = { "bigfoot" "changepage" "chngcntr" + "collection-fontsextra" + "collection-fontsrecommended" "csquotes" + "cyrillic" + "doi" "enumitem" "fancyhdr" "float" "footmisc" "geometry" + "href-ul" + "hypdoc" "ifmtarg" "imakeidx" "lastpage" + "lh" "libertine" "mdframed" "microtype" "needspace" "paralist" "pgf" + "pgfopts" "qrcode" "setspace" "soul" + "textpos" "titlesec" "ulem" "wrapfig" @@ -50986,11 +51598,11 @@ yb-book = { "xkeyval" "zref" ]; - sha512.doc = "dce0b5ebf0fb29b5560ff274cb968e6433779793502aa4e1dd6c390eea290ac7e619c4953727b167821ee943598031f042dde7f6becb0773052f271c198e3b3e"; - sha512.source = "f26d30e3acdd266393e28c59c9f68074dbc5c90995df6993177b41f52bd7c81b7550352c289a46efa5bee6c35ffffafad63e447a3851c76f57598d12f204e440"; + sha512.doc = "11d06aee00c3ab27473787c742491ee7699da244519a2d069c35b103ed8060a18c3a0ef28161ca171819eb7cec0448463ca7c817db20bd376caf5255f380e10b"; + sha512.source = "c011c106ff24ae377f0149f166c1dea5225e9bb06161da97b263364502bdea73537e090be1dbf7f95acd9cfbedc69cf1ef4d2e994c45170c3f2ec46d10970cc6"; license = [ "mit" ]; - version = "0.4.1"; - sha512.run = "28fb52e7835dc2e73195698fb5fbcbfdb47c079bf6955181dd2f22f012dccced8c93ed436d1ec878d0c5a0b903d370f2dc8ab431b82bf4fbb394d50ba074afe9"; + version = "0.6.3"; + sha512.run = "1e5a156ad302729c9df00528491eb171c18a1f7b0f3d2f6c77ee8b98d2f4e63957e59570963a33ef58e21d48129cc85b9c48c0265aab88c35272457ecd78ab02"; }; ycbook = { revision = 46201; @@ -51023,12 +51635,12 @@ ydoc = { sha512.run = "116d4be9a7ca06f90967c85a696e893a85555402acf400c0251a71f4d43a5ad244ee041518d4408b6627610ff87792f07ab51309303e442159bce46025d5a27c"; }; yet-another-guide-latex2e = { - revision = 68564; + revision = 73469; shortdesc = "A short guide to using LaTeX2e to typeset high quality documents"; stripPrefix = 0; - sha512.doc = "8ab0ebad6b627dc1a5d90477d48868715830c6558e9091d3782284e9766f22f9764170a3e89d55c8437dbca2c8eab446a1be0336baf43b3ddcaf67e125ea2f64"; + sha512.doc = "f6c150a1fa306f2c25770a8de4de9eb2ea4dfe2ddf1d9536767e6964bb093f08bd70527b2294cba7d26c32ead41b2b392a7db0d642e570dbf0879267f75ef359"; license = [ "fdl13Only" ]; - version = "1.2"; + version = "1.3.1"; }; yfonts = { revision = 50755; @@ -51041,13 +51653,13 @@ yfonts = { sha512.run = "1caa22023c93ae1e6a2fd94676da61fd576890f991a79d6a9724a4e5f7e653a752c6af792a1b15d44aa956f5788aa995614a33c2d97e95865d6a364f833e539f"; }; yfonts-otf = { - revision = 65030; + revision = 73612; shortdesc = "OpenType version of the Old German fonts designed by Yannis Haralambous"; stripPrefix = 0; - sha512.doc = "47d025d7a7d3a65803c1ebc318e13adbf371b5bc7720d7a5be5b839246906fbd963c4ba2147ad37aca5313f3ba95d361e19f87bf6d77b99e150bd96a29461f0c"; + sha512.doc = "c1c8009e50a87e1a1d7cdf11e2ef8168b0ba18f666460b65aba6a481a9086eb0a1dcc179b918500aac8121b2cd383f3639c28330d25b6eaaba1a40c0b4d2a37a"; license = [ "ofl" "lppl13c" ]; - version = "0.43"; - sha512.run = "cc1587d41121f8e15b3b659f2620c0324fb35b46a6914843c3abebb7c4fa0b30e85e59a2de603128d8015d68edd1e16b8cb02a9dacdd49c04dd3a602d1ee0148"; + version = "0.50"; + sha512.run = "4623db0d9e1314d6dd6f51f0e518cc292d5f715f455d7e64df03a519b37a7606c1c3ba68e3e79342539c224b4a3a4d925ac8afae92b3a90d7441a7fd8f9e38d1"; }; yfonts-t1 = { revision = 36013; @@ -51094,14 +51706,14 @@ york-thesis = { sha512.run = "5b5152cc315dc05164ba3502d6e7aff355d853e43a3836bda0a15a4af7a90ef9fef02c852125c7e1e4842c05d51f2be6441b5131400eb46bb6704b281711e18d"; }; youngtab = { - revision = 56500; + revision = 73766; shortdesc = "Typeset Young-Tableaux"; stripPrefix = 0; - sha512.doc = "b291614a22227693f93422af280200fd927fcefd0399d4294f934ff8882d26e263a3a1dcbac3ad2289d2adf2ff92c76a8223eb450de46e0b1df283af31bac3da"; - sha512.source = "57110b41ada1866d327eee8f1eae1ad61ad7bea1428bf9a3ccd31b9cf27e19537952ef756299f62e5204e5fddf5d032c8170eb36d6a9fe73e66c8d72e1c4f085"; + sha512.doc = "bc5a17e1d5c164fe2912c4529525e9067d7db8812a66656b8e4cfed7c5d09187e2ce62e10aead879343e6f5ce8b489e420ef945821c415121de64355a9d9ba53"; + sha512.source = "778d4706f25820da832f7ab671cb7958cdf31f2db1deddf2c6e34ad7958b306e7012d07ed7572c506d076fcd20d32ad3a2274a6cf6f188b9f3f69abefae1995c"; license = [ "lppl1" ]; version = "1.1"; - sha512.run = "4ac5c3803a2e815c51178fa30086ad25c1dd2b430753d582376c9f6c720bd1a72db1d285d2b0cd810e3564961ce3641f3b482d685126e880cfb1dc856dc74bc0"; + sha512.run = "9566789779579a489fc321c525c447f50fe020031b08e93f332ce21f7e75d75c5da81760e02bb6d1a5949f984c8d2066cc37055090d0f891fc6d4a392f5fd315"; }; yplan = { revision = 34398; @@ -51123,26 +51735,26 @@ yquant = { sha512.run = "2d9dbde5bbc12186a054624f4dfc30ab9cde606440e5568de12f9bcbc0f0c7f872141a2f1745e2f9729884e59e8c36ffddb77ae5b813cf837ea7e2ebea7d7109"; }; ysabeau = { - revision = 72638; + revision = 72800; shortdesc = "Ysabeau fonts with LaTeX support for traditional TeX engines"; stripPrefix = 0; fontMaps = [ "Map ysabeau.map" ]; - sha512.doc = "c01d651654fd62bd1cad16ff239285b48e712dd86824b15a87d4573a38fffaf6b4a87dc8e80b7d1e9e6cb16920d95f8983a3d494a6cf3ba4f0767d5831155aec"; + sha512.doc = "0c3e499b6da64d474e06fa45e93c8702a34b8941510af39c8a224953dddb285413fcf37e635f308a862041f51a7c5c3f48607652e7e12e85587d4237ea08c54c"; license = [ "ofl" "publicDomain" "free" ]; - version = "1.2"; - sha512.run = "988aabe96105518571e9dbfa65430eb6380cc4acd6e81c0506ea12390e77945513dea808f9b0f1b4b6a3cb4c6182d7813e0dea52fda26ac6af165b9b70c1f3a9"; + version = "1.5"; + sha512.run = "f1b409b6793218c62b70383a9bfdfe762ebe936dd521c4b70169ffaf2d8b51cfe8a950a67454b3fafb9001d684de08d1b8bdd1a27f4b982932855f0b9b17f572"; }; ytableau = { - revision = 59580; + revision = 73766; shortdesc = "Many-featured Young tableaux and Young diagrams"; stripPrefix = 0; - sha512.doc = "b98b0da2e5e0eb964ede56a27067b7ba862b63dd1b0dc6771e432abb16e924fda5630d067c6bbb05fdf6a37aba07c61396d47612adcfcccd5886ff3fdd47b7a4"; - sha512.source = "264f983cb28ddd4f2089b4d170603172cce27b463999e4806173106e384bd4c3be16ada6f0c2e3c176dc450c53c2e50e43f993c893880ccf5c9454b84a062ea8"; + sha512.doc = "109cfb4529ebd9415438416d32d83f1e9583e055059c34b81a7f1e2fde72b833ffe3ee70d43fca49f3e184af8bb79a9c732b5f0f1eb34f940aa1122ba97f16e3"; + sha512.source = "7e7c71f3652d60dd73b929832843a577061124aea055daa5ca1218082882b6aeab932d7e7f9a6b2069051c862022713737acdfbfcf0299cefab580d9daca7260"; license = [ "lppl12" ]; version = "1.4"; - sha512.run = "23bf33f11e295f5f36149bad2b801ecfee57b386dd952ea93b16e79f85c54e1edff741bb7d6dc7faa769062ff81277cf04ff06cb2fb92e9a7542b4dc93eebb0b"; + sha512.run = "fadb350bbea899824bb30d3027da91bc0c72a3ce0fca0ca5d162bcbddc4094284ed0c732dd2894602a2f7c76369cb0b16c932aae07766847cd43f7ba652566ba"; }; zapfchan = { revision = 61719; @@ -51305,51 +51917,55 @@ zref = { sha512.run = "1c21d99dc4f1627520914ed3620606c724f22754662797b93c4161aaf3e36d5a42a586ae7e4b227cdf67d55c88d3979635e78661d7029f1a5967c503a9f9dde5"; }; zref-check = { - revision = 68846; + revision = 72994; shortdesc = "Flexible cross-references with contextual checks based on zref"; stripPrefix = 0; - sha512.doc = "d050bb4a6c68a80eafe3eb7f99c61407424385743785014600404397e6fa322becaf3a28157f59951a2406fdfb66968f3cba9de4e388282ea0c84e3f33d4fc8d"; - sha512.source = "a84246193d390c55dd66d65b64eae79e52099e7f7c75b8ef03d595d466d57643832f95ff23ecdc2dd0cc31b7c5cc64db361bd5ece7949e544936739b2c70e1bb"; + sha512.doc = "1a679a6d862ca6f6742c482be1e45d2f63ef630fe705c5f881df91b9240a0a4fede662090e4d353becf414087f9d5d73e16d5eff7d37fee1f22963d75a870674"; + sha512.source = "72f7cc4fa2bb69ff95a5f510048e326895fd92a91db73f2b9eda8565b356f9e4fce77249c65fe07d1818a10e3d2d0cbb9177747a5027775eece8e47bbe3e7296"; license = [ "lppl13c" ]; - version = "0.3.5"; - sha512.run = "98aeb6007f1f599a2bda644c60c9929ca27c9045d73af3d54298837eb842e7976a2f9067182ce38c77ff197e2fe36a53207d2aa39adaa9deeb4e118bd034b0e5"; + version = "0.3.7"; + sha512.run = "bde041147d5d09aff0dbfc422887ff6304b70249e5594226565aa277f6642b252ad32bf167993cb37a9747881cb050f46c536f558192787a68016cf9e0acb769"; }; zref-clever = { - revision = 72484; + revision = 73000; shortdesc = "Clever LaTeX cross-references based on zref"; stripPrefix = 0; - sha512.doc = "372f4f3b1aa03de5a77eb0c1b93cc020d3dac18ded0506082f42175c16ac49cee58cdc0e730b6a33d1d73a4f197abdce3aeae001d35be9c1c9b371def848e6c8"; - sha512.source = "9e695a1c97e3b7156aae3d8efc99233fc92abe72396c89bee9ce6d52bd885532416ad9cdd3d61c5f004d66b9cfa16df66289e18da05a9c249720d8ef5cb096e2"; + deps = [ + "oberdiek" + "zref" + ]; + sha512.doc = "13cae78ad1c64252f75eb3c6d5f81edc69c0a1d7594f76c209f9cca42dea7a7fb3fd47a231ddfad9ef3b5cb657ead1e992013f4feaf0622f82c29aff0adfeea3"; + sha512.source = "ce795e68c2d47d842077237b0b20bf732efc2c3b2cb906b6afbed45170c24b0dce5508966c887d7dc6cb801798dfb8061f7b5b5b6a0d9f3b05c6ba9f6bac1b76"; license = [ "lppl13c" ]; - version = "0.4.7"; - sha512.run = "86676d3d72efb16cb0f4ccc8a4be4a39b7f77d44f3d85304943200e9570b71d12e2ab73bbe7c641c25eb9e47ad3a2155c2abf2181b6e1ae23c06fd919e2ef6bb"; + version = "0.5.1"; + sha512.run = "02b6be7dd13fab75cc2d1d750382b13494d3be7b35902babf1971fe84bd1c85d61506f425a7d2c2b324d0b7d0405b2e520ed9bd42c132b6382b7c6529953d834"; }; zref-vario = { - revision = 68846; + revision = 72978; shortdesc = "Extended LaTeX page cross-references with varioref and zref-clever"; stripPrefix = 0; deps = [ "tools" "zref-clever" ]; - sha512.doc = "b618216a0bd8d7b65fe73be05156e899917719436ef0139122fd01047b8d55faeea55ae05e259d99c464aaeb3fdd9268886b7dec9c4b6a86209da1dcf1c3a3ca"; - sha512.source = "0569db63bf6fd492952cdee442312e818926bceba7663ce0e17f485dbe990687d97efc02649acef6dd89210aa44f9e88c86cf2667c4a487e9b78b90b10a779ce"; + sha512.doc = "c74e76ce856e435dd57e48261054ef4583e166b842abc7101818362ab21e5991e843468a5a20061681ad17251ce8df78bc95fc220c41ebd9b8427e293786b6e5"; + sha512.source = "995d802d7f10bca9770e6e1f2a9cbd9701b68e5620d2d135827f29a393ebf2d8ac651dbbb560dfd123305ec0ddca27c9f23ded18eda507b290784a34f8f201bd"; license = [ "lppl13c" ]; - version = "0.1.10"; - sha512.run = "c159620be1d7d853641d4b42108ec0b2e36b6f4b0c604680469b52cf4c0557196263293d4692906d1d42c1d0ab9a666b59d462266131e42f319a5ab3a2385780"; + version = "0.1.12"; + sha512.run = "ca7fb61c8a6e7d1c1fef82f8663e56cc33025a55a668cb0bafe72f280b02075d5a9760326ded4b98dada0be8d327f7fafb21830a068a64dbfc4ab794ad23cb31"; }; zugferd = { - revision = 72638; + revision = 73286; shortdesc = "ZUGFeRD and Faktur-X invoicing using LaTeX"; stripPrefix = 0; deps = [ "siunitx" ]; - sha512.doc = "88669b0be5eb3d78cb938dc8d6e1b1f10b304e36a72c52b1de61dac39a470e72d97dc835dd7f4162f8edd11a1f8e20eabebecfcfc956acc72705c89741dfa386"; - sha512.source = "a68e08faf75f1a326a378cc9ab0631d9dcb2ba6612dac8c7edcf04932d9d6c9161560eae0f945d5d3944ae09dc3e4d8c3cf8d66c6ae53ca16e9e821f053861d8"; + sha512.doc = "fb51c002ca37e40cfa9defbbd03f09e08f97bda89ddaf6efcdbb923de14c8c837ab1d020eb413e1b51ca89e8a5a86455e8f66ad216b7dae647f544ba3d03c4bb"; + sha512.source = "ed1ec33d7bce91b2ab20c4e5a0a7f58be60f416fd57c03d749b742c750250a282032127672f91af227d96c36883ac51b2b0e79f774d841bf7483e6eb1776c3fa"; license = [ "lppl13c" ]; - version = "0.9"; - sha512.run = "c5f8ae1e376316605b795c6affe816ff8e72b88242d51511a2150bc8354f1c06122779f51e64a28e135be4406e35adc8da270466ca59d68541a338b942fabdb8"; + version = "0.9d"; + sha512.run = "0dd06c82227e228cc7e3214cb56f5b0ce159ac3456d1ee1ffd9368f8724a14ff7828412d768fbc0de214ae07f4c684d6ebd8141df828f372ffe4d3ae1301d095"; }; zwgetfdate = { revision = 15878; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 741dca6e8c2b..57a73f5c1860 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -208,6 +208,7 @@ mapAliases { bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17 bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17 BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 + beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18 betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15 @@ -821,6 +822,7 @@ mapAliases { licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; + lime3ds = throw "lime3ds is deprecated, use 'azahar' instead."; # Added 2025-03-22 limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25 lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 @@ -940,6 +942,33 @@ mapAliases { maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24 manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10 manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17 + + maple-mono-NF = throw '' + maple-mono-NF had been moved to maple-mono.NF. + for installing all maple-mono: + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) + ''; + maple-mono-otf = throw '' + maple-mono-otf had been moved to maple-mono.opentype. + for installing all maple-mono: + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) + ''; + maple-mono-woff2 = throw '' + maple-mono-woff2 had been moved to maple-mono.woff2. + for installing all maple-mono: + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) + ''; + maple-mono-SC-NF = throw '' + mono-SC-NF had been superseded by maple-mono.NF-CN. + for installing all maple-mono: + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) + ''; + maple-mono-autohint = throw '' + maple-mono-autohint had been moved to maple-mono.truetype-autohint. + for installing all maple-mono: + fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) + ''; + marwaita-manjaro = lib.warnOnInstantiate "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08 marwaita-peppermint = lib.warnOnInstantiate "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01 marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08 @@ -1180,6 +1209,7 @@ mapAliases { panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17 + pathsFromGraph = throw "pathsFromGraph has been removed, use closureInfo instead";# Added 2025-01-23 paperless-ng = paperless-ngx; # Added 2022-04-11 partition-manager = makePlasma5Throw "partitionmanager"; # Added 2024-01-08 patchelfStable = patchelf; # Added 2024-01-25 @@ -1205,6 +1235,7 @@ mapAliases { pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25 pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; + platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20 pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05 pltScheme = racket; # just to be sure @@ -1463,6 +1494,7 @@ mapAliases { steam-run-native = steam-run; # added 2022-02-21 StormLib = stormlib; # Added 2024-01-21 strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry-qt6"; # Added 2024-11-22 + strelka = throw "strelka depends on Python 2.6+, and does not support Python 3."; # Added 2025-03-17 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 sumokoin = throw "sumokoin has been removed as it was abandoned upstream"; # Added 2024-11-23 swiProlog = lib.warnOnInstantiate "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07 @@ -1488,6 +1520,7 @@ mapAliases { taskwarrior = lib.warnOnInstantiate "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 + targetcli = targetcli-fb; # Added 2025-03-14 taro = taproot-assets; # Added 2023-07-04 tbb_2021_5 = throw "tbb_2021_5 has been removed from nixpkgs, as it broke with GCC 14"; tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02 @@ -1703,6 +1736,11 @@ mapAliases { ### Z ### + zeroadPackages = recurseIntoAttrs { + zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22 + zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22 + zeroad-unwrapped = lib.warnOnInstantiate "'zeroadPackages.zeroad-unwrapped' has been renamed to 'zeroad-unwrapped'" zeroad-unwrapped; # Added 2025-03-22 + }; zeromq4 = zeromq; # Added 2024-11-03 zfsStable = zfs; # Added 2024-02-26 zfsUnstable = zfs_unstable; # Added 2024-02-26 @@ -1735,7 +1773,7 @@ mapAliases { openbsdCross = openbsd; # Added 2024-09-06 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: - llvmPackages_latest = llvmPackages_19; + llvmPackages_latest = llvmPackages_20; /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db392a2b84ea..c233383dd4f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -709,9 +709,9 @@ with pkgs; compressFirmwareZstd = callPackage ../build-support/kernel/compress-firmware.nix { type = "zstd"; }; - makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: + makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false, extraFirmwarePaths ? [ ] }: callPackage ../build-support/kernel/modules-closure.nix { - inherit kernel firmware rootModules allowMissing; + inherit kernel firmware rootModules allowMissing extraFirmwarePaths; }; mkBinaryCache = callPackage ../build-support/binary-cache { }; @@ -734,8 +734,6 @@ with pkgs; callPackages ../build-support/setup-hooks/patch-rc-path-hooks { } ) patchRcPathBash patchRcPathCsh patchRcPathFish patchRcPathPosix; - pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; - pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; } ../build-support/setup-hooks/prune-libtool-files.sh; @@ -1000,6 +998,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa VideoToolbox; }; + genealogos-api = genealogos-cli.override { + crate = "api"; + }; + # This is to workaround gfal2-python broken against Python 3.12 or later. # TODO: Remove these lines after solving the breakage. gfal2-util = callPackage ../by-name/gf/gfal2-util/package.nix (lib.optionalAttrs python3Packages.gfal2-python.meta.broken { @@ -1189,9 +1191,7 @@ with pkgs; datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; - forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { - buildGoModule = buildGo123Module; - }; + forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; gfold = callPackage ../applications/version-management/gfold { }; @@ -1433,19 +1433,6 @@ with pkgs; zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; - ### APPLICATIONS/EMULATORS/BSNES - - ### APPLICATIONS/EMULATORS/DOLPHIN-EMU - - dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox; - }; - - dolphin-emu-primehack = qt6.callPackage ../applications/emulators/dolphin-emu/primehack.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - }; - ### APPLICATIONS/EMULATORS/RETROARCH libretro = recurseIntoAttrs (callPackage ../applications/emulators/libretro { }); @@ -2341,10 +2328,6 @@ with pkgs; hocr-tools = with python3Packages; toPythonApplication hocr-tools; - homepage-dashboard = callPackage ../servers/homepage-dashboard { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - hopper = qt5.callPackage ../development/tools/analysis/hopper { }; hypr = callPackage ../applications/window-managers/hyprwm/hypr { @@ -2429,13 +2412,6 @@ with pkgs; maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; - maple-mono = (callPackage ../data/fonts/maple-font { }).Mono; - maple-mono-NF = (callPackage ../data/fonts/maple-font { }).NF; - maple-mono-SC-NF = (callPackage ../data/fonts/maple-font { }).SC-NF; - maple-mono-otf = (callPackage ../data/fonts/maple-font { }).opentype; - maple-mono-woff2 = (callPackage ../data/fonts/maple-font { }).woff2; - maple-mono-autohint = (callPackage ../data/fonts/maple-font { }).autohint; - mat2 = with python3.pkgs; toPythonApplication mat2; materialx = with python3Packages; toPythonApplication materialx; @@ -2748,8 +2724,9 @@ with pkgs; citrix_workspace_24_02_0 citrix_workspace_24_05_0 citrix_workspace_24_08_0 + citrix_workspace_24_11_0 ; - citrix_workspace = citrix_workspace_24_08_0; + citrix_workspace = citrix_workspace_24_11_0; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; @@ -2817,15 +2794,6 @@ with pkgs; libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { }; - netbird = callPackage ../tools/networking/netbird { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit Kernel UserNotifications WebKit; - buildGoModule = buildGo123Module; - }; - - netbird-ui = netbird.override { - ui = true; - }; - skkDictionaries = callPackages ../tools/inputmethods/skk/skk-dicts { }; ibus = callPackage ../tools/inputmethods/ibus { }; @@ -3166,7 +3134,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. # When updating make sure to update all plugins or they will break! - elk7Version = "7.17.16"; + elk7Version = "7.17.27"; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { util-linux = util-linuxMinimal; @@ -3566,10 +3534,6 @@ with pkgs; gzip = callPackage ../tools/compression/gzip { }; - pdisk = callPackage ../tools/system/pdisk { - inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; - }; - plplot = callPackage ../development/libraries/plplot { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -4235,6 +4199,8 @@ with pkgs; nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { }); + maple-mono = recurseIntoAttrs (callPackage ../data/fonts/maple-font { }); + netcdf-mpi = netcdf.override { hdf5 = hdf5-mpi.override { usev110Api = true; }; }; @@ -4743,8 +4709,6 @@ with pkgs; quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; - qastools = libsForQt5.callPackage ../tools/audio/qastools { }; - qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; @@ -5351,10 +5315,6 @@ with pkgs; unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; - vuls = callPackage ../by-name/vu/vuls/package.nix { - buildGoModule = buildGo123Module; - }; - xdp-tools = callPackage ../tools/networking/xdp-tools { }; ugarit = callPackage ../tools/backup/ugarit { @@ -6711,9 +6671,7 @@ with pkgs; tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { }; - tinygo = callPackage ../development/compilers/tinygo { - llvmPackages = llvmPackages_18; - }; + tinygo = callPackage ../development/compilers/tinygo { }; urweb = callPackage ../development/compilers/urweb { icu = icu67; @@ -6926,12 +6884,6 @@ with pkgs; wxSupport = false; systemdSupport = false; }; - beam_nodocs = callPackage ./beam-packages.nix { - beam = beam_nodocs; - wxSupport = false; - systemdSupport = false; - ex_docSupport = false; - }; inherit (beam.interpreters) erlang erlang_28 erlang_27 erlang_26 erlang_25 @@ -8741,10 +8693,6 @@ with pkgs; fplll = callPackage ../development/libraries/fplll { }; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; - freeimage = callPackage ../development/libraries/freeimage { - inherit (darwin) autoSignDarwinBinariesHook; - }; - freeipa = callPackage ../os-specific/linux/freeipa { # NOTE: freeipa and sssd need to be built with the same version of python kerberos = krb5.override { @@ -8764,10 +8712,7 @@ with pkgs; makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { }; - makeFontsCache = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: - callPackage ../development/libraries/fontconfig/make-fonts-cache.nix { - inherit fontconfig fontDirectories; - }; + makeFontsCache = callPackage ../development/libraries/fontconfig/make-fonts-cache.nix { }; freenect = callPackage ../development/libraries/freenect { inherit (darwin.apple_sdk.frameworks) Cocoa GLUT; @@ -8777,6 +8722,8 @@ with pkgs; protobuf = protobuf_21; }; + gamt = callPackage ../by-name/am/amtterm/package.nix { withGamt = true; }; + gcr = callPackage ../development/libraries/gcr { }; gcr_4 = callPackage ../development/libraries/gcr/4.nix { }; @@ -9194,6 +9141,7 @@ with pkgs; icu74 icu75 icu76 + icu77 ; icu = icu76; @@ -10398,7 +10346,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - SDL = SDL1; + SDL = SDL_compat; SDL2 = callPackage ../development/libraries/SDL2 { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; @@ -10460,8 +10408,6 @@ with pkgs; scheme = guile; }; - snac2 = darwin.apple_sdk_11_0.callPackage ../servers/snac2 { }; - soapyairspy = callPackage ../applications/radio/soapyairspy { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit Security; @@ -10962,17 +10908,17 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_5_0 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.5.0"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_5_1 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.5.1"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_5_1; + sbcl_2_5_2 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.5.2"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_5_2; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -12391,6 +12337,7 @@ with pkgs; usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { }; util-linuxMinimal = util-linux.override { + cryptsetupSupport = false; nlsSupport = false; ncursesSupport = false; pamSupport = false; @@ -13443,10 +13390,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; }; - freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; - }; + freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix {}; }) freerdp freerdp3 @@ -16535,12 +16479,10 @@ with pkgs; yquake2-the-reckoning yquake2-all-games; - zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { + zeroad-unwrapped = callPackage ../by-name/ze/zeroad-unwrapped/package.nix { wxGTK = wxGTK32; fmt = fmt_9; - }); - - zeroad = zeroadPackages.zeroad; + }; ### DESKTOP ENVIRONMENTS @@ -16839,14 +16781,15 @@ with pkgs; or-tools = callPackage ../development/libraries/science/math/or-tools { inherit (darwin) DarwinTools; - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; - protobuf = protobuf_23; - # or-tools builds with -std=c++20, so abseil-cpp must + protobuf = protobuf_26.override { + abseil-cpp = abseil-cpp_202407; + }; + # or-tools builds with -std=c++17, so abseil-cpp must # also be built that way - abseil-cpp = abseil-cpp_202301.override { + abseil-cpp = abseil-cpp_202407.override { static = true; - cxxStandard = "20"; + cxxStandard = "17"; }; }; @@ -17062,6 +17005,7 @@ with pkgs; }; inherit (callPackages ../applications/science/logic/z3 { python = python3; }) + z3_4_14 z3_4_13 z3_4_12 z3_4_11 diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 3e2fdd18d0ae..55b9d17aa5e3 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,12 +1,9 @@ { lib, beam, - beam_nodocs, callPackage, wxGTK32, - buildPackages, stdenv, - ex_docSupport ? true, wxSupport ? true, systemd, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, @@ -34,30 +31,24 @@ in erlang_28 = self.beamLib.callErlang ../development/interpreters/erlang/28.nix { wxGTK = wxGTK32; parallelBuild = true; - # ex_doc failing to build with erlang 28 - inherit (beam_nodocs.packages.erlang_27) ex_doc; - inherit ex_docSupport wxSupport systemdSupport; + inherit wxSupport systemdSupport; }; erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix { wxGTK = wxGTK32; parallelBuild = true; - autoconf = buildPackages.autoconf269; - inherit (beam_nodocs.packages.erlang_27) ex_doc; - inherit ex_docSupport wxSupport systemdSupport; + inherit wxSupport systemdSupport; }; erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix { wxGTK = wxGTK32; parallelBuild = true; - autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; erlang_25 = self.beamLib.callErlang ../development/interpreters/erlang/25.nix { wxGTK = wxGTK32; parallelBuild = true; - autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 4da43f0bd117..3770aee3bae7 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -148,6 +148,9 @@ let (callPackage ../development/cuda-modules/cutensor/extension.nix { inherit cudaVersion flags mkVersionedPackageName; }) + (callPackage ../development/cuda-modules/cusparselt/extension.nix { + inherit cudaVersion flags mkVersionedPackageName; + }) (callPackage ../development/cuda-modules/generic-builders/multiplex.nix { inherit cudaVersion flags mkVersionedPackageName; pname = "tensorrt"; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index c22ec05b724a..8c8d1686c70d 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -26,7 +26,6 @@ sourceHanPackages zabbix50 zabbix60 - zeroadPackages ; # Make sure haskell.compiler is included, so alternative GHC versions show up, diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ae5fdce752b2..316da20d8088 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -135,6 +135,7 @@ mapAliases ({ command_runner = command-runner; # added 2024-03-06 CommonMark = commonmark; # added 2023-02-1 ConfigArgParse = configargparse; # added 2021-03-18 + configshell = configshell-fb; # added 2025-03-14 coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04 covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20 cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21 @@ -205,6 +206,7 @@ mapAliases ({ email_validator = email-validator; # added 2022-06-22 enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15 + enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06 et_xmlfile = et-xmlfile; # added 2023-10-16 etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16 ev3dev2 = python-ev3dev2; # added 2023-06-19 @@ -386,6 +388,7 @@ mapAliases ({ mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 mitmproxy-wireguard = throw "mitmproxy-wireguard has been removed because it was replaced by upstream with mitmproxy-rs"; # added 2023-11-06 + mkdocs-awesome-pages-plugin = mkdocs-awesome-nav; # added 2025-03-10 mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28 mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 mox3 = throw "mox3 was removed because it is unmaintained"; # added 2024-08-30 @@ -599,6 +602,7 @@ mapAliases ({ pytorchWithCuda = torchWithCuda; # added 2022-09-30 pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30 pytwitchapi = twitchapi; # added 2022-03-07 + pytzdata = throw "pytzdata has been removed, because iit is unmaintained upstream. Use pytz or tzdata instead."; # added 2025-03-03 pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09 pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17 pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28 @@ -647,6 +651,7 @@ mapAliases ({ ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21 ROPGadget = ropgadget; # added 2021-07-06 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 + rtslib = rtslib-fb; # added 2025-03-14 ruamel_base = ruamel-base; # added 2021-11-01 ruamel_yaml = ruamel-yaml; # added 2021-11-01 ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2410fd2a0d2a..05658d470682 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -427,6 +427,8 @@ self: super: with self; { aiosonic = callPackage ../development/python-modules/aiosonic { }; + aiosonos = callPackage ../development/python-modules/aiosonos { }; + aiosql = callPackage ../development/python-modules/aiosql { }; aiosseclient = callPackage ../development/python-modules/aiosseclient { }; @@ -636,6 +638,8 @@ self: super: with self; { annotated-types = callPackage ../development/python-modules/annotated-types { }; + annotatedyaml = callPackage ../development/python-modules/annotatedyaml { }; + annoy = callPackage ../development/python-modules/annoy { }; anonip = callPackage ../development/python-modules/anonip { }; @@ -2008,6 +2012,8 @@ self: super: with self; { bump2version = callPackage ../development/python-modules/bump2version { }; + bump-my-version = callPackage ../development/python-modules/bump-my-version { }; + bumpfontversion = callPackage ../development/python-modules/bumpfontversion { }; bumps = callPackage ../development/python-modules/bumps { }; @@ -2520,6 +2526,8 @@ self: super: with self; { cmake = callPackage ../development/python-modules/cmake { inherit (pkgs) cmake; }; + cmake-build-extension = callPackage ../development/python-modules/cmake-build-extension { }; + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; cmd2 = callPackage ../development/python-modules/cmd2 { }; @@ -2646,6 +2654,10 @@ self: super: with self; { conda-package-streaming = callPackage ../development/python-modules/conda-package-streaming { }; + conduit = callPackage ../development/python-modules/conduit { }; + + conduit-mpi = callPackage ../development/python-modules/conduit { mpiSupport = true; }; + confection = callPackage ../development/python-modules/confection { }; configargparse = callPackage ../development/python-modules/configargparse { }; @@ -2656,7 +2668,7 @@ self: super: with self; { configparser = callPackage ../development/python-modules/configparser { }; - configshell = callPackage ../development/python-modules/configshell { }; + configshell-fb = callPackage ../development/python-modules/configshell-fb { }; configupdater = callPackage ../development/python-modules/configupdater { }; @@ -4134,6 +4146,8 @@ self: super: with self; { ec2instanceconnectcli = callPackage ../tools/virtualization/ec2instanceconnectcli { }; + ec2-metadata = callPackage ../development/python-modules/ec2-metadata { }; + eccodes = toPythonModule (pkgs.eccodes.override { enablePython = true; pythonPackages = self; @@ -4287,8 +4301,6 @@ self: super: with self; { enturclient = callPackage ../development/python-modules/enturclient { }; - enum34 = callPackage ../development/python-modules/enum34 { }; - env-canada = callPackage ../development/python-modules/env-canada { }; environmental-override = callPackage ../development/python-modules/environmental-override { }; @@ -4559,9 +4571,7 @@ self: super: with self; { faker = callPackage ../development/python-modules/faker { }; - fakeredis = callPackage ../development/python-modules/fakeredis { - redis-server = pkgs.redis; - }; + fakeredis = callPackage ../development/python-modules/fakeredis { }; falcon = callPackage ../development/python-modules/falcon { }; @@ -5369,6 +5379,8 @@ self: super: with self; { ghdiff = callPackage ../development/python-modules/ghdiff { }; + ghidra-bridge = callPackage ../development/python-modules/ghidra-bridge { }; + ghome-foyer-api = callPackage ../development/python-modules/ghome-foyer-api { }; ghp-import = callPackage ../development/python-modules/ghp-import { }; @@ -6322,6 +6334,8 @@ self: super: with self; { icalendar = callPackage ../development/python-modules/icalendar { }; + icalendar-compatibility = callPackage ../development/python-modules/icalendar-compatibility { }; + icalevents = callPackage ../development/python-modules/icalevents { }; icecream = callPackage ../development/python-modules/icecream { }; @@ -6618,6 +6632,8 @@ self: super: with self; { ipython-genutils = callPackage ../development/python-modules/ipython-genutils { }; + ipython-pygments-lexers = callPackage ../development/python-modules/ipython-pygments-lexers { }; + ipython = callPackage ../development/python-modules/ipython { }; ipython-sql = callPackage ../development/python-modules/ipython-sql { }; @@ -6796,6 +6812,8 @@ self: super: with self; { jh2 = callPackage ../development/python-modules/jh2 { }; + jfx-bridge = callPackage ../development/python-modules/jfx-bridge { }; + jianpu-ly = callPackage ../development/python-modules/jianpu-ly { }; jieba = callPackage ../development/python-modules/jieba { }; @@ -6950,6 +6968,8 @@ self: super: with self; { jug = callPackage ../development/python-modules/jug { }; + juliandate = callPackage ../development/python-modules/juliandate { }; + julius = callPackage ../development/python-modules/julius { }; junitparser = callPackage ../development/python-modules/junitparser { }; @@ -7234,6 +7254,8 @@ self: super: with self; { kubernetes-asyncio = callPackage ../development/python-modules/kubernetes-asyncio { }; + kubernetes-validate = callPackage ../by-name/ku/kubernetes-validate/unwrapped.nix { }; + kurbopy = callPackage ../development/python-modules/kurbopy { }; l18n = callPackage ../development/python-modules/l18n { }; @@ -7327,6 +7349,8 @@ self: super: with self; { inherit (pkgs.__splicedPackages) laszip; }; + lap = callPackage ../development/python-modules/lap { }; + latex2mathml = callPackage ../development/python-modules/latex2mathml { }; latex2pydata = callPackage ../development/python-modules/latex2pydata { }; @@ -7436,6 +7460,8 @@ self: super: with self; { libagent = callPackage ../development/python-modules/libagent { }; + libbs = callPackage ../development/python-modules/libbs { }; + pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; lib4sbom = callPackage ../development/python-modules/lib4sbom { }; @@ -7907,9 +7933,7 @@ self: super: with self; { loguru-logging-intercept = callPackage ../development/python-modules/loguru-logging-intercept { }; - logutils = callPackage ../development/python-modules/logutils { - redis-server = pkgs.redis; - }; + logutils = callPackage ../development/python-modules/logutils { }; logzero = callPackage ../development/python-modules/logzero { }; @@ -8216,6 +8240,8 @@ self: super: with self; { mcp = callPackage ../development/python-modules/mcp { }; + mcpadapt = callPackage ../development/python-modules/mcpadapt { }; + mcstatus = callPackage ../development/python-modules/mcstatus { }; mcuuid = callPackage ../development/python-modules/mcuuid { }; @@ -8307,6 +8333,8 @@ self: super: with self; { merge3 = callPackage ../development/python-modules/merge3 { }; + mergecal = callPackage ../development/python-modules/mergecal { }; + mergedb = callPackage ../development/python-modules/mergedb { }; mergedeep = callPackage ../development/python-modules/mergedeep { }; @@ -8497,7 +8525,7 @@ self: super: with self; { mkdocs-autolinks-plugin = callPackage ../development/python-modules/mkdocs-autolinks-plugin { }; mkdocs-autorefs = callPackage ../development/python-modules/mkdocs-autorefs { }; - mkdocs-awesome-pages-plugin = callPackage ../development/python-modules/mkdocs-awesome-pages-plugin { }; + mkdocs-awesome-nav = callPackage ../development/python-modules/mkdocs-awesome-nav { }; mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { }; @@ -8586,9 +8614,7 @@ self: super: with self; { mobly = callPackage ../development/python-modules/mobly { }; - mocket = callPackage ../development/python-modules/mocket { - redis-server = pkgs.redis; - }; + mocket = callPackage ../development/python-modules/mocket { }; mock = callPackage ../development/python-modules/mock { }; @@ -9284,6 +9310,8 @@ self: super: with self; { ndcurves = toPythonModule (pkgs.ndcurves.override { python3Packages = self; pythonSupport = true; }); + nglview = callPackage ../development/python-modules/nglview { }; + nomadnet = callPackage ../development/python-modules/nomadnet { }; nonbloat-db = callPackage ../development/python-modules/nonbloat-db { }; @@ -9406,6 +9434,8 @@ self: super: with self; { netbox-bgp = callPackage ../development/python-modules/netbox-bgp { }; + netbox-contract = callPackage ../development/python-modules/netbox-contract { }; + netbox-dns = callPackage ../development/python-modules/netbox-dns { }; netbox-documents = callPackage ../development/python-modules/netbox-documents { }; @@ -10912,6 +10942,8 @@ self: super: with self; { pyhepmc = callPackage ../development/python-modules/pyhepmc { }; + pyhidra = callPackage ../development/python-modules/pyhidra { }; + pyhive-integration = callPackage ../development/python-modules/pyhive-integration { }; pyhumps = callPackage ../development/python-modules/pyhumps { }; @@ -11736,6 +11768,10 @@ self: super: with self; { pybind11 = callPackage ../development/python-modules/pybind11 { }; + pybind11-abseil = callPackage ../development/python-modules/pybind11-abseil { }; + + pybind11-protobuf = callPackage ../development/python-modules/pybind11-protobuf { }; + pybind11-stubgen = callPackage ../development/python-modules/pybind11-stubgen { }; pybindgen = callPackage ../development/python-modules/pybindgen { }; @@ -11892,6 +11928,8 @@ self: super: with self; { pydantic_1 = callPackage ../development/python-modules/pydantic/1.nix { }; + pydantic-argparse-extensible = callPackage ../development/python-modules/pydantic-argparse-extensible { }; + pydantic-compat = callPackage ../development/python-modules/pydantic-compat { }; pydantic-core = callPackage ../development/python-modules/pydantic-core { }; @@ -12343,6 +12381,8 @@ self: super: with self; { pyleri = callPackage ../development/python-modules/pyleri { }; + pylette = callPackage ../development/python-modules/pylette { }; + pylev = callPackage ../development/python-modules/pylev { }; pylgnetcast = callPackage ../development/python-modules/pylgnetcast { }; @@ -12757,7 +12797,9 @@ self: super: with self; { pyqt-builder = callPackage ../development/python-modules/pyqt-builder { }; - pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { }; + pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { + inherit (pkgs) mesa; + }; pyqt5-stubs = callPackage ../development/python-modules/pyqt5-stubs { }; @@ -12807,6 +12849,8 @@ self: super: with self; { pyquery = callPackage ../development/python-modules/pyquery { }; + pyquerylist = callPackage ../development/python-modules/pyquerylist { }; + pyquaternion = callPackage ../development/python-modules/pyquaternion { }; pyquil = callPackage ../development/python-modules/pyquil { }; @@ -12981,6 +13025,8 @@ self: super: with self; { inherit (pkgs) cmake ninja; }); + pyside6-qtads = callPackage ../development/python-modules/pyside6-qtads { }; + pysigma = callPackage ../development/python-modules/pysigma { }; pysigma-backend-elasticsearch = callPackage ../development/python-modules/pysigma-backend-elasticsearch { }; @@ -13861,8 +13907,6 @@ self: super: with self; { pytz-deprecation-shim = callPackage ../development/python-modules/pytz-deprecation-shim { }; - pytzdata = callPackage ../development/python-modules/pytzdata { }; - pyu2f = callPackage ../development/python-modules/pyu2f { }; pyudev = callPackage ../development/python-modules/pyudev { @@ -14635,6 +14679,8 @@ self: super: with self; { roma = callPackage ../development/python-modules/roma { }; + roman-numerals-py = callPackage ../development/python-modules/roman-numerals-py { }; + roman = callPackage ../development/python-modules/roman { }; romy = callPackage ../development/python-modules/romy { }; @@ -14687,9 +14733,7 @@ self: super: with self; { rpyc = callPackage ../development/python-modules/rpyc { }; - rq = callPackage ../development/python-modules/rq { - redis-server = pkgs.redis; - }; + rq = callPackage ../development/python-modules/rq { }; rsa = callPackage ../development/python-modules/rsa { }; @@ -14719,7 +14763,7 @@ self: super: with self; { inherit (pkgs) libspatialindex; }; - rtslib = callPackage ../development/python-modules/rtslib { }; + rtslib-fb = callPackage ../development/python-modules/rtslib-fb { }; rtsp-to-webrtc = callPackage ../development/python-modules/rtsp-to-webrtc { }; @@ -14877,6 +14921,8 @@ self: super: with self; { scienceplots = callPackage ../development/python-modules/scienceplots { }; + sciform = callPackage ../development/python-modules/sciform { }; + scim2-client = callPackage ../development/python-modules/scim2-client { }; scim2-filter-parser = callPackage ../development/python-modules/scim2-filter-parser { }; @@ -15816,6 +15862,8 @@ self: super: with self; { sphinxext-opengraph = callPackage ../development/python-modules/sphinxext-opengraph { }; + sphinxext-rediraffe = callPackage ../development/python-modules/sphinxext-rediraffe { }; + spidev = callPackage ../development/python-modules/spidev { }; splinter = callPackage ../development/python-modules/splinter { }; @@ -16084,6 +16132,8 @@ self: super: with self; { stringzilla = callPackage ../development/python-modules/stringzilla { }; + strip-ansi = callPackage ../development/python-modules/strip-ansi { }; + stripe = callPackage ../development/python-modules/stripe { }; striprtf = callPackage ../development/python-modules/striprtf { }; @@ -16413,13 +16463,9 @@ self: super: with self; { grpcioTF = self.grpcio.override { protobuf = protobufTF; }; - tensorboard-plugin-profileTF = self.tensorboard-plugin-profile.override { - protobuf = protobuf-pythonTF; - }; tensorboardTF = self.tensorboard.override { grpcio = grpcioTF; protobuf = protobuf-pythonTF; - tensorboard-plugin-profile = tensorboard-plugin-profileTF; }; }; in diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index fd3606df0d75..5a8823d10493 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -134,7 +134,4 @@ makeScopeWithSplicing' { xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { }; }); -} // lib.optionalAttrs config.allowAliases { - # when removing, don't forget to remove a workaround in `pkgs/kde/default.nix` - stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05 } diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 55796a21291d..4ebabe05e1f3 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -23,6 +23,7 @@ let || builtins.elem license.shortName [ "CUDA EULA" "cuDNN EULA" + "cuSPARSELt EULA" "cuTENSOR EULA" "NVidia OptiX EULA" ] diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index b321a80017f4..28664c0ae2eb 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -3133,14 +3133,15 @@ version = "7.1.1"; }; rbs = { + dependencies = ["logger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dgj5n7rj83981fvrhswfwsh88x42p7r00nvd80hkxmdcjvda2h6"; + sha256 = "0drs9n5qn9pifmb752kali7r2sv0laclvchahc670phlv21awdqf"; type = "gem"; }; - version = "2.8.4"; + version = "3.9.0"; }; rchardet = { groups = ["default"]; @@ -3443,15 +3444,15 @@ version = "0.8.2"; }; ruby-lsp = { - dependencies = ["language_server-protocol" "prism" "sorbet-runtime"]; + dependencies = ["language_server-protocol" "prism" "rbs" "sorbet-runtime"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1548gmj14xrc91lp7yzn0q23g6cjn8r7xfdlv2qarzi9k2a92l5m"; + sha256 = "0rmqhp7v4k3xdz6d9sbb0xjyk2519zrk8lr3hpyrv9xa9jyxn6hn"; type = "gem"; }; - version = "0.15.0"; + version = "0.23.12"; }; ruby-lxc = { groups = ["default"]; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index b5c34fe6ba07..7e2e97200d93 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -107,7 +107,7 @@ let darwin = pkgs.darwin.diskdev_cmds; }; hexdump = { - linux = pkgs.util-linux; + linux = pkgs.util-linuxMinimal; darwin = pkgs.darwin.shell_cmds; }; hostname = {