diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf83fdd32167..7b13ddd68f26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31 + - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 with: # Sandbox is disabled on MacOS by default. extra_nix_config: sandbox = true diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 15db37f6c99e..53601bfcc023 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -12,17 +12,12 @@ on: mergedSha: required: true type: string - ownersCanFail: - required: true - type: boolean targetSha: required: true type: string secrets: CACHIX_AUTH_TOKEN: required: true - OWNER_RO_APP_PRIVATE_KEY: - required: true permissions: {} @@ -72,19 +67,8 @@ jobs: GH_TOKEN: ${{ github.token }} run: gh api /rate_limit | jq - # For checking code owners, this job depends on a GitHub App with the following permissions: - # - Permissions: - # - Repository > Administration: read-only - # - Organization > Members: read-only - # - Install App on this repository, setting these variables: - # - OWNER_RO_APP_ID (variable) - # - OWNER_RO_APP_PRIVATE_KEY (secret) - # - # This should not use the same app as the job to request reviewers, because this job requires - # handling untrusted PR input. owners: runs-on: ubuntu-24.04-arm - continue-on-error: ${{ inputs.ownersCanFail }} timeout-minutes: 5 steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 @@ -94,9 +78,8 @@ jobs: uses: ./.github/actions/checkout with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31 + - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: @@ -107,36 +90,15 @@ jobs: pushFilter: -source$ - name: Build codeowners validator - run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator - - - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4 - if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID - id: app-token - with: - app-id: ${{ vars.OWNER_RO_APP_ID }} - private-key: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }} - permission-administration: read - permission-members: read - - - name: Log current API rate limits - if: steps.app-token.outputs.token - env: - GH_TOKEN: ${{ steps.app-token.outputs.token }} - run: gh api /rate_limit | jq + run: nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A codeownersValidator - name: Validate codeowners - if: steps.app-token.outputs.token env: OWNERS_FILE: nixpkgs/untrusted/ci/OWNERS - GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }} REPOSITORY_PATH: nixpkgs/untrusted - OWNER_CHECKER_REPOSITORY: ${{ github.repository }} + # Omits "owners", which checks whether GitHub handles exist, but fails with nested team + # structures. + CHECKS: "duppatterns,files,syntax" # Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody EXPERIMENTAL_CHECKS: "avoid-shadowing" run: result/bin/codeowners-validator - - - name: Log current API rate limits - if: steps.app-token.outputs.token - env: - GH_TOKEN: ${{ steps.app-token.outputs.token }} - run: gh api /rate_limit | jq diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 5ef33f4dc34b..e88ed1b9999c 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -47,7 +47,7 @@ jobs: ci/pinned.json - name: Install Nix - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31 + uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 - name: Load supported versions id: versions @@ -92,7 +92,7 @@ jobs: target-as-trusted-at: ${{ inputs.targetSha }} - name: Install Nix - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31 + uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: @@ -190,7 +190,7 @@ jobs: merge-multiple: true - name: Install Nix - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31 + uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 - name: Combine all output paths and eval stats run: | @@ -350,7 +350,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} - name: Install Nix - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31 + uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 - name: Run misc eval tasks in parallel run: | diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 39a99acf3f32..bf17d67016ff 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -32,7 +32,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31 + - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well, # because the cache would be invalidated on every commit - treefmt checks every file. @@ -66,7 +66,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31 + - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: @@ -94,7 +94,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31 + - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2ff431225502..9f4a2ba4d0b4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -11,8 +11,6 @@ on: OWNER_APP_PRIVATE_KEY: # The Test workflow should not actually request reviews from owners. required: false - OWNER_RO_APP_PRIVATE_KEY: - required: true concurrency: group: pr-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }} @@ -59,13 +57,11 @@ jobs: pull-requests: write secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} - OWNER_RO_APP_PRIVATE_KEY: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }} with: baseBranch: ${{ needs.prepare.outputs.baseBranch }} headBranch: ${{ needs.prepare.outputs.headBranch }} mergedSha: ${{ needs.prepare.outputs.mergedSha }} targetSha: ${{ needs.prepare.outputs.targetSha }} - ownersCanFail: ${{ !contains(fromJSON(needs.prepare.outputs.touched), 'owners') }} lint: name: Lint diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml index c6f94acbec36..e96a09169e32 100644 --- a/.github/workflows/reviewers.yml +++ b/.github/workflows/reviewers.yml @@ -33,7 +33,7 @@ jobs: sparse-checkout: ci - name: Install Nix - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31 + uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 - name: Build the requestReviews derivation run: nix-build trusted/ci -A requestReviews diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e82719ab205f..0806b61c34c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -98,7 +98,6 @@ jobs: secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} - OWNER_RO_APP_PRIVATE_KEY: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }} push: if: needs.prepare.outputs.push diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js index e66a774e981c..7ef825a3ca17 100644 --- a/ci/github-script/prepare.js +++ b/ci/github-script/prepare.js @@ -221,7 +221,6 @@ module.exports = async ({ github, context, core, dry }) => { const touched = [] if (files.includes('ci/pinned.json')) touched.push('pinned') - if (files.includes('ci/OWNERS')) touched.push('owners') core.setOutput('touched', touched) return diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 866bde570f8a..df261e995a4a 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -3,7 +3,7 @@ Building software with Nix often requires downloading source code and other files from the internet. To this end, we use functions that we call _fetchers_, which obtain remote sources via various protocols and services. -Nix provides built-in fetchers such as [`builtins.fetchTarball`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-fetchTarball). +Nix provides built-in fetchers such as [`fetchTarball`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-fetchTarball). Nixpkgs provides its own fetchers, which work differently: - A built-in fetcher will download and cache files at evaluation time and produce a [store path](https://nixos.org/manual/nix/stable/glossary#gloss-store-path). diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index 7b4f14c63325..6f1c4dfba278 100644 --- a/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -163,7 +163,7 @@ Nixpkgs provides the following functions for producing derivations which write t They are useful for creating files from Nix expression, and are all implemented as convenience wrappers around `writeTextFile`. Each of these functions will cause a derivation to be produced. -When you coerce the result of each of these functions to a string with [string interpolation](https://nixos.org/manual/nix/stable/language/string-interpolation) or [`builtins.toString`](https://nixos.org/manual/nix/stable/language/builtins#builtins-toString), it will evaluate to the [store path](https://nixos.org/manual/nix/stable/store/store-path) of this derivation. +When you coerce the result of each of these functions to a string with [string interpolation](https://nixos.org/manual/nix/stable/language/string-interpolation) or [`toString`](https://nixos.org/manual/nix/stable/language/builtins#builtins-toString), it will evaluate to the [store path](https://nixos.org/manual/nix/stable/store/store-path) of this derivation. :::: {.note} Some of these functions will put the resulting files within a directory inside the [derivation output](https://nixos.org/manual/nix/stable/language/derivations#attr-outputs). @@ -344,7 +344,7 @@ Write a text file to the Nix store. `allowSubstitutes` (Bool, _optional_) : Whether to allow substituting from a binary cache. - Passed through to [`allowSubstitutes`](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-allowSubstitutes) of the underlying call to `builtins.derivation`. + Passed through to [`allowSubstitutes`](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-allowSubstitutes) of the underlying call to `derivation`. It defaults to `false`, as running the derivation's simple `builder` executable locally is assumed to be faster than network operations. Set it to true if the `checkPhase` step is expensive. @@ -355,7 +355,7 @@ Write a text file to the Nix store. : Whether to prefer building locally, even if faster [remote build machines](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-substituters) are available. - Passed through to [`preferLocalBuild`](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-preferLocalBuild) of the underlying call to `builtins.derivation`. + Passed through to [`preferLocalBuild`](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-preferLocalBuild) of the underlying call to `derivation`. It defaults to `true` for the same reason `allowSubstitutes` defaults to `false`. diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix index 0bc79d7a639d..64a320f3f0cc 100644 --- a/doc/doc-support/lib-function-locations.nix +++ b/doc/doc-support/lib-function-locations.nix @@ -24,19 +24,19 @@ let libset = toplib: - builtins.map (subsetname: { + map (subsetname: { subsetname = subsetname; functions = libDefPos [ ] toplib.${subsetname}; - }) (builtins.map (x: x.name) libsets); + }) (map (x: x.name) libsets); flattenedLibSubset = { subsetname, functions }: - builtins.map (fn: { + map (fn: { name = "lib.${subsetname}.${fn.name}"; value = fn.location; }) functions; - locatedlibsets = libs: builtins.map flattenedLibSubset (libset libs); + locatedlibsets = libs: map flattenedLibSubset (libset libs); removeFilenamePrefix = prefix: filename: let @@ -46,7 +46,7 @@ let in substr; - removeNixpkgs = removeFilenamePrefix (builtins.toString nixpkgsPath); + removeNixpkgs = removeFilenamePrefix (toString nixpkgsPath); liblocations = builtins.filter (elem: elem.value != null) (lib.lists.flatten (locatedlibsets lib)); @@ -59,19 +59,19 @@ let }; }; - relativeLocs = (builtins.map fnLocationRelative liblocations); + relativeLocs = (map fnLocationRelative liblocations); sanitizeId = builtins.replaceStrings [ "'" ] [ "-prime" ]; urlPrefix = "https://github.com/NixOS/nixpkgs/blob/${revision}"; jsonLocs = builtins.listToAttrs ( - builtins.map ( + map ( { name, value }: { name = sanitizeId name; value = let - text = "${value.file}:${builtins.toString value.line}"; - target = "${urlPrefix}/${value.file}#L${builtins.toString value.line}"; + text = "${value.file}:${toString value.line}"; + target = "${urlPrefix}/${value.file}#L${toString value.line}"; in "[${text}](${target}) in ``"; } diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md index 5e896aaacb6c..7c91078770ff 100644 --- a/doc/languages-frameworks/dhall.section.md +++ b/doc/languages-frameworks/dhall.section.md @@ -89,7 +89,7 @@ buildDhallPackage { # ./example.nix let - nixpkgs = builtins.fetchTarball { + nixpkgs = fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz"; hash = "sha256-B4Q3c6IvTLg3Q92qYa8y+i4uTaphtFdjp+Ir3QQjdN0="; }; diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 811b0687bbdd..12507a5e5d5f 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -316,7 +316,7 @@ buildNpmPackage { `importNpmLock` uses the following fetchers: - `pkgs.fetchurl` for `http(s)` dependencies -- `builtins.fetchGit` for `git` dependencies +- `fetchGit` for `git` dependencies It is possible to provide additional arguments to individual fetchers as needed: diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index 09f7a786d52d..095eaba4e648 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -374,7 +374,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "maven-demo"; version = "1.0"; - src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; + src = fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; buildInputs = [ maven ]; buildPhase = '' @@ -445,7 +445,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "maven-demo"; version = "1.0"; - src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; + src = fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ maven ]; @@ -538,7 +538,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "maven-demo"; version = "1.0"; - src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; + src = fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ maven ]; diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 8326d24a8d02..661441d0dfe2 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -11,7 +11,6 @@ - The official Nix formatter `nixfmt` is now stable and available as `pkgs.nixfmt`, deprecating the temporary `pkgs.nixfmt-rfc-style` attribute. The classic `nixfmt` will stay available for some more time as `pkgs.nixfmt-classic`. - The default GHC version has been updated from 9.8 to 9.10. `haskellPackages` correspondingly uses Stackage LTS 24 (instead of LTS 23) as a baseline. -- Added `nixos-init`, a Rust-based bashless initialization system for systemd initrd. This allows to build NixOS systems without any interpreter. Enable via `system.nixos-init.enable = true;`. ## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities} @@ -52,6 +51,8 @@ - `uw-ttyp0` has been updated to version 2.1. The filenames of the OTB and PSF fonts have been changed to match the upstream naming convention. If you were loading a font by path, for example in the `console.font` NixOS option, remember to update the filename accordingly. +- `adminneo` has been updated to version 5.1.1. Version 5 breaks compatibility with `adminer` and changes how plugins and configuration work. See the [Upgrade Guide](https://www.adminneo.org/upgrade#v5.0.0) for details. Those changes also led to changes in the arguments of the package. + - `base16-builder` node package has been removed due to lack of upstream maintenance. - `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities. @@ -129,6 +130,8 @@ - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld. +- `pcp` has been removed because the upstream repo was archived and it hasn't been updated since 2021. + - `navidrome` 0.58.0 introduces [multi-library support](https://www.navidrome.org/docs/usage/multi-library/) and backwards incompatible database migrations. Ensure backups are valid and run a Full Scan after starting the new version. @@ -151,6 +154,8 @@ - `inspircd` has been updated to the v4 release series. Please refer to the upstream documentation for [general information](https://docs.inspircd.org/4/overview/#v4-overview) and a list of [breaking changes](https://docs.inspircd.org/4/breaking-changes/). +- `proton-caller` has been removed due to lack of upstream maintenance. + - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input. - `mongodb-6_0` was removed as it is end of life as of 2025-07-31. @@ -172,6 +177,8 @@ of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0), make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_3;` in your configuration. +- `pkgs.nextcloud30` has been removed since it's out of support upstream. + - `privatebin` has been updated to `2.0.0`. This release changes configuration defaults including switching the template and removing legacy features. See the [v2.0.0 changelog entry](https://github.com/PrivateBin/PrivateBin/releases/tag/2.0.0) for details on how to upgrade. - `rocmPackages.triton` has been removed in favor of `python3Packages.triton`. @@ -207,6 +214,8 @@ - Added `rewriteURL` attribute to the nixpkgs `config`, to allow for rewriting the URLs downloaded by `fetchurl`. +- Added `gitConfig` and `gitConfigFile` option to the nixpkgs `config`, to allow for setting a default `gitConfigFile` for all `fetchgit` invocations. + - The `dockerTools.streamLayeredImage` builder now uses a better algorithm for generating layered docker images, such that much more sharing is possible when the number of store paths exceeds the layer limit. It gives each of the largest store paths its own layer and adds dependencies to those layers when they aren't used elsewhere. - The systemd initrd will now respect `x-systemd.wants` and `x-systemd.requires` for reliably unlocking multi-disk bcachefs volumes. @@ -243,8 +252,12 @@ * `$debug/lib/debug/.build-id/48/3bd7f7229bdb06462222e1e353e4f37e15c293.sourceoverlay` is a symlink to a directory with the same structure as the expanded `$sourceRoot` but containing only a copy of files which were patched during the build * `$debug/lib/debug/.build-id/48/3bd7f7229bdb06462222e1e353e4f37e15c293.debug` is the file containing debug symbols (like before). +- `fetchgit`: Add `gitConfigFile` argument to set a git config (via `$GIT_CONFIG_GLOBAL`) for the fetcher. + - `fetchgit`: Add `rootDir` argument to limit the resulting source to one subdirectory of the whole Git repository. Corresponding `--root-dir` option added to `nix-prefetch-git`. +- `nix-prefetch-git`: Added a `--no-add-path` argument to disable adding the path to the store; this is useful when working with a [read-only store](https://nix.dev/manual/nix/2.28/command-ref/new-cli/nix3-help-stores#store-experimental-local-overlay-store-read-only). + - `sftpman` has been updated to version 2, a rewrite in Rust which is mostly backward compatible but does include some changes to the CLI. For more information, [check the project's README](https://github.com/spantaleev/sftpman-rs#is-sftpman-v2-compatible-with-sftpman-v1). diff --git a/lib/asserts.nix b/lib/asserts.nix index 41908d00a812..c93254084b83 100644 --- a/lib/asserts.nix +++ b/lib/asserts.nix @@ -47,7 +47,7 @@ rec { ::: */ # TODO(Profpatsch): add tests that check stderr - assertMsg = pred: msg: pred || builtins.throw msg; + assertMsg = pred: msg: pred || throw msg; /** Specialized `assertMsg` for checking if `val` is one of the elements diff --git a/lib/attrsets.nix b/lib/attrsets.nix index b13a3f6ef637..de7859921c8c 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -2149,7 +2149,7 @@ rec { chooseDevOutputs :: [Derivation] -> [Derivation] ``` */ - chooseDevOutputs = builtins.map getDev; + chooseDevOutputs = map getDev; /** Make various Nix tools consider the contents of the resulting @@ -2230,7 +2230,7 @@ rec { intersection = builtins.intersectAttrs x y; collisions = lib.concatStringsSep " " (builtins.attrNames intersection); mask = builtins.mapAttrs ( - name: value: builtins.throw "unionOfDisjoint: collision on ${name}; complete list: ${collisions}" + name: value: throw "unionOfDisjoint: collision on ${name}; complete list: ${collisions}" ) intersection; in (x // y) // mask; diff --git a/lib/customisation.nix b/lib/customisation.nix index 16f248cd1b20..19c77633e6e3 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -3,6 +3,7 @@ let inherit (builtins) intersectAttrs + unsafeGetAttrPos ; inherit (lib) functionArgs @@ -303,7 +304,7 @@ rec { errorForArg = arg: let - loc = builtins.unsafeGetAttrPos arg fargs; + loc = unsafeGetAttrPos arg fargs; in "Function called without required argument \"${arg}\" at " + "${loc.file}:${toString loc.line}${prettySuggestions (getSuggestions arg)}"; diff --git a/lib/deprecated/misc.nix b/lib/deprecated/misc.nix index 22015c9b20aa..b5511e949a41 100644 --- a/lib/deprecated/misc.nix +++ b/lib/deprecated/misc.nix @@ -250,9 +250,9 @@ let # See https://github.com/NixOS/nixpkgs/pull/194391 for details. closePropagationFast = list: - builtins.map (x: x.val) ( + map (x: x.val) ( builtins.genericClosure { - startSet = builtins.map (x: { + startSet = map (x: { key = x.outPath; val = x; }) (builtins.filter (x: x != null) list); diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh index 043c1156a43f..78170ebc8391 100755 --- a/lib/fileset/tests.sh +++ b/lib/fileset/tests.sh @@ -1406,10 +1406,10 @@ echo '{ fs }: fs.toSource { root = ./.; fileset = fs.gitTracked ./.; }' > defaul git add . ## We can evaluate it locally just fine, `fetchGit` is used underneath to filter git-tracked files -expectEqual '(import ./. { fs = lib.fileset; }).outPath' '(builtins.fetchGit ./.).outPath' +expectEqual '(import ./. { fs = lib.fileset; }).outPath' '(fetchGit ./.).outPath' ## We can also evaluate when importing from fetched store paths -storePath=$(expectStorePath 'builtins.fetchGit ./.') +storePath=$(expectStorePath 'fetchGit ./.') expectEqual '(import '"$storePath"' { fs = lib.fileset; }).outPath' \""$storePath"\" ## But it fails if the path is imported with a fetcher that doesn't remove .git (like just using "${./.}") @@ -1429,13 +1429,13 @@ echo '{ fs }: fs.toSource { root = ./.; fileset = fs.gitTracked ./.; }' > sub/de git -C sub add . ## We can evaluate it locally just fine, `fetchGit` is used underneath to filter git-tracked files -expectEqual '(import ./. { fs = lib.fileset; }).outPath' '(builtins.fetchGit { url = ./.; submodules = true; }).outPath' -expectEqual '(import ./sub { fs = lib.fileset; }).outPath' '(builtins.fetchGit ./sub).outPath' +expectEqual '(import ./. { fs = lib.fileset; }).outPath' '(fetchGit { url = ./.; submodules = true; }).outPath' +expectEqual '(import ./sub { fs = lib.fileset; }).outPath' '(fetchGit ./sub).outPath' ## We can also evaluate when importing from fetched store paths -storePathWithSub=$(expectStorePath 'builtins.fetchGit { url = ./.; submodules = true; }') +storePathWithSub=$(expectStorePath 'fetchGit { url = ./.; submodules = true; }') expectEqual '(import '"$storePathWithSub"' { fs = lib.fileset; }).outPath' \""$storePathWithSub"\" -storePathSub=$(expectStorePath 'builtins.fetchGit ./sub') +storePathSub=$(expectStorePath 'fetchGit ./sub') expectEqual '(import '"$storePathSub"' { fs = lib.fileset; }).outPath' \""$storePathSub"\" ## But it fails if the path is imported with a fetcher that doesn't remove .git (like just using "${./.}") diff --git a/lib/gvariant.nix b/lib/gvariant.nix index e66217db8188..db2a33553ab7 100644 --- a/lib/gvariant.nix +++ b/lib/gvariant.nix @@ -150,7 +150,7 @@ rec { ) intConstructors; in throw '' - The GVariant type for number “${builtins.toString v}” is unclear. + The GVariant type for number “${toString v}” is unclear. Please wrap the value with one of the following, depending on the value type in GSettings schema: ${lib.concatMapStringsSep "\n" ( diff --git a/lib/meta.nix b/lib/meta.nix index 85e800a7d8f6..d60cb9287e3e 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -399,7 +399,7 @@ rec { => true lib.getLicenseFromSpdxIdOr "MY LICENSE" null => null - lib.getLicenseFromSpdxIdOr "MY LICENSE" (builtins.throw "No SPDX ID matches MY LICENSE") + lib.getLicenseFromSpdxIdOr "MY LICENSE" (throw "No SPDX ID matches MY LICENSE") => error: No SPDX ID matches MY LICENSE ``` ::: diff --git a/lib/strings.nix b/lib/strings.nix index 359e1a4cd8db..dcffacfcb420 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -1135,7 +1135,7 @@ rec { "." "~" ]; - toEscape = builtins.removeAttrs asciiTable unreserved; + toEscape = removeAttrs asciiTable unreserved; in replaceStrings (builtins.attrNames toEscape) ( lib.mapAttrsToList (_: c: "%${fixedWidthString 2 "0" (lib.toHexString c)}") toEscape diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 77247d269808..7e78ceb4827a 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -75,7 +75,7 @@ let # Those two will always be derived from "config", if given, so they should NOT # be overridden further down with "// args". - args = builtins.removeAttrs allArgs [ + args = removeAttrs allArgs [ "parsed" "system" ]; @@ -124,6 +124,8 @@ let "ucrt" else if final.isMinGW then "msvcrt" + else if final.isCygwin then + "cygwin" else if final.isWasi then "wasilibc" else if final.isWasm && !final.isWasi then @@ -183,7 +185,7 @@ let sharedLibrary = if final.isDarwin then ".dylib" - else if final.isWindows then + else if (final.isWindows || final.isCygwin) then ".dll" else ".so"; @@ -191,7 +193,7 @@ let // { staticLibrary = if final.isWindows then ".lib" else ".a"; library = if final.isStatic then final.extensions.staticLibrary else final.extensions.sharedLibrary; - executable = if final.isWindows then ".exe" else ""; + executable = if (final.isWindows || final.isCygwin) then ".exe" else ""; }; # Misc boolean options useAndroidPrebuilt = false; @@ -204,6 +206,7 @@ let { linux = "Linux"; windows = "Windows"; + cygwin = "CYGWIN_NT"; darwin = "Darwin"; netbsd = "NetBSD"; freebsd = "FreeBSD"; @@ -603,7 +606,7 @@ let "openbsd" else if final.isSunOS then "sunos" - else if final.isWindows then + else if (final.isWindows || final.isCygwin) then "win32" else null; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 9a53dac073ae..cdd28b1ddde1 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -388,6 +388,10 @@ rec { useLLVM = true; }; + x86_64-cygwin = { + config = "x86_64-pc-cygwin"; + }; + # BSDs aarch64-freebsd = { diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 65fdb9ee1959..ad6ff2b380a8 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -337,8 +337,7 @@ rec { kernel = kernels.windows; }; isCygwin = { - kernel = kernels.windows; - abi = abis.cygnus; + kernel = kernels.cygwin; }; isMinGW = { kernel = kernels.windows; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 0dfd91b7bb76..bbb0fa9d5582 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -42,6 +42,7 @@ let isLinux isPower64 isWindows + isCygwin ; inherit (lib.types) @@ -617,6 +618,10 @@ rec { execFormat = pe; families = { }; }; + cygwin = { + execFormat = pe; + families = { }; + }; ghcjs = { execFormat = unknown; families = { }; @@ -650,7 +655,6 @@ rec { types.abi = enum (attrValues abis); abis = setTypes types.openAbi { - cygnus = { }; msvc = { }; # Note: eabi is specific to ARM and PowerPC. @@ -783,11 +787,11 @@ rec { throw "system string '${lib.concatStringsSep "-" l}' with 1 component is ambiguous"; "2" = # We only do 2-part hacks for things Nix already supports if elemAt l 1 == "cygwin" then - { - cpu = elemAt l 0; - kernel = "windows"; - abi = "cygnus"; - } + mkSkeletonFromList [ + (elemAt l 0) + "pc" + "cygwin" + ] # MSVC ought to be the default ABI so this case isn't needed. But then it # becomes difficult to handle the gnu* variants for Aarch32 correctly for # minGW. So it's easier to make gnu* the default for the MinGW, but @@ -851,6 +855,13 @@ rec { else elemAt l 2; } + # lots of tools expect a triplet for Cygwin, even though the vendor is just "pc" + else if elemAt l 2 == "cygwin" then + { + cpu = elemAt l 0; + vendor = elemAt l 1; + kernel = "cygwin"; + } else throw "system string '${lib.concatStringsSep "-" l}' with 3 components is ambiguous"; "4" = { @@ -891,7 +902,7 @@ rec { getVendor args.vendor else if isDarwin parsed then vendors.apple - else if isWindows parsed then + else if (isWindows parsed || isCygwin parsed) then vendors.pc else vendors.unknown; @@ -933,12 +944,7 @@ rec { abi, ... }: - if abi == abis.cygnus then - "${cpu.name}-cygwin" - else if kernel.families ? darwin then - "${cpu.name}-darwin" - else - "${cpu.name}-${kernelName kernel}"; + if kernel.families ? darwin then "${cpu.name}-darwin" else "${cpu.name}-${kernelName kernel}"; tripleFromSystem = { diff --git a/lib/tests/checkAndMergeCompat.nix b/lib/tests/checkAndMergeCompat.nix index dc6f26fbf917..f21c9789e8b6 100644 --- a/lib/tests/checkAndMergeCompat.nix +++ b/lib/tests/checkAndMergeCompat.nix @@ -326,7 +326,7 @@ in coerce_str_to_int_coercer_ouput = getMatrix { outerTypeName = "coercedTo"; innerTypeName = "int->str"; - getType = a: b: a.coercedTo b.int builtins.toString a.str; + getType = a: b: a.coercedTo b.int toString a.str; value = [ ]; testAttrs = { expectedError = { diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index a9c78defdffb..e6252c17b67c 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -4488,7 +4488,7 @@ runTests { expr = packagesFromDirectoryRecursive { callPackage = path: overrides: import path overrides; # Do NOT remove the `builtins.toString` call here!!! - directory = builtins.toString ./packages-from-directory/plain; + directory = toString ./packages-from-directory/plain; }; expected = { a = "a"; diff --git a/lib/tests/modules/declare-coerced-value-no-default.nix b/lib/tests/modules/declare-coerced-value-no-default.nix index 820913f920c3..cc929f9585b6 100644 --- a/lib/tests/modules/declare-coerced-value-no-default.nix +++ b/lib/tests/modules/declare-coerced-value-no-default.nix @@ -3,7 +3,7 @@ { options = { value = lib.mkOption { - type = lib.types.coercedTo lib.types.int builtins.toString lib.types.str; + type = lib.types.coercedTo lib.types.int toString lib.types.str; }; }; } diff --git a/lib/tests/modules/declare-coerced-value.nix b/lib/tests/modules/declare-coerced-value.nix index 76b12ad53f00..65a35669a2e8 100644 --- a/lib/tests/modules/declare-coerced-value.nix +++ b/lib/tests/modules/declare-coerced-value.nix @@ -4,7 +4,7 @@ options = { value = lib.mkOption { default = 42; - type = lib.types.coercedTo lib.types.int builtins.toString lib.types.str; + type = lib.types.coercedTo lib.types.int toString lib.types.str; }; }; } diff --git a/lib/tests/modules/define-freeform-keywords-shorthand.nix b/lib/tests/modules/define-freeform-keywords-shorthand.nix index 3481cb52e5e3..9d0e8c871b4e 100644 --- a/lib/tests/modules/define-freeform-keywords-shorthand.nix +++ b/lib/tests/modules/define-freeform-keywords-shorthand.nix @@ -9,7 +9,7 @@ _module.args.result = let - r = builtins.removeAttrs config [ "_module" ]; + r = removeAttrs config [ "_module" ]; in builtins.trace (builtins.deepSeq r r) ( r == { diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 3bddf78dea19..642339e792fd 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -49,6 +49,7 @@ lib.runTests ( ++ illumos ++ wasi ++ windows + ++ cygwin ++ embedded ++ mmix ++ js @@ -202,8 +203,6 @@ lib.runTests ( "x86_64-openbsd" ]; testwindows = mseteq windows [ - "i686-cygwin" - "x86_64-cygwin" "aarch64-windows" "i686-windows" "x86_64-windows" diff --git a/lib/trivial.nix b/lib/trivial.nix index 9c4deafb402c..6a0fb87dc03b 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -769,7 +769,7 @@ in importTOML :: path -> any ``` */ - importTOML = path: builtins.fromTOML (builtins.readFile path); + importTOML = path: fromTOML (builtins.readFile path); /** `warn` *`message`* *`value`* @@ -975,7 +975,7 @@ in unexpected = lib.subtractLists valid given; in lib.throwIfNot (unexpected == [ ]) - "${msg}: ${builtins.concatStringsSep ", " (builtins.map builtins.toString unexpected)} unexpected; valid ones: ${builtins.concatStringsSep ", " (builtins.map builtins.toString valid)}"; + "${msg}: ${builtins.concatStringsSep ", " (map toString unexpected)} unexpected; valid ones: ${builtins.concatStringsSep ", " (map toString valid)}"; info = msg: builtins.trace "INFO: ${msg}"; @@ -1144,7 +1144,7 @@ in match = builtins.match "(0x)?([0-7]?[0-9A-Fa-f]{1,15})" str; in if match != null then - (builtins.fromTOML "v=0x${builtins.elemAt match 1}").v + (fromTOML "v=0x${builtins.elemAt match 1}").v else # TODO: Turn this into a `throw` in 26.05. assert lib.warn "fromHexString: ${ @@ -1153,7 +1153,7 @@ in let noPrefix = lib.strings.removePrefix "0x" (lib.strings.toLower str); in - (builtins.fromTOML "v=0x${noPrefix}").v; + (fromTOML "v=0x${noPrefix}").v; /** Convert the given positive integer to a string of its hexadecimal diff --git a/lib/types.nix b/lib/types.nix index 1de5afef1be9..c23581c5281c 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -1373,7 +1373,7 @@ let if builtins.isString v then ''"${v}"'' else if builtins.isInt v then - builtins.toString v + toString v else if builtins.isBool v then boolToString v else diff --git a/maintainers/README.md b/maintainers/README.md index 1019c4084224..2cc71698939f 100644 --- a/maintainers/README.md +++ b/maintainers/README.md @@ -155,8 +155,15 @@ When reviewing changes to a team, read the team's scope and the context around t In any case, request reviews from the existing team members. If the team lists no specific membership policy, feel free to merge changes to the team after giving the existing members a few days to respond. -*Important:* If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member. +> [!IMPORTANT] +> If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member. +A corresponding GitHub team can be created by any org member. +When creating the team it should be created with the `nixpkgs-maintainers` team as parent. +Once approved, the team will have the right privileges to be pinged and requested for review in Nixpkgs. + +> [!TIP] +> The team name should be as short as possible; because it is nested under the maintainers group, no -maintainers suffix is needed. # Maintainer scripts diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23700f6ede6e..23e836c8fa7a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1642,12 +1642,6 @@ githubId = 106511; name = "Andrew Kelley"; }; - andrewsmith = { - email = "andrew@velvet.software"; - github = "andrewsmith"; - githubId = 29887; - name = "Andrew Smith"; - }; Andy3153 = { name = "Andrei Dobrete"; email = "andy3153@protonmail.com"; @@ -7650,6 +7644,12 @@ name = "Zhenbo Li"; matrix = "@zhenbo:matrix.org"; }; + enkarterisi = { + name = "xNefas"; + email = "enkarterisi@proton.me"; + github = "xNefas"; + githubId = 199727225; + }; enorris = { name = "Eric Norris"; email = "erictnorris@gmail.com"; @@ -7925,6 +7925,12 @@ name = "Elis Hirwing"; keys = [ { fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; } ]; }; + etwas = { + email = "ein@etwas.me"; + github = "eetwas"; + githubId = 74488187; + name = "etwas"; + }; eu90h = { email = "stefan@eu90h.com"; github = "eu90h"; @@ -9392,6 +9398,11 @@ githubId = 5549373; name = "Jochen Kiemes"; }; + ginkogruen = { + name = "Jasper Wolter"; + github = "ginkogruen"; + githubId = 93037574; + }; giodamelio = { name = "Giovanni d'Amelio"; email = "gio@damelio.net"; @@ -18056,6 +18067,12 @@ matrix = "@n3t:matrix.org"; name = "Adrian Sadłocha"; }; + Necoro = { + email = "nix@necoro.dev"; + github = "Necoro"; + githubId = 68708; + name = "René Neumann"; + }; necrophcodr = { email = "nc@scalehost.eu"; github = "necrophcodr"; @@ -18104,12 +18121,6 @@ githubId = 50854675; name = "Nelson Jeppesen"; }; - neonfuz = { - email = "neonfuz@gmail.com"; - github = "neonfuz"; - githubId = 2590830; - name = "Sage Raflik"; - }; neosimsim = { email = "me@abn.sh"; github = "neosimsim"; @@ -19981,12 +19992,6 @@ githubId = 63069986; name = "Per Stark"; }; - petee = { - name = "Pete Erickson"; - email = "pete.perickson@gmail.com"; - github = "petee"; - githubId = 89916; - }; Peter3579 = { github = "Peter3579"; githubId = 170885528; @@ -21577,6 +21582,12 @@ github = "i-am-logger"; githubId = 1440852; }; + rebmit = { + name = "Lu Wang"; + email = "rebmit@rebmit.moe"; + github = "rebmit"; + githubId = 188659765; + }; reckenrode = { name = "Randy Eckenrode"; email = "randy@largeandhighquality.com"; @@ -24485,14 +24496,6 @@ githubId = 18124752; email = "m@rvinvogt.com"; }; - srxl = { - name = "Ruby Iris Juric"; - email = "ruby@srxl.me"; - matrix = "@ruby:isincredibly.gay"; - github = "Sorixelle"; - githubId = 38685302; - keys = [ { fingerprint = "2D76 76C7 A28E 16FC 75C7 268D 1B55 6ED8 4B0E 303A"; } ]; - }; Srylax = { name = "Srylax"; email = "srylax+nixpkgs@srylax.dev"; @@ -28058,12 +28061,6 @@ github = "x123"; githubId = 5481629; }; - x3ro = { - name = "^x3ro"; - email = "nix@x3ro.dev"; - github = "x3rAx"; - githubId = 2268851; - }; x807x = { name = "x807x"; email = "s10855168@gmail.com"; @@ -28707,6 +28704,12 @@ githubId = 10415894; name = "Zahrun"; }; + zainkergaye = { + email = "zain@zkergaye.me"; + github = "zainkergaye"; + githubId = 62440012; + name = "Zain Kergaye"; + }; zakame = { email = "zakame@zakame.net"; github = "zakame"; diff --git a/nixos/doc/manual/configuration/gpu-accel.chapter.md b/nixos/doc/manual/configuration/gpu-accel.chapter.md index 2cbf2c51bb70..0046337320a5 100644 --- a/nixos/doc/manual/configuration/gpu-accel.chapter.md +++ b/nixos/doc/manual/configuration/gpu-accel.chapter.md @@ -91,16 +91,7 @@ All successfully loaded drivers are exposed to the application as different GPUs. In NixOS, there are two ways to make ICD files visible to Vulkan applications: an environment variable and a module option. -The first option is through the `VK_ICD_FILENAMES` environment variable. -This variable can contain multiple JSON files, separated by `:`. For -example: - -```ShellSession -$ export \ - VK_ICD_FILENAMES=`nix-build '' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json -``` - -The second mechanism is to add the Vulkan driver package to +The way to do this is to add the Vulkan driver package to [](#opt-hardware.graphics.extraPackages). This links the ICD file under `/run/opengl-driver`, where it will be visible to the ICD loader. @@ -129,25 +120,7 @@ vulkan-tools package. Modern AMD [Graphics Core Next](https://en.wikipedia.org/wiki/Graphics_Core_Next) (GCN) GPUs are -supported through either radv, which is part of mesa, or the amdvlk -package. Adding the amdvlk package to -[](#opt-hardware.graphics.extraPackages) -makes amdvlk the default driver and hides radv and lavapipe from the device list. -A specific driver can be forced as follows: - -```nix -{ - hardware.graphics.extraPackages = [ pkgs.amdvlk ]; - - # To enable Vulkan support for 32-bit applications, also add: - hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; - - # Force radv - environment.variables.AMD_VULKAN_ICD = "RADV"; - # Or - environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; -} -``` +supported through the RADV driver, which is part of mesa. ## VA-API {#sec-gpu-accel-va-api} diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 35973153b249..c46c9fac3606 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -358,6 +358,37 @@ have a predefined type and string generator already declared under : Outputs the xml with header. +`pkgs.formats.pythonVars` { } + +: A function taking an empty attribute set (for future extensibility) + and returning a set with python variable specific attributes `type`, `lib`, and + `generate` as specified [below](#pkgs-formats-result). + + The `lib` attribute contains functions to be used in settings, for + generating special Python values: + + `mkRaw pythonCode` + + : Outputs the given string as raw Python code + + `_imports` + + `_imports` is a special value you can set to specify additional modules to be + imported on top of the file. + + `Example usage:` + + ```nix + let + format = pkgs.formats.pythonVars { }; + in { + _imports = [ "re" ]; + + conditional = format.lib.mkRaw "1 if True else 2"; + function_result = format.lib.mkRaw "re.findall(r'\\bf[a-z]*', 'which foot or hand fell fastest')"; + } + ``` + `pkgs.formats.cdn` { } : A function taking an empty attribute set (for future extensibility) diff --git a/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md b/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md index a10c3dc36709..a9755e4bf752 100644 --- a/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md +++ b/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md @@ -40,12 +40,18 @@ An example of how to build an image: } ``` -## Nix Store Partition {#sec-image-repart-store-partition} +## Nix Store Paths {#sec-image-repart-store-paths} + +If you want to rewrite Nix store paths, e.g., to remove the `/nix/store` prefix +or to nest it below a parent path, you can do that through the +`nixStorePrefix` option. + +### Nix Store Partition {#sec-image-repart-store-partition} You can define a partition that only contains the Nix store and then mount it under `/nix/store`. Because the `/nix/store` part of the paths is already -determined by the mount point, you have to set `stripNixStorePrefix = true;` so -that the prefix is stripped from the paths before copying them into the image. +determined by the mount point, you have to set `nixStorePrefix = "/"` so +that `/nix/store` is stripped from the paths before copying them into the image. ```nix { @@ -54,7 +60,7 @@ that the prefix is stripped from the paths before copying them into the image. image.repart.partitions = { "store" = { storePaths = [ config.system.build.toplevel ]; - stripNixStorePrefix = true; + nixStorePrefix = "/"; repartConfig = { Type = "linux-generic"; Label = "nix-store"; @@ -65,6 +71,42 @@ that the prefix is stripped from the paths before copying them into the image. } ``` +### Nix Store Subvolume {#sec-image-repart-store-subvolume} + +Alternatively, you can create a Btrfs subvolume `/@nix-store` containing the +Nix store and mount it on `/nix/store`: + +```nix +{ + fileSystems."/" = { + device = "/dev/disk/by-partlabel/root"; + fsType = "btrfs"; + options = [ "subvol=/@" ]; + }; + + fileSystems."/nix/store" = { + device = "/dev/disk/by-partlabel/root"; + fsType = "btrfs"; + options = [ "subvol=/@nix-store" ]; + }; + + image.repart.partitions = { + "root" = { + storePaths = [ config.system.build.toplevel ]; + nixStorePrefix = "/@nix-store"; + repartConfig = { + Type = "root"; + Label = "root"; + Format = "btrfs"; + Subvolumes = "/@ /@nix-store"; + MakeDirectories = "/@ /@nix-store"; + # ... + }; + }; + }; +} +``` + ## Appliance Image {#sec-image-repart-appliance} The `image/repart.nix` module can also be used to build self-contained [software diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 297956be881b..e2303ad270a7 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -302,9 +302,15 @@ "sec-image-repart": [ "index.html#sec-image-repart" ], + "sec-image-repart-store-paths": [ + "index.html#sec-image-repart-store-paths" + ], "sec-image-repart-store-partition": [ "index.html#sec-image-repart-store-partition" ], + "sec-image-repart-store-subvolume": [ + "index.html#sec-image-repart-store-subvolume" + ], "sec-image-repart-appliance": [ "index.html#sec-image-repart-appliance" ], diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 997c0bf1f325..f0fac1194f2f 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -29,7 +29,7 @@ - Convenience options for `amdgpu`, the open source driver for Radeon cards, are now available under [`hardware.amdgpu`](#opt-hardware.amdgpu.initrd.enable). -- [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured under the [`hardware.amdgpu.amdvlk`](#opt-hardware.amdgpu.amdvlk.enable) option. +- [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured under the {option}`hardware.amdgpu.amdvlk` option. This also allows configuring runtime settings for AMDVLK, including enabling experimental features. - The `moonlight-qt` package (for [Moonlight game streaming](https://moonlight-stream.org/)) now has HDR support on Linux systems. diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 73317da2b100..e0f097d5a0a6 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -12,6 +12,8 @@ - The default PostgreSQL version for new NixOS installations (i.e. with `system.stateVersion >= 25.11`) is v17. +- Added `nixos-init`, a Rust-based bashless initialization system for systemd initrd. This allows to build NixOS systems without any interpreter. Enable via `system.nixos-init.enable = true;`. + - The NetworkManager module does not ship with a default set of VPN plugins anymore. All required VPN plugins must now be explicitly configured in [`networking.networkmanager.plugins`](#opt-networking.networkmanager.plugins). - The Qt 5-based versions of KDE Gear, Plasma, Maui and Deepin have been removed. Users are advised to migrate to Plasma 6 and Gear 25.08, available under `kdePackages`. @@ -148,6 +150,8 @@ - The `no-broken-symlink` build hook now also fails builds whose output derivation contains links to $TMPDIR (typically /build, which contains the build directory). +- `hardware.amdgpu.amdvlk` and the `amdvlk` package have been removed, as they have been deprecated by AMD. These have been replaced with the RADV driver from Mesa, which is enabled by default. + - The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream. - `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information. @@ -170,10 +174,14 @@ - The zookeeper project changed their logging tool to logback, therefore `services.zookeeper.logging` option has been updated to expect a logback compatible string. - The `dovecot` systemd service was renamed from `dovecot2` to `dovecot`. The former is now just an alias. Update any overrides on the systemd unit to the new name. -- Configurations with `boot.initrd.systend.enable && !boot.initrd.enable` will have their `init` script at `$toplevel/init` instead of `$toplevel/prepare-root`. This is because it does not make sense for systemd stage 1 to affect the `init` script when stage 1 is entirely disabled (e.g. containers). +- Configurations with `boot.initrd.systemd.enable && !boot.initrd.enable` will have their `init` script at `$toplevel/init` instead of `$toplevel/prepare-root`. This is because it does not make sense for systemd stage 1 to affect the `init` script when stage 1 is entirely disabled (e.g. containers). - `programs.goldwarden` has been removed, due to the software not working with newer versions of the Bitwarden and Vaultwarden servers, as well as it being abandoned upstream. +- The `chatgpt-retrieval-plugin` package and `services.chatgpt-retrieval-plugin` module were removed due to the package having been broken since at least November 2024. + +- The `cardboard` package and `programs.cardboard` module were removed due to the package having been broken since at least November 2024. + - The default `kops` version is now 1.33.0 and versions 1.30 and older have been dropped. See [Upgrading Kubernetes](https://kops.sigs.k8s.io/tutorial/upgrading-kubernetes/) for instructions on how to update kOps. - `programs.skim.fuzzyCompletions` has been removed in favor of adding the completions to the package itself. @@ -192,6 +200,8 @@ - The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection. +- The `services.mysql` module now restarts the database `on-abnormal`, which means that it now will be restarted in certain situations, it wasn't before. For example an OOM-kill. + - The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x. - `services.tor.torsocks.enable` no longer defaults to true if Tor and Tor client functionality is enabled. diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index 1fee6c7f2c9f..bd4b9cd0475e 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -268,6 +268,7 @@ in sw: let realDevice' = utils.escapeSystemdPath sw.realDevice; + btrfsInSystem = config.boot.supportedFilesystems.btrfs or false; in lib.nameValuePair "mkswap-${sw.deviceName}" { description = "Initialisation of swap device ${sw.device}"; @@ -287,6 +288,7 @@ in pkgs.util-linux pkgs.e2fsprogs ] + ++ lib.optional btrfsInSystem pkgs.btrfs-progs ++ lib.optional sw.randomEncryption.enable pkgs.cryptsetup; environment.DEVICE = sw.device; @@ -295,13 +297,19 @@ in ${lib.optionalString (sw.size != null) '' currentSize=$(( $(stat -c "%s" "$DEVICE" 2>/dev/null || echo 0) / 1024 / 1024 )) if [[ ! -b "$DEVICE" && "${toString sw.size}" != "$currentSize" ]]; then - # Disable CoW for CoW based filesystems like BTRFS. - truncate --size 0 "$DEVICE" - chattr +C "$DEVICE" 2>/dev/null || true + if [[ $(stat -f -c %T $(dirname "$DEVICE")) == "btrfs" ]]; then + # Use btrfs mkswapfile to speed up the creation of swapfile. + rm -f "$DEVICE" + btrfs filesystem mkswapfile --size "${toString sw.size}M" --uuid clear "$DEVICE" + else + # Disable CoW for CoW based filesystems. + truncate --size 0 "$DEVICE" + chattr +C "$DEVICE" 2>/dev/null || true - echo "Creating swap file using dd and mkswap." - dd if=/dev/zero of="$DEVICE" bs=1M count=${toString sw.size} status=progress - ${lib.optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"} + echo "Creating swap file using dd and mkswap." + dd if=/dev/zero of="$DEVICE" bs=1M count=${toString sw.size} status=progress + ${lib.optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"} + fi fi ''} ${lib.optionalString sw.randomEncryption.enable '' diff --git a/nixos/modules/hardware/opentabletdriver.nix b/nixos/modules/hardware/opentabletdriver.nix index d74e9b8e4dce..592c2575e9a4 100644 --- a/nixos/modules/hardware/opentabletdriver.nix +++ b/nixos/modules/hardware/opentabletdriver.nix @@ -53,18 +53,16 @@ in boot.blacklistedKernelModules = cfg.blacklistedKernelModules; - systemd.user.services.opentabletdriver = - with pkgs; - lib.mkIf cfg.daemon.enable { - description = "Open source, cross-platform, user-mode tablet driver"; - wantedBy = [ "graphical-session.target" ]; - partOf = [ "graphical-session.target" ]; + systemd.user.services.opentabletdriver = lib.mkIf cfg.daemon.enable { + description = "Open source, cross-platform, user-mode tablet driver"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; - serviceConfig = { - Type = "simple"; - ExecStart = "${cfg.package}/bin/otd-daemon"; - Restart = "on-failure"; - }; + serviceConfig = { + Type = "simple"; + ExecStart = lib.getExe' cfg.package "otd-daemon"; + Restart = "on-failure"; }; + }; }; } diff --git a/nixos/modules/image/amend-repart-definitions.py b/nixos/modules/image/amend-repart-definitions.py index fa9b1544ae85..4ca8c3156f8a 100644 --- a/nixos/modules/image/amend-repart-definitions.py +++ b/nixos/modules/image/amend-repart-definitions.py @@ -36,11 +36,11 @@ def add_contents_to_definition( def add_closure_to_definition( - definition: Path, closure: Path | None, strip_nix_store_prefix: bool | None + definition: Path, closure: Path | None, nix_store_prefix: str | None ) -> None: """Add CopyFiles= instructions to a definition for all paths in the closure. - If strip_nix_store_prefix is True, `/nix/store` is stripped from the target path. + Replace `/nix/store` with the value of nix_store_prefix. """ if not closure: return @@ -52,10 +52,12 @@ def add_closure_to_definition( continue source = Path(line.strip()) - target = str(source.relative_to("/nix/store/")) - target = f":/{target}" if strip_nix_store_prefix else "" + option = f"CopyFiles={source}" + if nix_store_prefix: + target = nix_store_prefix / source.relative_to("/nix/store/") + option = f"{option}:{target}" - copy_files_lines.append(f"CopyFiles={source}{target}\n") + copy_files_lines.append(f"{option}\n") with open(definition, "a") as f: f.writelines(copy_files_lines) @@ -102,8 +104,8 @@ def main() -> None: add_contents_to_definition(definition, contents) closure = config.get("closure") - strip_nix_store_prefix = config.get("stripNixStorePrefix") - add_closure_to_definition(definition, closure, strip_nix_store_prefix) + nix_store_prefix = config.get("nixStorePrefix") + add_closure_to_definition(definition, closure, nix_store_prefix) print(target_dir.absolute()) diff --git a/nixos/modules/image/repart-image.nix b/nixos/modules/image/repart-image.nix index 1bc50c719b14..e8047757117d 100644 --- a/nixos/modules/image/repart-image.nix +++ b/nixos/modules/image/repart-image.nix @@ -30,7 +30,7 @@ # arguments name, version, - imageFileBasename, + baseName, compression, fileSystems, finalPartitions, @@ -205,7 +205,7 @@ stdenvNoCC.mkDerivation ( echo "Building image with systemd-repart..." unshare --map-root-user fakeroot systemd-repart \ ''${systemdRepartFlags[@]} \ - ${imageFileBasename}.raw \ + ${baseName}.raw \ | tee repart-output.json runHook postBuild @@ -220,14 +220,14 @@ stdenvNoCC.mkDerivation ( # separate derivation to allow users to save disk space. Disk images are # already very space intensive so we want to allow users to mitigate this. + lib.optionalString compression.enable '' - for f in ${imageFileBasename}*; do + for f in ${baseName}*; do echo "Compressing $f with ${compression.algorithm}..." # Keep the original file when compressing and only delete it afterwards ${compressionCommand} $f && rm $f done '' + '' - mv -v repart-output.json ${imageFileBasename}* $out + mv -v repart-output.json ${baseName}* $out runHook postInstall ''; diff --git a/nixos/modules/image/repart-verity-store.nix b/nixos/modules/image/repart-verity-store.nix index ee2cdd05961e..b0b137789bec 100644 --- a/nixos/modules/image/repart-verity-store.nix +++ b/nixos/modules/image/repart-verity-store.nix @@ -194,8 +194,8 @@ in | assert_uki_repart_match.py "${config.system.build.intermediateImage}/repart-output.json" # copy the uncompressed intermediate image, so that systemd-repart picks it up - cp -v ${config.system.build.intermediateImage}/${config.image.repart.imageFileBasename}.raw . - chmod +w ${config.image.repart.imageFileBasename}.raw + cp -v ${config.system.build.intermediateImage}/${config.image.baseName}.raw . + chmod +w ${config.image.baseName}.raw ''; # replace "TBD" with the original roothash values diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index a44a2e5f9ea3..1f276590f9c2 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -15,69 +15,83 @@ let inherit (utils.systemdUtils.lib) GPTMaxLabelLength; - partitionOptions = { - options = { - storePaths = lib.mkOption { - type = with lib.types; listOf path; - default = [ ]; - description = "The store paths to include in the partition."; - }; - - stripNixStorePrefix = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to strip `/nix/store/` from the store paths. This is useful - when you want to build a partition that only contains store paths and - is mounted under `/nix/store`. - ''; - }; - - contents = lib.mkOption { - type = - with lib.types; - attrsOf (submodule { - options = { - source = lib.mkOption { - type = types.path; - description = "Path of the source file."; - }; - }; - }); - default = { }; - example = lib.literalExpression '' - { - "/EFI/BOOT/BOOTX64.EFI".source = - "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; - - "/loader/entries/nixos.conf".source = systemdBootEntry; - } - ''; - description = "The contents to end up in the filesystem image."; - }; - - repartConfig = lib.mkOption { - type = - with lib.types; - attrsOf (oneOf [ - str - int - bool - (listOf str) - ]); - example = { - Type = "home"; - SizeMinBytes = "512M"; - SizeMaxBytes = "2G"; + partitionOptions = + { config, ... }: + { + options = { + storePaths = lib.mkOption { + type = with lib.types; listOf path; + default = [ ]; + description = "The store paths to include in the partition."; }; - description = '' - Specify the repart options for a partiton as a structural setting. - See {manpage}`repart.d(5)` - for all available options. - ''; + + # Superseded by `nixStorePrefix`. Unfortunately, `mkChangedOptionModule` + # does not support submodules. + stripNixStorePrefix = lib.mkOption { + default = "_mkMergedOptionModule"; + visible = false; + }; + + nixStorePrefix = lib.mkOption { + type = lib.types.path; + default = "/nix/store"; + description = '' + The prefix to use for store paths. Defaults to `/nix/store`. This is + useful when you want to build a partition that only contains store + paths and is mounted under `/nix/store` or if you want to create the + store paths below a parent path (e.g., `/@nix/nix/store`). + ''; + }; + + contents = lib.mkOption { + type = + with lib.types; + attrsOf (submodule { + options = { + source = lib.mkOption { + type = types.path; + description = "Path of the source file."; + }; + }; + }); + default = { }; + example = lib.literalExpression '' + { + "/EFI/BOOT/BOOTX64.EFI".source = + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; + + "/loader/entries/nixos.conf".source = systemdBootEntry; + } + ''; + description = "The contents to end up in the filesystem image."; + }; + + repartConfig = lib.mkOption { + type = + with lib.types; + attrsOf (oneOf [ + str + int + bool + (listOf str) + ]); + example = { + Type = "home"; + SizeMinBytes = "512M"; + SizeMaxBytes = "2G"; + }; + description = '' + Specify the repart options for a partiton as a structural setting. + See {manpage}`repart.d(5)` + for all available options. + ''; + }; + }; + + config = lib.mkIf (config.stripNixStorePrefix == true) { + nixStorePrefix = "/"; }; }; - }; mkfsOptionsToEnv = opts: @@ -350,7 +364,7 @@ in } ) cfg.partitions; - warnings = lib.filter (v: v != null) ( + warnings = lib.flatten ( lib.mapAttrsToList ( fileName: partitionConfig: let @@ -358,20 +372,23 @@ in suggestedMaxLabelLength = GPTMaxLabelLength - 2; labelLength = builtins.stringLength repartConfig.Label; in - if (repartConfig ? Label && labelLength >= suggestedMaxLabelLength) then - '' - The partition label '${repartConfig.Label}' - defined for '${fileName}' is ${toString labelLength} characters long. - The suggested maximum label length is ${toString suggestedMaxLabelLength}. + lib.optional (repartConfig ? Label && labelLength >= suggestedMaxLabelLength) '' + The partition label '${repartConfig.Label}' + defined for '${fileName}' is ${toString labelLength} characters long. + The suggested maximum label length is ${toString suggestedMaxLabelLength}. - If you use sytemd-sysupdate style A/B updates, this might - not leave enough space to increment the version number included in - the label in a future release. For example, if your label is - ${toString GPTMaxLabelLength} characters long (the maximum enforced by UEFI) and - you're at version 9, you cannot increment this to 10. - '' - else - null + If you use sytemd-sysupdate style A/B updates, this might + not leave enough space to increment the version number included in + the label in a future release. For example, if your label is + ${toString GPTMaxLabelLength} characters long (the maximum enforced by UEFI) and + you're at version 9, you cannot increment this to 10. + '' + ++ lib.optional (partitionConfig.stripNixStorePrefix != "_mkMergedOptionModule") '' + The option definition `image.repart.paritions.${fileName}.stripNixStorePrefix` + has changed to `image.repart.paritions.${fileName}.nixStorePrefix` and now + accepts the path to use as prefix directly. Use `nixStorePrefix = "/"` to + achieve the same effect as setting `stripNixStorePrefix = true`. + '' ) cfg.partitions ); }; @@ -391,7 +408,7 @@ in mkfsEnv = mkfsOptionsToEnv cfg.mkfsOptions; val = pkgs.callPackage ./repart-image.nix { systemd = cfg.package; - imageFileBasename = config.image.baseName; + inherit (config.image) baseName; inherit (cfg) name version diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index aa3aaed54cea..bf8a27419ae2 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -341,8 +341,6 @@ in system.build = { inherit nixos-generate-config nixos-install; nixos-rebuild = if config.system.rebuild.enableNg then nixos-rebuild-ng else nixos-rebuild; - nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option; - nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter; }; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 043132db23c2..3171684a30e6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -337,7 +337,6 @@ ./programs/vivid.nix ./programs/vscode.nix ./programs/wavemon.nix - ./programs/wayland/cardboard.nix ./programs/wayland/dwl.nix ./programs/wayland/gtklock.nix ./programs/wayland/hyprland.nix @@ -632,7 +631,6 @@ ./services/hardware/acpid.nix ./services/hardware/actkbd.nix ./services/hardware/amdgpu.nix - ./services/hardware/amdvlk.nix ./services/hardware/argonone.nix ./services/hardware/asusd.nix ./services/hardware/auto-cpufreq.nix @@ -1237,7 +1235,6 @@ ./services/networking/mmsd.nix ./services/networking/modemmanager.nix ./services/networking/monero.nix - ./services/networking/morty.nix ./services/networking/mosquitto.nix ./services/networking/mozillavpn.nix ./services/networking/mptcpd.nix @@ -1554,7 +1551,6 @@ ./services/web-apps/calibre-web.nix ./services/web-apps/castopod.nix ./services/web-apps/changedetection-io.nix - ./services/web-apps/chatgpt-retrieval-plugin.nix ./services/web-apps/chhoto-url.nix ./services/web-apps/cloudlog.nix ./services/web-apps/code-server.nix diff --git a/nixos/modules/programs/wayland/cardboard.nix b/nixos/modules/programs/wayland/cardboard.nix deleted file mode 100644 index 84fe878dc1f8..000000000000 --- a/nixos/modules/programs/wayland/cardboard.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.programs.cardboard; -in -{ - meta.maintainers = with lib.maintainers; [ ]; - - options.programs.cardboard = { - enable = lib.mkEnableOption "cardboard"; - - package = lib.mkPackageOption pkgs "cardboard" { }; - }; - - config = lib.mkIf cfg.enable ( - lib.mkMerge [ - { - environment.systemPackages = [ cfg.package ]; - - # To make a cardboard session available for certain DMs like SDDM - services.displayManager.sessionPackages = [ cfg.package ]; - } - (import ./wayland-session.nix { inherit lib pkgs; }) - ] - ); -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 10651b211405..3451c82297ce 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -34,6 +34,11 @@ in "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") + (mkRemovedOptionModule [ + "hardware" + "amdgpu" + "amdvlk" + ] "'amdvlk' has been removed. The replacement driver RADV, part of Mesa, is enabled by default.") (mkRemovedOptionModule [ "hardware" "brightnessctl" ] '' The brightnessctl module was removed because newer versions of brightnessctl don't require the udev rules anymore (they can use the @@ -58,6 +63,10 @@ in "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ + "programs" + "cardboard" + ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "gnome-documents" @@ -109,6 +118,10 @@ in "cgmanager" "enable" ] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.") + (mkRemovedOptionModule [ + "services" + "chatgpt-retrieval-plugin" + ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" @@ -211,6 +224,9 @@ in "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "morty" ] + "services.morty has been removed from NixOS. As the morty package was unmaintained and removed and searxng, its main consumer, dropped support for it." + ) (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index e1e8dae2a918..f634b9766961 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -40,7 +40,7 @@ in security.pki.certificateFiles = lib.mkOption { type = lib.types.listOf lib.types.path; default = [ ]; - example = lib.literalExpression ''[ "''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]''; + example = lib.literalExpression ''[ "''${pkgs.dn42-cacert}/etc/ssl/certs/dn42-ca.crt" ]''; description = '' A list of files containing trusted root certificates in PEM format. These are concatenated to form diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix index b5c8d5d291d5..a2df04e597d8 100644 --- a/nixos/modules/services/continuous-integration/github-runner/options.nix +++ b/nixos/modules/services/continuous-integration/github-runner/options.nix @@ -26,7 +26,7 @@ default = { }; type = lib.types.attrsOf ( lib.types.submodule ( - { name, ... }: + { name, config, ... }: { options = { enable = lib.mkOption { @@ -186,7 +186,11 @@ default = { }; }; - package = lib.mkPackageOption pkgs "github-runner" { }; + package = lib.mkPackageOption pkgs "github-runner" { } // { + apply = + # Support old github-runner versions which don't have the `nodeRuntimes` arg yet. + pkg: pkg.override (old: lib.optionalAttrs (old ? nodeRuntimes) { inherit (config) nodeRuntimes; }); + }; ephemeral = lib.mkOption { type = lib.types.bool; diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix index d40b51da0eef..aaf8083dc5b9 100644 --- a/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -41,10 +41,6 @@ currentConfigTokenFilename = ".current-token"; workDir = if cfg.workDir == null then runtimeDir else cfg.workDir; - # Support old github-runner versions which don't have the `nodeRuntimes` arg yet. - package = cfg.package.override ( - old: lib.optionalAttrs (lib.hasAttr "nodeRuntimes" old) { inherit (cfg) nodeRuntimes; } - ); in lib.nameValuePair svcName { description = "GitHub Actions runner"; @@ -77,7 +73,7 @@ serviceConfig = lib.mkMerge [ { - ExecStart = "${package}/bin/Runner.Listener run --startuptype service"; + ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service"; # Does the following, sequentially: # - If the module configuration or the token has changed, purge the state directory, @@ -196,7 +192,7 @@ else args+=(--token "$token") fi - ${package}/bin/Runner.Listener configure "''${args[@]}" + ${cfg.package}/bin/Runner.Listener configure "''${args[@]}" # Move the automatically created _diag dir to the logs dir mkdir -p "$STATE_DIRECTORY/_diag" cp -r "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/" diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 28fac48844fa..3d65823c73d8 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -691,7 +691,7 @@ in serviceConfig = lib.mkMerge [ { Type = if hasNotify then "notify" else "simple"; - Restart = "on-abort"; + Restart = "on-abnormal"; RestartSec = "5s"; # User and group diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index eae24f71eacc..342e1d7e3d5a 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -72,6 +72,8 @@ in environment.pathsToLink = [ "/share/backgrounds" "/share/cosmic" + "/share/cosmic-layouts" + "/share/cosmic-themes" ]; environment.systemPackages = utils.removePackagesByName ( corePkgs diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix index 2384cda86c50..5b24304b4993 100644 --- a/nixos/modules/services/desktop-managers/pantheon.nix +++ b/nixos/modules/services/desktop-managers/pantheon.nix @@ -321,6 +321,7 @@ in elementary-code elementary-files elementary-mail + elementary-maps elementary-music elementary-photos elementary-screenshot diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index dca78ef6d301..488b817946d4 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -369,6 +369,9 @@ in systemd.user.services.pipewire.environment.LV2_PATH = mkIf ( !cfg.systemWide ) "${lv2Plugins}/lib/lv2"; + systemd.user.services.filter-chain.environment.LV2_PATH = mkIf ( + !cfg.systemWide + ) "${lv2Plugins}/lib/lv2"; # Mask pw-pulse if it's not wanted systemd.services.pipewire-pulse.enable = cfg.pulse.enable && cfg.systemWide; diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index d5ba80d009b7..af7600ec5f66 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -257,6 +257,7 @@ in theme = mkOption { type = types.str; default = ""; + example = lib.literalExpression "\"\${pkgs.where-is-my-sddm-theme.override { variants = [ \"qt5\" ]; }}/share/sddm/themes/where_is_my_sddm_theme_qt5\""; description = '' Greeter theme to use. ''; diff --git a/nixos/modules/services/hardware/amdgpu.nix b/nixos/modules/services/hardware/amdgpu.nix index 4aff9cdd077d..0958ef58b4b0 100644 --- a/nixos/modules/services/hardware/amdgpu.nix +++ b/nixos/modules/services/hardware/amdgpu.nix @@ -40,7 +40,6 @@ in }; opencl.enable = lib.mkEnableOption ''OpenCL support using ROCM runtime library''; - # cfg.amdvlk option is defined in ./amdvlk.nix module }; config = { diff --git a/nixos/modules/services/hardware/amdvlk.nix b/nixos/modules/services/hardware/amdvlk.nix deleted file mode 100644 index ba0349a069bc..000000000000 --- a/nixos/modules/services/hardware/amdvlk.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.hardware.amdgpu.amdvlk; -in -{ - options.hardware.amdgpu.amdvlk = { - enable = lib.mkEnableOption "AMDVLK Vulkan driver"; - - package = lib.mkPackageOption pkgs "amdvlk" { }; - - supportExperimental.enable = lib.mkEnableOption "Experimental features support"; - - support32Bit.enable = lib.mkEnableOption "32-bit driver support"; - support32Bit.package = lib.mkPackageOption pkgs [ "driversi686Linux" "amdvlk" ] { }; - - settings = lib.mkOption { - type = with lib.types; attrsOf (either str int); - default = { }; - example = { - AllowVkPipelineCachingToDisk = 1; - ShaderCacheMode = 1; - IFH = 0; - EnableVmAlwaysValid = 1; - IdleAfterSubmitGpuMask = 1; - }; - description = '' - Runtime settings for AMDVLK to be configured {file}`/etc/amd/amdVulkanSettings.cfg`. - See [AMDVLK GitHub page](https://github.com/GPUOpen-Drivers/AMDVLK?tab=readme-ov-file#runtime-settings). - ''; - }; - }; - - config = lib.mkIf cfg.enable { - hardware.graphics = { - enable = true; - extraPackages = [ cfg.package ]; - } - // lib.optionalAttrs cfg.support32Bit.enable { - enable32Bit = true; - extraPackages32 = [ cfg.support32Bit.package ]; - }; - - environment.sessionVariables = lib.mkIf cfg.supportExperimental.enable { - AMDVLK_ENABLE_DEVELOPING_EXT = "all"; - }; - - environment.etc = lib.mkIf (cfg.settings != { }) { - "amd/amdVulkanSettings.cfg".text = lib.concatStrings ( - lib.mapAttrsToList (n: v: '' - ${n},${builtins.toString v} - '') cfg.settings - ); - }; - }; - - meta = { - maintainers = with lib.maintainers; [ johnrtitor ]; - }; -} diff --git a/nixos/modules/services/hardware/hddfancontrol.nix b/nixos/modules/services/hardware/hddfancontrol.nix index 999fb3cc5317..567d6295ed1c 100644 --- a/nixos/modules/services/hardware/hddfancontrol.nix +++ b/nixos/modules/services/hardware/hddfancontrol.nix @@ -42,6 +42,7 @@ in options = { services.hddfancontrol.enable = lib.mkEnableOption "hddfancontrol daemon"; + services.hddfancontrol.package = lib.mkPackageOption pkgs "hddfancontrol" { }; services.hddfancontrol.settings = lib.mkOption { type = lib.types.attrsWith { @@ -164,7 +165,7 @@ in let argString = lib.strings.concatStringsSep " " (args cnf); in - "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${argString}"; + "${lib.getExe cfg.package} -v ${cnf.logVerbosity} daemon ${argString}"; serviceConfig = { CPUSchedulingPolicy = "rr"; CPUSchedulingPriority = 49; @@ -189,7 +190,7 @@ in ]; in { - systemd.packages = [ pkgs.hddfancontrol ]; + systemd.packages = [ cfg.package ]; hardware.sensor.hddtemp = { enable = true; diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix index 6cc7c4ef1904..7c0ea64f29cf 100644 --- a/nixos/modules/services/hardware/lirc.nix +++ b/nixos/modules/services/hardware/lirc.nix @@ -42,7 +42,7 @@ in config = lib.mkIf cfg.enable { - # Note: LIRC executables raises a warning, if lirc_options.conf do not exists + # Note: LIRC executables raises a warning, if lirc_options.conf does not exist environment.etc."lirc/lirc_options.conf".text = cfg.options; passthru.lirc.socket = "/run/lirc/lircd"; diff --git a/nixos/modules/services/home-automation/wyoming/piper.nix b/nixos/modules/services/home-automation/wyoming/piper.nix index 39add1192c05..e21b4f881e7f 100644 --- a/nixos/modules/services/home-automation/wyoming/piper.nix +++ b/nixos/modules/services/home-automation/wyoming/piper.nix @@ -190,7 +190,7 @@ in ProtectKernelTunables = true; ProtectControlGroups = true; ProtectProc = "invisible"; - ProcSubset = "pid"; + ProcSubset = "all"; # for onnxruntime, which queries cpuinfo RestrictAddressFamilies = [ "AF_INET" "AF_INET6" diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 2c93754b781b..9715c8645dc3 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -1250,7 +1250,7 @@ in [ "services" "postfix" "settings" "main" "mynetworks" ] ) (lib.mkRenamedOptionModule - [ "services" "postfix" "networkStyle" ] + [ "services" "postfix" "networksStyle" ] [ "services" "postfix" "settings" "main" "mynetworks_style" ] ) (lib.mkRenamedOptionModule diff --git a/nixos/modules/services/misc/gitlab.md b/nixos/modules/services/misc/gitlab.md index de1e256bfef3..60c0e9310acd 100644 --- a/nixos/modules/services/misc/gitlab.md +++ b/nixos/modules/services/misc/gitlab.md @@ -21,7 +21,10 @@ frontend proxy: virtualHosts."git.example.com" = { enableACME = true; forceSSL = true; - locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + locations."/" = { + proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + proxyWebsockets = true; + }; }; }; } diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix index 284b2972d300..11374f9c014d 100644 --- a/nixos/modules/services/misc/sssd.nix +++ b/nixos/modules/services/misc/sssd.nix @@ -21,7 +21,6 @@ in description = "Contents of {file}`sssd.conf`."; default = '' [sssd] - config_file_version = 2 services = nss, pam domains = shadowutils diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index 5d7b7c30f04c..8b7977c2ae4d 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -16,7 +16,7 @@ let { "--servers" = lib.concatStringsSep "," fe.servers; "--domain" = fe.domain; - "--listen" = fe.listenAddress; + "--listen" = stringOrConcat "," fe.listenAddresses; "--proxy-port" = fe.proxyPort; "--whois" = fe.whois; "--dns-interface" = fe.dnsInterface; @@ -37,7 +37,7 @@ let { "--allowed" = lib.concatStringsSep "," px.allowedIPs; "--bird" = px.birdSocket; - "--listen" = px.listenAddress; + "--listen" = stringOrConcat "," px.listenAddresses; "--traceroute_bin" = px.traceroute.binary; "--traceroute_flags" = lib.concatStringsSep " " px.traceroute.flags; "--traceroute_raw" = px.traceroute.rawOutput; @@ -58,6 +58,17 @@ let args: lib.mapAttrsToList (name: value: "${name} " + mkArgValue value) (filterNull args); in { + imports = [ + (lib.mkRenamedOptionModule + [ "services" "bird-lg" "frontend" "listenAddress" ] + [ "services" "bird-lg" "frontend" "listenAddresses" ] + ) + (lib.mkRenamedOptionModule + [ "services" "bird-lg" "proxy" "listenAddress" ] + [ "services" "bird-lg" "proxy" "listenAddresses" ] + ) + ]; + options = { services.bird-lg = { package = lib.mkPackageOption pkgs "bird-lg" { }; @@ -77,8 +88,8 @@ in frontend = { enable = lib.mkEnableOption "Bird Looking Glass Frontend Webserver"; - listenAddress = lib.mkOption { - type = lib.types.str; + listenAddresses = lib.mkOption { + type = with lib.types; either str (listOf str); default = "127.0.0.1:5000"; description = "Address to listen on."; }; @@ -202,8 +213,8 @@ in proxy = { enable = lib.mkEnableOption "Bird Looking Glass Proxy"; - listenAddress = lib.mkOption { - type = lib.types.str; + listenAddresses = lib.mkOption { + type = with lib.types; either str (listOf str); default = "127.0.0.1:8000"; description = "Address to listen on."; }; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index fed65ee8ec16..54e488db9856 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -268,8 +268,8 @@ in message = "You cannot use both services.ddclient.passwordFile and services.ddclient.secretsFile at the same time."; } { - assertion = !(cfg.protocol == "nsupdate") || (cfg.passwordFile == null && cfg.secretsFile == null); - message = "You cannot use services.ddclient.passwordFile and or services.ddclient.secretsFile when services.ddclient.protocol is \"nsupdate\"."; + assertion = (cfg.protocol != "nsupdate") || (cfg.secretsFile == null); + message = "You cannot use services.ddclient.secretsFile when services.ddclient.protocol is \"nsupdate\". Use services.ddclient.passwordFile instead."; } ]; diff --git a/nixos/modules/services/networking/firezone/server.nix b/nixos/modules/services/networking/firezone/server.nix index 3206d1d30e76..b83b8b5da94c 100644 --- a/nixos/modules/services/networking/firezone/server.nix +++ b/nixos/modules/services/networking/firezone/server.nix @@ -143,7 +143,7 @@ let }; commonServiceConfig = { - AmbientCapablities = [ ]; + AmbientCapabilities = [ ]; CapabilityBoundingSet = [ ]; LockPersonality = true; MemoryDenyWriteExecute = true; diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix deleted file mode 100644 index 99aab2f263f1..000000000000 --- a/nixos/modules/services/networking/morty.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - - cfg = config.services.morty; - -in - -{ - - ###### interface - - options = { - - services.morty = { - - enable = mkEnableOption "Morty proxy server. See "; - - ipv6 = mkOption { - type = types.bool; - default = true; - description = "Allow IPv6 HTTP requests?"; - }; - - key = mkOption { - type = types.str; - default = ""; - description = '' - HMAC url validation key (hexadecimal encoded). - Leave blank to disable. Without validation key, anyone can - submit proxy requests. Leave blank to disable. - Generate with `printf %s somevalue | openssl dgst -sha1 -hmac somekey` - ''; - }; - - timeout = mkOption { - type = types.int; - default = 2; - description = "Request timeout in seconds."; - }; - - package = mkPackageOption pkgs "morty" { }; - - port = mkOption { - type = types.port; - default = 3000; - description = "Listing port"; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "The address on which the service listens"; - }; - - }; - - }; - - ###### Service definition - - config = mkIf config.services.morty.enable { - - users.users.morty = { - description = "Morty user"; - createHome = true; - home = "/var/lib/morty"; - isSystemUser = true; - group = "morty"; - }; - users.groups.morty = { }; - - systemd.services.morty = { - description = "Morty sanitizing proxy server."; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "morty"; - ExecStart = '' - ${cfg.package}/bin/morty \ - -listen ${cfg.listenAddress}:${toString cfg.port} \ - ${optionalString cfg.ipv6 "-ipv6"} \ - ${optionalString (cfg.key != "") "-key " + cfg.key} \ - ''; - }; - }; - environment.systemPackages = [ cfg.package ]; - - }; -} diff --git a/nixos/modules/services/networking/pangolin.nix b/nixos/modules/services/networking/pangolin.nix index d612f6953904..9b5bdb9d3690 100644 --- a/nixos/modules/services/networking/pangolin.nix +++ b/nixos/modules/services/networking/pangolin.nix @@ -515,34 +515,38 @@ in tls.certResolver = "letsencrypt"; }; # Integration API router - int-api-router-redirect = lib.mkIf (finalSettings.flags.enable_integration_api) { + int-api-router-redirect = { rule = "Host(`api.${cfg.baseDomain}`)"; service = "int-api-service"; entryPoints = [ "web" ]; middlewares = [ "redirect-to-https" ]; }; - int-api-router = lib.mkIf (finalSettings.flags.enable_integration_api) { + int-api-router = { rule = "Host(`api.${cfg.baseDomain}`)"; service = "int-api-service"; entryPoints = [ "websecure" ]; tls.certResolver = "letsencrypt"; }; }; - # could be map - services = { - # Next.js server - next-service.loadBalancer.servers = [ - { url = "http://localhost:${toString finalSettings.server.next_port}"; } - ]; - # API/WebSocket server - api-service.loadBalancer.servers = [ - { url = "http://localhost:${toString finalSettings.server.external_port}"; } - ]; - # Integration API server - int-api-service.loadBalancer.servers = lib.mkIf (finalSettings.flags.enable_integration_api) [ - { url = "http://localhost:${toString finalSettings.server.integration_port}"; } - ]; - }; + # needs to be a mkMerge otherwise will give error about standalone element + services = lib.mkMerge [ + { + # Next.js server + next-service.loadBalancer.servers = [ + { url = "http://localhost:${toString finalSettings.server.next_port}"; } + ]; + # API/WebSocket server + api-service.loadBalancer.servers = [ + { url = "http://localhost:${toString finalSettings.server.external_port}"; } + ]; + } + (lib.mkIf (finalSettings.flags.enable_integration_api) { + # Integration API server + int-api-service.loadBalancer.servers = [ + { url = "http://localhost:${toString finalSettings.server.integration_port}"; } + ]; + }) + ]; }; }; }; diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 8a32cf302fa1..fb5370a297b2 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -223,6 +223,9 @@ in ); serviceConfig = { + Type = "simple"; + DynamicUser = true; + Restart = "always"; LoadCredential = lib.mkMerge ( [ (lib.mkIf (cfg.masterKeyFile != null) [ "master_key:${cfg.masterKeyFile}" ]) @@ -232,11 +235,15 @@ in ) secrets-with-path ); ExecStart = "${lib.getExe cfg.package} --config-file-path \${RUNTIME_DIRECTORY}/config.toml"; - DynamicUser = true; StateDirectory = "meilisearch"; WorkingDirectory = "%S/meilisearch"; RuntimeDirectory = "meilisearch"; RuntimeDirectoryMode = "0700"; + ReadWritePaths = [ + cfg.settings.db_path + cfg.settings.dump_dir + cfg.settings.snapshot_dir + ]; ProtectSystem = "strict"; ProtectHome = true; @@ -255,6 +262,7 @@ in RestrictSUIDSGID = true; LockPersonality = true; MemoryDenyWriteExecute = true; + RemoveIPC = true; # Meilisearch needs to determine cgroup memory limits to set its own memory limits. # This means this can't be set to "pid" diff --git a/nixos/modules/services/web-apps/chatgpt-retrieval-plugin.nix b/nixos/modules/services/web-apps/chatgpt-retrieval-plugin.nix deleted file mode 100644 index dba076436df7..000000000000 --- a/nixos/modules/services/web-apps/chatgpt-retrieval-plugin.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: - -with lib; - -let - cfg = config.services.chatgpt-retrieval-plugin; -in -{ - options.services.chatgpt-retrieval-plugin = { - enable = mkEnableOption "chatgpt-retrieval-plugin service"; - - port = mkOption { - type = types.port; - default = 8080; - description = "Port the chatgpt-retrieval-plugin service listens on."; - }; - - host = mkOption { - type = types.str; - default = "127.0.0.1"; - example = "0.0.0.0"; - description = "The hostname or IP address for chatgpt-retrieval-plugin to bind to."; - }; - - bearerTokenPath = mkOption { - type = types.path; - description = '' - Path to the secret bearer token used for the http api authentication. - ''; - default = ""; - example = "config.age.secrets.CHATGPT_RETRIEVAL_PLUGIN_BEARER_TOKEN.path"; - }; - - openaiApiKeyPath = mkOption { - type = types.path; - description = '' - Path to the secret openai api key used for embeddings. - ''; - default = ""; - example = "config.age.secrets.CHATGPT_RETRIEVAL_PLUGIN_OPENAI_API_KEY.path"; - }; - - datastore = mkOption { - type = types.enum [ - "pinecone" - "weaviate" - "zilliz" - "milvus" - "qdrant" - "redis" - ]; - default = "qdrant"; - description = "This specifies the vector database provider you want to use to store and query embeddings."; - }; - - qdrantCollection = mkOption { - type = types.str; - description = '' - name of the qdrant collection used to store documents. - ''; - default = "document_chunks"; - }; - }; - - config = mkIf cfg.enable { - - assertions = [ - { - assertion = cfg.bearerTokenPath != ""; - message = "services.chatgpt-retrieval-plugin.bearerTokenPath should not be an empty string."; - } - { - assertion = cfg.openaiApiKeyPath != ""; - message = "services.chatgpt-retrieval-plugin.openaiApiKeyPath should not be an empty string."; - } - ]; - - systemd.services.chatgpt-retrieval-plugin = { - description = "ChatGPT Retrieval Plugin"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - DynamicUser = true; - Restart = "always"; - LoadCredential = [ - "BEARER_TOKEN:${cfg.bearerTokenPath}" - "OPENAI_API_KEY:${cfg.openaiApiKeyPath}" - ]; - StateDirectory = "chatgpt-retrieval-plugin"; - StateDirectoryMode = "0755"; - }; - - # it doesn't make sense to pass secrets as env vars, this is a hack until - # upstream has proper secret management. - script = '' - export BEARER_TOKEN=$(${pkgs.systemd}/bin/systemd-creds cat BEARER_TOKEN) - export OPENAI_API_KEY=$(${pkgs.systemd}/bin/systemd-creds cat OPENAI_API_KEY) - exec ${pkgs.chatgpt-retrieval-plugin}/bin/start --host ${cfg.host} --port ${toString cfg.port} - ''; - - environment = { - DATASTORE = cfg.datastore; - QDRANT_COLLECTION = mkIf (cfg.datastore == "qdrant") cfg.qdrantCollection; - }; - }; - - systemd.tmpfiles.rules = [ - # create the directory for static files for fastapi - "C /var/lib/chatgpt-retrieval-plugin/.well-known - - - - ${pkgs.chatgpt-retrieval-plugin}/${pkgs.python3Packages.python.sitePackages}/.well-known" - ]; - }; -} diff --git a/nixos/modules/services/web-apps/gerrit.nix b/nixos/modules/services/web-apps/gerrit.nix index f171ea8688ec..82bce5ae545d 100644 --- a/nixos/modules/services/web-apps/gerrit.nix +++ b/nixos/modules/services/web-apps/gerrit.nix @@ -5,20 +5,18 @@ ... }: -with lib; let cfg = config.services.gerrit; # NixOS option type for git-like configs gitIniType = - with types; let - primitiveType = either str (either bool int); - multipleType = either primitiveType (listOf primitiveType); - sectionType = lazyAttrsOf multipleType; - supersectionType = lazyAttrsOf (either multipleType sectionType); + primitiveType = lib.types.either lib.types.str (lib.types.either lib.types.bool lib.types.int); + multipleType = lib.types.either primitiveType (lib.types.listOf primitiveType); + sectionType = lib.types.lazyAttrsOf multipleType; + supersectionType = lib.types.lazyAttrsOf (lib.types.either multipleType sectionType); in - lazyAttrsOf supersectionType; + lib.types.lazyAttrsOf supersectionType; gerritConfig = pkgs.writeText "gerrit.conf" (lib.generators.toGitINI cfg.settings); @@ -64,14 +62,14 @@ in { options = { services.gerrit = { - enable = mkEnableOption "Gerrit service"; + enable = lib.mkEnableOption "Gerrit service"; - package = mkPackageOption pkgs "gerrit" { }; + package = lib.mkPackageOption pkgs "gerrit" { }; - jvmPackage = mkPackageOption pkgs "jdk21_headless" { }; + jvmPackage = lib.mkPackageOption pkgs "jdk21_headless" { }; - jvmOpts = mkOption { - type = types.listOf types.str; + jvmOpts = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance" "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance" @@ -79,16 +77,16 @@ in description = "A list of JVM options to start gerrit with."; }; - jvmHeapLimit = mkOption { - type = types.str; + jvmHeapLimit = lib.mkOption { + type = lib.types.str; default = "1024m"; description = '' How much memory to allocate to the JVM heap ''; }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "[::]:8080"; description = '' `hostname:port` to listen for HTTP traffic. @@ -97,7 +95,7 @@ in ''; }; - settings = mkOption { + settings = lib.mkOption { type = gitIniType; default = { }; description = '' @@ -106,7 +104,7 @@ in ''; }; - replicationSettings = mkOption { + replicationSettings = lib.mkOption { type = gitIniType; default = { }; description = '' @@ -115,8 +113,8 @@ in ''; }; - plugins = mkOption { - type = types.listOf types.package; + plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; default = [ ]; description = '' List of plugins to add to Gerrit. Each derivation is a jar file @@ -124,8 +122,8 @@ in ''; }; - builtinPlugins = mkOption { - type = types.listOf (types.enum cfg.package.passthru.plugins); + builtinPlugins = lib.mkOption { + type = lib.types.listOf (lib.types.enum cfg.package.passthru.plugins); default = [ ]; description = '' List of builtins plugins to install. Those are shipped in the @@ -133,8 +131,8 @@ in ''; }; - serverId = mkOption { - type = types.str; + serverId = lib.mkOption { + type = lib.types.str; description = '' Set a UUID that uniquely identifies the server. @@ -145,11 +143,11 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { - assertion = cfg.replicationSettings != { } -> elem "replication" cfg.builtinPlugins; + assertion = cfg.replicationSettings != { } -> lib.elem "replication" cfg.builtinPlugins; message = "Gerrit replicationSettings require enabling the replication plugin"; } ]; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 98d829c1a827..36640ea8a953 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -437,7 +437,6 @@ in type = lib.types.package; description = "Which package to use for the Nextcloud instance."; relatedPackages = [ - "nextcloud30" "nextcloud31" ]; }; @@ -549,7 +548,7 @@ in Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives. The above are recommended for a server with 4GiB of RAM. - It's advisable to read the [section about PHPFPM tuning in the upstream manual](https://docs.nextcloud.com/server/30/admin_manual/installation/server_tuning.html#tune-php-fpm) + It's advisable to read the [section about PHPFPM tuning in the upstream manual](https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#tune-php-fpm) and consider customizing the values. ''; }; diff --git a/nixos/modules/services/web-apps/sharkey.nix b/nixos/modules/services/web-apps/sharkey.nix index 6cbc43f27aa8..61dc97d56dc8 100644 --- a/nixos/modules/services/web-apps/sharkey.nix +++ b/nixos/modules/services/web-apps/sharkey.nix @@ -297,7 +297,6 @@ in ]); meta.maintainers = with lib.maintainers; [ - srxl tmarkus ]; } diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 6ac728bfaeba..bbd9b40ad8e5 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -178,8 +178,20 @@ let in { - options.boot.bcachefs.package = lib.mkPackageOption pkgs "bcachefs-tools" { } // { - description = "Configured Bcachefs userspace package."; + options.boot.bcachefs = { + package = lib.mkPackageOption pkgs "bcachefs-tools" { + extraDescription = '' + This package should also provide a passthru 'kernelModule' + attribute to build the out-of-tree kernel module. + ''; + }; + + modulePackage = lib.mkOption { + type = lib.types.package; + # See NOTE in linux-kernels.nix + default = config.boot.kernelPackages.callPackage cfg.package.kernelModule { }; + internal = true; + }; }; options.services.bcachefs.autoScrub = { @@ -230,7 +242,7 @@ in } ]; - warnings = lib.mkIf config.boot.kernelPackages.bcachefs.meta.broken [ + warnings = lib.mkIf cfg.modulePackage.meta.broken [ '' Using unmaintained in-tree bcachefs kernel module. This will be removed in 26.05. Please use a kernel supported @@ -245,8 +257,8 @@ in system.fsPackages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; - boot.extraModulePackages = lib.optionals (!config.boot.kernelPackages.bcachefs.meta.broken) [ - config.boot.kernelPackages.bcachefs + boot.extraModulePackages = lib.optionals (!cfg.modulePackage.meta.broken) [ + cfg.modulePackage ]; systemd = { diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a35b9101c3d4..6893d39382ea 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -129,7 +129,7 @@ let NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE" if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then - echo "Disk image do not exist, creating the virtualisation disk image..." + echo "Disk image does not exist, creating the virtualisation disk image..." ${ if (cfg.useBootLoader && cfg.useDefaultFilesystems) then diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f1aca99da1a9..0216ea9d9bd5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -935,7 +935,6 @@ in moosefs = runTest ./moosefs.nix; mopidy = runTest ./mopidy.nix; morph-browser = runTest ./morph-browser.nix; - morty = runTest ./morty.nix; mosquitto = runTest ./mosquitto.nix; movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; }; mpd = runTest ./mpd.nix; @@ -1418,7 +1417,7 @@ in systemd = runTest ./systemd.nix; systemd-analyze = runTest ./systemd-analyze.nix; systemd-binfmt = handleTestOn [ "x86_64-linux" ] ./systemd-binfmt.nix { }; - systemd-boot = handleTest ./systemd-boot.nix { }; + systemd-boot = import ./systemd-boot.nix { inherit runTest runTestOn; }; systemd-bpf = runTest ./systemd-bpf.nix; systemd-capsules = runTest ./systemd-capsules.nix; systemd-confinement = handleTest ./systemd-confinement { }; diff --git a/nixos/tests/bird.nix b/nixos/tests/bird.nix index e036983c6b54..1f5037cc60e1 100644 --- a/nixos/tests/bird.nix +++ b/nixos/tests/bird.nix @@ -124,7 +124,7 @@ in host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'") host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'") - with subtest("Check fake routes in preCheckConfig do not exists"): + with subtest("Check fake routes in preCheckConfig do not exist"): host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") diff --git a/nixos/tests/clickhouse/kafka.nix b/nixos/tests/clickhouse/kafka.nix index 65dbd98be96f..71f0df3c0530 100644 --- a/nixos/tests/clickhouse/kafka.nix +++ b/nixos/tests/clickhouse/kafka.nix @@ -99,6 +99,8 @@ in }; systemd.services.apache-kafka.serviceConfig.StateDirectory = "apache-kafka"; + + virtualisation.memorySize = 1024 * 2; }; }; diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index 2ac1795cca06..d83a2b69326a 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -79,7 +79,7 @@ with subtest( "files created in the hosts container dir in a path where a tmpfs " + "file system has been mounted are not visible to the container as " - + "the do not exist in the tmpfs" + + "they do not exist in the tmpfs" ): machine.succeed( "touch /var/lib/nixos-containers/tmpfs/var/test.file", diff --git a/nixos/tests/k3s/etcd.nix b/nixos/tests/k3s/etcd.nix index c858dd4e0283..a44de1f6233f 100644 --- a/nixos/tests/k3s/etcd.nix +++ b/nixos/tests/k3s/etcd.nix @@ -50,6 +50,7 @@ import ../make-test-python.nix ( services.k3s = { enable = true; role = "server"; + package = k3s; extraFlags = [ "--datastore-endpoint=\"http://192.168.1.1:2379\"" "--disable coredns" diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix deleted file mode 100644 index b8e490fbbcb5..000000000000 --- a/nixos/tests/morty.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs, ... }: - -{ - name = "morty"; - meta = with pkgs.lib.maintainers; { - maintainers = [ leenaars ]; - }; - - nodes = { - mortyProxyWithKey = - - { ... }: - { - services.morty = { - enable = true; - key = "78a9cd0cfee20c672f78427efb2a2a96036027f0"; - port = 3001; - }; - }; - - }; - - testScript = - { ... }: - '' - mortyProxyWithKey.wait_for_unit("default.target") - mortyProxyWithKey.wait_for_open_port(3001) - mortyProxyWithKey.succeed("curl -fL 127.0.0.1:3001 | grep MortyProxy") - ''; - -} diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index dc0bd933f21d..31e889b58600 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -139,7 +139,6 @@ let in listToAttrs ( concatMap genTests [ - 30 31 ] ) diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix index 397a3b5a7b8f..0c7c93359dae 100644 --- a/nixos/tests/radicle.nix +++ b/nixos/tests/radicle.nix @@ -203,7 +203,7 @@ in with subtest("alice can receive the patch"): alice.wait_until_succeeds("test 1 = \"$(rad stats | jq .local.patches)\"") alice.succeed( - f"cd /tmp/repo && rad patch show {bob_repo_patch1_pid} | grep 'opened by bob'", + f"cd /tmp/repo && rad patch show {bob_repo_patch1_pid} | grep -E '{bob_repo_patch1_pid[:7]} @ .+ by bob'", f"cd /tmp/repo && rad patch checkout {bob_repo_patch1_pid}" ) assert alice.succeed("cat /tmp/repo/testfile") == "hello alice\n" diff --git a/nixos/tests/renovate.nix b/nixos/tests/renovate.nix index 94974b00fd07..c02e5d9d3df0 100644 --- a/nixos/tests/renovate.nix +++ b/nixos/tests/renovate.nix @@ -12,7 +12,7 @@ services.renovate = { enable = true; settings = { - platform = "gitea"; + platform = "forgejo"; endpoint = "http://localhost:3000"; autodiscover = true; gitAuthor = "Renovate "; @@ -34,24 +34,24 @@ }; testScript = '' - def gitea(command): - return machine.succeed(f"cd /var/lib/forgejo && sudo --user=forgejo GITEA_WORK_DIR=/var/lib/forgejo GITEA_CUSTOM=/var/lib/forgejo/custom gitea {command}") + def forgejo(command): + return machine.succeed(f"cd /var/lib/forgejo && sudo --user=forgejo FORGEJO_WORK_DIR=/var/lib/forgejo FORGEJO_CUSTOM=/var/lib/forgejo/custom forgejo {command}") machine.wait_for_unit("forgejo.service") machine.wait_for_open_port(3000) machine.systemctl("stop forgejo.service") - gitea("admin user create --username meow --email meow@example.com --password meow") + forgejo("admin user create --username meow --email meow@example.com --password meow") machine.systemctl("start forgejo.service") machine.wait_for_unit("forgejo.service") machine.wait_for_open_port(3000) - accessToken = gitea("admin user generate-access-token --raw --username meow --scopes all | tr -d '\n'") + accessToken = forgejo("admin user generate-access-token --raw --username meow --scopes all | tr -d '\n'") machine.succeed(f"tea login add --name default --user meow --token '{accessToken}' --password meow --url http://localhost:3000") - machine.succeed("tea repo create --name kitty --init") + machine.succeed("tea repo create --login default --name kitty --init") machine.succeed("git config --global user.name Meow") machine.succeed("git config --global user.email meow@example.com") machine.succeed(f"git clone http://meow:{accessToken}@localhost:3000/meow/kitty.git /tmp/kitty") @@ -63,8 +63,8 @@ machine.succeed(f"echo '{accessToken}' > /etc/renovate-token") machine.systemctl("start --wait renovate.service") - machine.succeed("tea pulls list --repo meow/kitty | grep 'Configure Renovate'") - machine.succeed("tea pulls merge --repo meow/kitty 1") + machine.succeed("tea pulls list --login default --repo meow/kitty | grep 'Configure Renovate'") + machine.succeed("tea pulls merge --login default --repo meow/kitty 1") machine.systemctl("start --wait renovate.service") ''; diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 570cd6b93409..fe0bde317646 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -1,21 +1,20 @@ { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, + runTest, + runTestOn, + ... }: -with import ../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; - let - common = { - virtualisation.useBootLoader = true; - virtualisation.useEFIBoot = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - environment.systemPackages = [ pkgs.efibootmgr ]; - system.switch.enable = true; - }; + common = + { pkgs, ... }: + { + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + environment.systemPackages = [ pkgs.efibootmgr ]; + system.switch.enable = true; + }; commonXbootldr = { @@ -32,6 +31,9 @@ let partitionTableType = "efixbootldr"; touchEFIVars = true; installBootLoader = true; + # Don't copy the channel to avoid rebuilding this image, and all tests + # that use it, every time that nixpkgs changes + copyChannel = false; }; in { @@ -90,80 +92,23 @@ let ''; in { - basic = makeTest { - name = "systemd-boot"; - meta.maintainers = with pkgs.lib.maintainers; [ - danielfullmer - julienmalka - ]; + basic = runTest ( + { lib, ... }: + { + name = "systemd-boot"; + meta.maintainers = with lib.maintainers; [ + danielfullmer + julienmalka + ]; - nodes.machine = common; - - testScript = '' - machine.start() - machine.wait_for_unit("multi-user.target") - - machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") - machine.succeed("grep 'sort-key nixos' /boot/loader/entries/nixos-generation-1.conf") - - # Ensure we actually booted using systemd-boot - # Magic number is the vendor UUID used by systemd-boot. - machine.succeed( - "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" - ) - - # "bootctl install" should have created an EFI entry - machine.succeed('efibootmgr | grep "Linux Boot Manager"') - ''; - }; - - # Test that systemd-boot works with secure boot - secureBoot = makeTest { - name = "systemd-boot-secure-boot"; - - nodes.machine = { - imports = [ common ]; - environment.systemPackages = [ pkgs.sbctl ]; - virtualisation.useSecureBoot = true; - }; - - testScript = - let - efiArch = pkgs.stdenv.hostPlatform.efiArch; - in - { nodes, ... }: - '' - machine.start(allow_reboot=True) - machine.wait_for_unit("multi-user.target") - - machine.succeed("sbctl create-keys") - machine.succeed("sbctl enroll-keys --yes-this-might-brick-my-machine") - machine.succeed('sbctl sign /boot/EFI/systemd/systemd-boot${efiArch}.efi') - machine.succeed('sbctl sign /boot/EFI/BOOT/BOOT${toUpper efiArch}.EFI') - machine.succeed('sbctl sign /boot/EFI/nixos/*${nodes.machine.system.boot.loader.kernelFile}.efi') - - machine.reboot() - - assert "Secure Boot: enabled (user)" in machine.succeed("bootctl status") - ''; - }; - - basicXbootldr = makeTest { - name = "systemd-boot-xbootldr"; - meta.maintainers = with pkgs.lib.maintainers; [ sdht0 ]; - - nodes.machine = commonXbootldr; - - testScript = - { nodes, ... }: - '' - ${customDiskImage nodes} + nodes.machine = common; + testScript = '' machine.start() machine.wait_for_unit("multi-user.target") - machine.succeed("test -e /efi/EFI/systemd/systemd-bootx64.efi") machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + machine.succeed("grep 'sort-key nixos' /boot/loader/entries/nixos-generation-1.conf") # Ensure we actually booted using systemd-boot # Magic number is the vendor UUID used by systemd-boot. @@ -174,140 +119,217 @@ in # "bootctl install" should have created an EFI entry machine.succeed('efibootmgr | grep "Linux Boot Manager"') ''; - }; + } + ); + + # Test that systemd-boot works with secure boot + secureBoot = runTest ( + { pkgs, lib, ... }: + { + name = "systemd-boot-secure-boot"; + + nodes.machine = + { pkgs, ... }: + { + imports = [ common ]; + environment.systemPackages = [ pkgs.sbctl ]; + virtualisation.useSecureBoot = true; + }; + + testScript = + { nodes, ... }: + let + efiArch = pkgs.stdenv.hostPlatform.efiArch; + in + '' + machine.start(allow_reboot=True) + machine.wait_for_unit("multi-user.target") + + machine.succeed("sbctl create-keys") + machine.succeed("sbctl enroll-keys --yes-this-might-brick-my-machine") + machine.succeed('sbctl sign /boot/EFI/systemd/systemd-boot${efiArch}.efi') + machine.succeed('sbctl sign /boot/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI') + machine.succeed('sbctl sign /boot/EFI/nixos/*${nodes.machine.system.boot.loader.kernelFile}.efi') + + machine.reboot() + + assert "Secure Boot: enabled (user)" in machine.succeed("bootctl status") + ''; + } + ); + + basicXbootldr = runTest ( + { lib, ... }: + { + name = "systemd-boot-xbootldr"; + meta.maintainers = with lib.maintainers; [ sdht0 ]; + + nodes.machine = commonXbootldr; + + testScript = + { nodes, ... }: + '' + ${customDiskImage nodes} + + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /efi/EFI/systemd/systemd-bootx64.efi") + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + + # Ensure we actually booted using systemd-boot + # Magic number is the vendor UUID used by systemd-boot. + machine.succeed( + "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" + ) + + # "bootctl install" should have created an EFI entry + machine.succeed('efibootmgr | grep "Linux Boot Manager"') + ''; + } + ); # Check that specialisations create corresponding boot entries. - specialisation = makeTest { - name = "systemd-boot-specialisation"; - meta.maintainers = with pkgs.lib.maintainers; [ - lukegb - julienmalka - ]; + specialisation = runTest ( + { pkgs, lib, ... }: + { + name = "systemd-boot-specialisation"; + meta.maintainers = with lib.maintainers; [ + lukegb + julienmalka + ]; - nodes.machine = - { pkgs, lib, ... }: - { - imports = [ common ]; - specialisation.something.configuration = { - boot.loader.systemd-boot.sortKey = "something"; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + specialisation.something.configuration = { + boot.loader.systemd-boot.sortKey = "something"; - # Since qemu will dynamically create a devicetree blob when starting - # up, it is not straight forward to create an export of that devicetree - # blob without knowing before-hand all the flags we would pass to qemu - # (we would then be able to use `dumpdtb`). Thus, the following config - # will not boot, but it does allow us to assert that the boot entry has - # the correct contents. - boot.loader.systemd-boot.installDeviceTree = pkgs.stdenv.hostPlatform.isAarch64; - hardware.deviceTree.name = "dummy.dtb"; - hardware.deviceTree.package = lib.mkForce ( - pkgs.runCommand "dummy-devicetree-package" { } '' - mkdir -p $out - cp ${pkgs.emptyFile} $out/dummy.dtb - '' - ); + # Since qemu will dynamically create a devicetree blob when starting + # up, it is not straight forward to create an export of that devicetree + # blob without knowing before-hand all the flags we would pass to qemu + # (we would then be able to use `dumpdtb`). Thus, the following config + # will not boot, but it does allow us to assert that the boot entry has + # the correct contents. + boot.loader.systemd-boot.installDeviceTree = pkgs.stdenv.hostPlatform.isAarch64; + hardware.deviceTree.name = "dummy.dtb"; + hardware.deviceTree.package = lib.mkForce ( + pkgs.runCommand "dummy-devicetree-package" { } '' + mkdir -p $out + cp ${pkgs.emptyFile} $out/dummy.dtb + '' + ); + }; }; - }; - testScript = - { nodes, ... }: - '' + testScript = + { nodes, ... }: + '' + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed( + "test -e /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + ) + machine.succeed( + "grep -q 'title NixOS (something)' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + ) + machine.succeed( + "grep 'sort-key something' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + ) + '' + + pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isAarch64 '' + machine.succeed( + r"grep 'devicetree /EFI/nixos/[a-z0-9]\{32\}.*dummy' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + ) + ''; + } + ); + + # Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI" + fallback = runTest ( + { pkgs, lib, ... }: + { + name = "systemd-boot-fallback"; + meta.maintainers = with lib.maintainers; [ + danielfullmer + julienmalka + ]; + + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + boot.loader.efi.canTouchEfiVariables = lib.mkForce false; + }; + + testScript = '' machine.start() machine.wait_for_unit("multi-user.target") + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + + # Ensure we actually booted using systemd-boot + # Magic number is the vendor UUID used by systemd-boot. machine.succeed( - "test -e /boot/loader/entries/nixos-generation-1-specialisation-something.conf" - ) - machine.succeed( - "grep -q 'title NixOS (something)' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" - ) - machine.succeed( - "grep 'sort-key something' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" - ) - '' - + pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isAarch64 '' - machine.succeed( - r"grep 'devicetree /EFI/nixos/[a-z0-9]\{32\}.*dummy' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" ) + + # "bootctl install" should _not_ have created an EFI entry + machine.fail('efibootmgr | grep "Linux Boot Manager"') ''; - }; + } + ); - # Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI" - fallback = makeTest { - name = "systemd-boot-fallback"; - meta.maintainers = with pkgs.lib.maintainers; [ - danielfullmer - julienmalka - ]; + update = runTest ( + { lib, ... }: + { + name = "systemd-boot-update"; + meta.maintainers = with lib.maintainers; [ + danielfullmer + julienmalka + ]; - nodes.machine = - { pkgs, lib, ... }: - { - imports = [ common ]; - boot.loader.efi.canTouchEfiVariables = mkForce false; - }; + nodes.machine = common; - testScript = '' - machine.start() - machine.wait_for_unit("multi-user.target") + testScript = '' + machine.succeed("mount -o remount,rw /boot") - machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + def switch(): + # Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c + machine.succeed( + """ + find /boot -iname '*boot*.efi' -print0 | \ + xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 000.0-1-notnixos ####/' '{}' + """ + ) + return machine.succeed("/run/current-system/bin/switch-to-configuration boot 2>&1") - # Ensure we actually booted using systemd-boot - # Magic number is the vendor UUID used by systemd-boot. - machine.succeed( - "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" - ) + output = switch() + assert "updating systemd-boot from 000.0-1-notnixos to " in output, "Couldn't find systemd-boot update message" + assert 'to "/boot/EFI/systemd/systemd-bootx64.efi"' in output, "systemd-boot not copied to to /boot/EFI/systemd/systemd-bootx64.efi" + assert 'to "/boot/EFI/BOOT/BOOTX64.EFI"' in output, "systemd-boot not copied to to /boot/EFI/BOOT/BOOTX64.EFI" - # "bootctl install" should _not_ have created an EFI entry - machine.fail('efibootmgr | grep "Linux Boot Manager"') - ''; - }; + with subtest("Test that updating works with lowercase bootx64.efi"): + machine.succeed( + # Move to tmp file name first, otherwise mv complains the new location is the same + "mv /boot/EFI/BOOT/BOOTX64.EFI /boot/EFI/BOOT/bootx64.efi.new", + "mv /boot/EFI/BOOT/bootx64.efi.new /boot/EFI/BOOT/bootx64.efi", + ) + output = switch() + assert "updating systemd-boot from 000.0-1-notnixos to " in output, "Couldn't find systemd-boot update message" + assert 'to "/boot/EFI/systemd/systemd-bootx64.efi"' in output, "systemd-boot not copied to to /boot/EFI/systemd/systemd-bootx64.efi" + assert 'to "/boot/EFI/BOOT/BOOTX64.EFI"' in output, "systemd-boot not copied to to /boot/EFI/BOOT/BOOTX64.EFI" + ''; + } + ); - update = makeTest { - name = "systemd-boot-update"; - meta.maintainers = with pkgs.lib.maintainers; [ - danielfullmer - julienmalka - ]; - - nodes.machine = common; - - testScript = '' - machine.succeed("mount -o remount,rw /boot") - - def switch(): - # Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c - machine.succeed( - """ - find /boot -iname '*boot*.efi' -print0 | \ - xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 000.0-1-notnixos ####/' '{}' - """ - ) - return machine.succeed("/run/current-system/bin/switch-to-configuration boot 2>&1") - - output = switch() - assert "updating systemd-boot from 000.0-1-notnixos to " in output, "Couldn't find systemd-boot update message" - assert 'to "/boot/EFI/systemd/systemd-bootx64.efi"' in output, "systemd-boot not copied to to /boot/EFI/systemd/systemd-bootx64.efi" - assert 'to "/boot/EFI/BOOT/BOOTX64.EFI"' in output, "systemd-boot not copied to to /boot/EFI/BOOT/BOOTX64.EFI" - - with subtest("Test that updating works with lowercase bootx64.efi"): - machine.succeed( - # Move to tmp file name first, otherwise mv complains the new location is the same - "mv /boot/EFI/BOOT/BOOTX64.EFI /boot/EFI/BOOT/bootx64.efi.new", - "mv /boot/EFI/BOOT/bootx64.efi.new /boot/EFI/BOOT/bootx64.efi", - ) - output = switch() - assert "updating systemd-boot from 000.0-1-notnixos to " in output, "Couldn't find systemd-boot update message" - assert 'to "/boot/EFI/systemd/systemd-bootx64.efi"' in output, "systemd-boot not copied to to /boot/EFI/systemd/systemd-bootx64.efi" - assert 'to "/boot/EFI/BOOT/BOOTX64.EFI"' in output, "systemd-boot not copied to to /boot/EFI/BOOT/BOOTX64.EFI" - ''; - }; - - memtest86 = - with pkgs.lib; - optionalAttrs (meta.availableOn { inherit system; } pkgs.memtest86plus) (makeTest { + memtest86 = runTestOn [ "x86_64-linux" ] ( + { lib, ... }: + { name = "systemd-boot-memtest86"; - meta.maintainers = with maintainers; [ julienmalka ]; + meta.maintainers = with lib.maintainers; [ julienmalka ]; nodes.machine = { pkgs, lib, ... }: @@ -320,282 +342,313 @@ in machine.succeed("test -e /boot/loader/entries/memtest86.conf") machine.succeed("test -e /boot/efi/memtest86/memtest.efi") ''; - }); + } + ); - netbootxyz = makeTest { - name = "systemd-boot-netbootxyz"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + netbootxyz = runTest ( + { lib, ... }: + { + name = "systemd-boot-netbootxyz"; + meta.maintainers = with lib.maintainers; [ julienmalka ]; - nodes.machine = - { pkgs, lib, ... }: - { - imports = [ common ]; - boot.loader.systemd-boot.netbootxyz.enable = true; - }; - - testScript = '' - machine.succeed("test -e /boot/loader/entries/netbootxyz.conf") - machine.succeed("test -e /boot/efi/netbootxyz/netboot.xyz.efi") - ''; - }; - - edk2-uefi-shell = makeTest { - name = "systemd-boot-edk2-uefi-shell"; - meta.maintainers = with pkgs.lib.maintainers; [ iFreilicht ]; - - nodes.machine = - { ... }: - { - imports = [ common ]; - boot.loader.systemd-boot.edk2-uefi-shell.enable = true; - }; - - testScript = '' - machine.succeed("test -e /boot/loader/entries/edk2-uefi-shell.conf") - machine.succeed("test -e /boot/efi/edk2-uefi-shell/shell.efi") - ''; - }; - - windows = makeTest { - name = "systemd-boot-windows"; - meta.maintainers = with pkgs.lib.maintainers; [ iFreilicht ]; - - nodes.machine = - { ... }: - { - imports = [ common ]; - boot.loader.systemd-boot.windows = { - "7" = { - efiDeviceHandle = "HD0c1"; - sortKey = "before_all_others"; - }; - "Ten".efiDeviceHandle = "FS0"; - "11" = { - title = "Title with-_-punctuation ...?!"; - efiDeviceHandle = "HD0d4"; - sortKey = "zzz"; - }; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.netbootxyz.enable = true; }; - }; - testScript = '' - machine.succeed("test -e /boot/efi/edk2-uefi-shell/shell.efi") - - machine.succeed("test -e /boot/loader/entries/windows_7.conf") - machine.succeed("test -e /boot/loader/entries/windows_Ten.conf") - machine.succeed("test -e /boot/loader/entries/windows_11.conf") - - machine.succeed("grep 'efi /efi/edk2-uefi-shell/shell.efi' /boot/loader/entries/windows_7.conf") - machine.succeed("grep 'efi /efi/edk2-uefi-shell/shell.efi' /boot/loader/entries/windows_Ten.conf") - machine.succeed("grep 'efi /efi/edk2-uefi-shell/shell.efi' /boot/loader/entries/windows_11.conf") - - machine.succeed("grep 'HD0c1:EFI\\\\Microsoft\\\\Boot\\\\Bootmgfw.efi' /boot/loader/entries/windows_7.conf") - machine.succeed("grep 'FS0:EFI\\\\Microsoft\\\\Boot\\\\Bootmgfw.efi' /boot/loader/entries/windows_Ten.conf") - machine.succeed("grep 'HD0d4:EFI\\\\Microsoft\\\\Boot\\\\Bootmgfw.efi' /boot/loader/entries/windows_11.conf") - - machine.succeed("grep 'sort-key before_all_others' /boot/loader/entries/windows_7.conf") - machine.succeed("grep 'sort-key o_windows_Ten' /boot/loader/entries/windows_Ten.conf") - machine.succeed("grep 'sort-key zzz' /boot/loader/entries/windows_11.conf") - - machine.succeed("grep 'title Windows 7' /boot/loader/entries/windows_7.conf") - machine.succeed("grep 'title Windows Ten' /boot/loader/entries/windows_Ten.conf") - machine.succeed('grep "title Title with-_-punctuation ...?!" /boot/loader/entries/windows_11.conf') - ''; - }; - - memtestSortKey = makeTest { - name = "systemd-boot-memtest-sortkey"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; - - nodes.machine = - { pkgs, lib, ... }: - { - imports = [ common ]; - boot.loader.systemd-boot.memtest86.enable = true; - boot.loader.systemd-boot.memtest86.sortKey = "apple"; - }; - - testScript = '' - machine.succeed("test -e /boot/loader/entries/memtest86.conf") - machine.succeed("test -e /boot/efi/memtest86/memtest.efi") - machine.succeed("grep 'sort-key apple' /boot/loader/entries/memtest86.conf") - ''; - }; - - entryFilenameXbootldr = makeTest { - name = "systemd-boot-entry-filename-xbootldr"; - meta.maintainers = with pkgs.lib.maintainers; [ sdht0 ]; - - nodes.machine = - { pkgs, lib, ... }: - { - imports = [ commonXbootldr ]; - boot.loader.systemd-boot.memtest86.enable = true; - }; - - testScript = - { nodes, ... }: - '' - ${customDiskImage nodes} - - machine.start() - machine.wait_for_unit("multi-user.target") - - machine.succeed("test -e /efi/EFI/systemd/systemd-bootx64.efi") - machine.succeed("test -e /boot/loader/entries/memtest86.conf") - machine.succeed("test -e /boot/EFI/memtest86/memtest.efi") + testScript = '' + machine.succeed("test -e /boot/loader/entries/netbootxyz.conf") + machine.succeed("test -e /boot/efi/netbootxyz/netboot.xyz.efi") ''; - }; + } + ); - extraEntries = makeTest { - name = "systemd-boot-extra-entries"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + edk2-uefi-shell = runTest ( + { lib, ... }: + { + name = "systemd-boot-edk2-uefi-shell"; + meta.maintainers = with lib.maintainers; [ iFreilicht ]; - nodes.machine = - { pkgs, lib, ... }: - { - imports = [ common ]; - boot.loader.systemd-boot.extraEntries = { - "banana.conf" = '' - title banana - ''; + nodes.machine = + { ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.edk2-uefi-shell.enable = true; }; - }; - testScript = '' - machine.succeed("test -e /boot/loader/entries/banana.conf") - machine.succeed("test -e /boot/efi/nixos/.extra-files/loader/entries/banana.conf") - ''; - }; + testScript = '' + machine.succeed("test -e /boot/loader/entries/edk2-uefi-shell.conf") + machine.succeed("test -e /boot/efi/edk2-uefi-shell/shell.efi") + ''; + } + ); - extraFiles = makeTest { - name = "systemd-boot-extra-files"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + windows = runTest ( + { lib, ... }: + { + name = "systemd-boot-windows"; + meta.maintainers = with lib.maintainers; [ iFreilicht ]; - nodes.machine = - { pkgs, lib, ... }: - { - imports = [ common ]; - boot.loader.systemd-boot.extraFiles = { - "efi/fruits/tomato.efi" = pkgs.netbootxyz-efi; + nodes.machine = + { ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.windows = { + "7" = { + efiDeviceHandle = "HD0c1"; + sortKey = "before_all_others"; + }; + "Ten".efiDeviceHandle = "FS0"; + "11" = { + title = "Title with-_-punctuation ...?!"; + efiDeviceHandle = "HD0d4"; + sortKey = "zzz"; + }; + }; }; - }; - testScript = '' - machine.succeed("test -e /boot/efi/fruits/tomato.efi") - machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") - ''; - }; + testScript = '' + machine.succeed("test -e /boot/efi/edk2-uefi-shell/shell.efi") - switch-test = makeTest { - name = "systemd-boot-switch-test"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + machine.succeed("test -e /boot/loader/entries/windows_7.conf") + machine.succeed("test -e /boot/loader/entries/windows_Ten.conf") + machine.succeed("test -e /boot/loader/entries/windows_11.conf") - nodes = { - inherit common; + machine.succeed("grep 'efi /efi/edk2-uefi-shell/shell.efi' /boot/loader/entries/windows_7.conf") + machine.succeed("grep 'efi /efi/edk2-uefi-shell/shell.efi' /boot/loader/entries/windows_Ten.conf") + machine.succeed("grep 'efi /efi/edk2-uefi-shell/shell.efi' /boot/loader/entries/windows_11.conf") - machine = - { pkgs, nodes, ... }: + machine.succeed("grep 'HD0c1:EFI\\\\Microsoft\\\\Boot\\\\Bootmgfw.efi' /boot/loader/entries/windows_7.conf") + machine.succeed("grep 'FS0:EFI\\\\Microsoft\\\\Boot\\\\Bootmgfw.efi' /boot/loader/entries/windows_Ten.conf") + machine.succeed("grep 'HD0d4:EFI\\\\Microsoft\\\\Boot\\\\Bootmgfw.efi' /boot/loader/entries/windows_11.conf") + + machine.succeed("grep 'sort-key before_all_others' /boot/loader/entries/windows_7.conf") + machine.succeed("grep 'sort-key o_windows_Ten' /boot/loader/entries/windows_Ten.conf") + machine.succeed("grep 'sort-key zzz' /boot/loader/entries/windows_11.conf") + + machine.succeed("grep 'title Windows 7' /boot/loader/entries/windows_7.conf") + machine.succeed("grep 'title Windows Ten' /boot/loader/entries/windows_Ten.conf") + machine.succeed('grep "title Title with-_-punctuation ...?!" /boot/loader/entries/windows_11.conf') + ''; + } + ); + + memtestSortKey = runTest ( + { lib, ... }: + { + name = "systemd-boot-memtest-sortkey"; + meta.maintainers = with lib.maintainers; [ julienmalka ]; + + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.memtest86.enable = true; + boot.loader.systemd-boot.memtest86.sortKey = "apple"; + }; + + testScript = '' + machine.succeed("test -e /boot/loader/entries/memtest86.conf") + machine.succeed("test -e /boot/efi/memtest86/memtest.efi") + machine.succeed("grep 'sort-key apple' /boot/loader/entries/memtest86.conf") + ''; + } + ); + + entryFilenameXbootldr = runTest ( + { lib, ... }: + { + name = "systemd-boot-entry-filename-xbootldr"; + meta.maintainers = with lib.maintainers; [ sdht0 ]; + + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ commonXbootldr ]; + boot.loader.systemd-boot.memtest86.enable = true; + }; + + testScript = + { nodes, ... }: + '' + ${customDiskImage nodes} + + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /efi/EFI/systemd/systemd-bootx64.efi") + machine.succeed("test -e /boot/loader/entries/memtest86.conf") + machine.succeed("test -e /boot/EFI/memtest86/memtest.efi") + ''; + } + ); + + extraEntries = runTest ( + { lib, ... }: + { + name = "systemd-boot-extra-entries"; + meta.maintainers = with lib.maintainers; [ julienmalka ]; + + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.extraEntries = { + "banana.conf" = '' + title banana + ''; + }; + }; + + testScript = '' + machine.succeed("test -e /boot/loader/entries/banana.conf") + machine.succeed("test -e /boot/efi/nixos/.extra-files/loader/entries/banana.conf") + ''; + } + ); + + extraFiles = runTest ( + { lib, ... }: + { + name = "systemd-boot-extra-files"; + meta.maintainers = with lib.maintainers; [ julienmalka ]; + + nodes.machine = + { pkgs, lib, ... }: { imports = [ common ]; boot.loader.systemd-boot.extraFiles = { "efi/fruits/tomato.efi" = pkgs.netbootxyz-efi; }; - - # These are configs for different nodes, but we'll use them here in `machine` - system.extraDependencies = [ - nodes.common.system.build.toplevel - nodes.with_netbootxyz.system.build.toplevel - ]; }; - with_netbootxyz = - { pkgs, ... }: - { - imports = [ common ]; - boot.loader.systemd-boot.netbootxyz.enable = true; - }; - }; - - testScript = - { nodes, ... }: - let - originalSystem = nodes.machine.system.build.toplevel; - baseSystem = nodes.common.system.build.toplevel; - finalSystem = nodes.with_netbootxyz.system.build.toplevel; - in - '' + testScript = '' machine.succeed("test -e /boot/efi/fruits/tomato.efi") machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") - - with subtest("remove files when no longer needed"): - machine.succeed("${baseSystem}/bin/switch-to-configuration boot") - machine.fail("test -e /boot/efi/fruits/tomato.efi") - machine.fail("test -d /boot/efi/fruits") - machine.succeed("test -d /boot/efi/nixos/.extra-files") - machine.fail("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") - machine.fail("test -d /boot/efi/nixos/.extra-files/efi/fruits") - - with subtest("files are added back when needed again"): - machine.succeed("${originalSystem}/bin/switch-to-configuration boot") - machine.succeed("test -e /boot/efi/fruits/tomato.efi") - machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") - - with subtest("simultaneously removing and adding files works"): - machine.succeed("${finalSystem}/bin/switch-to-configuration boot") - machine.fail("test -e /boot/efi/fruits/tomato.efi") - machine.fail("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") - machine.succeed("test -e /boot/loader/entries/netbootxyz.conf") - machine.succeed("test -e /boot/efi/netbootxyz/netboot.xyz.efi") - machine.succeed("test -e /boot/efi/nixos/.extra-files/loader/entries/netbootxyz.conf") - machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/netbootxyz/netboot.xyz.efi") ''; - }; + } + ); - garbage-collect-entry = makeTest { - name = "systemd-boot-garbage-collect-entry"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + switch-test = runTest ( + { lib, ... }: + { + name = "systemd-boot-switch-test"; + meta.maintainers = with lib.maintainers; [ julienmalka ]; - nodes = { - inherit common; - machine = - { pkgs, nodes, ... }: - { - imports = [ common ]; + nodes = { + inherit common; - # These are configs for different nodes, but we'll use them here in `machine` - system.extraDependencies = [ - nodes.common.system.build.toplevel - ]; - }; - }; + machine = + { pkgs, nodes, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.extraFiles = { + "efi/fruits/tomato.efi" = pkgs.netbootxyz-efi; + }; - testScript = - { nodes, ... }: - let - baseSystem = nodes.common.system.build.toplevel; - in - '' - machine.succeed("nix-env -p /nix/var/nix/profiles/system --set ${baseSystem}") - machine.succeed("nix-env -p /nix/var/nix/profiles/system --delete-generations 1") - machine.succeed("${baseSystem}/bin/switch-to-configuration boot") - machine.fail("test -e /boot/loader/entries/nixos-generation-1.conf") - machine.succeed("test -e /boot/loader/entries/nixos-generation-2.conf") + # These are configs for different nodes, but we'll use them here in `machine` + system.extraDependencies = [ + nodes.common.system.build.toplevel + nodes.with_netbootxyz.system.build.toplevel + ]; + }; + + with_netbootxyz = + { pkgs, ... }: + { + imports = [ common ]; + boot.loader.systemd-boot.netbootxyz.enable = true; + }; + }; + + testScript = + { nodes, ... }: + let + originalSystem = nodes.machine.system.build.toplevel; + baseSystem = nodes.common.system.build.toplevel; + finalSystem = nodes.with_netbootxyz.system.build.toplevel; + in + '' + machine.succeed("test -e /boot/efi/fruits/tomato.efi") + machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") + + with subtest("remove files when no longer needed"): + machine.succeed("${baseSystem}/bin/switch-to-configuration boot") + machine.fail("test -e /boot/efi/fruits/tomato.efi") + machine.fail("test -d /boot/efi/fruits") + machine.succeed("test -d /boot/efi/nixos/.extra-files") + machine.fail("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") + machine.fail("test -d /boot/efi/nixos/.extra-files/efi/fruits") + + with subtest("files are added back when needed again"): + machine.succeed("${originalSystem}/bin/switch-to-configuration boot") + machine.succeed("test -e /boot/efi/fruits/tomato.efi") + machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") + + with subtest("simultaneously removing and adding files works"): + machine.succeed("${finalSystem}/bin/switch-to-configuration boot") + machine.fail("test -e /boot/efi/fruits/tomato.efi") + machine.fail("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") + machine.succeed("test -e /boot/loader/entries/netbootxyz.conf") + machine.succeed("test -e /boot/efi/netbootxyz/netboot.xyz.efi") + machine.succeed("test -e /boot/efi/nixos/.extra-files/loader/entries/netbootxyz.conf") + machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/netbootxyz/netboot.xyz.efi") + ''; + } + ); + + garbage-collect-entry = runTest ( + { lib, ... }: + { + name = "systemd-boot-garbage-collect-entry"; + meta.maintainers = with lib.maintainers; [ julienmalka ]; + + nodes = { + inherit common; + machine = + { pkgs, nodes, ... }: + { + imports = [ common ]; + + # These are configs for different nodes, but we'll use them here in `machine` + system.extraDependencies = [ + nodes.common.system.build.toplevel + ]; + }; + }; + + testScript = + { nodes, ... }: + let + baseSystem = nodes.common.system.build.toplevel; + in + '' + machine.succeed("nix-env -p /nix/var/nix/profiles/system --set ${baseSystem}") + machine.succeed("nix-env -p /nix/var/nix/profiles/system --delete-generations 1") + machine.succeed("${baseSystem}/bin/switch-to-configuration boot") + machine.fail("test -e /boot/loader/entries/nixos-generation-1.conf") + machine.succeed("test -e /boot/loader/entries/nixos-generation-2.conf") + ''; + } + ); + + no-bootspec = runTest ( + { lib, ... }: + { + name = "systemd-boot-no-bootspec"; + meta.maintainers = with lib.maintainers; [ julienmalka ]; + + nodes.machine = { + imports = [ common ]; + boot.bootspec.enable = false; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") ''; - }; - - no-bootspec = makeTest { - name = "systemd-boot-no-bootspec"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; - - nodes.machine = { - imports = [ common ]; - boot.bootspec.enable = false; - }; - - testScript = '' - machine.start() - machine.wait_for_unit("multi-user.target") - ''; - }; + } + ); } diff --git a/nixos/tests/web-apps/sharkey.nix b/nixos/tests/web-apps/sharkey.nix index 3a07493178b5..4811cd06ab97 100644 --- a/nixos/tests/web-apps/sharkey.nix +++ b/nixos/tests/web-apps/sharkey.nix @@ -50,7 +50,6 @@ in ''; meta.maintainers = with lib.maintainers; [ - srxl tmarkus ]; } diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 1ad175bb0376..cf40ea7d9552 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -17,7 +17,9 @@ aixlog, popl, pulseaudioSupport ? false, + pipewireSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, + pipewire, nixosTests, openssl, }: @@ -54,11 +56,15 @@ stdenv.mkDerivation rec { openssl ] ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional pipewireSupport pipewire ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS"; - cmakeFlags = [ (lib.cmakeBool "BUILD_WITH_PULSE" pulseaudioSupport) ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_WITH_PULSE" pulseaudioSupport) + (lib.cmakeBool "BUILD_WITH_PIPEWIRE" pipewireSupport) + ]; # Upstream systemd unit files are pretty awful, so we provide our own in a # NixOS module. It might make sense to get that upstreamed... diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0001-cask-bootstrap.diff b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0001-cask-bootstrap.diff new file mode 100644 index 000000000000..b6d0305f8ee1 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0001-cask-bootstrap.diff @@ -0,0 +1,85 @@ +diff --git a/cask-bootstrap.el b/cask-bootstrap.el +--- a/cask-bootstrap.el ++++ b/cask-bootstrap.el +@@ -27,41 +27,18 @@ + + ;;; Code: + +-(require 'package) ++;; Add nix store paths for dependencies to the load-path. ++(let ((paths '(@loadPaths@))) ++ (dolist (path paths) ++ (push path load-path))) + +-(defvar cask-directory) ++(let ((paths '(@nativeLoadPaths@))) ++ (dolist (path paths) ++ (push path native-comp-eln-load-path))) + +-(defconst cask-bootstrap-dir +- (expand-file-name +- (locate-user-emacs-file +- (format ".cask/%s.%s/bootstrap" emacs-major-version emacs-minor-version))) +- "Path to Cask bootstrap directory.") +- +-;; Restore several package- variables and `load-path` after let-scope. +-(let (package-alist +- package-archive-contents +- package--initialized +- (load-path (add-to-list +- 'load-path (expand-file-name "package-build" cask-directory))) +- (package-archives '(("gnu" . "https://elpa.gnu.org/packages/") +- ("melpa" . "https://melpa.org/packages/"))) +- (package-user-dir cask-bootstrap-dir) +- (deps '(s f commander git epl shut-up cl-lib cl-generic eieio ansi))) +- (package-initialize) +- (setq package-archive-contents nil) ;; force refresh, cask#573, cask#559 +- (unless (package-installed-p 'cl-lib) +- ;; package-build depends on cl-lib +- (unless package-archive-contents +- (package-refresh-contents)) +- (package-install 'cl-lib)) +- (require 'package-build) ++(let ((deps '(@depsMod@))) + (dolist (pkg deps) +- (unless (featurep pkg) +- (unless (package-installed-p pkg) +- (unless package-archive-contents +- (package-refresh-contents)) +- (package-install pkg)) +- (require pkg)))) ++ (require pkg))) + + (provide 'cask-bootstrap) + +diff --git a/cask-cli.el b/cask-cli.el +--- a/cask-cli.el ++++ b/cask-cli.el +@@ -129,25 +129,8 @@ already is installed, it will not be installed again." + (cask-install (cask-cli--bundle)))) + + (defun cask-cli/upgrade-cask () +- "Upgrade Cask itself and its dependencies. +- +-This command requires that Cask is installed using Git and that +-Git is available in `exec-path'." +- (unless (f-exists? (f-expand ".no-upgrade" cask-directory)) +- (unwind-protect +- (progn +- (epl-change-package-dir cask-bootstrap-dir) +- (epl-initialize) +- (epl-add-archive "gnu" "https://elpa.gnu.org/packages/") +- (epl-add-archive "melpa" "https://melpa.org/packages/") +- (epl-refresh) +- (epl-upgrade)) +- (epl-reset)) +- (require 'git) +- (let ((git-repo cask-directory)) +- (if (s-present? (git-run "status" "--porcelain")) +- (error "Cannot update Cask because of dirty tree") +- (git-pull))))) ++ "Disabled in Nixpkgs as this function requires that Cask is installed using Git." ++ (princ "Upgrade not available when installed via Nixpkgs.\n")) + + (defun cask-cli/exec (&rest _args) + "Execute ARGS with correct `exec-path' and `load-path'.") diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix index a344978ebf33..17b3cabb837d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix @@ -4,68 +4,103 @@ cl-generic, cl-lib, commander, - epl, f, fetchFromGitHub, + installShellFiles, git, melpaBuild, package-build, + replaceVars, s, shut-up, }: +let + formatLoadPath = x: ''"${x}/share/emacs/site-lisp/elpa/${x.ename}-${x.melpaVersion or x.version}"''; + formatNativeLoadPath = x: ''"${x}/share/emacs/native-lisp"''; + getAllDependenciesOfPkg = + pkg: + let + direct = builtins.filter (x: x != null) (pkg.packageRequires or [ ]); + indirect = builtins.concatLists (map getAllDependenciesOfPkg direct); + in + lib.unique (direct ++ indirect); +in +melpaBuild ( + finalAttrs: + let + nixpkgDependencies = getAllDependenciesOfPkg finalAttrs.finalPackage; + loadPaths = builtins.concatStringsSep " " (map formatLoadPath nixpkgDependencies); + nativeLoadPaths = builtins.concatStringsSep " " ( + map formatNativeLoadPath (nixpkgDependencies ++ [ (placeholder "out") ]) + ); + emacsBuiltinDeps = [ + "cl-lib" + "eieio" + ]; + depsMod = builtins.concatStringsSep " " ((map (x: x.ename) nixpkgDependencies) ++ emacsBuiltinDeps); + in + { + pname = "cask"; + version = "0.9.1"; -melpaBuild (finalAttrs: { - pname = "cask"; - version = "0.9.0"; + src = fetchFromGitHub { + name = "cask-source-${finalAttrs.version}"; + owner = "cask"; + repo = "cask"; + rev = "v${finalAttrs.version}"; + hash = "sha256-/vinpQ51AuaTbXW4L4MnVonyfzTMvHUF4HViSPBKZxs="; + }; - src = fetchFromGitHub { - name = "cask-source-${finalAttrs.version}"; - owner = "cask"; - repo = "cask"; - rev = "v${finalAttrs.version}"; - hash = "sha256-91rJFsp2SLk/JY+v6G5JmXH5bg9QnT+qhI8ccNJlI4A="; - }; + nativeBuildInputs = [ installShellFiles ]; - patches = [ - # Uses LISPDIR substitution var - ./0000-cask-lispdir.diff - ]; + patches = [ + # Uses LISPDIR substitution var + ./0000-cask-lispdir.diff + # Use Nix provided dependencies instead of letting Cask bootstrap itself + ./0001-cask-bootstrap.diff + ]; - packageRequires = [ - ansi - cl-generic - cl-lib - commander - epl - f - git - package-build - s - shut-up - ]; + packageRequires = [ + ansi + cl-generic + cl-lib + commander + epl + f + git + package-build + s + shut-up + ]; - # use melpaVersion so that it works for unstable releases too - postPatch = '' - lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \ - substituteAllInPlace bin/cask - ''; + postPatch = '' + # use melpaVersion so that it works for unstable releases too + substituteInPlace bin/cask \ + --replace-fail @lispdir@ $out/share/emacs/site-lisp/elpa/$ename-$melpaVersion - # TODO: use installBin as soon as installBin arrives Master branch - postInstall = '' - install -D -t $out/bin bin/cask - ''; - - meta = { - homepage = "https://github.com/cask/cask"; - description = "Project management for Emacs"; - longDescription = '' - Cask is a project management tool for Emacs that helps automate the - package development cycle; development, dependencies, testing, building, - packaging and more. + # using `replaceVars` results in wrong result of `placeholder "out"` + substituteInPlace cask-bootstrap.el \ + --replace-fail @depsMod@ '${depsMod}' \ + --replace-fail @loadPaths@ '${loadPaths}' \ + --replace-fail @nativeLoadPaths@ '${nativeLoadPaths}' ''; - license = lib.licenses.gpl3Plus; - mainProgram = "cask"; - maintainers = with lib.maintainers; [ ]; - }; -}) + + postInstall = '' + installBin bin/cask + ''; + + meta = { + homepage = "https://github.com/cask/cask"; + description = "Project management for Emacs"; + longDescription = '' + Cask is a project management tool for Emacs that helps automate the + package development cycle; development, dependencies, testing, building, + packaging and more. + ''; + license = lib.licenses.gpl3Plus; + mainProgram = "cask"; + maintainers = with lib.maintainers; [ ]; + }; + } +) diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index a68f24ea0653..d75ff27bfe7d 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -42,6 +42,7 @@ mapAliases ( blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17 BufOnly = BufOnly-vim; calendar = calendar-vim; + coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # addedd 2025-10-01 coffee-script = vim-coffee-script; coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18 Solarized = vim-colors-solarized; diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 5d7496000268..cdbbda8eb54d 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -4,6 +4,7 @@ coc-clangd, coc-css, coc-diagnostic, + coc-docker, coc-pyright, coc-toml, }: @@ -28,6 +29,11 @@ final: prev: { src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic"; }; + coc-docker = buildVimPlugin { + inherit (coc-docker) pname version meta; + src = "${coc-docker}/lib/node_modules/coc-docker"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7c72a3142071..90d1b9687846 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -12834,12 +12834,12 @@ final: prev: { project-nvim = buildVimPlugin { pname = "project.nvim"; - version = "2025-09-26"; + version = "2025-10-01"; src = fetchFromGitHub { owner = "DrKJeff16"; repo = "project.nvim"; - rev = "8010402e3b10264eb832f5ebbeb853decaa97433"; - sha256 = "0lfyv2hl453pxm3kkmb2d6gq2a7g5c5kycvhhnc1kkgznvr5872z"; + rev = "7008545417848450c6dad83fcc6b3e58f0450990"; + sha256 = "sha256-ZGKC/r+1/TcAqZvkzTHPtpcBC7eRfvuuMNTVeMR4qLQ="; }; meta.homepage = "https://github.com/DrKJeff16/project.nvim/"; meta.hydraPlatforms = [ ]; @@ -13705,6 +13705,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + sidekick-nvim = buildVimPlugin { + pname = "sidekick.nvim"; + version = "2025-09-30"; + src = fetchFromGitHub { + owner = "folke"; + repo = "sidekick.nvim"; + rev = "7b3d28bbb883e898f6a8b4f2d7a9ab6ad5cef9f8"; + sha256 = "1m2af27xvagdq6q8kyahcsrbraaw4x2yvrg35xxcpgp0vi0m9h6a"; + }; + meta.homepage = "https://github.com/folke/sidekick.nvim/"; + meta.hydraPlatforms = [ ]; + }; + sideways-vim = buildVimPlugin { pname = "sideways.vim"; version = "2025-07-28"; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 6abe5ab246df..ac37feb3897e 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -7,7 +7,6 @@ final: prev: let nodePackageNames = [ "coc-cmake" - "coc-docker" "coc-emmet" "coc-eslint" "coc-explorer" @@ -26,7 +25,6 @@ let "coc-pairs" "coc-prettier" "coc-r-lsp" - "coc-rls" "coc-rust-analyzer" "coc-sh" "coc-smartf" diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b0b01208a15a..42435a4233df 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -73,6 +73,8 @@ gitMinimal, # Preview-nvim dependencies md-tui, + # sidekick-nvim dependencies + copilot-language-server, # sved dependencies glib, gobject-introspection, @@ -3123,6 +3125,16 @@ assertNoAdditions { ]; }; + sidekick-nvim = super.sidekick-nvim.overrideAttrs { + runtimeDeps = [ + copilot-language-server + ]; + + nvimSkipModules = [ + "sidekick.docs" + ]; + }; + skim-vim = super.skim-vim.overrideAttrs { dependencies = [ self.skim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 626164676424..9f10a2b1b71b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1052,6 +1052,7 @@ https://github.com/jaxbot/semantic-highlight.vim/,, https://github.com/numirias/semshi/,, https://github.com/junegunn/seoul256.vim/,, https://github.com/osyo-manga/shabadou.vim/,, +https://github.com/folke/sidekick.nvim/,HEAD, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/skim-rs/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index 054f65b8b908..483cf4c68f62 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "1.94.0"; - hash = "sha256-VLTEDDD0/nadlMKYeeUKdGh3p1JXQoGhUQ6aXGpT10U="; + version = "1.96.0"; + hash = "sha256-VnPCVcV3UFZZWOTk52Z4hfAgzzqk7G6cMGiScEHb0Y8="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index ed6a7bb2eb53..3511736331b1 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "1.0.124"; - hash = "sha256-pqm1A8ckV38fZE6h5HKxoU3k3T4volSbmsmOZ8F6aHQ="; + version = "2.0.0"; + hash = "sha256-vd3ZT8iwmbUCeaHgiDGLzWehOj4j/hMinHiXQytwVz4="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index 97d9470852f3..49ab14ef4ccc 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.528"; - hash = "sha256-YnY15/I0bJ14J4KDU7AI6Y2lE7SWug/yoH0X+upqKzA="; + version = "2.0.536"; + hash = "sha256-Q6T8Ab8kwOjdFM63SjTNEOgd+a6fL1PRGRredHzwg7U="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 892c2201f772..77f428b9e9ac 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -379,8 +379,8 @@ let mktplcRef = { name = "cue"; publisher = "asdine"; - version = "0.3.2"; - hash = "sha256-jMXqhgjRdM3UG/9NtiwWAg61mBW8OYVAKDWgb4hzhA4="; + version = "0.3.4"; + hash = "sha256-X+CFRKAZmjzf5dkE/AGd3A/voX/XHfMP5WEt8sJll8U="; }; meta = { description = "Cue language support for Visual Studio Code"; @@ -673,8 +673,8 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.28.0"; - hash = "sha256-NAQD6DK1c13nA/O0QHNxFraImE6C0+Jzj9+f06EkiW0="; + version = "1.29.0"; + hash = "sha256-qjfZ2/otO2BAIbhjqicHI2H0KKdpji55K+2XfOrzUIw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog"; @@ -1003,8 +1003,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.10.1"; - hash = "sha256-TD2lWGZCKTj9qbwV9elue+jyoQLEOmPBuePpOXH8wEg="; + version = "1.11.0"; + hash = "sha256-gyhvLFFGVUxOYr33SeWJIlVYQGEDUkuGyATylI+loUM="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; @@ -1123,8 +1123,8 @@ let mktplcRef = { name = "vscode-database-client2"; publisher = "cweijan"; - version = "8.4.0"; - hash = "sha256-ly54itCpVdirU6GmK2GM7A749wt2SbHR/TidutTwCUE="; + version = "8.4.2"; + hash = "sha256-SfvpR1ldrvo/q0nt0cLu55bzNXjwNNdqdSwBORN2Bjw="; }; meta = { description = "Database Client For Visual Studio Code"; @@ -1137,8 +1137,8 @@ let mktplcRef = { publisher = "DanielGavin"; name = "ols"; - version = "0.1.43"; - hash = "sha256-b5jBEj4Kw5Nmm1L1RSNIZsqbpdo3EkOGaSH/7QK8y84="; + version = "0.1.44"; + hash = "sha256-b8zf6p5N51VHSgyFWsFBmCd3GvRgBeFpikt8GfoG7J0="; }; meta = { description = "Visual Studio Code extension for Odin language"; @@ -1152,8 +1152,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.14.110"; - hash = "sha256-8qTKmtnDFCCYwZPE2E3fDNDPTTvHVMqbNL5BybN58X8="; + version = "3.14.118"; + hash = "sha256-jAFlmF7HE0pfYx5jqnUjObM+awdc62DvayV9FdEx70E="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1743,8 +1743,8 @@ let mktplcRef = { name = "foam-vscode"; publisher = "foam"; - version = "0.27.7"; - hash = "sha256-1h/u0MBPtRYIStv3ZR1kbIaiRszavjWs5+oB1huwJBs="; + version = "0.28.1"; + hash = "sha256-VO3rJsKKZJWGBrNYnRXh5QedN13RR7qdcYmDn5WmOkg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; @@ -1834,8 +1834,8 @@ let mktplcRef = { publisher = "funkyremi"; name = "vscode-google-translate"; - version = "1.4.13"; - hash = "sha256-9Vo6lwqD1eE3zY0Gi9ME/6lPwmwuJ3Iq9StHPvncnM4="; + version = "1.5.0"; + hash = "sha256-t6USs2mZE3g802BRwP56eH/Wj/cyAcA+h/V+++NtHnA="; }; meta = { description = "Visual Studio Code extension using google translation to helping you quickly translate text right in your code rocket"; @@ -1981,8 +1981,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.44.1"; - hash = "sha256-coYUIPe3hq3zaLnzOe51P+yY2iQxH9+ARr4f3J6ueTI="; + version = "6.47.0"; + hash = "sha256-UeQbz64ow/VJ2yDenXGYKAcaIwMM2RLkhHf2Ck4Vlek="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -3002,8 +3002,8 @@ let mktplcRef = { name = "rainbow-csv"; publisher = "mechatroner"; - version = "3.21.0"; - hash = "sha256-IPgPE5vM9tzHPioRBZeJs4hqut6t++SjZJlHnz/ismA="; + version = "3.22.0"; + hash = "sha256-7X7tqoN3VUa/63qfCioRdODxAanvtb2wTMQbcWsqupQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mechatroner.rainbow-csv/changelog"; @@ -3765,8 +3765,8 @@ let mktplcRef = { name = "pico8-ls"; publisher = "PollywogGames"; - version = "0.6.0"; - hash = "sha256-qruXJjT2C45LFgFc1xV+h9b6kRZzeh/kS/BZNz6L+x8="; + version = "0.6.1"; + hash = "sha256-TlULqIKb3R+bvjN3f4Bwha0bewqCHpPVFiePHNV2kmE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/PollywogGames.pico8-ls/changelog"; @@ -3782,8 +3782,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "6.16.2"; - hash = "sha256-woL6jWlrNb9lsQ6NqXx3YOo/eAinpAuz2bXw6mJw8Dc="; + version = "6.16.3"; + hash = "sha256-xJ2SQgXZfVXjn6JCsjBr2SkaCpkGS2Fk1mjcW6WPnS0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; @@ -3844,8 +3844,8 @@ let mktplcRef = { name = "ansible"; publisher = "redhat"; - version = "25.8.1"; - hash = "sha256-TXXOuayVohQPp+yQAHbsZDr/UYtyHmUkaLU+lADpjDU="; + version = "25.9.0"; + hash = "sha256-Z0oUhqoHfVALG5k1dbSBpJiq0AEjaqeh8yLJ8FjvfcY="; }; meta = { description = "Ansible language support"; @@ -4075,8 +4075,8 @@ let mktplcRef = { name = "sas-lsp"; publisher = "SAS"; - version = "1.16.0"; - hash = "sha256-+nB+J5exzxso6LM41HDH6SEjAUtDPZXhdZLdydYvFBk="; + version = "1.17.0"; + hash = "sha256-lhvSAPbvRmNwrAB0Lk4oKVu7+o3H7TJSQbBlURH2SCA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; @@ -4767,8 +4767,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.90.8"; - hash = "sha256-0I4jf9Ba8PlNM0eUYHaMyCvuHZ5U3+RvT8aIbHJu9KU="; + version = "0.91.0"; + hash = "sha256-nvcISWilvPXIm/er3QnM2aOhrWn2BgOL0aXpGHpDw9M="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; @@ -5088,8 +5088,8 @@ let mktplcRef = { name = "vscode-java-pack"; publisher = "vscjava"; - version = "0.29.2024091906"; - hash = "sha256-A0WHSqqYVkRN1C3WI7Gd7DZJFDJPYDVsEygDCG67GoQ="; + version = "0.30.2"; + hash = "sha256-uC3hf2OjncMqTRc9KTfrVvTwZOoPT0QXX7HCBTdblnQ="; }; meta = { description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more"; @@ -5168,8 +5168,8 @@ let mktplcRef = { name = "volar"; publisher = "Vue"; - version = "3.0.7"; - hash = "sha256-Uwgb+7Zxy4HaE97WdNpTaaCQNARpuu8cae3uDCjZYcA="; + version = "3.0.8"; + hash = "sha256-ZzNsoYfDVDIBEByZZcn1IAV7WijF/w6CEqZdS6qu/zk="; }; meta = { changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; @@ -5208,6 +5208,22 @@ let }; }; + vytautassurvila.csharp-ls = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "csharp-ls"; + publisher = "vytautassurvila"; + version = "0.0.27"; + hash = "sha256-kl6W1UQ36cNQNj3cOsMyZbxD6glaRm3W0Z1W+xuEcjs="; + }; + meta = { + changelog = "https://github.com/vytautassurvila/vscode-csharp-ls/blob/master/CHANGELOG.md"; + description = "Visual Studio Code Extension - C# LSP client for csharp-language-server"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vytautassurvila.csharp-ls"; + homepage = "https://github.com/vytautassurvila/vscode-csharp-ls"; + license = lib.licenses.mit; + }; + }; + waderyan.gitblame = buildVscodeMarketplaceExtension { mktplcRef = { name = "gitblame"; diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 690e55daf50d..7c82d89ee4a4 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.31.0"; - hash = "sha256-jMy6mjPUxz3p1dvrveZ/9tyn+KZ6rBLJinZMBUUb9QY="; + version = "0.31.3"; + hash = "sha256-Kvg5gmvAcz+K6mWBzWoNnkqEWAPRgC+w0idUC6RzM0g="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 8b7c5600f667..da65cec3a2e0 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2025.7.1"; - hash = "sha256-0lPbu5amiqk/O0XIFxJpTBKQEbU8mamnjBGsaalTyh8="; + version = "2025.8.2"; + hash = "sha256-Z2R7gUZw1S2iL3KX/3fB326lFzE39v9LGq17Ec2aHCA="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index 8ae694f9ea43..d6cdd508ce51 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "0.20.0"; - hash = "sha256-oRbNML3+Ynnv7rQamv03TJphun3nAKVeDtVxRXTkoK0="; + version = "0.22.1"; + hash = "sha256-eUtl1x3HqpFEUGkBVb8EOHneWV7DfYHHWGmM5gOGYcg="; }; 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 8cd8ec902d30..33c278c911ac 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-VSbrKzj+FBK+MtXkBJzHe8pEODQACCYgADKYyyKUHAY="; + hash = "sha256-LUJ0e/ndyeeRsC2h7JJL6zymmPDWxW0cPGBceuC7+X0="; }; 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 6c9c200041c0..acffeb81490c 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "RooVeterinaryInc"; name = "roo-cline"; - version = "3.28.3"; - hash = "sha256-aBS6T8S8+D9FGIAPi5dELKyqt3/oqFVa6XNDcTMYkoM="; + version = "3.28.9"; + hash = "sha256-RNPXhCRfyFl0pQ5mELdZ2RIBms9pCpH99//AiUbRzAE="; }; passthru.updateScript = vscode-extension-update-script { }; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index cb741ef730fd..25663ca9e60c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-y0Bjrxmp7DYV4iUDnQGC0aIYrQNM3oPicajbeVuEtqc="; - x86_64-darwin = "sha256-6/BiMvVp955PW0hz22+NzdvC+IC+pNYjz25n3Op6V/k="; - aarch64-linux = "sha256-DF8QnqvVFqNyxjrphR6NaUXOKr8Koe34NitRa5mTBYs="; - aarch64-darwin = "sha256-v+m8AMpPph6CztUCjneBKC9txEOAKvcHsAXr/8KjIeA="; - armv7l-linux = "sha256-py1FZYd77YVNloQbXm36ou4HGowmteY8HzOiUioGD8Y="; + x86_64-linux = "sha256-0zgsR0nk9zsOeEcKhrmAFbAhvKKFNsC8fXjCnxFcndE="; + x86_64-darwin = "sha256-4+3T3axXNfePEkevhLwRPeqoxKs2OTL7B7TiV2BxZWc="; + aarch64-linux = "sha256-iGLtuVFA5NphiF1PU9Pus/nZ8PyCNNzDOpcQ+utYE2I="; + aarch64-darwin = "sha256-E4BopxbqH1lg1Q2NlyWjH8jytabiv5y4hG5ZJW4nqzs="; + armv7l-linux = "sha256-YIidKSsqK3DSAfPd7O1pbft1C/ny/iB+CFbR/T9u7L8="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.104.1"; + version = "1.104.2"; # This is used for VS Code - Remote SSH test - rev = "0f0d87fa9e96c856c5212fc86db137ac0d783365"; + rev = "e3a5acfb517a443235981655413d566533107e92"; in callPackage ./generic.nix { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ callPackage ./generic.nix { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-o0O/WDH+hr3R9np+WPLJo+/nIVBRjP8H2JVwa8volfg="; + hash = "sha256-Tz1P8eGokG+8thao9dRllAdTxvllhfOEDKH9lC2QwB0="; }; stdenv = stdenvNoCC; }; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix index effe46dde609..908f8094aacd 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x"; - version = "0-unstable-2025-09-18"; + version = "0-unstable-2025-09-24"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "b43619754a595ec6feb089a387638118037ef74b"; - hash = "sha256-b6YC4qisHPdJtM1IEsrwUjCBZ6JElZuKvakApOLGGvY="; + rev = "94115094ead4da7342bd638bb4cc293ae7d297c0"; + hash = "sha256-tXSQursZcV/gsLlydVRD1KUR8t2zztfby7cDno1xtHc="; }; makefile = "Makefile"; diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 730888167763..0e7ebfe59e9a 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -82,14 +82,14 @@ let ]; in mkDerivation rec { - version = "3.40.10"; + version = "3.40.11"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-3FvHAoVeTwBvFNUxSCSumjiPg1hK3oRS1zMzWLXoSTc="; + hash = "sha256-HjdOLG/x8qXTDlMKW6+jBuwi+36rBkBFM1OCe3BcjWY="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 90ad45152c03..c102d9c23356 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -82,14 +82,14 @@ let ]; in mkDerivation rec { - version = "3.44.2"; + version = "3.44.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-ERaox5jqB7E/W0W6NnipHx1qfY2+FTHYf3r2l1KRkC0="; + hash = "sha256-g7ZdNLal16b0Fbq492mPpOiNkYc3Bm4c7INWX+2e7H8="; }; passthru = { diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix deleted file mode 100644 index 66d0cc580204..000000000000 --- a/pkgs/applications/misc/barrier/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - fetchFromGitHub, - cmake, - curl, - xorg, - avahi, - qtbase, - mkDerivation, - openssl, - wrapGAppsHook3, - avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }, - fetchpatch, -}: - -mkDerivation rec { - pname = "barrier"; - version = "2.4.0"; - - src = fetchFromGitHub { - owner = "debauchee"; - repo = "barrier"; - rev = "v${version}"; - hash = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU="; - fetchSubmodules = true; - }; - - patches = [ - # This patch can be removed when a new version of barrier (greater than 2.4.0) - # is released, which will contain this commit. - (fetchpatch { - name = "add-missing-cstddef-header.patch"; - url = "https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7.patch"; - sha256 = "sha256-ajMxP7szBFi4h8cMT3qswfa3k/QiJ1FGI3q9fkCFQQk="; - }) - ]; - - CXXFLAGS = [ - # error: 'uint8_t' is not a member of 'std'; did you mean 'wint_t'? - "-include cstdint" - ]; - - buildInputs = [ - curl - xorg.libX11 - xorg.libXext - xorg.libXtst - avahiWithLibdnssdCompat - qtbase - ]; - nativeBuildInputs = [ - cmake - wrapGAppsHook3 - ]; - - postFixup = '' - substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" - ''; - - qtWrapperArgs = [ - ''--prefix PATH : ${lib.makeBinPath [ openssl ]}'' - ]; - - meta = { - description = "Open-source KVM software"; - longDescription = '' - Barrier is KVM software forked from Symless's synergy 1.9 codebase. - Synergy was a commercialized reimplementation of the original - CosmoSynergy written by Chris Schoeneman. - ''; - homepage = "https://github.com/debauchee/barrier"; - downloadPage = "https://github.com/debauchee/barrier/releases"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.phryneas ]; - platforms = lib.platforms.linux; - mainProgram = "barrier"; - }; -} diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 9006e143ed6e..99d0f4bd1a68 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -10,7 +10,6 @@ mkChromiumDerivation (base: rec { name = "chromium-browser"; packageName = "chromium"; buildTargets = [ - "run_mksnapshot_default" "chrome_sandbox" "chrome" ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a6d28e16ed86..feac9db09d2e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -439,12 +439,6 @@ let # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ./patches/no-build-timestamps.patch ] - ++ lib.optionals (!chromiumVersionAtLeast "136") [ - # Fix build with Pipewire 1.4 - # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500 - # Got merged, started shipping with M136+. - ./patches/webrtc-pipewire-1.4.patch - ] ++ lib.optionals (packageName == "chromium") [ # This patch is limited to chromium and ungoogled-chromium because electron-source sets # enable_widevine to false. @@ -484,33 +478,15 @@ let # allowing us to use our rustc and our clang. ./patches/chromium-129-rust.patch ] - ++ lib.optionals (chromiumVersionAtLeast "140") [ + ++ lib.optionals (versionRange "140" "141") [ # Rebased variant of the patch above due to # https://chromium-review.googlesource.com/c/chromium/src/+/6665907 ./patches/chromium-140-rust.patch ] - ++ lib.optionals (!ungoogled && !chromiumVersionAtLeast "136") [ - # Note: We since use LLVM v19.1+ on unstable *and* release-24.11 for all version and as such - # no longer need this patch. We opt to arbitrarily limit it to versions prior to M136 just - # because that's when this revert stopped applying cleanly and defer fully dropping it for - # the next cleanup to bundle rebuilding all of chromium and electron. - # - # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size - # and std::hardware_constructive_interference_size. - # So let's revert the change for now and hope that our rustc.llvmPackages and - # nixpkgs-stable catch up sooner than later. - # https://groups.google.com/a/chromium.org/g/cxx/c/cwktrFxxUY4 - # https://chromium-review.googlesource.com/c/chromium/src/+/5767325 - # Note: We exclude the changes made to the partition_allocator (PA), as the revert - # would otherwise not apply because upstream reverted those changes to PA already - # in https://chromium-review.googlesource.com/c/chromium/src/+/5841144 - # Note: ungoogled-chromium already reverts this as part of its patchset. - (githubPatch { - commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9"; - hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8="; - excludes = [ "base/allocator/partition_allocator/src/partition_alloc/*" ]; - revert = true; - }) + ++ lib.optionals (chromiumVersionAtLeast "141") [ + # Rebased variant of the patch above due to + # https://chromium-review.googlesource.com/c/chromium/src/+/6897026 + ./patches/chromium-141-rust.patch ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # Reverts decommit pooled pages which causes random crashes of tabs on systems @@ -528,7 +504,7 @@ let hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY="; }) ] - ++ lib.optionals (chromiumVersionAtLeast "136") [ + ++ [ # Modify the nodejs version check added in https://chromium-review.googlesource.com/c/chromium/src/+/6334038 # to look for the minimal version, not the exact version (major.minor.patch). The linked CL makes a case for # preventing compilations of chromium with versions below their intended version, not about running the very @@ -552,6 +528,17 @@ let # Rebased variant of the patch above for # electron 35 (M134) and 36 (M136) ./patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch + ] + ++ lib.optionals (chromiumVersionAtLeast "141") [ + (fetchpatch { + # Fix "invalid application of 'sizeof' to an incomplete type 'blink::CSSStyleSheet'" + # by reverting https://chromium-review.googlesource.com/c/chromium/src/+/6892157 + name = "chromium-141-Revert-Remove-unnecessary-include-in-tree_scope.h.patch"; + url = "https://chromium.googlesource.com/chromium/src/+/0fc0e71aa1ca0419fae6d14255025543980d2cba^!?format=TEXT"; + decode = "base64 -d"; + revert = true; + hash = "sha256-pnEus2NHpNWZ6ZSXLgdTn+it7oy1MPZPbD8SOAKLWbw="; + }) ]; postPatch = @@ -562,8 +549,6 @@ let chmod u+w build/config/gclient_args.gni echo 'checkout_mutter = false' >> build/config/gclient_args.gni echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni - '' - + lib.optionalString (!isElectron && chromiumVersionAtLeast "140") '' echo 'checkout_clusterfuzz_data = false' >> build/config/gclient_args.gni '' + lib.optionalString (!isElectron) '' @@ -767,23 +752,24 @@ let # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; clang_base_path = "${llvmCcAndBintools}"; - - use_qt5 = false; - use_qt6 = false; } - // lib.optionalAttrs (chromiumVersionAtLeast "136") { - # LLVM < v21 does not support --warning-suppression-mappings yet: - clang_warning_suppression_file = ""; + // lib.optionalAttrs (chromiumVersionAtLeast "141") { + # TODO: remove opt-out of https://chromium.googlesource.com/chromium/src/+/main/docs/modules.md + use_clang_modules = false; } // { + use_qt5 = false; + use_qt6 = false; + + # LLVM < v21 does not support --warning-suppression-mappings yet: + clang_warning_suppression_file = ""; + # To fix the build as we don't provide libffi_pic.a # (ld.lld: error: unable to find library -l:libffi_pic.a): use_system_libffi = true; # Use nixpkgs Rust compiler instead of the one shipped by Chromium. rust_sysroot_absolute = "${buildPackages.rustc}"; rust_bindgen_root = "${buildPackages.rust-bindgen}"; - } - // { enable_rust = true; # While we technically don't need the cache-invalidation rustc_version provides, rustc_version # is still used in some scripts (e.g. build/rust/std/find_std_rlibs.py). @@ -841,9 +827,7 @@ let # Mute some warnings that are enabled by default. This is useful because # our Clang is always older than Chromium's and the build logs have a size # of approx. 25 MB without this option (and this saves e.g. 66 %). - env.NIX_CFLAGS_COMPILE = - "-Wno-unknown-warning-option" - + lib.optionalString (chromiumVersionAtLeast "135") " -Wno-unused-command-line-argument -Wno-shadow"; + env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-shadow"; env.BUILD_CC = "$CC_FOR_BUILD"; env.BUILD_CXX = "$CXX_FOR_BUILD"; env.BUILD_AR = "$AR_FOR_BUILD"; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 71b9f2aa7573..6e59ffb26c30 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,28 +1,28 @@ { "chromium": { - "version": "140.0.7339.207", + "version": "141.0.7390.54", "chromedriver": { - "version": "140.0.7339.208", - "hash_darwin": "sha256-sdBwwXl63vOkkGHsXG5BFWmXj2pbgA5bk2J5mNwEnGA=", - "hash_darwin_aarch64": "sha256-pL/7kHVv0e4X7bSCcjqQdI/myzgKqU858WPVJ5XZmKw=" + "version": "141.0.7390.55", + "hash_darwin": "sha256-wo68N1aftGGyZR4rYI+96lXKJqPAYro3g4s/OL/CUco=", + "hash_darwin_aarch64": "sha256-5uUklsYRFhpLIAKoPl5EU5dQJcxwXVpJp0lyQ4SkspY=" }, "deps": { "depot_tools": { - "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b", - "hash": "sha256-ZOzKQpo7Z/h1eeWQj20ghDq7pFZ9nch8lt60aoK/g2k=" + "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219", + "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA=" }, "gn": { - "version": "0-unstable-2025-07-29", - "rev": "3a4f5cea73eca32e9586e8145f97b04cbd4a1aee", - "hash": "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw=" + "version": "0-unstable-2025-08-29", + "rev": "5d0a4153b0bcc86c5a23310d5b648a587be3c56d", + "hash": "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg=" }, - "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI=" + "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "17230b545fd18b35aad49122e5af97a463bc7a9c", - "hash": "sha256-TPO2tCz3pkYAlZW0u5xfyBEUjqZvu7n+2Pr7KD8MfMQ=", + "rev": "b95610d5c4a562d9cd834bc0a098d3316e2f533f", + "hash": "sha256-jraDPodJBdyFFHS30BcQTZOEUD+h9SFHQrO0GoMhtk8=", "recompress": true }, "src/third_party/clang-format/script": { @@ -32,28 +32,28 @@ }, "src/third_party/compiler-rt/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git", - "rev": "dc425afb37a69b60c8c02fef815af29e91b61773", - "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8=" + "rev": "d1877a8622be9c5a692dc5ed9ea5a54a78c9360e", + "hash": "sha256-Vtz6Xj4ktP/8q2QDVt2bQnwkz7eDKuPx9KswagxgqmY=" }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a", - "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M=" + "rev": "9ce37ed6b68eda96a67199e6564ceb958ad4b37e", + "hash": "sha256-2URJyICEyBwIXJRDkJt1B27DXq6nLZTCbW7dD8MBQk0=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "a6c815c69d55ec59d020abde636754d120b402ad", - "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70=" + "rev": "f7f5a32b3e9582092d8a4511acec036a09ae8524", + "hash": "sha256-8hqb7ZtY3PAC8R9S0KTay79xlD8QBKjy0ZR5oUVr4p0=" }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093", - "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw=" + "rev": "92fb77dfd4d86aa120730359f5e4d6bb47f1c129", + "hash": "sha256-n7U+CKQ839Oa35JpygygPUhk9JqWIyafJRj0jYSMlwg=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "6adc0aa946a413c124758a3a0ac12e5a536c7dd3", - "hash": "sha256-C5ZmMzhGdRAd9tpad8hnqM6RoXsunKSuYUoUQdsYclI=" + "rev": "46f8689c0b3999bd4b3a60adef01ceb3d8c0071f", + "hash": "sha256-qItKSIS5p4iIN+iSXgXYbFXq1CFFgwQV5NCQxunl0Zg=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -72,8 +72,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "a89f6810f6a5b0e11e4ec00387e9f97e8f6c23ae", - "hash": "sha256-LH4TlXPBULUamqTDitDEXiB37705BzEAqX1Lan87eoM=" + "rev": "c6edf98e7fab2385c90caac6211f00b62e9b773d", + "hash": "sha256-i08iEbbV+RAvSQKxWutCSjpZkfcbTQdRUZkgtPZfLck=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -82,8 +82,8 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "42832178b3b6ae20f0d1c9634c040c528614f45f", - "hash": "sha256-ImjvS826eyo82TIDw6M/7h3lrwbCwxQ+oKJr8RaqDTc=" + "rev": "62826931e84c49c94192065c896931576d8273c8", + "hash": "sha256-YZFFKQKFyJUvrfG1bm84Hl3AGOkSgpqefwY5mHh1O0A=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -92,8 +92,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "a8c8a6febe630c6239a5e207530e9fac651ae373", - "hash": "sha256-GxWTdzSf7/9WIqrECdAEkibXve/ZpKpxJcNS+KnfNc0=" + "rev": "bb55ea10fcef3759e4db7ef8a473a9ceac2c6aa6", + "hash": "sha256-NIy3fOwfheHeGo0MX8tmZbaGMBwqM5+k7cCypeoS6GI=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -107,8 +107,8 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "ad59a18f2ce08e60c9f4ab0aaf9b62679ab8c626", - "hash": "sha256-42ShMIXq9CnOlmwXcUvupPpQSNggdlXEkR3mdthsGzg=" + "rev": "15469c3d00394c8c365d1b1951fcf6255c589afb", + "hash": "sha256-Bd/Q181NBMJkLwkEmttNvjNBQqtRRT7p+nbevqvt2HI=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", @@ -117,8 +117,8 @@ }, "src/third_party/readability/src": { "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git", - "rev": "04fd32f72b448c12b02ba6c40928b67e510bac49", - "hash": "sha256-yUf4UTwcJ7H0tuN+e6c92F4UUSXjmTNOIKqNZA4+zAo=" + "rev": "1f0ec42686c89a4a1c71789849f7ffde349ab197", + "hash": "sha256-liNoIZreSx/RgL5/oSKyzOuqChAgDwTtViNq0KiY0R0=" }, "src/third_party/content_analysis_sdk/src": { "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", @@ -127,13 +127,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833", - "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc=" + "rev": "af5cf2b1e7f03d6f6de84477e1ca8eed1f3eb03d", + "hash": "sha256-dPVDZ4SyrHWsRWERUl6UKbbdUG/5dC/UTte6sItMYxg=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "67be7fddacc4f4bcb21d0cf7bf8bb18752d8fb08", - "hash": "sha256-ulw+gDGpUn8uWuNedlfQADwnSYYbPWpHN5Q+pJbwKGc=" + "rev": "9caf49389e5e0564d18e0504c6cfa45c88b4e4fd", + "hash": "sha256-d6WHeELxGtZ7nZzHIm18QaHY+2sc8KSRJgdH+vTuWN8=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -142,8 +142,8 @@ }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "50764bac3d4048144e9ada5f5a742c82cc97cc9a", - "hash": "sha256-rs5cw/kpRq0Bcr2ov5kKsupwqkIQDvuvUMbZbAdOmGI=" + "rev": "4e0f5364a3692f4122de0874ebb0f5550a27c867", + "hash": "sha256-ocnWUgw3rBYTsKS7j+Zq6hTGhhB4VRgifASMqBO66Os=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -162,8 +162,8 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "5b477670f53e5fefcf4bd829a2952013ef9d1953", - "hash": "sha256-os0yeQb6snDvUjYghrIYAy9nUi1j8Y2YoTfsiQ7SlpA=" + "rev": "0558b1933531e6379ac5875129b92aac9d1ce035", + "hash": "sha256-247bXbblup/bg+iWeIwlUxLinvvQK5hX+Jm0jKiaEbM=" }, "src/third_party/dawn/third_party/webgpu-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers", @@ -182,13 +182,13 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "0a0009998fa180695f3e2071805dc03c9a5f3124", - "hash": "sha256-hYUbfUo00gHqYKac0vOpmBHtb5/FBsgXL+UQtrHxGaM=" + "rev": "40e035a9e5d721b3b7c15c46259d782ffe7d9e96", + "hash": "sha256-m2WNsjSwlg57ACftIDCcIWJ/jwbD7FU43lhGcpGDhCw=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94", - "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok=" + "rev": "44ba5b579bf2f5c8548ad5016664fef8458c43b4", + "hash": "sha256-b8+7NGE9SelVFFuDOVr/k/nrk3jr/r8zwuW7vpm4c74=" }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", @@ -197,8 +197,8 @@ }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9", - "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM=" + "rev": "3c5077921dbacc75db5768cf4fc0b1d9ca05d2e0", + "hash": "sha256-w/tFeyek51/izvLSMkGP3RCW2j6KJdIa3l1PzxKjnaM=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -222,8 +222,8 @@ }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "33ed0be77d7767d0e2010e2c3cf972ef36c7c307", - "hash": "sha256-0rZzbZkOo6DAt1YnH4rtx0FvmCuYH8M6X3DNJ0gURpU=" + "rev": "e414c0446436ed34151de3158d18f8ae32e55d03", + "hash": "sha256-748MwxVi7oONccrirjUWgtDNBWWijrXSXlZdHoowYz0=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -232,13 +232,13 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "07b9fafa3fff468afa2960789d2b28444c38db3e", - "hash": "sha256-JpimNp8PmsROMiQLy8H39n8l+KDwaivZiIOgSjLF3U4=" + "rev": "ed91ea4a3cd063cbace42360d769983fb08163b4", + "hash": "sha256-vauYEQW9iTs8VZwyKAYeahLl9LTzkOR0krzcBR4VYus=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "69b7e2bb8e1d8d92d4efbb92bcddba3af2716577", - "hash": "sha256-1cyXu5fSHWLWt3qdafWQu1WyeZ+fT/be7seiv/MDPdQ=" + "rev": "b560604e8f2261a2c685c28359b69af74b92a196", + "hash": "sha256-vgWATYq/7UXnFhfdJZ0JXvGpr4eI08sSU115MWpD1js=" }, "src/third_party/crossbench-web-tests": { "url": "https://chromium.googlesource.com/chromium/web-tests.git", @@ -247,13 +247,13 @@ }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b", - "hash": "sha256-ZOzKQpo7Z/h1eeWQj20ghDq7pFZ9nch8lt60aoK/g2k=" + "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219", + "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "725edaaf06b966e670194d0376d50be0c25deb13", - "hash": "sha256-7YwrN+MizCnfcwDHWsYkZaTbN2qmCHcixX6KHhCPrXs=" + "rev": "65f160d43dc97a2e8eb5e1c2814179a519313884", + "hash": "sha256-VLMJ/WWCIzk92mmuBdx+P6Gi0ouiXuMGkiR0KVK5GWI=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -280,15 +280,20 @@ "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4", "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=" }, + "src/third_party/federated_compute/src": { + "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git", + "rev": "cf49f95f941eb872f596522890055878240c3a22", + "hash": "sha256-R8KE0Whpb4qsZ6HxWG4/uFSsrT2nnpwNV2nQcNYHEXg=" + }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "d2d06b12c22d27af58114e779270521074ff1f85", - "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY=" + "rev": "9e751092c9498b84bbb77e2e0689ef9f50fe608f", + "hash": "sha256-ZeFzrCE9LkDcp3VTMJkm5ypX29RGZCyZkp3tEr7yFKU=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", - "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=" + "rev": "807e251d9f8c5dd6059e547931e9c6a4251967af", + "hash": "sha256-Y5TXyJ8lVh8TaVC5S4BVxOmFxySBzPbJYEe8YJS6ZR4=" }, "src/third_party/flatbuffers/src": { "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", @@ -302,8 +307,8 @@ }, "src/third_party/fp16/src": { "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", - "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=" + "rev": "b3720617faf1a4581ed7e6787cc51722ec7751f0", + "hash": "sha256-nDJH3Jmztrglr9hnwegfS7NNLAXklnwdeH9iWWwwZt4=" }, "src/third_party/gemmlowp/src": { "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", @@ -312,8 +317,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "27c1cb10a52420515ce66729dfca897be21691b8", - "hash": "sha256-2ialoA/hqlTwnbBkBlgz5CT2nzpUVXVMtEOxSxifiXQ=" + "rev": "61a423426089e65c27699d824303f209026b2f05", + "hash": "sha256-XaSl1YJk5TUR72PDbKwnn5IGT46VR7ip1wVxUMEkvu8=" }, "src/third_party/fxdiv/src": { "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", @@ -322,8 +327,8 @@ }, "src/third_party/harfbuzz-ng/src": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "9f83bbbe64654b45ba5bb06927ff36c2e7588495", - "hash": "sha256-lNnCtgIegUy4DLhYaGZXcEaFw83KWAHoKpz69AEsWp4=" + "rev": "7d936359a27abb2d7cb14ecc102463bb15c11843", + "hash": "sha256-gUUXBd2/di6MYhUzo0QkGQvRY6KLcy7qdDlSClnmnL8=" }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", @@ -345,6 +350,11 @@ "rev": "955936be8b391e00835257059607d7c5b72ce744", "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=" }, + "src/third_party/oak/src": { + "url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git", + "rev": "bd9e19ed20525444be0882bd5848ec475ac8c040", + "hash": "sha256-F/qSxLpbPPOBjY4/Gowq6HUINb1hH+ll9T+mDMGeJ7c=" + }, "src/third_party/ots/src": { "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", @@ -357,8 +367,8 @@ }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "373af2e3df71599b87a40ce0e37164523849166b", - "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw=" + "rev": "244cec869d12e53378fa0efb610cd4c32a454ec8", + "hash": "sha256-A3kDQbt9ITaxCjl/tJtwySsPUyH+NNb8erdjBzq81o8=" }, "src/third_party/hunspell_dictionaries": { "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", @@ -387,8 +397,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66", - "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk=" + "rev": "169baf17795850fd4b2c29e4d52136aa8d955b61", + "hash": "sha256-jcpUwHKWV4aWJSOZ4AlFk5YXZoTuXrrSE4jmwrrvoKI=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -402,18 +412,18 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226", - "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo=" + "rev": "4703185b29b381e5651eb1caed66630f623bf752", + "hash": "sha256-f3IPUpLB0jYrBwwJCBzatJgzayGtUxV6NsCLU2TiIqs=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "644c9d84c123ac811a611760a9adc807e3eb5be5", - "hash": "sha256-snogXm3EMmDJoL2ikoaxeODYfmTaVEsAb5cMcRU7uC4=" + "rev": "4c70b98d1ebc8a210f2919be7ccabbcf23061cb5", + "hash": "sha256-PHtOD9HWxgwlfmcoDDHYyjhHpV/LclCVIk+ci9eUaIc=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "a8889d12a27ef7006d1a47dfefc272e0815f5c41", - "hash": "sha256-pFcusmbij3OsSAmaKhuI8/bo3AlfP7DuTo/W/6mAZs8=" + "rev": "5f27145da57a32eb8db215c40fe867a20beea987", + "hash": "sha256-ZbrbLnL/5LYu8cW06KnjNaUjMSlJCrzl0ywthOjNeX0=" }, "src/third_party/securemessage/src": { "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", @@ -422,8 +432,8 @@ }, "src/third_party/jetstream/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", - "rev": "fe1f348226d4b7c3447e606577960a606cc058e4", - "hash": "sha256-kznek87yenGR9Ft3D06LGDOy7+VPRhSUFru340mvES4=" + "rev": "f8e3d7e50ed5c7ac071a9d90d3ee36cb68a8678c", + "hash": "sha256-7JF4A2ayMOAFOP3DH2Z2iBx9MHvMN9hogCY5unJZDbQ=" }, "src/third_party/jetstream/v2.2": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", @@ -432,8 +442,8 @@ }, "src/third_party/speedometer/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "87f9ed88c8f8abe3a3bb19b9ec5ea49623d803ad", - "hash": "sha256-eIrkM7UxuaZox3A8pqEgvgpQCkcBO3zJWFwK45fgWm0=" + "rev": "06449bdc34789a7459393405dd777e02d78a3743", + "hash": "sha256-3TlVewJ9C3MXvlIudzLHshQZOCAmUkMYsZzAazSbMLY=" }, "src/third_party/speedometer/v3.1": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", @@ -517,8 +527,8 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "a985e5e847a2fe69bef3e547cf25088132194e39", - "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8=" + "rev": "b122dc0932009e78f928386c5081bb69d3c2de5c", + "hash": "sha256-y5yD3YwsQjWZn60VPUH4H2D1AwkBoGGmTNpyxGneciY=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -527,13 +537,13 @@ }, "src/third_party/libwebp/src": { "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "4fa21912338357f89e4fd51cf2368325b59e9bd9", - "hash": "sha256-eaGWMpF6ENrKxGxqXccQ0P1G0X+nQI0EoL0Y0R2VVZ0=" + "rev": "b0e8039062eedbcb20ebb1bad62bfeaee2b94ec6", + "hash": "sha256-yKVLUxzIK5ybYM/22fVaQlqSCG5Hx4Notxj+3kI2LCg=" }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c", - "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus=" + "rev": "36edc5fa8b2da5aa00b8c2c68b25ffd64219d0ba", + "hash": "sha256-RTgcspt8hOHN79ZD5jjwuX7XFrFkuAJemIXmjoBKVMk=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -567,8 +577,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "f51be2dd676c855bc588a439f002bc941b87db6b", - "hash": "sha256-7AmfZjugPKty0lpinOR/Q22M7F34p57tl+gs6s2BJhY=" + "rev": "9756d3a568a78213678eeb52e044b9658e195e15", + "hash": "sha256-LK1b2O4pgLyGBViXLid2w6+DxtstK44msyOJUNFn1ek=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -582,18 +592,18 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "1afaa1a380fcd06cec420f3e5b6ec1d2ccb920dc", - "hash": "sha256-kx2jF4kHeGECdf6WzcRKTmwhvmoKl+rIVQ2Ep8Y9rs8=" + "rev": "0a74b90b9a53b2033de1a53ed8401730f906a453", + "hash": "sha256-eTq4d9nE9J6ZbX2b7QK5gVacApSv6EQXUmvy1P641Eo=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", - "rev": "4ab725613a8ee64e9acd7930eceb8995e24df562", - "hash": "sha256-V16Fm389yRNn0b13n70828c8xTdwxoQ6GW8iKLyy0qE=" + "rev": "43afaf571d990c0f3275c6800cf3ed42138bdc26", + "hash": "sha256-I5MrV4zYZjH0iSnc1aZ95xAg6e3OxQXX/rQoD8/OQIk=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", - "rev": "28bf5df73ef2f345a936d9cc95d64ba8ed426a53", - "hash": "sha256-c/aC+LZQtedL5oouUXw2eTF6xD7LN3J3C0q3D0wl+W0=" + "rev": "e6d763860001ba1a76a63adcff5efb12b1c96024", + "hash": "sha256-1o6N9+1wsQSu1B4w5LlGlwzIUmuPCIYHPqwOyt234ZM=" }, "src/third_party/pthreadpool/src": { "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git", @@ -617,8 +627,8 @@ }, "src/third_party/re2/src": { "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "8451125897dd7816a5c118925e8e42309d598ecc", - "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ=" + "rev": "6569a9a3df256f4c0c3813cb8ee2f8eef6e2c1fb", + "hash": "sha256-e18aSNVEE42LNzCDMay/Fa3BNg36pBPeEtfNvWqlnWE=" }, "src/third_party/ruy/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", @@ -627,13 +637,13 @@ }, "src/third_party/search_engines_data/resources": { "url": "https://chromium.googlesource.com/external/search_engines_data.git", - "rev": "5c5db51f8c13cb42379d8b333890971f1a1a1797", - "hash": "sha256-Z4ykCZkUVatvkH3ytIdGOp0zEYLKIqr8fta0MnovZKw=" + "rev": "629f034fd4473fca4ee8886ed886943672fc72fa", + "hash": "sha256-iWtSJ8AL2rbjltg+FHO/w4mL1XHsemCc39lEFWKAVGA=" }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "f3ff281f2330f2948888a9cc0ba921bbdc107da8", - "hash": "sha256-88ezOArtEdPJZACmgyjJ2Jf5biSlyoDYMJBZ7wwPt7Q=" + "rev": "5eefbe51d17d2e379fa2d7353827e0ccb1e1f601", + "hash": "sha256-hjihCH6CykIfNcQ8TWCD8+buN0ZBYDwQr4I2Z2hUmxM=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -647,13 +657,13 @@ }, "src/third_party/sqlite/src": { "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "cc08c79629643fdd5b592f1391e738815f5577b6", - "hash": "sha256-1Q2+NyCJb0GIMC30YNbVqVYHnP62tmKqBRfr9Xw5Z4A=" + "rev": "7d348fc79216a09b864ff881d8561a6222301666", + "hash": "sha256-13HMEpzzcFx/UKqt4V68619R+0j4B/GOl6NYlhpBk0c=" }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "fdb6700ecb04103b658d2e4623d6bc663ba80ea8", - "hash": "sha256-jJT0hF1k5a6na+9aH1yHuUo6go/PzgKibP/k60m6+xM=" + "rev": "7cd1022cdc50fa3ac4f0ca5d0cdd64ce20af3c4f", + "hash": "sha256-YNQYUe3xgnPny6tYmlYOjC6/jszy896y+/u5aXjthvU=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -667,13 +677,13 @@ }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "c466059b72815c7fbce8bb3ab4832407aabc5dc5", - "hash": "sha256-MEMOJBBMBeA0kBlU5ZhkPbfRpn1PSL1950IsU1rWaJ8=" + "rev": "a493d027dfa1ebf220dea834757f5114494f0f92", + "hash": "sha256-n52ZDzn4/SxcdUzCENBpUfjJk3+0IQSe+qj9FVgFn2w=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "38f6708b6b6f213010c51ffa8f577a7751e12ce7", - "hash": "sha256-HeH7j7IsjeP2vFPhX9cKzZ2O54eIGSCoSnPT4pumA00=" + "rev": "3289b1d61b69a6c66c4b7cd2c6d3ab2a6df031e5", + "hash": "sha256-9xGshr6ts0TdER7Sy86XpKrUItukeM59ozCIwkFy26A=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -682,38 +692,38 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "97e96f9e9defeb4bba3cfbd034dec516671dd7a3", - "hash": "sha256-/OT6//yu8VmQMXs3DSgwEx2lMDTPlUuXJDjboNdLjrI=" + "rev": "3397e1e4fe0a9964e1837c2934b81835093494b8", + "hash": "sha256-Yp+HE/XIPJD/Baj9Nvs3H7J5Bx816qkYFpL6zARyY/8=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "3aeaaa088d37b86cff036eee1a9bf452abad7d9d", - "hash": "sha256-bkoD3/4o/CjNBAp49vnRq4ZtY7TNgYkVPI5gESM8CUI=" + "rev": "392b4893c4955125c1873c33a97f2a8ee8363bd3", + "hash": "sha256-HMzQps2F9TAnHHPvBeqowADHPlTvfRWUekE37AKMcaw=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "a01329f307fa6067da824de9f587f292d761680b", - "hash": "sha256-LCRK6UzqvcRoa3sr6nsfkDf3aILXj8zjb48lirsLTIw=" + "rev": "d1cd37e925510a167d4abef39340dbdea47d8989", + "hash": "sha256-WUj4nmr4SJFTDoaOuZBVfqOrJykzW9Kg2sqaplm8E1A=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "f2389e27734347c1d9f40e03be53f69f969976b1", - "hash": "sha256-NIBn5HkAKzNaSruw742QBWPgCkrxQdmITvTASagYlKM=" + "rev": "fe92c7d7e54664b1d3f3a0d734fd6f2ffd92e485", + "hash": "sha256-9Oe3JIuOT/yc+pUgKptnex9gKQFsHo1uBb3zeTegL6Q=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "f766b30b2de3ffe2cf6b656d943720882617ec58", - "hash": "sha256-9sF9syF7d28J5yzGsIHUcJ1QB2JmJZpAVqDt92ZZOY4=" + "rev": "8ce6f121d1fcbdf60f0f4264e23fbcd247b9101d", + "hash": "sha256-3OcmtPp8mhrVYrPoCe9qnisXllMhYLdZ4dEulDhlq8k=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "b0a40d2e50310e9f84327061290a390a061125a3", - "hash": "sha256-bj9YCZfIFeaQ9TVpyyztRs3LOIaJkKpkGKbU5g9hEzg=" + "rev": "a528f95dc2f92bdd83c0c32efe2d13c806428c9d", + "hash": "sha256-7VEYvq1x+BYPuMGi47a7/R9ZrIR9CoIaV15wLpk97bg=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "6b1b8e3d259241a68c0944ca0a7bb5320d086191", - "hash": "sha256-Do+6/v8Ysp1Wnnmdi5I+UKHpBcEG4xMeRROCWgLmJbY=" + "rev": "88a897d5921f737c9826fdd4db1ae2010d23dbb3", + "hash": "sha256-X5JFPq+4rqpfKLO7ImHOcR1nvO3+PCCglP0+hhUeiJ0=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", @@ -752,8 +762,8 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "07f4412e935c988d60fad2e373287d6450bcd231", - "hash": "sha256-yb7NqciuvXi7crCqpN+7hgJ+JXfDF9x48gkYI2uSTtA=" + "rev": "b500efdd5fdd62404322ab9ecd70b938ac59a47f", + "hash": "sha256-gGyXYaHH0nk3rbJTtazNyj9vO4PqDPJ0OG1/CisrIq0=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", @@ -762,8 +772,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "36ea4535a500ac137dbf1f577ce40dc1aaa774ef", - "hash": "sha256-/3V/V0IrhOKcMAgs/C1qraqq+1pfopW8HKvGRmqLE0Q=" + "rev": "bc7452c444245f7999be5711b1802e900f25540b", + "hash": "sha256-Bqsd8b14ORREk/J3Tfs7OJXny0FdwUHO/sfCSEMEUSE=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -782,18 +792,18 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "ae40b1a2d93d5c516bc7657c6c3eea1470f917ae", - "hash": "sha256-w+8aCRTlBWQcDh4EvAF87eiLmQWsIsxD9adPTnuA12E=" + "rev": "63e7e89ddc0cf5671d2659cd34a3eb64a008dd63", + "hash": "sha256-cqzSTeRziIZFdArk6Ty/1JyeSM8w/aH2buoNy5GOIdg=" }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "f9938c217da17ec3e9dcd2a2d99c5cf39536aeb9", - "hash": "sha256-emmJF7XLq5CxXFd0KUrtUtw1YGOHDSiz39vtgVoEPd0=" + "rev": "e128976193546dceb24249206a02ff8f444f7120", + "hash": "sha256-09KBWIUdz53TOSGhi32BJ2/FIA/BXxRNvgZMZJYiWgw=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "b7ed978e41b4bac7802b206404d0e2f3d09f31ac", - "hash": "sha256-/XuTD8ENQutrbBt5sJYHuG/87q00J2fACSBBkeEHTYs=" + "rev": "ad8af0fc661d278e87627fcaa3a7cf795ee80dd8", + "hash": "sha256-NOhavmx5NYJx6MSDwRS6RXHcn3DB7kNlTjIFZr6rMMY=" } } }, diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-141-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-141-rust.patch new file mode 100644 index 000000000000..dfaf83da60ed --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-141-rust.patch @@ -0,0 +1,21 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 516f7d85fc5718a26707d988389081cd86da49bd..f4b5284ad90591a57cb803353bbe57fd4e213159 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1911,16 +1911,6 @@ config("runtime_library") { + configs += [ "//build/config/c++:runtime_library" ] + } + +- # Rust and C++ both provide intrinsics for LLVM to call for math operations. We +- # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins +- # library. The Rust symbols are marked as weak, so that they can be replaced by +- # the C++ symbols. This config ensures the C++ symbols exist and are strong in +- # order to cause that replacement to occur by explicitly linking in clang's +- # compiler-rt library. +- if (is_clang && !(is_a_target_toolchain && is_cronet_build)) { +- configs += [ "//build/config/clang:compiler_builtins" ] +- } +- + # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia + # configuration. + if (is_posix || is_fuchsia) { diff --git a/pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch b/pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch deleted file mode 100644 index a614188a9689..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/webrtc-pipewire-1.4.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -+++ b/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, - .param = OnNodeParam, - }; - -- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); -+ pw_node_add_listener(reinterpret_cast(proxy_), &node_listener_, &node_events, this); - } - - // static -@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) { - uint32_t id = info->params[i].id; - if (id == SPA_PARAM_EnumFormat && - info->params[i].flags & SPA_PARAM_INFO_READ) { -- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); -+ pw_node_enum_params(reinterpret_cast(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); - break; - } - } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index cecc77c15072..e6c2fd10834e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,2477 +1,2477 @@ { - version = "143.0.1"; + version = "143.0.3"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ach/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ach/firefox-143.0.3.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "cc57177b1af6dfe01756a7c3583c075edce50f6a826b232c6032624b386ee814"; + sha256 = "a01923c861c629e4c9928814847dada2c1140d60884f51ab4026941aeca48e40"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/af/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/af/firefox-143.0.3.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f1c836bd22ebe6b7ce11af95cfc0b8d8f7f45dabb275156c8e417726c4780288"; + sha256 = "b91c7c74e97f5c0e808db502d189e24224059ea768c1a0681307dbcd95eb7b00"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/an/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/an/firefox-143.0.3.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d1404b07d8260e6b4df015faecb76c48056de59de56871a27e2e6a4837f69945"; + sha256 = "738655c63ef2558527c2f172c9fba1a3f90942ccfb7df58cac4f615569c27fb6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ar/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ar/firefox-143.0.3.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "fc2fc5ba8777cd342e20c81b2d5d6bd291871166fc227d734e1a231d8ff12bcd"; + sha256 = "d7dfd3e601ae23a382df4265bb1f51c5ea5aee3e16042a4467052bc7c6bd2cbf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ast/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ast/firefox-143.0.3.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a1d8076048087cbfde71f1bf0bab7f2a5f8052cf714dc8464d3a16962456a110"; + sha256 = "6ae791ba341fb5770bb562e2359dec776d7e7ed3c33fd69889d439e71f22b317"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/az/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/az/firefox-143.0.3.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "426042c34f9e31f5caa28b4bee99bd50324a0a7ce1e67824dfda5a385ab3f0fb"; + sha256 = "1dcdfad54da662ff7a50864810081291cc288eb6c82cc6164cbd6b67962a2e36"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/be/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/be/firefox-143.0.3.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "25e13cb57c8c519594f126238a915a9c001f8794c0ee63b1cec5e5ea7ae2014f"; + sha256 = "d8c8c024cacb65f3cf9174b1c064ca359c69c23bdc2d1e2138893238335d740e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/bg/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/bg/firefox-143.0.3.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a404bdc365007c59994e516578c8f706e38a439d7b8e4a07f2d8357717916e24"; + sha256 = "3cb5669ebfdbec9f73d1c58d8daf96a0d4c4d377ddb94ecb9f5b7bf52823811b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/bn/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/bn/firefox-143.0.3.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9e277b035d005db65802227b1029633ae8363978d7065f774da105d866d8b208"; + sha256 = "162943a9a13077bf5da05497ad0429a01e55d02b4bece2cc17c0e2d131a44f8f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/br/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/br/firefox-143.0.3.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5d205a56e7866f11da8198a2f4b07ff00a7b6d0e27983b8f686b38e4e6a5dda9"; + sha256 = "dd215107f98ae440dab82df5a5fd381c6cc628b4e33bde41e17af598429eeb4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/bs/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/bs/firefox-143.0.3.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d69a7d9d6d02e2bc8b103934e884c5f3598ec17aa50a5c845fc83c936ede0c77"; + sha256 = "b21b44faa183f127348a195cd89ee9940c56a8973b04f2fea3fc15e9989e334c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ca-valencia/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ca-valencia/firefox-143.0.3.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "1df4d79ba508870567f76311a1626774b356794f82382815ec2059819b0b7e53"; + sha256 = "5f17897abc3b61da2551a89f81135acc6758a473efab4821d72c897d69926566"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ca/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ca/firefox-143.0.3.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "114be0142acd813b31de893fe49f7b8cd67f96e3cbe88fe3c81c562d6a841d4a"; + sha256 = "b367adc555ecc927209185988806ef17f2c1cb0d5cd28f116e1ef930cf0d39be"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/cak/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/cak/firefox-143.0.3.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "53baaaa80b50ec6a482bd03e1cbf79bf0c7e2f52e2cdc03da87b6475b48faa82"; + sha256 = "561c57bf5484d715d1d55323033854d30951ae12bf954292f6ff2b2998a9ef6b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/cs/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/cs/firefox-143.0.3.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4c34e3a7a362bde889dc785fa9507623278ccd82c44f497c77475dd31220e31a"; + sha256 = "5bb5689b61761742cbf89e5812f105660159cbd5071a1abb7aa858eff69e5fa6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/cy/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/cy/firefox-143.0.3.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "00e7450b6ec627182ceed875810078eb92e2c79a530ac66947dca9a6947a4f35"; + sha256 = "2baf15876e5daf46e34468e4798c74bcf36c83cf13dcde8e07fadf2be05b4dfe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/da/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/da/firefox-143.0.3.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c021396fb9d814f649f7ad9d7da0bc6c2b93a8a04251c8ef2b8d181668087173"; + sha256 = "3366f5a8ffafb182ebb66c1a41e90ea0ee219568cdff8b2732801d1b1280894c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/de/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/de/firefox-143.0.3.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "3fcd8e7e161305d38c98f3ae8db1d97af0ebb98fb8a9c78062d2ce56233f11fc"; + sha256 = "45e58ad9e0cc104396f877a08be3e613afa23dfa2e8ea258e4e6fc74f73a7194"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/dsb/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/dsb/firefox-143.0.3.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "92938ad06e4591221b10b0f122c55329250d6ea902c0aa27fd434c2262b4f38c"; + sha256 = "a000472cca359af36b83f2a88bb24a86d8fe7c0b3d71db6139a2613253b819db"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/el/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/el/firefox-143.0.3.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "dfde560e2010176bc582cb552b95f2d32df7b78dde482a921ef238cd94a59ce3"; + sha256 = "482d5d057becfaf927539b010146662826ac91ab31e105d08d96b2f24124822e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/en-CA/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/en-CA/firefox-143.0.3.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5859ec3e746715336009216fde117c051ce70d4a1c4363a1b15c764284147526"; + sha256 = "274ba64ac473caa91d743295a6bfed4bea090f94d9638be59c0c309c1337cecb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/en-GB/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/en-GB/firefox-143.0.3.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "dd78e622e2177a59ee3f8006b920f9806ca1d0b50303724a769c7f7e1f25f6cf"; + sha256 = "8a1c2b720ebd8453e301a05c14ac86df642cb2b0bde222b36de9d1f12ea9ac0c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/en-US/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/en-US/firefox-143.0.3.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0d515c65248d4485cc8f5abf4e3b09a9a65363f2b4e6b8435309a4c87e500720"; + sha256 = "c0d70d6e4f2026f0e677addd595b58e0f898a991b0fd9e6ca0cafb048d10f442"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/eo/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/eo/firefox-143.0.3.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "2cf465124c12715443de35c333e344372a0c81904f7907b75353490f4bfa4cba"; + sha256 = "6b3c4d8f269bf3b57166e91531d6d2e1fd14d72d24e3b1525ecee304e8de4a86"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/es-AR/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/es-AR/firefox-143.0.3.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "5306b7d158413c0dfb7906eee0c5f17fe0b54b60cac2d9b8be2fa3db54c18a77"; + sha256 = "7f116ee6073e9bb3335743ab957b575af8bf6d8fb180de4bdf01325d389134e0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/es-CL/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/es-CL/firefox-143.0.3.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "c58d8248c8fb0740a32e56bb2e213efd66e959a53e48411a7e17b8ac8de5dd8b"; + sha256 = "417bdacf574d27783fa7f384d484041916da53055cac4387e7365a3c11f5f80c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/es-ES/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/es-ES/firefox-143.0.3.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f2b4da508c656cd77891f0931ff463bf2b16426cc5c233993c52e28f8b5ec9ae"; + sha256 = "9531074814fb31ffd968bb7719e777a32949521549f313c83d4a93173eb0b762"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/es-MX/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/es-MX/firefox-143.0.3.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "48b058835905a6c3c555891f502c4cf798342e53d7878358c1239157ee86c43d"; + sha256 = "599f2fbd10c27db25c72054ffeea3096a1fd00f1dcee5e50933d8cb89b565931"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/et/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/et/firefox-143.0.3.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "99f2fce592224acbfc74228ace603f6c0c9aa91bbabe64ccb149ecd83b610774"; + sha256 = "efbd598e08e73af1d9d0877e60481e73b7e02930545d85d9c16c34ce22c28f2f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/eu/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/eu/firefox-143.0.3.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "810b7e87a7490616f12e8d769df9323aad3a0e52f8ffc3d254fabe12176d2e94"; + sha256 = "7108b4d729052e2dc417e93f958e4a9ab577bd0bb8d3edabc0e49c5582736755"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/fa/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/fa/firefox-143.0.3.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "f6d8dd9b16a45e63eb302f78a0caf1d3578f9d5c2903cbde3fe3678e24cecbd0"; + sha256 = "5c53fbc3112bcee74643e3e797c4bb3471bcfe5df9db72140b51e011107b7f22"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ff/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ff/firefox-143.0.3.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "7f0b0c3629df7ab39695e43f02d2c2ed2683c223212fb6b2fe02e902727da865"; + sha256 = "540322b5fd036e2b53b2d38282b7eb9fc268d3873fbca32b1484e70fc0c00c7d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/fi/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/fi/firefox-143.0.3.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "fab5b4646cb245b80c8b1b707b280a0eb34253de3dc2158b0fee03902acc390d"; + sha256 = "fb589f8b6cd10707a28c8fa9383d2ff00833a3e5dd3afb0adfe1499c430ae91a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/fr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/fr/firefox-143.0.3.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a0216ea52eb7bbd56285ea5ad2a770f793e85eb8d23949abca469adfc6f4f5e5"; + sha256 = "4c481134702543f1627a84564de7f7b3a4273faf3ee4b419aca1899ad07cb0b0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/fur/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/fur/firefox-143.0.3.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "becb77ef5ec25a473eb524af26893c6465dc6ddd564b31b756a79346354863b7"; + sha256 = "fda22987901a37e82a4dd29526cfcf8bc6c7c4976bd3784102d03003a929874b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/fy-NL/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/fy-NL/firefox-143.0.3.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "554fc361b041747c9e00e522d6f9438791f7f748acf0511766bbc33cbf6b4f5f"; + sha256 = "a057be21245de0995018a3c3a95d9b29a5124ef5a3b5a2d4ee8feaba8f04a147"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ga-IE/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ga-IE/firefox-143.0.3.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "e6d521472ddf58a0e144ffd15d3a67cc5623894516bd31003992e4d71f02db41"; + sha256 = "421fa60d35982bf3a23c5114ff542cb8f5a30e1347c2aad23fe5012bb02f1386"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/gd/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/gd/firefox-143.0.3.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6ea75692a263b015dbf32cf98dba78b84fa3a5cadcc035bc3abe760631fb4691"; + sha256 = "26c6d0d5f53ff33f1d3efa82d96cf195cadd2c1c57f1b7bc40b71bbb8ea8b903"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/gl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/gl/firefox-143.0.3.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "554ff414a64943a79a2d555f9f45d41e2b00b8d3b398a78e066daec3019d8888"; + sha256 = "4351e7ecd133015acc1f7fff4d49ff50531cfbeff3f9f1a26274f5230be323bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/gn/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/gn/firefox-143.0.3.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "aa58827c86026bd64c9f399956706ee62527c86aa3369783e9d34338e79424ea"; + sha256 = "8d771f1d2614fa762d2c7f4f0affbe89b4244ba425cbe6537c014bb1e7ef2fa4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/gu-IN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/gu-IN/firefox-143.0.3.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "1dbef2d65f0128c3d6b84722bc72d5edf1b7683c1d6c63bc7810b597199f91c5"; + sha256 = "b7282de46e5351a71507c08a12595625126ab645539716c37fc8731bb18f4077"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/he/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/he/firefox-143.0.3.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d32564bf72b4bb70aeffe931034e4c8cc64d2b7d7d62ad4cb067ad64790dc2f2"; + sha256 = "98d01d5e33148e006f1de0eb97e83f38096a6101978ed955507e57f108ac966c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/hi-IN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/hi-IN/firefox-143.0.3.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "241027818bca81399565d6dedea7fb7c7a2e20ef40fbdd71101650c42c67f051"; + sha256 = "f4d293101e9d9b869a4f82514568c726f4c5a18463980d137c832c3b318fc16c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/hr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/hr/firefox-143.0.3.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "f8b1588b0e9ff3077585cdd62b5ac36e5189dc97c97019b335b8a95089860a47"; + sha256 = "b430f1f451952bea7b76e4d10657d3cfc3dec9d89aa8e6a0cfdebbb3bc323992"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/hsb/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/hsb/firefox-143.0.3.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "8ead2f183b329f956894943fe92e46692fc8ffab363834020166a78ae775700c"; + sha256 = "2d4bb4e450a7cf3bfb35167895514ee64ad97c2cfe3a12465b1bbbd222f39610"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/hu/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/hu/firefox-143.0.3.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d543c3b84f5ff2a97d921556c6b884eb76f8086a9c6ac944aacbaa09d39a4a11"; + sha256 = "6a246b11ee62084377fef23ce088577ef2a1da4bdc1f4cc2c14ee649df86b1fc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/hy-AM/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/hy-AM/firefox-143.0.3.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0ab01d5a2eaadf9a905b7b8e4a539dd657c06f246cc4f378567f530d157130fa"; + sha256 = "5833ab0400245d47fe6c2808d4553fb14a88efb78e6157e0f460a3a504b7b274"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ia/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ia/firefox-143.0.3.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "1b5b81ddc1b5c287a87012faf3cd7142953b1c3b5ccb4892dc482026f9e62e13"; + sha256 = "039dcfa668a8b5f1667b50aa259580854f06fa914368099d2af6dc0d536f45fa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/id/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/id/firefox-143.0.3.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1d0f9840f0b944d61c0f7133c17e6b5ec30e9d3fdf8caa34001309c9279eeddc"; + sha256 = "e0e3cb60cb58b4df942f681cefe4b053347fa19d3cb4bcc5ebdeecbb0fdb5370"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/is/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/is/firefox-143.0.3.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ae03dbb68f8f8af90bfa3feb4f83850fb1dc3294922c8d75096ee688c864a20f"; + sha256 = "2888d6de9408553dcdadc048c9b5e5a943e187fd2a9514200544fb78da5a6e7a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/it/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/it/firefox-143.0.3.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "6089612cad1871d3cd2abfc2ee52f37e47443288ed6f2f8d028e26c622e93951"; + sha256 = "87a84f1a1f1eb9ba976f3d32965a9d58670f3998e4c529519a21b5c61fe97a2a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ja/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ja/firefox-143.0.3.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "985d555a83bf10457a24bde35cb0fcae7d70d0a6698da38b57e80a20aeab5147"; + sha256 = "545bcaed68135a3f4ea36fc9a5b2a95535162a991d240728c1d3f84a073c55b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ka/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ka/firefox-143.0.3.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "cf86359058a231676227dc7de62b39c95b816e52a575a478d7dea8c9b2a7f3ad"; + sha256 = "1259b11d8cc8418cdebf438db9ccf5e1857dab1417899ea97dfd1646595ddb21"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/kab/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/kab/firefox-143.0.3.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "121c8689c99e0d84c20e4462ab313889bd5564da1aca364e7588cfab32935655"; + sha256 = "209607917e233f9ae0ed9697d9fb9d19c9ca5f73062d411985a36fb79f8684c9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/kk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/kk/firefox-143.0.3.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c6055c1f54bf793405ce3096dc477adc40b45aae1157be53d33630036ef5eaa6"; + sha256 = "f9d037fbceb9e5d739612c601c1a8ff0071cbb43114d681472aff67267796f71"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/km/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/km/firefox-143.0.3.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "d3d16ae7a9499483d0263c99876aba7cd14753f5f31ad79fc2463d9682ee3af6"; + sha256 = "529b64995b7b8845a573224e0bd15276c712d3ee83604240b60499082d799ffd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/kn/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/kn/firefox-143.0.3.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "b23f801009786bbbb7ed581660015b3a4a504cd99c91dcca581eeb14fbeaca02"; + sha256 = "8f7f56b2b0584b52af8a8d05276fee66bf9e69f35077fd525ac349ded111ed21"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ko/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ko/firefox-143.0.3.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "907920a510b93b2365e43dde04539b757364a2a2a4e8f74ebe1ff72296a5eda2"; + sha256 = "eef84bf2539ddf76095fbd51819a7acac72d731ed46f3435b23f6902ca18f947"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/lij/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/lij/firefox-143.0.3.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "e27f4523eadca3ae2fb3a3d6eaa599675514b97c2bac032f8e90e74c26c2e513"; + sha256 = "f53d94dad84a083f26dc85124a5e7e50a158ac0584bb55af01ea4b6afffddd56"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/lt/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/lt/firefox-143.0.3.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "812e2fad1b656f43624d794bff35c43b54587fec36cae52d8d4ec29eefbe3245"; + sha256 = "e7d48c6a9e5c99ee8caea09c0784f16a6c6ef9a77e32ee3505b41746f156b4b5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/lv/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/lv/firefox-143.0.3.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ce450b89154c531c5b9d954cf000060d2e4ff413414922afcea60fbebb0fb076"; + sha256 = "c23f86769c3ff1b054746c2cf7e1224ae0ece9623cd13f4e57807949faffab36"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/mk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/mk/firefox-143.0.3.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "042189f18109d71882cd67453e5dfc5caac0a710bc4313ab1d7176130b4b524b"; + sha256 = "8a004d8ecdf94fe2e286a0d2ad9455ec4e0c60bd376179da255a8ffc203aa7d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/mr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/mr/firefox-143.0.3.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "d63f0790873e0b2427bc8dce5976510db75f1825db4a20392d5bdf9e395cb267"; + sha256 = "fbbb8454af5d75245074234a136a4349034666057278781a7063c32e142e3b75"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ms/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ms/firefox-143.0.3.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c67d9b4e8b8093b63165b6c9860971455aae73c88eb73d302b2d8e54c378a7ae"; + sha256 = "e467bf8a5dab06d145b19a13bfae6a56cbc16518b69347f070a91a1b3b9ff537"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/my/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/my/firefox-143.0.3.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "6e949230daac40d71a705c1f3178678ee246a4bd08cbc8c1b885e2335fccdd34"; + sha256 = "23babe6851d3147fa5177b69a9f16ab3c9b2029f479708719c75c2e72e9d81c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/nb-NO/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/nb-NO/firefox-143.0.3.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d845511af58acf2d56c2f671ec79e1bb6689e1c5efe9e6ec0dc5d289eb19092c"; + sha256 = "1cff623114fe60a1aa2e14c075ded3313a518c5275f45ed5f14b5f4e59420066"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ne-NP/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ne-NP/firefox-143.0.3.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d28ae2f5acad5f0f4c06d6c625a4a0cc90a77ca2e460d632c116fdc3e3e942f9"; + sha256 = "3733b901c4e215179416363eaa2c1b074b9a2a2380f5af45e751e1105938e99d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/nl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/nl/firefox-143.0.3.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6e48604f40249f1c3fea56c423753d46179a62c79222119b1b2ae75dede86550"; + sha256 = "e48e4e830f68e166c4aa0def7af4e410162a602d5acbc9c5fdfa46a6e07a874c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/nn-NO/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/nn-NO/firefox-143.0.3.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "5e793864dd4c4b48c7170afd06fe5abeb45dfbe09820704073e4fa6392420f17"; + sha256 = "6fbf9d163b02562d499c9f1c533224dab9e9c8052d962c19195e55fc72d81783"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/oc/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/oc/firefox-143.0.3.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "dc505f706c2c3afdfdafac6284a1b8d1eabca20464829b6319a182928cb09373"; + sha256 = "cf94b53a437af188f1f277b5f12fb0106d2fc91ff58fb235830a9425755caa88"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/pa-IN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/pa-IN/firefox-143.0.3.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "282710a680dce4134bd52b35ad85588bace56142d42a2b0269b957d5e64511dc"; + sha256 = "c1a2c7893a10c578ef4e2f6dc5ee6988d8d95f73e326314f62c0c4d874a6e1a1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/pl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/pl/firefox-143.0.3.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4498e1086b7934b38ce10a295fc8389fb4398f0cba2831287db4e3294d4256d2"; + sha256 = "e59da0750f9cb869fbe4c30bc5aee342d682c670cf62cafd196ed1e35b742007"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/pt-BR/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/pt-BR/firefox-143.0.3.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "b34c963abcaed15e73c507f2bb30199ae90ba8948e576fad63503b32656d8595"; + sha256 = "c4d525c7d76d1f5dc067702963f61777fadbe4f98efe13201f1eb26b6348f153"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/pt-PT/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/pt-PT/firefox-143.0.3.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "29989d745a447a75f722787b2607038a46e89418622a9601c098cc4b9ce2ed59"; + sha256 = "79ca83ee6cac833e1f0b15393362b602d649f05f6cfd465b168de55e49ffde87"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/rm/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/rm/firefox-143.0.3.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a87076af115c5cb551fa3d6317dc1fd24eabf38143873e0f0e0892e92684d936"; + sha256 = "a36c062f6e36aac3e38d365f9d59ca44b58e900e1231f325cdc341d5f25f7900"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ro/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ro/firefox-143.0.3.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1ff4d1d337a4f502a9cbf7421f974660ddb6a3fb4e025e497c63d48931b3f3ac"; + sha256 = "4308365c40e6a4087799f8516e0af75f7b66d38eef6714621c914194753dc319"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ru/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ru/firefox-143.0.3.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "704e9f19ee71f2e56c41a496e50bd8b2c56269a148afe8c5621481522d885935"; + sha256 = "695f5543a63335ac8dc2c9e34e6e8aea001ea1d0fc0a831141f0f3657a86b669"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/sat/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sat/firefox-143.0.3.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "63409bc430a3af6566179ea197e5f066a5cb27dbb2283f5b4a12beed189d15e2"; + sha256 = "f7918adee19a052ce6aeefd9c9ef8cf5bd0d8c4f101ccc9df5e7f4b25100047f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/sc/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sc/firefox-143.0.3.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "1ded7b3c29bc0c62611df0b09ffd4c55b8577db783b1e3da00bb033d60623154"; + sha256 = "2b4740775570d934fbf505977333771e627159cacb6e135c6689c465527d7fe5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/sco/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sco/firefox-143.0.3.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "1a139fcd51d6f886bcba78e584d5005f04c0a84af845f3e526f7f8f6e2173e83"; + sha256 = "56af3f374c2b860fc9c6e362882bc8c756d40cb52281a8f6d45a2249ce487b51"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/si/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/si/firefox-143.0.3.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "6028c13eb5408dbb297cb15e6f2dd053dce663909df8730899cfc49586b52831"; + sha256 = "39692ba5cd781a6a2023b99fb26ab3f20208bca1158f2c3de63e21568042fd80"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/sk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sk/firefox-143.0.3.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "9cb07a4fd191e8e35360145263bfada995a5c5cc42151e9529e4aebb91bd1297"; + sha256 = "3041971e483fc9a74c0cab3b0a447ef7bfd79ebcb52ea153a5b7f9035465503d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/skr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/skr/firefox-143.0.3.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "5820c79abac430af8ef6e4c4cc8d0a2f6025adb12b6b60994d54ef0b77fa0622"; + sha256 = "4aa86dabc7c8a898d615ec4f8cc5293f7a6ccb05d96f18e9abeeeb70b7b8eba7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/sl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sl/firefox-143.0.3.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "0a4f03e848f14336936c6eaf93f3ada15e6b6af576f391b19cdd2fd6c70bddf8"; + sha256 = "2202be1ef313769dae4a744f5541f8af60a4bcc9b7c0b56069cb7342080e62fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/son/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/son/firefox-143.0.3.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "2023f04e88f23242d39749d29076516e5db7322cf5ba95d553fb227f46bdb978"; + sha256 = "d2dcc8dee6d72914f28907e60ae42663668122234268ecc5855a90fdafefaa17"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/sq/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sq/firefox-143.0.3.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "1c9fa318cb9bc160a8d51f3f8e45642fe80288c208bb88fab38c276fae33cf1e"; + sha256 = "80e6b1bac173fb8ef91d34acfec509b21544a63dccbeb78894681f1a9d146ba4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/sr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sr/firefox-143.0.3.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "dcabed0d13dbfe1ced43e2cf3fedf682abc8b5ebff31ca5f4bbf12902a6ea94f"; + sha256 = "9a8b73c3bc98354670236b90b7f47063e254e02765a0a1dc058359f8ce7ff56e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/sv-SE/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sv-SE/firefox-143.0.3.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "44ce3ec032060132f51920c1b9532de93c075060dba94ff6a356cd8a7ddda2b0"; + sha256 = "3994e8b13043f3a3f7ef3b2639b2aaf2e183976aa86de8ae13649f380d81659f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/szl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/szl/firefox-143.0.3.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "088dc165641d10d33f5bceea3e9c26a0ce691c6b753af636c8d6bea88a911dba"; + sha256 = "84ce4df59819749ef27397b2e3bfc9579bdbec86e9b41d0ad91855f185b201de"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ta/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ta/firefox-143.0.3.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "63da38c2d832a31d224ef9aa4a084eba229ee98a8f3f9353296d8b587ae7a498"; + sha256 = "61d0ae973ba8e86c3ec1768b0c957d8218a4f78a1c103ec089277ac8c112a946"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/te/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/te/firefox-143.0.3.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "e17ba9b2c0ae1213c583cb0347f7a6a4cdda5c569e0627fa748f6bcfe5ca0bd0"; + sha256 = "0778df80957bdc9f0385f6a313b5791b3336d044fad20aeb42135ef32beab718"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/tg/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/tg/firefox-143.0.3.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "f13d16bd8a5b573a8edf31ddb1b4ee0a6fe0f817cac365229fcdd4867073a05f"; + sha256 = "54a15d2238f8b7f926ae61cca05169309c3d5b2f9aaa764760dc4c56482e27b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/th/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/th/firefox-143.0.3.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c9bf355f60fce7e968b9d61df70c6c150256a4405bcb9b4663c47cf8ca722e74"; + sha256 = "37afd35187a76320b51a2b6a13fe2fd27c92852b3c41ea9942a06911fcdd9bf0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/tl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/tl/firefox-143.0.3.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "6b0517a9f17ab839323f26b62688e2829f8ea01ed629b239fcb504aaa312f8e2"; + sha256 = "fa8c15eb9074d0655eb30635bdb0aefc717dd83d604c9e734d0b93cb5aa329b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/tr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/tr/firefox-143.0.3.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "74982da4e49dec432a271da1cb2ae5dc05e7f0506679793d1614349da407ed9c"; + sha256 = "3d3867b58b0a6b6f3ade72bfd69526d529d7e3c696c8f7e865c3e7c6f1469bdf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/trs/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/trs/firefox-143.0.3.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "dea884fe45d1520eaf5f0c933d265f531c63d05a4c706b3e93d182b594828b62"; + sha256 = "2a6f1ce8f06f6fff06431ab6b43a6bae3baf57187267e7e39372b627a9a506fb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/uk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/uk/firefox-143.0.3.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c3f0fc20d70a480fe275dce6b3cf50cfefc8d2c463e5f1bc495f2d192e21ea54"; + sha256 = "bbdb0a6b83d3670c65ab51540bd64d60377cfedb6d31b15760e906899e7e60af"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/ur/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ur/firefox-143.0.3.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7e964276fe824230e82a0646ac59f8debdd3d097782809b4d623d876571b5328"; + sha256 = "fb9c3bfd618039aee74910f91243f3005fec01880a824df27b71cb501edc16ee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/uz/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/uz/firefox-143.0.3.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "73f18b5e3af74c1f5b0268ea24dd7f46a6f1b18b12573a3e7f202164fde27a2d"; + sha256 = "31dfcbe572cfe4c951b9c06816e20a9a2b9b2d6bd2243e43537beb938fc92ecb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/vi/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/vi/firefox-143.0.3.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "850b71927236f377eb3978e201d4a4279eadbd5da143b2d2a8345370c68c7652"; + sha256 = "71bf154fb82a6374d9d79ebbd45684f95aad04402c6a3065c321540ed896eacd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/xh/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/xh/firefox-143.0.3.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "41932e2465df34febac6454e7ca494aba058db04dd81f50a646775d1771a5949"; + sha256 = "e87384a9c4ca8daebc11a6db28e8d49408d32684f0c2b3ab66b7695da8899a54"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/zh-CN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/zh-CN/firefox-143.0.3.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "6ac6b9199817dd48080c15dc70d9911b0febde7c962b433b29645a0a39bafcdd"; + sha256 = "fc07a3f8bdf1743642b6d54644f2c2c888f63f76602dfb56443a99f9bc12e12b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-x86_64/zh-TW/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/zh-TW/firefox-143.0.3.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "840c7c6689aa93ff80ed7ffa6f3c62c26790c7d887f8c01fdfc52f3269a0d2d6"; + sha256 = "b560f9e6aa380f61199239b024ad5068a89d028616688b0b6bf19d5e1e272c0e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ach/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ach/firefox-143.0.3.tar.xz"; locale = "ach"; arch = "linux-i686"; - sha256 = "447a5f265391969a8d0b7a028d540c1583b37932ce0b8cd3c7dcb424ba805a7c"; + sha256 = "f20a578274c7a84cc90dcb4e84542539bc0d51bb29c25997ae6f464d746e8d4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/af/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/af/firefox-143.0.3.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "ea372e84fad534b7dd6b065a784ed22a84a72e6f0f69006e73a52efe29b34734"; + sha256 = "c756ef7d3efa41d9f84fc7e944d352b649f07219d53c3991f750175fb1148ac6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/an/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/an/firefox-143.0.3.tar.xz"; locale = "an"; arch = "linux-i686"; - sha256 = "286c0c986f19c380d19c2216dba48a1234c587adf42ade8e44f799c5a2eaf0fd"; + sha256 = "bb2ae4ab3c672a12d3e54d7aa3d28425a3d917e262c5fc9a9b1d1625f65c3167"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ar/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ar/firefox-143.0.3.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "6b857fdcc6b212e4040993fa4e366af3e3ab9c86e899f97f8ba75a570b50d466"; + sha256 = "1429fec6eb9002221620e843080423d71ddf1b5db9656eb844792f122cd3127f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ast/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ast/firefox-143.0.3.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "fb2e385db337da24dd9ab4f655f65a2041137d11686735c7266e78eaf0c8e56e"; + sha256 = "85a32eeb6d5d5a3291d81308c932ba4f6e25bbd077c3129c0baf181b71d9fc44"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/az/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/az/firefox-143.0.3.tar.xz"; locale = "az"; arch = "linux-i686"; - sha256 = "19f81de66b1e764b96083bd840ab1714f7df7972bf5f621bb47767fb123a7ed9"; + sha256 = "da4961c58b772d6441e575a1a6c767749c1ea7aa5164846fae5015f493921e46"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/be/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/be/firefox-143.0.3.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "d185e077f78d9e00d5bc0be5db5f5da001c4cd04b9953fe37e4aa0c011a215ef"; + sha256 = "96d92e9d6a28c51af104fb42a7acde1c32c8de145246875044ff6b2b44f411e1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/bg/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/bg/firefox-143.0.3.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "8f9f9cfa814418c4eb327a4c6d9baa971a5e9a853607ed548243fe1b20f88bba"; + sha256 = "455a73741a1f93032610aad98de820f64c518d89b28a2cf85dab95d9e949f5a8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/bn/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/bn/firefox-143.0.3.tar.xz"; locale = "bn"; arch = "linux-i686"; - sha256 = "817d0fc748e6413f9f7ab145e23577a4adc65e791575123a1d25bfb751d1ccfe"; + sha256 = "dd19ef50f790709e3a4d1537b862d3536638cd6e5748e5dfce7b491d32e49ab8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/br/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/br/firefox-143.0.3.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "436003557d2ed1dddc189914eef7503e561842ae117a33a2b265c95d0acd7523"; + sha256 = "2a883e52f1763df2dd2326873198ca91d192cb902279e3d3abe7b3e85cc9bf40"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/bs/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/bs/firefox-143.0.3.tar.xz"; locale = "bs"; arch = "linux-i686"; - sha256 = "21aec551c12759176e5cd933ddbac34630fb9f7cf448ab2ac9ca9ea0cb7d0c77"; + sha256 = "4370bff6cd7eb8c420ad5d397f67c7c84beab5043056c8c71236a130e740110e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ca-valencia/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ca-valencia/firefox-143.0.3.tar.xz"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f5f999bd42080ccb48b684104270e3407d1e702063de76903ee5869e9e7a7735"; + sha256 = "15142009db9e86e7dec40df8a31f750480798894224545c0e20c480d97015e5e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ca/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ca/firefox-143.0.3.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "85888753fd7cdb9c059e3d8ef069d588b65b2f4892d278ece9f8227b5e85724b"; + sha256 = "974a5a0041c983ff06fbe2f0bb86c7535163e7af67116119b04f121680edcb0d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/cak/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/cak/firefox-143.0.3.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "d878134aecec04076d5f9cf5921d299a2fde1747b60283ee8ce4d188360fedfd"; + sha256 = "462bf044072dc3ec3c2d681d3cd8ca28c96087b1adccba9f67507a652ce5077a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/cs/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/cs/firefox-143.0.3.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "b7eb7e06f19434bab147882e04e77038142b7452f9745f32a6a93e8f83997db7"; + sha256 = "bd9f722b39b04974bc9f5ef33def65664d653a10f8b89387012e76c879b486e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/cy/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/cy/firefox-143.0.3.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "cbf5d997df6f82b9df1a12d6c52cc850964f84fedd8f4c90cd080bce153b8ff9"; + sha256 = "2864898ef11b28cffaf03b403107ce0647d9d7c85e6bee7be452625b34f724ed"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/da/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/da/firefox-143.0.3.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "0a34f01ba5c6e38b0125e724dda56224fca09a8567ea7c233f696b6b580d36a2"; + sha256 = "2046be5001dccbb9dffa72e8771a6b10509101cbb65536a62afc4e3603c0fc99"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/de/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/de/firefox-143.0.3.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "3ac432aa4dabb3cc64843c5dc2e66a6463fd7a6b8f0d1a3e120852048db096ef"; + sha256 = "1b4c719b8735750cef4761c5df65158e56b1bc1be574cfd73ef47c46f483e8a9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/dsb/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/dsb/firefox-143.0.3.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "8f085de8aed077dd128fab1ada14a020c6d20d1d2cbd95e8b48d448c93d5ed58"; + sha256 = "d4238e172298513c0628afb0f541cf95e5f71470010ef6f8e4615d836abfca5d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/el/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/el/firefox-143.0.3.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "738d4606a58797fe5ec92990f9e5d51e814b86d6f3bde64ca5ea1b53603a6fa0"; + sha256 = "4068d0cbe4a5e4907d77d03530fa364c8e279199d3cf4b00da39887cdc3d8aa0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/en-CA/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/en-CA/firefox-143.0.3.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3e0873c24d8aef2f90c3ab7bfd981f40b0c126971e5b1d05106f9b5b8ed0a3af"; + sha256 = "aa30ad263dc5ad494d8e9017b1134662edd3b05cae4b61f7951957202dc50b9e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/en-GB/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/en-GB/firefox-143.0.3.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1d570ab1480cfa3e78fc41475ee2e92dbbb2e0d00960cac13937470ef3b5bdf8"; + sha256 = "834f9aa12541b65d757c979d51c0a18958aeb28b427aa3ba7f06f24cf35a336e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/en-US/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/en-US/firefox-143.0.3.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "118b6155f0e81e6e86e29760608caa6a04c56d08da229b5a8ac09f71be080dd4"; + sha256 = "05bf83e98973c08840b2a8b8415cc433451735a5e2688d672d5be4e56d57a38c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/eo/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/eo/firefox-143.0.3.tar.xz"; locale = "eo"; arch = "linux-i686"; - sha256 = "4baa5891caacd3b6c932ffc19f31c5b82a285e75efb815782c0ce231124336cc"; + sha256 = "ad6fb098fba9a372c7001df8811f5fb47dbf8b8cc19472747eaeec00d3fee436"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/es-AR/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/es-AR/firefox-143.0.3.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4fce2ed1057ceca85e36b2029bc78f4bf06ecf98bdc016bb864f9c24fd2a63e2"; + sha256 = "42ec0ca57f4bfd2cbbdffce88ad84429460a5f872f3c9f3c2b29191113a15665"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/es-CL/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/es-CL/firefox-143.0.3.tar.xz"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "534893858c5a1a040d61ad0f70c9a1ae795f7fe4aa63f8aa31442cdfdd732de9"; + sha256 = "1088be092d9e9c9ad50733e28547cd631a3a9c723235c3b1224a1c71fbb87d1b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/es-ES/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/es-ES/firefox-143.0.3.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3e142c15b060adb9de437c4166b55d35338278be6ddbe5240e3fcd2f95d83edc"; + sha256 = "a72abe312378300d61577558e2eaa49acc70c6921d0d7b413bb524b71ad74b72"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/es-MX/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/es-MX/firefox-143.0.3.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b27a77b89e997a6353d7c77f1a8b2f90cd1b04e038a6ead45d06588040b41eef"; + sha256 = "bcd2549dc47232d1f0628a82fe68c9ee40d3265c711785a200a0662c3ce350b3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/et/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/et/firefox-143.0.3.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "b5f8ddf17b2fa1ed21b15c68cc6001b569b61d267d91f842f22db3c0f96ab43a"; + sha256 = "9303599c83ed66f1143ec232835b7a9f59ad10f7b7a95326c34ceaf16eeedadb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/eu/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/eu/firefox-143.0.3.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "0e5a6851fdca9b88488ec80f20d44379f0bd03e7df5f557b61a073862d8e371a"; + sha256 = "4c36cb3c3527df77a86c446557358d556286834b46e2ef4b3510a3bd0ed2b459"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/fa/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/fa/firefox-143.0.3.tar.xz"; locale = "fa"; arch = "linux-i686"; - sha256 = "999d91d4295a7b0bdcb7767cfe9a5997a0a0c07cf208d96b26093a7ebfd0da78"; + sha256 = "b3bbe87b6427e1764d17c233cdf78e24cf7a9d518832b42ef9c49c4354fff4c9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ff/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ff/firefox-143.0.3.tar.xz"; locale = "ff"; arch = "linux-i686"; - sha256 = "16f6d6f4c381f9c019c09589e4ffa1431a7eacab2173350679cd801dd9fb1c5a"; + sha256 = "dfdde6df46668c5feea6735e8f0b390d8d385168d12da4576cbf246e52cbe7cc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/fi/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/fi/firefox-143.0.3.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "82a8fc57c4fc89f6c7f2ed487a677283a6764d0a0a409d601b80adfdb50fdabe"; + sha256 = "a872bb14a26af938487fbfd4c99afaac4213c8ba56f44c75d501f1eba9148f27"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/fr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/fr/firefox-143.0.3.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "1babdb4d98760d8d82c79531c2b3c45f77b831cf85e914285660e865fd8c4a51"; + sha256 = "4354d7a4cd1f6e874f177f9cc2d15d609841dcec6a6649b8b1e697cde298dbd4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/fur/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/fur/firefox-143.0.3.tar.xz"; locale = "fur"; arch = "linux-i686"; - sha256 = "249631e406ae355ab26253ae6db66b056470e32a2b342373d4ca2af75bd8d496"; + sha256 = "1f873d08d520f3553e452368bc510721e928f69b54c6196bf5b28b42775c0e6d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/fy-NL/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/fy-NL/firefox-143.0.3.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "be26a4d5f3640b0ffd4f0b6ce9a74b580f0ccd7944ee4a623ff6854f33a6900c"; + sha256 = "ccd33cb513fac96c668e776ddd6330e04a64813e0d5d131881ef93b794690ec3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ga-IE/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ga-IE/firefox-143.0.3.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "accd39facc5400375f326385436b661049f9f003a67b72129a7d3093bb131142"; + sha256 = "206ac31d2c60bf122a98087931917f670b6618becee7ed3de49d3658fe3bf8b9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/gd/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/gd/firefox-143.0.3.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "2916f666e3b52c2550ca41e373b8263b045abea9f9d8884c4df3e59dc7fadd60"; + sha256 = "00b720be6171f69aff4b5dc194d1e8beed5b2c0ba1cd3867ef153360ef1aabe7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/gl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/gl/firefox-143.0.3.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "a3d0ae5ec2a2a804fef8ed8ec9f4a477920f032329ea7cefde76eb689ac47fc9"; + sha256 = "67eadaebc0a35e41d93b7e6d261a6e1345a730d3b56821bd99833966560d0ced"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/gn/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/gn/firefox-143.0.3.tar.xz"; locale = "gn"; arch = "linux-i686"; - sha256 = "8e937c71fca23c5ec57963804bcbeeb9acb8bb2bf33843785d3e36f34a8de344"; + sha256 = "610e15a6c06a22544210b01942d2bd33de43180bde56c1713afe5570a78eb987"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/gu-IN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/gu-IN/firefox-143.0.3.tar.xz"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6dc7341914554f801b92e047e3018dce5985ca8cddc5ec0e82151c493ef43e27"; + sha256 = "db73ce08f4d6aeaa46dce32243b2233ffa11aaa140f2fe869d05f045cc055ee3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/he/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/he/firefox-143.0.3.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "22e6909a4f8534cec8ac2e984a50ef29aa20a1c3725589e3d3efbe70ca510012"; + sha256 = "0b66e9bf41322111477aa039db339ede0bf6e3573c7431ce0f419f6dc4a70ecf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/hi-IN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/hi-IN/firefox-143.0.3.tar.xz"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "7c513d74c21a3fd97ae8e0250ed58f07103c97d12f6ef2ae382b1469bf5c7d3e"; + sha256 = "e0571f317bd83a168a8e6e085a47021c9815a1411012ab58cbd5bbaaf489ec02"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/hr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/hr/firefox-143.0.3.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "384c22384b3ff09fd54b4d62fe96e7b6642703ecc739017461d3db07a08f63b3"; + sha256 = "5231a4cdadd213a365e9e7ce4e2428f9ba8355cea0b513245442e17853a74b36"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/hsb/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/hsb/firefox-143.0.3.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c6992330827af639faed8fa955976e6f13c9f456beb54ff11676f4959079a76f"; + sha256 = "e2929b118285a5dd7096420495e7a763d96a659707d4549beb1f9abd92bbd2bb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/hu/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/hu/firefox-143.0.3.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "a9eeab48d3cdf34f105542bc54157d23386a3dfe94772a2c7f70fd1a1213a631"; + sha256 = "cbdcf4aecd7a869797f1bc09e0fc96f82db590172ff434b8af2081ef1d4d0cc8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/hy-AM/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/hy-AM/firefox-143.0.3.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b488dd622766141a0edeca08375788752fd5617d32fbb6c6e441bec26e0679ab"; + sha256 = "15c3a3e2b2ba23d62f247ed71554cc7b1b473fbf4e83dcd2a32f393aa426a7db"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ia/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ia/firefox-143.0.3.tar.xz"; locale = "ia"; arch = "linux-i686"; - sha256 = "3266cd3cb39c2a4c92c734b95219076c34870dfdb83ee3152f0c670d494c3d30"; + sha256 = "bf035e808769f109a379331f3364e236ecff55a8c311c567c14e3baa7849809d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/id/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/id/firefox-143.0.3.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "bcf431cb848c0c303bab15b097e14d030fe249cd712a0503e91107c9085a4248"; + sha256 = "84dd51f50ab9821d4714c7ba088f0a7e2a5163967ab0d964e3b279d01eebcefb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/is/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/is/firefox-143.0.3.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "6da50936a09705e10cd8a83e3876d2daae66cee04c6a489bc3327e9cf8e57bec"; + sha256 = "c63104d83b9df221e2bed5aff050345b7dd5193bd31afa8f240206e1e223a918"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/it/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/it/firefox-143.0.3.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "4fe6b6812e3a9a2bd86736ab158708aa95282345991247b563cf13e664676b02"; + sha256 = "0275688a3fdb9233d06e1c4215a6a3989898d9b89d1073942d360c888f7403a1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ja/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ja/firefox-143.0.3.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "b85a8c1920b4beb890f961df127b3d4a9c7eb6cfe1bdb444248c8ee708ec68e6"; + sha256 = "b1833b5c393462d0dfd09fb82e6db7f0862a55e072e14a12946f5c9ed0a1afe1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ka/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ka/firefox-143.0.3.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "63a013a826af7d05e3d0bfa61ea072c3d48b077dc22c4c2b290cebb949ffe165"; + sha256 = "3d6df60f90876502ed4211b637597a1fb5b7f8152b75b1efdfaf9142d8d90f2a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/kab/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/kab/firefox-143.0.3.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "7e5acfeccb66970a5431b78be3846df93fd1bb3b7b564805dd4762ef991178bb"; + sha256 = "3ff5c571f5bd8cdceb31679c97ce08ceb3136ea110efbf4648339273312550b0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/kk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/kk/firefox-143.0.3.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "140284d303c92cfc634a8e0f2d165f6405dc85f5b4c7a3beeb69c0138723bb4b"; + sha256 = "1ae7ce453c15e002d004306557cd1330cb7d33a5ba52efaf6aec1daf6a827c9b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/km/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/km/firefox-143.0.3.tar.xz"; locale = "km"; arch = "linux-i686"; - sha256 = "7742e6e0d23376951a15333e62b8316cecb2a2b4bc88a48550f1dec17495f813"; + sha256 = "5d8e2d5b6fed5847d413cf2f734d6509dd46665975161a33bc0a1733563489c8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/kn/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/kn/firefox-143.0.3.tar.xz"; locale = "kn"; arch = "linux-i686"; - sha256 = "82cb51a65c3bee20ee16afb8dbfaf439ab3a0246df3b21b720c984fbee0f7e0e"; + sha256 = "189122be2a67808cf28db14f35dbd7d3090a638d67a7b54a6f93da7498759340"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ko/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ko/firefox-143.0.3.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "ea93c7df0c6f84bceb93c7ee8fed4f4cf215e03916aa81a10bcd392f88af2821"; + sha256 = "0d3a5ecb485dbffb1ec5807f5c68c9c44b187687e535f75c5d7c04a50bae603b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/lij/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/lij/firefox-143.0.3.tar.xz"; locale = "lij"; arch = "linux-i686"; - sha256 = "20956d7a9b64ce74cafb9b02102ee6e3bf34f336d3cafbddce7ec2055020e425"; + sha256 = "58374c75f1320ef785c2587acc5b632ed805bc6d69b740a9d4ff0c8639b2c8c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/lt/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/lt/firefox-143.0.3.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "cdc0535f7593aa2732ad22605c09c1dd449463d55bdc2c0daaca71e654f5e6d4"; + sha256 = "43c5ff178076aff633c49e4d52adb6a408352a3b432967ef5e9ce95b9413fcaa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/lv/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/lv/firefox-143.0.3.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "efeddd3be9c11791b26ddf57d9a11cc026bbe08721ab632c5df9fd13b7cce78a"; + sha256 = "56eab786da6bb911f746b5afc652708323231fbca32d5c5797d9fe71c9318362"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/mk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/mk/firefox-143.0.3.tar.xz"; locale = "mk"; arch = "linux-i686"; - sha256 = "b384a555432d29a12dc5515481c502a338294336441dcfd71fe26b5ddaf4b92f"; + sha256 = "444aff7a619a7db477517dd9815a36aefb0efdf27fdd9b4d253e810486c2310e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/mr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/mr/firefox-143.0.3.tar.xz"; locale = "mr"; arch = "linux-i686"; - sha256 = "2305019559381be293c19c7be3952554c5c56d2e4303d6dbda77fb532589a107"; + sha256 = "acc53a62cc223a03b4f59ba2a66876d43eafddc48389e49197e548ab46e17993"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ms/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ms/firefox-143.0.3.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "4e90e4bb68b74b03ae605c6c4a6f10cb2f76862947160cc55031c7e1fa13a535"; + sha256 = "df1ded63c2da854e7ac5b960ea20174a140a9cfe59f7843669a5ef86d8b3fa25"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/my/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/my/firefox-143.0.3.tar.xz"; locale = "my"; arch = "linux-i686"; - sha256 = "23e7379bca1a753a23805ea64bbf4b895643b8af2f741e9dde4f034e2498f1ec"; + sha256 = "6b4f1f12bfd9b1e482a2619d0d89c1dcccbeed5847a7f618f0a19bf1b0158636"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/nb-NO/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/nb-NO/firefox-143.0.3.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f4d6b114bfc398a3cd9e3a7e598b24260e80ce5e2d7af90c922f96943a56091b"; + sha256 = "68f8384b5362a8021d8e64b30991c5741b6e2e1d9a52a409521469824d256d4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ne-NP/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ne-NP/firefox-143.0.3.tar.xz"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "490beccdfb65205bceec80fab31aa7b35529b9f44ab1b00c5a47c145c9cd73fb"; + sha256 = "56dda860f988b235c1cd12cf6eed827650257a68af7839b0a1d25909d26e8041"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/nl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/nl/firefox-143.0.3.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "f0a4d0d2dc6ee3a92bb386a6555abb2181b9b560fca1d76be7bfe73d2d6469bf"; + sha256 = "2736d95a46c5646a5c4168b8519ea56b446842a3c573e9ea6b0b14de14266959"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/nn-NO/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/nn-NO/firefox-143.0.3.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "8b049d4aa37db3862f9fe3c4a55663a0ab1d3c008b60c24fd2573d33f9ba54a6"; + sha256 = "d8fd06fb4c4a1b344c2c8783cea8afdf95d7cf64ea71955fc57955b88828796c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/oc/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/oc/firefox-143.0.3.tar.xz"; locale = "oc"; arch = "linux-i686"; - sha256 = "fd783e7cb7a99b7fa738b5c82fd23c0242dfab517f61dca2df0a453de9eb7c6f"; + sha256 = "8a436c96f6c711290277f67087f73097248c05d36c4c3298481b24c04deda521"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/pa-IN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/pa-IN/firefox-143.0.3.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ffc9a8e5bce51764502ff3da1be88a5a45c86fabeb9976e87502d4142cba95a5"; + sha256 = "bc81bee9631122b060612ed55c0281186974e62e5a41622cc83021c17b42cd23"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/pl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/pl/firefox-143.0.3.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "99af6f5356231d2e164093383940b1cf51d73702bb838c0d39b246ddc44b53de"; + sha256 = "4d86c53bc1e103400f8b9a17985955fc193e957fa2719189e932be795a5e7226"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/pt-BR/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/pt-BR/firefox-143.0.3.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fa5d7b6631ea29aed41f60474e1f7bc4a99a56a7b0bd63b540e60cd12557e85e"; + sha256 = "16a72c6dc814564a0be6314ad42ae82523ccb3fabda147800d72deaf69a8d69c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/pt-PT/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/pt-PT/firefox-143.0.3.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f66fc74f1e28c6bd1b74e15667d656a4907a3236d6057b452184e57d55a8d97a"; + sha256 = "7ee4ab35565e79e50a12c2d7d480594ecd434de21b05f145c01fa42359ca4d65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/rm/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/rm/firefox-143.0.3.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "1b6f5b95ea68844cf28666b28dd0e9211065eba9aeabd4a7a6b23951dce159ca"; + sha256 = "bdad1468f989615765be9025bcb53c84b0c0a920cd14ab4ebce5ad4e0cd3faa9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ro/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ro/firefox-143.0.3.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "d4c11e8705f908c8e672e623e0b064f71596d66b623717e899c213923e248892"; + sha256 = "12b9198071a591d92431a6df6d6c447d923da7b28ecb7c7708cb5a9b92e2c390"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ru/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ru/firefox-143.0.3.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "99b1c6a019074cf6edfa95c3bd4b18ba921222e393f03f3807bd74d08f5d6805"; + sha256 = "2179df788ab2f471157a36b122705672cdd7414c0fbc25600cf74ea72f0c731e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/sat/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sat/firefox-143.0.3.tar.xz"; locale = "sat"; arch = "linux-i686"; - sha256 = "8992d626415cdf9eee7b7b472a80ed55012c87dda0352e5652e2eee33d8dce6f"; + sha256 = "af1ae7aaa710039c54a98ec0e4c8eed7cd8b602d290c601feceb20aeee788870"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/sc/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sc/firefox-143.0.3.tar.xz"; locale = "sc"; arch = "linux-i686"; - sha256 = "816e3dab8e322a77da52e06fe9506cdb09cd1a6ea48046c04e821ea308e00422"; + sha256 = "d4d57ccc72ac924713ed46441bef50371e4a169f835c2f58173df653291288ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/sco/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sco/firefox-143.0.3.tar.xz"; locale = "sco"; arch = "linux-i686"; - sha256 = "095e7ff241ec2462b8a4b3b1747808c42b83da32fbc6e0123047d27e5c40259b"; + sha256 = "4e4f293f330d7fbfc52f11fcebbae62f93058a51d2eaae7a6b4e7f75324fae88"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/si/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/si/firefox-143.0.3.tar.xz"; locale = "si"; arch = "linux-i686"; - sha256 = "77e2823fb1d4cda6854e7d15dd5e8f0c4c259553a04a6269865a423eac64860a"; + sha256 = "9cd110763c21fc4e32e324ddca27c68b9d98b5c9d2e93eaf0094ee99bb0826a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/sk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sk/firefox-143.0.3.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "8aed72b6b19dd9336592f9b593b9b234753d89f6da50f536facfaeae888d86a5"; + sha256 = "3c67e3038fc4ba8a6b30b5984e2d27e9f2c33b39ad9d4423a772b1e166151eec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/skr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/skr/firefox-143.0.3.tar.xz"; locale = "skr"; arch = "linux-i686"; - sha256 = "71f20bd39badf34d70d3f9449d163719536c8283ce50d26ea164a88938f795a8"; + sha256 = "2c99168028a3f8e2cd2d6f34aeec98b92b7812a8075db948f2dff0b4ae15f143"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/sl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sl/firefox-143.0.3.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "f6ef7bced5c7259ffa49d6b58d1f0047e2490f5381b102aaa48c942b73ac92f4"; + sha256 = "9c4729f51f54bfe504b393139430c2c8f01db340d3abfe40a401919fa8b3e950"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/son/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/son/firefox-143.0.3.tar.xz"; locale = "son"; arch = "linux-i686"; - sha256 = "dedbae9b3ffbb2499da03cdc8b30348b227f7866d666eb4faf6feabd4e86e55e"; + sha256 = "e8312d8a19617c97ab63052d4006c01ad070bd68670eea9588d16568e0ede486"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/sq/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sq/firefox-143.0.3.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "761a875dcb478daef0e39a761843c1a732efa3a1102429d31f25e6ace3dcc194"; + sha256 = "6331b868423062fb4d3a66aea2f89bd43d7107c8e3f370950f6696fda20fefaa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/sr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sr/firefox-143.0.3.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "7dc7c749000652a2a72d91008fe29c6ce9710df511c712a2a5d5b6bfcf895a71"; + sha256 = "d88381b7ced8b9493e0f6f362e3ad58f8416d0922b34be848bd8610a8f5b8ffa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/sv-SE/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sv-SE/firefox-143.0.3.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "c75416cba3d7f9e47aec144724b8d4f86428fc2d8a903a0c17803c23b94b33d8"; + sha256 = "ee666a39fd4374c9efed17a32f19f206244f95c0415f2121f228324afdc61288"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/szl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/szl/firefox-143.0.3.tar.xz"; locale = "szl"; arch = "linux-i686"; - sha256 = "7126a305f902f37019070aec76f1c3c19e643cd055b83a23232b156851650528"; + sha256 = "0b4d6af3bd6942c336921f55fe67a9c5186155e21664297c86577ca954ee80c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ta/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ta/firefox-143.0.3.tar.xz"; locale = "ta"; arch = "linux-i686"; - sha256 = "99d7968da2f5de0671e2eecba04acc9c423d027272d0e368d106692ffb07c6c6"; + sha256 = "9edf779a416c59bae453a822d7668bf6eaf56b86a137a6048f20ffb08a06b8fc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/te/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/te/firefox-143.0.3.tar.xz"; locale = "te"; arch = "linux-i686"; - sha256 = "c28e37e17fb14130005e00a6b3da9fb713d1344f0a57b13a2294c0934a1e8767"; + sha256 = "c9d8348257dc0acccc812793d68b274717cb032df2f8a8692b853e4e23bf8eea"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/tg/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/tg/firefox-143.0.3.tar.xz"; locale = "tg"; arch = "linux-i686"; - sha256 = "afa6cc3b1b2c7aa20326686dd4a1515a1e53e44883cf7e2fea65927427f1662f"; + sha256 = "b187a5df63c50ef09471eb934f9bcd7863744b27e3ed8ad40b4cc9b21715e849"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/th/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/th/firefox-143.0.3.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "6124ec76b1362f2eb8d422db2b8cdca052cd24c00bc6e76eb5b8c3413b08f5cf"; + sha256 = "440daf9829b258d34ffdf912317c2b7621b3fbf9b687d96a1fcbd40dcb50d5d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/tl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/tl/firefox-143.0.3.tar.xz"; locale = "tl"; arch = "linux-i686"; - sha256 = "c31845ac222d656d0d9023be4e6449e9df3aa42a8a605b49414f123df97e8bc5"; + sha256 = "8977ab2b5933a1db9c9091d9353c42b554995b9748bd6224b4b0de23f3fec220"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/tr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/tr/firefox-143.0.3.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "dbe7753f9ad9cc1f0c0b1fd00cc12312cad557695a1511eabd4671f36cd03fea"; + sha256 = "abe19d4fd8dab151d74065d3a614cc709fc0fa8233e88b368501994406c7462c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/trs/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/trs/firefox-143.0.3.tar.xz"; locale = "trs"; arch = "linux-i686"; - sha256 = "58aedb5dc9fe330f2d7b4dd5e39c2a7ae8c80bf365777b8f87b54ac2a66e8452"; + sha256 = "f922b9a0d2a0c0b568ba8925c6d557b288873b2d43189116ae727dc979b4246e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/uk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/uk/firefox-143.0.3.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "d20cfa7037afaeeaf421b75e997bc0dc5bc853252011f2583865441baaefea8b"; + sha256 = "326b4fec9f4bbe24eae3347c812d509888f2074a8c239171fb943c9e4d5b43ec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/ur/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ur/firefox-143.0.3.tar.xz"; locale = "ur"; arch = "linux-i686"; - sha256 = "1a217a8ddd8e436750d89ffcdeebfc4ec4a935c9f7edc9746b7844f1b47bf214"; + sha256 = "ac89815430adb91dd5e7ce7d136af9505eae906b36095acab406f3f5e90b0c93"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/uz/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/uz/firefox-143.0.3.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "dab47c525c86751cbe905e10b0d312bf596f707c4d999ac4d081b88b2cf54c58"; + sha256 = "f63e09736292a39daf2a025a7d5ce1237d668f52adb4aa460a6de1c3e013d5aa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/vi/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/vi/firefox-143.0.3.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "fbe4c90598e6f12362c8f28b09dfbefcdeeded91f4982f2262b3ec8527bce912"; + sha256 = "16cd03096d58a5c65b4517eedf987339547c71d562ab6acaa295dd72d5f3cd58"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/xh/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/xh/firefox-143.0.3.tar.xz"; locale = "xh"; arch = "linux-i686"; - sha256 = "08f0472fceec6bee0f18a5bef973746c153df84a108f1a15a18f265bd9130d28"; + sha256 = "1d8d988ba6aa2e394086e42f3e718c5abe61ad6ad8b63aa094b65eab8d58679d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/zh-CN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/zh-CN/firefox-143.0.3.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "5611deaad36a8e8dc2d1d896d991dfa201721e723e9894e9bea345e0f1a8c321"; + sha256 = "c4df7ba3b5e0e546f02c2de32bc54ea6de43eb657b535bee999fff35bca70c65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-i686/zh-TW/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/zh-TW/firefox-143.0.3.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f268465201dbfb300696f513b5a762a15e50c0e750582e252ede15820502d177"; + sha256 = "b98f584663fa69ea69c2564f157fa7f157a5d6b9e9311aa10416177e6132bd1b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ach/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ach/firefox-143.0.3.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "43e3ddafbf02c57f8e8189f16297cff7178f9e5ddfc31101cf869b08c5cda4d5"; + sha256 = "8053c4f36bf6eef29a337167693b1f6848be5122e9f0c944ea1422ee4e26daff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/af/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/af/firefox-143.0.3.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "7cb2b24adfc80273ff9c5f12de38f1a09501a7d571c2db8aca60d6d2c9b8c55f"; + sha256 = "7c6e8fcd34d0003da47ebf2e108f23cc7fe4cf3bbdfc889afd7b1dd50a1afef5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/an/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/an/firefox-143.0.3.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "7ce41ac9f59b62d5586232583281f3fbb0a55ca831e6f63864d0d445e38ba026"; + sha256 = "50d2d78d64f1873439ce9c1c72dda4320941f2393ece551a87e0fa4209531649"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ar/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ar/firefox-143.0.3.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "e21fc32b74dac0bb5d76584837dad4ffa350510dd670be68ff76e162e1c672bb"; + sha256 = "7c2ddd035806634653311311287cb22f88c20515f446cc070e89f908d67b835e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ast/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ast/firefox-143.0.3.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "e85d7ace4b312ea339ab6190b60c88d73c7e85d8bf2cc9d4d69f476120e18d23"; + sha256 = "df65e59e0481cc2f2b9b8517ed3af809855ca9ee4a076535d00b3fb28fc18f26"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/az/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/az/firefox-143.0.3.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "7b0f0f928eb5bd1964eff6a538529e6dd1c5ac42aa51cf52a5d4705766524323"; + sha256 = "60a0c45a2eb4a4a9c0156b7b51d4c05de0c01855d751304d18134535a3206899"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/be/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/be/firefox-143.0.3.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "128a2b98a54099f46514c9ba6bf835906b3741f79382a32bcf2db211fea5ecc0"; + sha256 = "e1478a69ed96905b166d42151b827b9c6715c92faf0c565f48f4df8e30df495a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/bg/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/bg/firefox-143.0.3.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "6b4e4847f44516c954df9cf4af8211a900a3235a507e05fcced2cb6918c77d2d"; + sha256 = "bd7a2aa5818196749912ba6994028fc93fbbe45554eaf701f691b50764f7a8f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/bn/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/bn/firefox-143.0.3.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "607ebd64ebb0f3a58e0140d4b37eebe677965343e5dee77e42f035264b38def5"; + sha256 = "32cc469fab651e436a92c494cd423d45b64530807bbb2f05cf82b481431ff2b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/br/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/br/firefox-143.0.3.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "52b6767a8f923451d0b3f72666995a6c35d5669d174593f4b69c09bcd2589f9a"; + sha256 = "2d0e0a617c7e4b6feea72180f02e1aa12596d2973d3c3cf17cdfe610295af3ae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/bs/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/bs/firefox-143.0.3.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "4e0528921c583faae27b64a8f9926dbcc2c61e9c8db8d965b10e0ae82ce361bc"; + sha256 = "612353b2a63548bd3c7470d94062526f3bda7ca7f4a79c86e33c5f5f41ce6142"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ca-valencia/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ca-valencia/firefox-143.0.3.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "b7b713bd7d204d736ef977e73b7d4f6513633c32ec290a52306d073955bfe8c2"; + sha256 = "73001f0e636f4c5859d1ac9e102888634455a94eef814219bc5eaa9c95d6c287"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ca/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ca/firefox-143.0.3.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "ac2efd9c7a752631d324914c47cb5b6b30ff19bab508326be974652321ef8674"; + sha256 = "e779da111d878eaa4a5bf24412a19dfe096de2182c9ce316d68a01394b30a377"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/cak/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/cak/firefox-143.0.3.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "1f6e5e10e954d5c22b262720d48b2140a66b99d3365aea6201a0ddc8ce90542b"; + sha256 = "f252d5fb815b07a5206f53d711baa10345cbfe77e6617d20e1bc5e70d2a4ee41"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/cs/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/cs/firefox-143.0.3.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "56d167c5a58cba4cc27cb6fdeed7f31f8d182ecb756c8be7fb1bde7f24cae623"; + sha256 = "a162e1b93942e4969e1b89cabe77e579b12098529548ae8401157e8d098b5154"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/cy/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/cy/firefox-143.0.3.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "69dae7915b77adec669430026dcd6e2fb40475607b6c1fb207acf13362870895"; + sha256 = "d20337005992a620d0f6ba2f87abc4b135d1d7a42b1cd7af36983f6677eabe43"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/da/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/da/firefox-143.0.3.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "c57e386a4956062fc3ef881d5274e6273cf64e5f5a3c044230aeff1b1c8ba385"; + sha256 = "18d8b162a76f4d0e5b4306cda8e07b62bfefe9709912e333a10e1133f380ff66"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/de/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/de/firefox-143.0.3.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "3cbf021ff41d66ce0c9e9cfe93241dee6de1e6243ee864a07beda5ea7ef1acbb"; + sha256 = "d677a0eb7358ab5135740c10505456a896a02ccb187830889643bc46bb53a653"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/dsb/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/dsb/firefox-143.0.3.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "37e881b2a403369816a7bb7b488b891cde093cc10abceb810f5acbfac99d3b42"; + sha256 = "d88022d45184ec156773c932ab148b653571e6f5d05677c05a02c76a2c3bfda6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/el/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/el/firefox-143.0.3.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "bf4b8c282cf1409280e9ef38c526437c48cc6ee2d505997ef4aa851c4212d255"; + sha256 = "ed5e8620858d52d911277bec13d10a01e49035a74ef399e51e05d42af2c4a55c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/en-CA/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/en-CA/firefox-143.0.3.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "5d69f78d0996b9a05f6d57a8dc3fdc551ac4d12b3cb565c68adab51fe4dd1c39"; + sha256 = "e144995d391a53c76029ec84e9e244d3a2bfb7f05afbc453749a5c85e65d5ccb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/en-GB/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/en-GB/firefox-143.0.3.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "5be5083a50febc89df3ce10f44681dfbeee210649506fdec64c1b79861631715"; + sha256 = "f376f19f99ad0b739f5b1cd78e5ea892cb45bfcb31d747055eadf4f85ecd8924"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/en-US/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/en-US/firefox-143.0.3.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "f7c4048e5cd92729ac0b6fde7d131b7f8d2f2db7855b84826a668b36bbbfaeae"; + sha256 = "a2f025df6729b7eb7d96a5f5930aa31de9219a145c14ba66f8b48b6426d66357"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/eo/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/eo/firefox-143.0.3.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "72019085a6a9d0d1cb3c554655cac28f2ba87bf3608a05070e583402c02d6a60"; + sha256 = "0a7586208a50672c882e97d1def2cf4e631e36238b6fe422d86925595f78a874"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/es-AR/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/es-AR/firefox-143.0.3.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "8764e598ed3ea5a174f91181e80f3d3ad146a2f168f261f6c7ec410d5f8b0a5e"; + sha256 = "c157fdb6a2d16466902fc976b6c399bb1dd9c17ef67bfeedabc93d644e50a16f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/es-CL/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/es-CL/firefox-143.0.3.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "0063cd09651fac526769a8cd12114ad379b93b4a8de233da55286099b9556ca9"; + sha256 = "37418bd583f425e2f93e0ae8351569101b8079e213b316f35583a39061c78efd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/es-ES/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/es-ES/firefox-143.0.3.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "3df7a09eaceb95745087d171301ee2e0cec8c3508b9fddc28ec99b8c169f0269"; + sha256 = "c5817c1c052147ef069fd7438798ab5ccfbfe59d98543f02d6ce3baaae86f6ff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/es-MX/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/es-MX/firefox-143.0.3.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "c1fe111a02da86aae76a52e76d12c5c2e9e6723984600a7bd523cab2047079c4"; + sha256 = "5df8e4ac17917ddf8cd964a2d473e4eccbbddb92c681291c89cff12d407389a5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/et/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/et/firefox-143.0.3.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "ef0c26fbaf41e2f2d67887463704f85468a8f14db93c47cd4fc7c0645b3d6bc6"; + sha256 = "c628cee6962b1c7d30b4aec1eb83ac427385d8606729d54967ad7eef5fb530f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/eu/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/eu/firefox-143.0.3.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "68f92a75f988d8e95ce507df4a94342ee1aac56f5f6329d57ac2402b01d7e7b3"; + sha256 = "091053f7f9c681e50964daf16546d16eaf935fedd470cd3802b0f53f7ae0842d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/fa/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/fa/firefox-143.0.3.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "02ec744fbe1db40936032cbd3b70110bdc8d9fe45ae59bdc9706f361eb0568c8"; + sha256 = "6532e65e22f0c98864c66b8334663b770b5f8fce21ad83be3f4d01eb7385d3ee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ff/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ff/firefox-143.0.3.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "4bad6bd109ae0af3eb0eb55f5f7f63fd82bebf4a286d5de0f47fbb646af0d9e5"; + sha256 = "722c9544804d2a75ca6f9e5b2a6927eaa3182fe4ea6f027a7b5d6d9131a5bede"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/fi/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/fi/firefox-143.0.3.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "2e00490503d089d0b3575f778ef40d1eafdcc7e14082b56d363a32b70e25698b"; + sha256 = "78c97144b4b51527bd31f8e863f9b215772608d6bc909f210a927ffc392628dd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/fr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/fr/firefox-143.0.3.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "a7223d098ad6b6d3f13f78605965a6fa4bac38fde6f1e25cd6c71c44b543fd98"; + sha256 = "1b6ec2bbcfa74e8953ae8a4996230512d64942be88dae727dc9aabcbb24a3463"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/fur/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/fur/firefox-143.0.3.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "44c4713c01c88448cd5f9eea7684f75e6f59667e4be9f9f90ec2f611f4fd6e19"; + sha256 = "6e8407e88bc7476c7ce9ff8cfb628a782493ef31c9c9609801ae8e65a4f3010e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/fy-NL/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/fy-NL/firefox-143.0.3.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "b11950c221c9549370b7ffcd0f28a21e8f6985f7bd552c2940320531f8231b0b"; + sha256 = "99b22ced3a90a6ad58d202d3a7717a9c3b20160bdbc3a2495f828c4f663b741b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ga-IE/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ga-IE/firefox-143.0.3.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "67bd7722dc6234257854d1121d12521dd48e646a00b9abb962b793b695c8aa6c"; + sha256 = "900e6595700379d7ee88f5d76e8d6bead98d1a03acd92b03d82ffc4d837175e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/gd/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/gd/firefox-143.0.3.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "ad05245159b2b11d174a0ffc09e1ddeccf3634b7db1fcb024bd95e4d35b2b536"; + sha256 = "34a998b312f13865cb0e69a38e655f18561d141ac07bdab9f74af018737e0376"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/gl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/gl/firefox-143.0.3.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "b4784c74af4820f44bb2541e424677d1d24acff829809364ffd0bf26f12637bd"; + sha256 = "9213682704b2dfb2ead97a63511160a5f41bb34dbd47848d9828d45f693d90bb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/gn/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/gn/firefox-143.0.3.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "1ddcc44b5d02463b06d30e6659ca7795695458f8f790aff3346c6e62be1b2147"; + sha256 = "705d088ecd20a18b53403de8658e2ed2adf7f7a35a19aadfc343af59781665f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/gu-IN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/gu-IN/firefox-143.0.3.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "19538158f763408ef9607ceaebe4f18b6c83505c16bab612cad694fa0dbdb33d"; + sha256 = "21ae47b6a89cea9c6f934e16c10890ad920811aa9cb1d5603615b66009a58397"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/he/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/he/firefox-143.0.3.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "dfb6b3e3c410232bebdd1b7c5edb4537c4ba26849c332743be811a88c265ec70"; + sha256 = "3b95def8e58fabe1997048fbe2025818c766ede6a36cc5c1e171f15feccedbae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/hi-IN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/hi-IN/firefox-143.0.3.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "485d55ed2b007f231d389d7b908a108f0ef73284f3d88ac039f7b9d747f822b8"; + sha256 = "fbe9a0b4fcb00a8b7faa0039ad3b218c878a1285f1d436a6f93dbd454b8bfa97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/hr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/hr/firefox-143.0.3.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "3764263728e9e18d050a834afcfeca4ff1c1f0bd3044f527fb7dd8dc63870c26"; + sha256 = "d6b49e83f578793ffce53694abdbdee8b8ddabeeddbd0cd8ffc7f4f2757d49db"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/hsb/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/hsb/firefox-143.0.3.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "0dc63eb4f71e49cf39120da917589b99ae630320fe595a99ef8d3b563d142540"; + sha256 = "a3db4f506024cfc9302c698dc222d7db2de647ed10816b83813dd0be9b5955a5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/hu/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/hu/firefox-143.0.3.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "049f194d2999a3797fdcb1a7585d0a4d7f15ae858c1fa0cf8717374ec652b798"; + sha256 = "608fae37109b62119365f86945176e3fddf57c9d5dc1d4a4bda6ec514da132da"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/hy-AM/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/hy-AM/firefox-143.0.3.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "bfdfed16e094ec5197f24ab2d56d75acfc7301b99246d4291c371bbfd119428b"; + sha256 = "0c416e3d0ad29a361fcfd3b63be57da124d2842d68ba9d39974998ac7951f725"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ia/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ia/firefox-143.0.3.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "363757a282282b7bc39103e8d808052fe060739574ab9ca5d3eccf361419872c"; + sha256 = "709a56f2001c3def5803e76e03a6c0b33c6d8816a4c3435225cedadbf0de195d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/id/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/id/firefox-143.0.3.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "88df4987664031323804df35328bfa21d635f407a4c5251f5869ac7d04095127"; + sha256 = "66cacb45e1b803cb7bd9007e631c5d1398533d68dca153b792dbd19d8c12c20c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/is/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/is/firefox-143.0.3.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "d0f40f8337fb71a8c860fe49d370223e9e25380772c1a0ec37e4f56b83282681"; + sha256 = "77b1beaf40c76d92cf8f2428afbd4e5d31968e436caafbfb74f7851fde920464"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/it/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/it/firefox-143.0.3.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "b951768b285303ac8ed641d5fdb3ae7ca5a1a05cb11f7a5d04eca059eccaa214"; + sha256 = "6066e1e188b04d83b517395dbc47faa8da46c90ae8716635890fdf15fe4d0031"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ja/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ja/firefox-143.0.3.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "0690a17e90f55f435b6ff8f38d63b059f11c19b39e4b28a4fc4d809c7d8df9e3"; + sha256 = "ce5ed43c74191dddce14111ac506a796fe2419f1aa17c77b360a61a8d6569b02"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ka/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ka/firefox-143.0.3.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "0db9ecce0b43821813665672be66bd3bdc6e3a83a6ed0e5cfa23a30547e712e8"; + sha256 = "80eaa614f74fc17d0093fcbbba5a0b42247a77622318584863fca1f4819289ae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/kab/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/kab/firefox-143.0.3.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "a1d493549d68809612a91c83f4b20abf4b261decf62f118249c622dbafb59336"; + sha256 = "46e3c178ba8b3b9c2968f602123df49479d8670acedcbb96b0caa93c33c72f4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/kk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/kk/firefox-143.0.3.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "b4ba1ececf60b565c2c2705f3500efcc08e4796d1220a864f8ac6204c684992d"; + sha256 = "9354d494d91aab8c1baa5332a510c52b22e93b1dc9b5c09c05af8df465acf8b9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/km/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/km/firefox-143.0.3.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "6c11b6c5ce8d803da2f90ed8e8b352182077beae0d93fc6a7a0819ebfbb3f856"; + sha256 = "4646c9deee5e81c68ab4e06ede3618fc36cc70a816515952d290bfd659cffe92"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/kn/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/kn/firefox-143.0.3.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "024d6e5cb37898ab3fe1dd0576ba9741df1bc1f2d16f3c29d337dfdb7330586a"; + sha256 = "ee52f4e1350e9299b4e97c74763ef96f639618ad50e0c201cf374370cb4ea9d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ko/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ko/firefox-143.0.3.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "b1fdc0ad7087467c443a20c4e57269fce933af51cc0cacbaaf41c72d11e7bc05"; + sha256 = "7f04c688319a26de3251122927442e0ec91799786a40d55cb42c8cc8ab038b03"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/lij/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/lij/firefox-143.0.3.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "44c8200cd5c3bb747798f49181e86da22c5da7333638d01829caf3051357f064"; + sha256 = "a47a3fbc4ff2d2817032ee9a8f8a38ce821f88c19a93f8bed03f5a5fc725c925"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/lt/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/lt/firefox-143.0.3.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "4d580e6e0115bd204d591b5b4738af1534405764355b70126eb1651e260634ef"; + sha256 = "cb1c959dc4468cda9774d50bf034f063c0b95f72e9708a0b94d0505d5020807f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/lv/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/lv/firefox-143.0.3.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "95fc3b104abb3a4d3dac273c50797a8e5ae211a8f79d85ea0b901d6d93ce3177"; + sha256 = "ce66b3fe1efb75018ad6d0519be6c8a5b8b1676301195550db7a7bb728499bf5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/mk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/mk/firefox-143.0.3.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "12e07886b0cd541edd06629cb5b8f5909c4caeabd55b2a471aa90ce480145b20"; + sha256 = "fa0519da1363680e1369cee5af18a2962a35f0104980882420eabeb17d310eca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/mr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/mr/firefox-143.0.3.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "905240b9ccb14be03f254b287631255e156ff8cac30d6eaaebd5a7f2234d9214"; + sha256 = "16af23ae0b83a8d702c4509101abd6d1d40547d96b9cc22ee51ebeca9f878e52"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ms/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ms/firefox-143.0.3.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "0ac9bfac3e9772e10564ca811ebb0d286b2692848f59fc878472ad7933e3a2ff"; + sha256 = "74de925fbc79a5ce74fd9ffea267040cd1a8a30ac5beeb6d637d92a967f69aaa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/my/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/my/firefox-143.0.3.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "f317937fb3d56a3ff8ea62ba6e191e77abd5ddbd0b0e03f9fc73af450d841f62"; + sha256 = "c483a6fec400040c1f06201c3f9daee3d137dc7807172bac7761aec629743376"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/nb-NO/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/nb-NO/firefox-143.0.3.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "6fa616c7582d28adc9f0b8c6f6a5202ca0c08dbf2791bd72056530a1ecbfbc9a"; + sha256 = "07b875379947dbc02ff335af981742aba09764de3835dcb47ce39e46807d321a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ne-NP/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ne-NP/firefox-143.0.3.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "bfa4cea1363bb77d7956a451be8362dff6c451bf03b6e7c1297f10df99913b76"; + sha256 = "0262231be16a6801bf711430f79869835998c263922f3914b7df1d1d938a6277"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/nl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/nl/firefox-143.0.3.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "338c8b6aa7f24d6321a38a06826330ff1537e18bae83d7c4142cbed238b9c0bc"; + sha256 = "0f2af8725bd5b8eebde1d01a8a225b560378c7d7e79c56da3e87f6a1c0dc3c75"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/nn-NO/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/nn-NO/firefox-143.0.3.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "9f163423c947e82358ab99eb29ee36d3ea0ac78471aff6f8ef8096bc98d3fe20"; + sha256 = "b6ccfab9b4c337f92cddd178f735adfd89074984e65882523e0744a3213f4c73"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/oc/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/oc/firefox-143.0.3.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "97a35f7275b7928ce364f65228f1718fe971d0378e2cd5b9d4912a679ba007b8"; + sha256 = "b68d9c84b9ad59c5bb6ce56bdc16eb388cf40940e7d59053e8c567efcd72fd8f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/pa-IN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/pa-IN/firefox-143.0.3.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "7f74adc991668367f735b3d4ddb11bea5351dbe0d9e33b66698a89320e69ff70"; + sha256 = "fc89bb7de48f731b116f86bdb30c959697872c6ae7b1133f85320d02fc7fd802"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/pl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/pl/firefox-143.0.3.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "be22bbb8ca588cc59389ff44786bcd76740a0cccf614c8bd5bbb143eeb0fd2e9"; + sha256 = "a692d76eb4d73d1db49913f16ef22379eab4b19815f14d23adfb3acf4a95aa41"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/pt-BR/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/pt-BR/firefox-143.0.3.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "bce1b2f0f0d8917758218252dfec811667e1810ad5aaf98fd48627161a3fe0a8"; + sha256 = "9a28e65e22b450e7970dff508abf7e821457226c433a83577279eb81c3792359"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/pt-PT/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/pt-PT/firefox-143.0.3.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "ea56a1e9423bdc924f871f934ac2f25e32e32a7c7e8e27837d9c1f6fa0bcdf3f"; + sha256 = "4a886ec3078e0dbc90fe572a3f053d2feae734a555145af8689d84e85b53f35b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/rm/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/rm/firefox-143.0.3.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "a3c94be0a393baf39b69bce963b5cf7a890da1dd6072410cadf5d0b7bb172b6a"; + sha256 = "1988b0142dd07ec759b490ced16e3a71faab56bb849ebe6a3329f85726ec5b9f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ro/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ro/firefox-143.0.3.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "fe63438332180f8a4250508b393fc089c5e9944f5eba56c6401de8a5427d0ed7"; + sha256 = "637b5940cf48185e6a65c8314e00b721ce2ba7598c32bbc6ff85c4d05e85403a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ru/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ru/firefox-143.0.3.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "4a04e70cb1be2f37388fd60837b868a5278d8d80e5ab761b00f227f27babb486"; + sha256 = "1dd6bd60bedcf18e0f08d2b9371483e01e87617704696c69b82aad74973bcfe7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/sat/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sat/firefox-143.0.3.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "874cd12b77670a79386192f8b2e7d1ca4f988ccd74263e461fcb53d2f2367a23"; + sha256 = "d9f90a4c0090cba274b6b3888a84f6c45de72297e62a5ff5a47cab257c2a3e19"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/sc/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sc/firefox-143.0.3.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "68a5a00063eab97a263c9a7b5b7bf626b84d0c0dc97b1c91594c9fa286883ee0"; + sha256 = "92ba301f079d4c18eb4031a924eab1a817bb89819a2fd2c3933489b97886efa1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/sco/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sco/firefox-143.0.3.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "39b0abf240ee07052a6f968034cbe6509b05f4412080698778d86df4c0bcc4a1"; + sha256 = "106576d3fa835383c8d64ea33b3b05f4810e2d2168406f56ac9afad07eabaa51"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/si/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/si/firefox-143.0.3.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "92310682a1c661af822ee849cd1b2382b19edd53c31a9417074722801d1827f7"; + sha256 = "449a9873ca18d231a9260b4fa75f6af8cd1ef8ab92bd7f614c4f6d3b5b2061b4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/sk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sk/firefox-143.0.3.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "382e4da2b144fa42325e4c612bdf28418b26e5345ac9601b0a9f4518906e2b91"; + sha256 = "d936894e571eeab7b19fe287aed3f7656f5c9fd4525fc0b4748e89749a1312d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/skr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/skr/firefox-143.0.3.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "0da78198e2f5718f885b8726da627f39b39fa9a5cdc700f6dddc95bf416a9ee3"; + sha256 = "3dc68ff035968c7ce3a9bdfde39cd2d7a1ec16744068ecf486d149a713991e2f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/sl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sl/firefox-143.0.3.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "de9513c29f450bbe613b28e4c85154911e494fe0433e4fd50541f09e1346c7f9"; + sha256 = "df4d18b8fcd1f4e2ebb03696182f1abf13ccd3d87df2bd98e101edd65262b6fc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/son/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/son/firefox-143.0.3.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "8e24c5dac67bb953cd3cf6aabf89b880bd7c849d37dd92130916a97d52bd2ebf"; + sha256 = "78f7663913b0236c643c5a504d9eaf9d2be0f95a14c4db07b1e648704fc6228d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/sq/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sq/firefox-143.0.3.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "1f19c065cacd55fc56c8360863a3c4b75e1244db09387051a95fc2262773e6e6"; + sha256 = "3c1f967a341e36634a68c6ce8c7576e73525ea4aa7fd8af3db82688a5b85b373"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/sr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sr/firefox-143.0.3.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "49623b42e15c948ca999563f227e0569830bb896cee85013247056c543826d3b"; + sha256 = "d8734140f83702ba7ac374872cf368fae84e16bcc05f911b67d26203e36dd979"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/sv-SE/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sv-SE/firefox-143.0.3.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "50f28fa61e6a843d626b4f013fb2c6a434ab381a9649bde42e6919b62fe2eab4"; + sha256 = "5c7c5e77a3c297873509dce940057208ae0ae7790c4b8408f9d714539776cf33"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/szl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/szl/firefox-143.0.3.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "2ff98617d23d3337886e824974353c0e6277ba575974244259288cf52a1f7f06"; + sha256 = "521e178f8de46507d6783b995135a516ad94cf871e40a79c4baa1ec3479349ca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ta/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ta/firefox-143.0.3.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "2060ca181ac1cf06c27d958e2ac79cb27eb9e81050431b055ff506769a98616f"; + sha256 = "80b5e8effb3c4767e037c27e42db99747565f7e65ebaa649fc2b1c24446b3061"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/te/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/te/firefox-143.0.3.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "d80b8f327e2a22eb9552a832c3ac3f99769ed950649f29ad7f206827f18a537f"; + sha256 = "e8918cd933cccbfea7608ea2c70379654d2130bdbd0e85274e26f514e9ec17cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/tg/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/tg/firefox-143.0.3.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "d69698a9a0c6eec9ea0d902a9b54e01199c4da729c62d95153406c5c68e2882d"; + sha256 = "8b2758a66f1722f9fc9aaf3c086f713831f2c01718892993c8fa9a54f6a2d6de"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/th/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/th/firefox-143.0.3.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "76f1a5707477c4dd2efa6ead07cb7171f23153eeea133ea983829afe97fbbf9a"; + sha256 = "0f94413a5fa19eee8e2a2edde00e29c230ddc3a9eab82c74fc8b63877154b067"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/tl/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/tl/firefox-143.0.3.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "7d236dfed4fbcf22a8578e97e2a9fbecc8ac6c11875063cb3cd6e4c49685b8b4"; + sha256 = "0d6450446d090268150de81fc69b108f3296ab6faab83e7c7562d746143768e4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/tr/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/tr/firefox-143.0.3.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "dd70fe9b4372d39b54b1dce549e2fa1c23087fcb6211155fbe50a95d30bfd18b"; + sha256 = "8751c2272a2fd6d7b8efe79ea65ea28b5bc68b014d9e4dcf9576c1a819d7e7f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/trs/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/trs/firefox-143.0.3.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "b28e14535a632ae81fa88145cfa8bb061a382b9485d03d913f38a5b6a99eb28c"; + sha256 = "815ff3324e2c10252d0d154f31f2a5731525d0e8be913b712524c2e635ecf1fa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/uk/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/uk/firefox-143.0.3.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "ffd232ffc4ee583d434aa7807325491c066fb8b70a7e780b9a195ce0537edef3"; + sha256 = "398344f569b3764f1b51f7730af1a6d770f10362e24436c86bc726a112f2cb44"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/ur/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ur/firefox-143.0.3.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "04943ebcff0a29c123dd10c95178839cfdb3ecd664fa5979a93f7a16c42412c2"; + sha256 = "49285e5b56da461dfa2f140f628914f703de86c62a18d082faaf168993cae87d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/uz/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/uz/firefox-143.0.3.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "d76f36c1bae352d9d8daf88eeb79174d9b22e5796eba05be0bdb7aaa66c2a3ec"; + sha256 = "9e8ea2a68b607b858f91cc2578d82f690974b037bd8258e19bc8bffb0ffdb593"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/vi/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/vi/firefox-143.0.3.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "cefdffc96ac45fe71b2bcad54e9b54afb61aaaa9678ed0a33eb102fc6429b457"; + sha256 = "b81b9ddc99a6e3b7d4d486eb93dfae8b6d3459429c435ef40a7625e11f13eab3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/xh/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/xh/firefox-143.0.3.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "c2739afba0d51943902b256a831b8debcac09bed90d45b4c6d0aa493037f93d4"; + sha256 = "e3b2d4c2967deac1e13cdc36e38ae686e26bd18978f1212058cb182335a33ed9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/zh-CN/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/zh-CN/firefox-143.0.3.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "0c9f1d2cacb4b30050f377f2baa2d95b022815989d9b0cf63d3e4374e5882a5a"; + sha256 = "6faab7707dc42e56b4829d025da9e10ad8137e9be118b42bd2eadca0c8ae7685"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/linux-aarch64/zh-TW/firefox-143.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/zh-TW/firefox-143.0.3.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "674e9940c52dc2ac368860dc4457a08ce743645cc40a9e66e536008ed2058e8f"; + sha256 = "b2916017606870eea520cd03db40a54f51c76259a774edf5932ca8c34d381268"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ach/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ach/Firefox%20143.0.3.dmg"; locale = "ach"; arch = "mac"; - sha256 = "b20888e0e60ab153f5eaf162d7e4d7d9f38553b9e4b058f89b68bb5c5b4b29d4"; + sha256 = "12e5e72bd9ade4e96378c417c0e4a118d347e5ef4fe2bdd36a1ee0673bcebdc0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/af/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/af/Firefox%20143.0.3.dmg"; locale = "af"; arch = "mac"; - sha256 = "f25f4ee3e1974ae8cf907b0c0c8e47257f6e3f6524ab1a23c3cfc30546fdeb67"; + sha256 = "c3c90bfbec6fc0b95fb10f037e80aed1d0aa52702920f89537385b4d4bd9d78a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/an/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/an/Firefox%20143.0.3.dmg"; locale = "an"; arch = "mac"; - sha256 = "c56ecffec043498f6ae3cb043362bfb765d185d8dc72097d97add15cfee81a44"; + sha256 = "8b14f175a72a64b009417ac6980a093f5b3ec856347f18bd7c0d1ccd7f113769"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ar/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ar/Firefox%20143.0.3.dmg"; locale = "ar"; arch = "mac"; - sha256 = "f3f7dae4efa7170421b1401a4052d9abf51a36ce2ad4ae406da70a40456320ea"; + sha256 = "c5dd3600c8ca0d7dcb09ea230920038d53c1d95c1504391e770ec3d2dfd684d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ast/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ast/Firefox%20143.0.3.dmg"; locale = "ast"; arch = "mac"; - sha256 = "d2f0e0126889daef227ba7864cf75da55fe90e7ab3d81e113270415567989264"; + sha256 = "b66e98006624305e39581b78ddd5e67013ed01c00001dc1ddce06ba682d571b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/az/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/az/Firefox%20143.0.3.dmg"; locale = "az"; arch = "mac"; - sha256 = "c2f6f74c419cd7a29955f4867da034ea26b4705a38916ee5c16107e01e86e73a"; + sha256 = "314d408c90a6024ffc23118cecc7a73ceb05ab8230faeacc9f90051c3c449d14"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/be/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/be/Firefox%20143.0.3.dmg"; locale = "be"; arch = "mac"; - sha256 = "4df0e9fff64f5e82c0f88c6e6042b90313299d27292919c4e08bbfd8eb00bf57"; + sha256 = "2076b201b44200f1449e5e3c7e79e5e70ee5541db533d3951a59ab7cb04c707e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/bg/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/bg/Firefox%20143.0.3.dmg"; locale = "bg"; arch = "mac"; - sha256 = "55ba1f97abb3777eb9bb17621c3505ecb79c4dc3befcf811f58a47d7462d4fde"; + sha256 = "55f6a7f125cb8abdcbbc093698505b1de26fccb92119766a39aebaaf52ea9104"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/bn/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/bn/Firefox%20143.0.3.dmg"; locale = "bn"; arch = "mac"; - sha256 = "865c916e5644a16a77d061717791de700bc0c778a2937f170d387a8897118738"; + sha256 = "9e8854e6d67bdae9ffe23aa368902cb4ed81c1da36a2f6bd40b164ee2bbf23cb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/br/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/br/Firefox%20143.0.3.dmg"; locale = "br"; arch = "mac"; - sha256 = "c206b9ad035a0414362c72779df6af6664b491b4efbb5f291edb4bdf3ace439c"; + sha256 = "49c297d3fb5dd4d16cbcbd4c502364ffceae4d83d23bcefa04579960696d3faf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/bs/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/bs/Firefox%20143.0.3.dmg"; locale = "bs"; arch = "mac"; - sha256 = "33d19cda14e8f66e94c773d263b1b49e1ee0eefa069de4c15339d49f304ad676"; + sha256 = "9ae3ad1540030b52eadc6e9763c09cbe422cfc19b3e4a4546467191b2ad32378"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ca-valencia/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ca-valencia/Firefox%20143.0.3.dmg"; locale = "ca-valencia"; arch = "mac"; - sha256 = "702f5a1cfb558acc42eadffb00ba234d37ad27a4bf3785103eda87c307790819"; + sha256 = "674f3d42c4e28bcadff386efce477415f5cf3889b5dbf1374752708ab628e9cc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ca/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ca/Firefox%20143.0.3.dmg"; locale = "ca"; arch = "mac"; - sha256 = "22988bc3dec7a1e42d05964f8f712bf73c2469383568e6645928ee2a06eb9568"; + sha256 = "de8f59903f370219247bf30755aed7eaed0461b917b7e8dac66775ce9c959f7f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/cak/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/cak/Firefox%20143.0.3.dmg"; locale = "cak"; arch = "mac"; - sha256 = "ac1a402c495e7005c3dff6ef2679ebffe4746ec753c384337bf71ef83ae4a226"; + sha256 = "5d08830a40b4bde32e08184bae082e0b325626ac1fe9471821fa87bfa3f15d3f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/cs/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/cs/Firefox%20143.0.3.dmg"; locale = "cs"; arch = "mac"; - sha256 = "8089bde4cc3e8648d11ca6f4cc605c229b7229add992671731bc585c549a4ea1"; + sha256 = "b889fe5334844ab1a1c983a2640b47de3e7d9a59f20273900bb056c9b6a7b0c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/cy/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/cy/Firefox%20143.0.3.dmg"; locale = "cy"; arch = "mac"; - sha256 = "7f88df387e477111415c12ad46778d25c4cdaa3f662a0689ce2a313ec19042d2"; + sha256 = "46ce1a6845aa567a44e7264389453586a85591c2c8f261cf528083c43a915d00"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/da/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/da/Firefox%20143.0.3.dmg"; locale = "da"; arch = "mac"; - sha256 = "29705f503f0a9e4bcd1e76c9a6ba6de4ac803082817765ded15c18afdaef4953"; + sha256 = "ed0a779b10465f3e68ba4cc78fb153a4feffc266e5ea57a16dc31fdbb178002a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/de/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/de/Firefox%20143.0.3.dmg"; locale = "de"; arch = "mac"; - sha256 = "bf8e50923c24471ea1c7f66d55822d2dac259d9548807912727b0442928259cf"; + sha256 = "473ff2761c72891fe655f397a69fb7efde5e6af76d0da51720c1982953a7b6e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/dsb/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/dsb/Firefox%20143.0.3.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "c4790c64ecc6638cb3b34d51c07dc14964945269394938b67fbce243b98e8740"; + sha256 = "b41be37a7a2e3335518a48d13f6ffad65534529c9215d987bcd53ad8436453d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/el/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/el/Firefox%20143.0.3.dmg"; locale = "el"; arch = "mac"; - sha256 = "d4afc8b8c7c6d6ef927bebb6ea25318b21468e5a7de50570c66e3e831aef70ec"; + sha256 = "9c01e1ff0f3c41f684631e27640c1363fec95321255c39bb0a3c9a28d9b471c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/en-CA/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/en-CA/Firefox%20143.0.3.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "ba006d423461a76d63810627b9f9db37a296ac04c9fa9876c3acfb574cb6ba1e"; + sha256 = "fa2da4d015bd5ae8bbaa511d414797a40dc9c7b7a50e42ce5932881c20e5a636"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/en-GB/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/en-GB/Firefox%20143.0.3.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "0a981dc5e762ae530faa36d57ee4b634998b7ad6b7e988cd248e3cbd20778935"; + sha256 = "e298eda3c8940b0a5f807dd30f388a8687b5f54531c13d13dff69a334fbe9a16"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/en-US/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/en-US/Firefox%20143.0.3.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "c37afd2e0ec1ea5e6d508779ffefdf2c404752392288a6a7f0f1670fe8747e3c"; + sha256 = "ca889a4ae53b93c65a54130b81eca818a08e38d15dd0efe9d06217f899530beb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/eo/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/eo/Firefox%20143.0.3.dmg"; locale = "eo"; arch = "mac"; - sha256 = "b48e4f2526148ec45395cb7320c7383ef7b7e18d9dac0abf1d2666d230e27d87"; + sha256 = "c71ec55fa4b1108613789be3bfad9c66261bf9456087caa1a2946ec32411a7db"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/es-AR/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/es-AR/Firefox%20143.0.3.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "c1f73e781831d74fcd91eeda7caad1771218e5da2fc7e74b7a66aec5ed477972"; + sha256 = "0bd1e84c2053f215f792634849b67c34127a392eb75ac4b0e2130d5da70ff844"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/es-CL/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/es-CL/Firefox%20143.0.3.dmg"; locale = "es-CL"; arch = "mac"; - sha256 = "9f1dc00b06e9e2fd5ca5f578052ea73463adcf27162219c275a3cee49350138a"; + sha256 = "85c4356ba7a541d7501b49d5c3580d33c44fd94e832057d38c89245cfbe4f3b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/es-ES/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/es-ES/Firefox%20143.0.3.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "dca7ba20f478d602da2d50602690be1111f43990dae531798257cea4e3acf451"; + sha256 = "3d8222db853b68ae182b209456476a6f2a38d80daba67c7ca24b9f5184f9df24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/es-MX/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/es-MX/Firefox%20143.0.3.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "d0274dd80bcd92fe242324faeb96bb10991f821341d9164c22dca36d49a8f0d5"; + sha256 = "76090c72df5dcf2d81248fa2b3f4a1f9daf9927cee1cd7916d18e29bd59160e3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/et/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/et/Firefox%20143.0.3.dmg"; locale = "et"; arch = "mac"; - sha256 = "f4712379f6bfec3b8bfd098be414a810d20e7102625cd3bec1348248df0fe965"; + sha256 = "b25682929543562d5340cb1e4da0c5d0a7df5e45c0be1fb127734b39f8e37e09"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/eu/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/eu/Firefox%20143.0.3.dmg"; locale = "eu"; arch = "mac"; - sha256 = "721b550c8955091d82369a12d1e182a466b1f33c6c5b59534b658027dffa7e92"; + sha256 = "bc1bdc2035fbaca16a1f50d40412236d18cc02c96f9a124f3453a0a7548b613b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/fa/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/fa/Firefox%20143.0.3.dmg"; locale = "fa"; arch = "mac"; - sha256 = "0f7229c4da93ca2d688aeb504e67a29c85e972dab5874dc53d80a50cb707936b"; + sha256 = "56854e26cb350f8ae6803c0855c86890a8b0adc84cbae45713e64ee74da87b79"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ff/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ff/Firefox%20143.0.3.dmg"; locale = "ff"; arch = "mac"; - sha256 = "9f36687a0b2bf49d5e1e98c1aba19aef2870250e0e20a44070ebdb5635be6b11"; + sha256 = "779496d23e557acfcd21f7207d1c765169f12efa230f8b23ffafbf67082411f9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/fi/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/fi/Firefox%20143.0.3.dmg"; locale = "fi"; arch = "mac"; - sha256 = "b3fbf397689cff577dbe4f255310c0f5be3cbc85a585af56fe36f2c9ecbab31b"; + sha256 = "7e0897eeed7a441fa9daa2fc4c02283eac61ecb545b4da289bf327464e49e5a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/fr/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/fr/Firefox%20143.0.3.dmg"; locale = "fr"; arch = "mac"; - sha256 = "a4a6dae3781ac8dbe945479212767c864f2abdcfb36c79260281216916628f03"; + sha256 = "9cdd197b54eae86e58ee513eec128bc6b6a8e4f189f6dc1088b2bc81e34c37c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/fur/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/fur/Firefox%20143.0.3.dmg"; locale = "fur"; arch = "mac"; - sha256 = "d80553bcf4eb44c06ab4bf805c118a418c8635c4fc6e7a8d5c2a1978566bebf7"; + sha256 = "da3ef44d17bff2aecf35a10c81c04d018d261bebe6d2a52e0c26ca93e77403c0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/fy-NL/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/fy-NL/Firefox%20143.0.3.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "6d4c7ffcf65a8e9ef890fac3b6403f3caf1d7855589fb8d4c185f2417aa06ba5"; + sha256 = "69840fe24f6cf7b703ac1b473d13b0ebba148544e04826f1d06a563d283db5a9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ga-IE/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ga-IE/Firefox%20143.0.3.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "4716a3de3c69b53479320ebe4ec73574834e000296028d8f5a4fabc4c9a9778a"; + sha256 = "520a7e3f24034015a12948ea689a22727b17449af3a633ee2908251e8ba1ae48"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/gd/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/gd/Firefox%20143.0.3.dmg"; locale = "gd"; arch = "mac"; - sha256 = "da2fab2cde8cb200d9f2eef4903c45f1e7a7c1d2e9452ccbe1bd649101926cf6"; + sha256 = "43479e90ff4550f20c133b4167e83c753d116aeffb1fec7696d6474a647a48e1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/gl/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/gl/Firefox%20143.0.3.dmg"; locale = "gl"; arch = "mac"; - sha256 = "a94b767bb1f5c36d86f675b71a73c28a36f2ec134eb07b2e76bcdf171ae8d30b"; + sha256 = "cac6a98e48a2556978ecd24df9e0a39693c95f5d1d27a7d7a063b31ac7628afd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/gn/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/gn/Firefox%20143.0.3.dmg"; locale = "gn"; arch = "mac"; - sha256 = "dd518bf77b9000ab2cd64eb945a96ae0023582a0f88154fed5cd06fe4ddae36e"; + sha256 = "3d603292f4ffde754a27eb2b84f37b1fd7e243fa186baea563a212da87ff5ed8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/gu-IN/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/gu-IN/Firefox%20143.0.3.dmg"; locale = "gu-IN"; arch = "mac"; - sha256 = "1c242c665c0650098ba6c79a5d02dfd8b2c97079869abc72b8aeb4f77bae5d7c"; + sha256 = "cdb7ec69ed13040fb04f658f5ca4eb064215ca136a29d0ac02194ba3e5f3d59b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/he/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/he/Firefox%20143.0.3.dmg"; locale = "he"; arch = "mac"; - sha256 = "1df75d52918c6203eafcab241f0666aac8d8732340bdce22e345816aec582dab"; + sha256 = "7589b9cd2a912227b71dcb7a2286dcc5e7b402bdcd1e2d91f30112949d1b7cf7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/hi-IN/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/hi-IN/Firefox%20143.0.3.dmg"; locale = "hi-IN"; arch = "mac"; - sha256 = "b62253cfdea72c4e48f5161bb3476bd79dd24ef620a3cf1e1f15a5f1de77569a"; + sha256 = "a44e32e2c868b31d9959b093a772b4f031d8eebe56e811fef4b22044a9d4e31a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/hr/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/hr/Firefox%20143.0.3.dmg"; locale = "hr"; arch = "mac"; - sha256 = "f2c8f248c3fba5a177ea5c97b3829c588afeb0386d3faea43c2c0502b9eee6ae"; + sha256 = "2819c54d815da89efad29864d487751e6e9c566eaf7e8726acbca860a55a6197"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/hsb/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/hsb/Firefox%20143.0.3.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "bd379bbd7dc9190dfb9e1d3a83292244578062e1f1f7332f26dcb7ebac3a7580"; + sha256 = "b329a9398ba93676178245d62b8b053d37e94a66e33a63aaca88be4a1c18c38c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/hu/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/hu/Firefox%20143.0.3.dmg"; locale = "hu"; arch = "mac"; - sha256 = "017adcbbb18113a05feb66f4019b240248e36b16c424e549d46d318f090bd49c"; + sha256 = "dad4dfc5f6bc8cb1e33989d7d41c2ecb2dfe070f22a81c4c9a39ceb90de091e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/hy-AM/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/hy-AM/Firefox%20143.0.3.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "6bb69a121ca481ac214a7c0f4e429f7341e1d73d87c352bfdb4f659ae26c93c1"; + sha256 = "4769d222e0b9a9c8a55d99d3884c5f23922a9b20c0d99febec8431c1631d9f9b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ia/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ia/Firefox%20143.0.3.dmg"; locale = "ia"; arch = "mac"; - sha256 = "61161b882e5e8266e097bca1bc0ad6c8957aa5a989f3f2401de7e1debeeed78a"; + sha256 = "dd1d1571fa6616cf50ad86079123d54c3016146cc376b395af9b6466cd3a613f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/id/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/id/Firefox%20143.0.3.dmg"; locale = "id"; arch = "mac"; - sha256 = "72c6b31f171aa333bf27e99b1b86bff62c04366b34a72a1c1aa6c99d285d2475"; + sha256 = "6735d3efee7eba68cba8c5e02f4274ea464bb2e91b85434b7e53fb62a27a8492"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/is/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/is/Firefox%20143.0.3.dmg"; locale = "is"; arch = "mac"; - sha256 = "bceb429197fbdfdb64254c6d7cb884ab33dbcf37a20e9dbb683a14bdefd78f53"; + sha256 = "686ffc85e6fabd94417d9f3fc74c990a876785651db6b23e14444d51d54fc2cc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/it/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/it/Firefox%20143.0.3.dmg"; locale = "it"; arch = "mac"; - sha256 = "f259670964419df973ee3c63373148ab2499c8afbb2316914bafb6e58a817711"; + sha256 = "e354cd82850d445677a538d00f9ceb8df3338e2f4677d4dddc1fa19e4e990698"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ja-JP-mac/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ja-JP-mac/Firefox%20143.0.3.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "9f2d9c909640a7dda80aa026fbef65ddb2dbc644f6d818c7f69e57d06d0f1eeb"; + sha256 = "7c486c36fd796956018de225512bd7d6420f769760fb3c330b484619cff5541a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ka/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ka/Firefox%20143.0.3.dmg"; locale = "ka"; arch = "mac"; - sha256 = "f76eb86ce59e6a65ade3509f1132aae154f6f07f8749d7f415f30ffd6e51d195"; + sha256 = "b60c8f46a95c9f32aff935aafa140f3c532be3d2d061d3fff970cad2428d8350"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/kab/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/kab/Firefox%20143.0.3.dmg"; locale = "kab"; arch = "mac"; - sha256 = "b4949ac4ba67b4ec28ec37793827e498baa6065c874f57de006aaf58633df073"; + sha256 = "1591a0ab0c689ce376d80e8f08956eaea22eb38dde525433527024987f9f1fb8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/kk/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/kk/Firefox%20143.0.3.dmg"; locale = "kk"; arch = "mac"; - sha256 = "5e629d237aaf7bc98c88e2338775537e4d1518e8f6c38f86f503c2be441f90ac"; + sha256 = "3f996d8cd907f76d9e9395c19cea32d25224cf40f422f8a7daf4cadcec320945"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/km/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/km/Firefox%20143.0.3.dmg"; locale = "km"; arch = "mac"; - sha256 = "d21b16f6e8582b65ca3e776a8590f9bd8b903aa7a200c1a59bf6f6106bd1c453"; + sha256 = "ddb96825f910f82cda0ab90926bf621f9b2133229de97313d0b48353a06504d3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/kn/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/kn/Firefox%20143.0.3.dmg"; locale = "kn"; arch = "mac"; - sha256 = "9087fb8969715f81fafa65ab146786e35ae7b3a76bdb22ab963c5ecf165918dc"; + sha256 = "ec2bff666898973c9227c442aa3d3aa57adf8c0bceab878a195ccbe70609e6b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ko/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ko/Firefox%20143.0.3.dmg"; locale = "ko"; arch = "mac"; - sha256 = "70596992d34f1f179031d23506769a70960f721b0cb9da178850c444d24f9dde"; + sha256 = "e79a73a794af71863a47936e17e11330cdba7ca4dd48dff7d23c444289beb60c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/lij/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/lij/Firefox%20143.0.3.dmg"; locale = "lij"; arch = "mac"; - sha256 = "67dc01432551598ea428ddfe29c7de6228caaf7b70f56c2424663729fb31ea3d"; + sha256 = "18d82058cd71faa3d6b16e9147988046c523dc51d9ff85f07a5faf85446d60d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/lt/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/lt/Firefox%20143.0.3.dmg"; locale = "lt"; arch = "mac"; - sha256 = "739960d5ae7a8e5598d406432e3628782c166ddee2f8c0cf9f1bb2c5e614497c"; + sha256 = "3e7038fb93e75f522c184160681175343cd0b7ea64d27602e3acd048b0900388"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/lv/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/lv/Firefox%20143.0.3.dmg"; locale = "lv"; arch = "mac"; - sha256 = "1b833055473e49d88bcfdcc5b9f061d2f39f480b016d0c960a472eb919d5c66b"; + sha256 = "177628dc4af5a8011644993a7714478fa276e72534be9d97a0e518173d31a661"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/mk/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/mk/Firefox%20143.0.3.dmg"; locale = "mk"; arch = "mac"; - sha256 = "20e9184ba97af26e2e77fd24fcbd0de264d16dcc5ce248b9c5917887f5e2861e"; + sha256 = "b2dfc734b814393c34472f3f820000c6729756bedc571113fa983dcf1170753f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/mr/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/mr/Firefox%20143.0.3.dmg"; locale = "mr"; arch = "mac"; - sha256 = "9174f9e47db189be5de832f84785f27ab380ebac3621a5c3820a1f8865adf9dd"; + sha256 = "579f5050d494347d28951479339887772e134606958229cd1d8c6a66fdb7f98a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ms/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ms/Firefox%20143.0.3.dmg"; locale = "ms"; arch = "mac"; - sha256 = "9e4877fc1d108c5355af3e697e106bba1409518fd2a26a01235905f0a1380f3f"; + sha256 = "165d25d694261cfcf4b1c01ff8984e957ad8e81ae41bb5a203dd401e29bc5475"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/my/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/my/Firefox%20143.0.3.dmg"; locale = "my"; arch = "mac"; - sha256 = "ffbe8d2ad474d4ea812bb0b3c7f4a411021bdbf6f89fb57668ce2b38f803572f"; + sha256 = "74a9761276966b4d526cc43c8f2603a1a092f401e23fdfce0ef8eb73f3e464bf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/nb-NO/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/nb-NO/Firefox%20143.0.3.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "756563cb3c8db103ace0ded9fdf64a68c8365a7563f6ca1b12e90b299dd174ad"; + sha256 = "e9ad3ad106a75316d6b0cf1f255d3d00d3121492e926ba8ed52e2f8b0a851fec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ne-NP/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ne-NP/Firefox%20143.0.3.dmg"; locale = "ne-NP"; arch = "mac"; - sha256 = "1d1d8b8b928a564eeac0956d5cf4acc1609471bf449870e341bd4fbf3fc989b1"; + sha256 = "f058d7c591cf2f3319002bb1f612a2887764cb80cc7f4e003f70b47769d43dd2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/nl/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/nl/Firefox%20143.0.3.dmg"; locale = "nl"; arch = "mac"; - sha256 = "b333a65b498fce71b046b8296ed02c50bb80dd1ebf0e77f071e5aee530ff2ae1"; + sha256 = "53660ce795915ed6eb1e01c0dfeb19dccc9bdb4d30e9a70571a3a021157b9d63"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/nn-NO/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/nn-NO/Firefox%20143.0.3.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "a0479053321275ffa0d4d07605b822103bf24a03fe708f3f53fbb8479e8707d8"; + sha256 = "0ee4fc35c14f69da1ca44128ce12b05bad8993b35097ea26cd898662827ce2f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/oc/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/oc/Firefox%20143.0.3.dmg"; locale = "oc"; arch = "mac"; - sha256 = "f27f13bb54aa96c36423c482b3a5b455fe693ab63d03f160316c08eb9a85a460"; + sha256 = "97500adb9b794e18a10a3fb9fd8bdab77f5e99793faaabe65e88d7f7f5baa4f3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/pa-IN/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/pa-IN/Firefox%20143.0.3.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "36423e995ee393349d5bdfde6682e1853f9b2a3aa5bf1cd0c7bd053c09c9e291"; + sha256 = "71438f7242685959cef76b9b22f34299afbae0c166e53029b2b0939d4413aa4b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/pl/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/pl/Firefox%20143.0.3.dmg"; locale = "pl"; arch = "mac"; - sha256 = "2f19f28756a3a2d099f44c85d37394c3195d92c14d5ff05e36d56cf84f6b915f"; + sha256 = "ae2399ce00e6ce821b403fbe2a7576a3149c3ea287ca19e4a2230ca9abe6a4a1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/pt-BR/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/pt-BR/Firefox%20143.0.3.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "93aa57382549eb15edaa6fac7986fde58accb9f27ebb6ea6110d85609bdc56c4"; + sha256 = "4bfe3fa05eb1d16acba01389e17b4a553093061cc0bd314e0ea949d638f41eee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/pt-PT/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/pt-PT/Firefox%20143.0.3.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "acec8e9e6a027461a5659f5a79a8cf5d3aaba2897cff472e48d5caacf267f256"; + sha256 = "f41aaebeb27f5d77cd9c83d88d7339b9d8d10dcd3bba32df29a8b452463abd96"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/rm/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/rm/Firefox%20143.0.3.dmg"; locale = "rm"; arch = "mac"; - sha256 = "b1106f2b204b1216bb6ce0c392870acecc21b84d67403b3a865c73564b800eed"; + sha256 = "c4065dd2bd767ba0433f2526f414b2b35cbc017c763f22406726a6eb9d236a44"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ro/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ro/Firefox%20143.0.3.dmg"; locale = "ro"; arch = "mac"; - sha256 = "f857ab29d14068b8a94243a4613f4f55a296bfe9bd40356b922dfbed89546c3e"; + sha256 = "3115325cb0bd02fd4f760e87c1d7ea7aac91825ff08317e281b5b462160e351a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ru/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ru/Firefox%20143.0.3.dmg"; locale = "ru"; arch = "mac"; - sha256 = "d8fa2576e7f4b9ad3a730d97762c68039eaf22edd06b8c1d5787bfc4641457ff"; + sha256 = "96f936f255eec9aa58ce1c3a52f0c48a037a74a55580b797bbff05bc049cf5cf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/sat/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sat/Firefox%20143.0.3.dmg"; locale = "sat"; arch = "mac"; - sha256 = "590a95185c9453f7bc3f850722d815e9f113fcae7ea397941c1c3801510bfb9b"; + sha256 = "f57bcdb49fb2f10a475ec0e8dfec16faf2f2a2c316d2a531f43dd8d86b3e81f2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/sc/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sc/Firefox%20143.0.3.dmg"; locale = "sc"; arch = "mac"; - sha256 = "14296a123b02c4cd0e8c53629ca2e61f50082949b0f08cab1aa19b901b1e426b"; + sha256 = "49632f810a805892208416194499208f92c4419a9bf20673269b460149cac58c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/sco/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sco/Firefox%20143.0.3.dmg"; locale = "sco"; arch = "mac"; - sha256 = "6f14ac6ca619256c341b10a5eae8e7ea3f9f5794e018231481040eb2f4a53956"; + sha256 = "1ee0a2437b69da63918653f4086b5bd2103f8842ff2c57ab65078fb202a92741"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/si/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/si/Firefox%20143.0.3.dmg"; locale = "si"; arch = "mac"; - sha256 = "322731b726ea18e032f166fab8e46107bdc09c1cb23e349e28e35cbd814eae15"; + sha256 = "1b7c01bf22f2e5857839c5051a8fdb6c14851f7b2fb4604c509a4a204d860c6a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/sk/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sk/Firefox%20143.0.3.dmg"; locale = "sk"; arch = "mac"; - sha256 = "63bf99a108b424637d97e33956cee4f82a708dba9ba38d9070fcc8a76cb1690a"; + sha256 = "3e6269866800f5c8a68c48e324b56b199c9ac7545868539a18303140ba4428d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/skr/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/skr/Firefox%20143.0.3.dmg"; locale = "skr"; arch = "mac"; - sha256 = "2c0c4c97f2f8ad1ebb1c51437c145dbb02a033dd9bdcacf281192f91d6d1ecc0"; + sha256 = "cb2ae1d6b817a65552669c2392f2d1e2f04627e6b4ee38b110fba52c6ffc7317"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/sl/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sl/Firefox%20143.0.3.dmg"; locale = "sl"; arch = "mac"; - sha256 = "ee5684b0364cfa357916619056bad49cc6854fa3a70bcff0750c9b13debd2823"; + sha256 = "d8ee0e2af3945ea95aaff77440912d272d734058ba9faa10c293bca41258eeb4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/son/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/son/Firefox%20143.0.3.dmg"; locale = "son"; arch = "mac"; - sha256 = "5e99692490509f1a8fdb6fffb68b930d68af0b3913d8ab6f542d8128bdfd7fa2"; + sha256 = "ce0f4f685305c92a1107a0cc3ef16eddc39aeaebee17efd1bc198360aecdfff5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/sq/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sq/Firefox%20143.0.3.dmg"; locale = "sq"; arch = "mac"; - sha256 = "12a61cf1cb994ddb31ef59149812ef18cc13fb4b522681284916248ec5df0307"; + sha256 = "31d7647b880828a40b95f660529347926e8fdcd6c0101c6aea8a0a661483521d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/sr/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sr/Firefox%20143.0.3.dmg"; locale = "sr"; arch = "mac"; - sha256 = "d98baff055db294c6fa80e74e104bae81de517916e754347a5507bc05e8c2b4e"; + sha256 = "53df38528396100085a9f01ea9ce575061e0aad397a3d83eac8e01d6ca94a0c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/sv-SE/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sv-SE/Firefox%20143.0.3.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "a287f6422da6ba4a9bdc0337cb367a17721c62e31f03c02e6f8078224cf22749"; + sha256 = "52236e7093d312d210cd81f493a222c508af2b29b9d312e0e7cabd76eb0d071e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/szl/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/szl/Firefox%20143.0.3.dmg"; locale = "szl"; arch = "mac"; - sha256 = "361474eefe99be484670c84ff2efd25d420ba5a76b8a3715806cb22baf14c769"; + sha256 = "49b921303b123ea43964a3cf907fefeba01f5dbb81e4c069be8c6242cce2177e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ta/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ta/Firefox%20143.0.3.dmg"; locale = "ta"; arch = "mac"; - sha256 = "4ad76f8e164d36b0904b0a0982998dbb56bde21ad59c46fb1c3f55a376234f60"; + sha256 = "fc70876184e04a1ca576d8afb9a00b7d810b4e53f3435d5df6117cb2b10d7fab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/te/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/te/Firefox%20143.0.3.dmg"; locale = "te"; arch = "mac"; - sha256 = "231b6c04a793c692f666ae8d781314b9d8d1f47f38fb95fdc352b9f78a23c589"; + sha256 = "bf1c1c9b52fb088899e49a517c15dd3457794a2bc597546aac3cef03f81d750f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/tg/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/tg/Firefox%20143.0.3.dmg"; locale = "tg"; arch = "mac"; - sha256 = "e2a242cacaa779a3d0bb7afd99862b675aed5d01735a45c15fc3ad4bfb746d3d"; + sha256 = "ef1bb589f50278b93a40ff9c0e1e15738facd6eaf6813e66af8bac70e00e3798"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/th/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/th/Firefox%20143.0.3.dmg"; locale = "th"; arch = "mac"; - sha256 = "9813fe85b0bfc4e7eab23ce2e899bd2915e44aed2084d704b69d17e4868bc839"; + sha256 = "676ef2796011abc1486e5a8b64ad50ae80822fb13f4b6e1284a8b0cc32614d22"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/tl/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/tl/Firefox%20143.0.3.dmg"; locale = "tl"; arch = "mac"; - sha256 = "0a24db6a27184e5921a08ffd02b66fa084725b6a05d692ef1bca53eb8e602064"; + sha256 = "1964fc43c7344e3cf6e9e78a9fa0205095e388b64a6f30547b85bd9108e8e341"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/tr/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/tr/Firefox%20143.0.3.dmg"; locale = "tr"; arch = "mac"; - sha256 = "eaa553cab5d9ef24daafc57cdef5902287224aab95c0d141db3bd6b52d7a0410"; + sha256 = "624dfb1b3ac8c251b128d66912adf36d8eaf853581223a9edca6a696cecadb86"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/trs/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/trs/Firefox%20143.0.3.dmg"; locale = "trs"; arch = "mac"; - sha256 = "2ece21cfad11a0b80fb95297f880c4bc12a1333d4bff7be333286bec4373e3da"; + sha256 = "e7ab13546d00e67ea2d52398d7c39f86d2b22501739714218eeda15ca367be67"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/uk/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/uk/Firefox%20143.0.3.dmg"; locale = "uk"; arch = "mac"; - sha256 = "1f8e55bae4869d755869f888f7f8f04b492948621472d22594c4940e556d0e02"; + sha256 = "0eb61bcd90de0ec1ac21c59880fa89a67b1a724130fad9166ba46605e22e23c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/ur/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ur/Firefox%20143.0.3.dmg"; locale = "ur"; arch = "mac"; - sha256 = "70aea940357b158ffa31eed002e7d1d23c22368a34776598d67d6465f619af60"; + sha256 = "44be93c26bf8201a1da28225b1db49b396c17765fcad1685089c533217b72e30"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/uz/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/uz/Firefox%20143.0.3.dmg"; locale = "uz"; arch = "mac"; - sha256 = "a798f4c34da3b088e620e3da4f7bdc99185e52666b5a134b72e02c7bbe86e822"; + sha256 = "bfb7a55d6f088df98a3c21a6bfa2f215b304e75c3970753aad6505660dd83a2a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/vi/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/vi/Firefox%20143.0.3.dmg"; locale = "vi"; arch = "mac"; - sha256 = "23aae04e3d5676fe43296c5f9acfecfaf03484cdf03208af58b4f6919d39c6a2"; + sha256 = "0e450e9070ebd5325cbb5d500f57ed5a8a2238ff0058cd47b0708bad864681c8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/xh/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/xh/Firefox%20143.0.3.dmg"; locale = "xh"; arch = "mac"; - sha256 = "f9a1215da29e6e99efe309040e5b0d572a9bd297246581dd09e8cb2c7a27170b"; + sha256 = "a5af3237ff3291302e2f2c1f29927e2e4412f3305f78b65dc6b34ca10bf03a3a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/zh-CN/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/zh-CN/Firefox%20143.0.3.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "73f7b95ae2a03c69e39c7e1934999b05c79ffa43242b3da9d1e59d1b8ff5f664"; + sha256 = "ce91e029e66c6942424f4b4d1507d597a8722de81a6daf39e76c92103df41848"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/143.0.1/mac/zh-TW/Firefox%20143.0.1.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/zh-TW/Firefox%20143.0.3.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "a1ec258a661baa4bbf5b3a8ed775a97d0e851e311d808b6166f7aa7575bdcc55"; + sha256 = "703dccec7e82badf95458e2e81769b37c2568e19764bdf67ef679bc4d99321a3"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index c1ac226816ff..206d2c590902 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = "firefox-beta"; - version = "144.0b4"; + version = "144.0b6"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f49e852eae3c453e4de46cde42f3d23d977a71414e8193b49ceff7816d8aff4d11e915860b6c732a64922bb2b897ff39b9fe9919458eb943ffd03efbc1c75650"; + sha512 = "b0e8398513db7de1f16412bedba519b3d307022c0eadc1c114f3ad247ac368c027bd968f98a38c41076c1e6e06c96ec3821230d470f4f804e51ff09ede84a618"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index e4889fd3f926..81dbe8cf8c56 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 = "firefox-devedition"; - version = "144.0b4"; + version = "144.0b6"; 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 = "144a10bc0c2121e22990def70e1b5bcc033a8b8cd7ad433a1b1d5db33599d05142d1f5c1e486f919e7b839849aaf83c6c4287df89f337151b82f220f9bd7fe52"; + sha512 = "08a42497eef413f097c4c8191ef2d0e4e7a6f39a63744d51352aaa4016ed8877da4eace81bfc85e97f8e4f17c7ea9225fe11c94e70d6e4c9f4ec69cd43aeecc4"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index c9742c6ac01a..33304d10dae5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @@ -9,10 +9,10 @@ buildMozillaMach rec { pname = "firefox"; - version = "143.0.1"; + version = "143.0.3"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ef00d8bab715e7c2f4c138cfce0698e004f0616c767c8a7fa918e24e4a9f9151c41184d9c089ccbc6ab46a3b4bf6f12d723196f47e9c9d7f55f2ca44bab17cb2"; + sha512 = "c092bd3aac79f856a804c908b76d40409ce052b00176269ea3029b5a3a6885d4d21ce26bd76c9ea13827ff75459b6b4b0566f5aa49035ac234ae5890c67845b0"; }; meta = { diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 0eb4d5bf2c64..0096c24902bb 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "143.0-1", + "packageVersion": "143.0.3-1", "source": { - "rev": "143.0-1", - "hash": "sha256-eR5ArTe/XVz5CCEzgZ061i4ta+opX+hvbcChscsTBcs=" + "rev": "143.0.3-1", + "hash": "sha256-0gOt8YEnyDcMHy+EdSi2MLtRZMnMzfeBBKiMa2QO3uQ=" }, "firefox": { - "version": "143.0", - "hash": "sha512-Sf5eXbt1Ob4+TFF9PKxFPqm3OeYQQMSsGrzz1mZXMvul/5H7BA88ApSvD4woJCNalOYKycJuJcsU2J1LUMipEQ==" + "version": "143.0.3", + "hash": "sha512-wJK9Oqx5+FaoBMkIt21AQJzgUrABdiaeowKbWjpohdTSHOJr12yeoTgn/3VFm2tLBWb1qkkDWsI0rliQxnhFsA==" } } diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index c9960ceee70e..96e0a2ab8a93 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.8.2"; + version = "33.9.0.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-W5N2OzHTYhJ7Lha/iduN7JPcczF+VPU9I36BAUiXUmU="; + hash = "sha256-QhER20l8GP0wQ0pDVwBZbYb2FImbX0kiUS9RCcR7gvg="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-RmX/yCWHzZEdkh6TnUQ/guIc7+iEdpK8ANhJxL3MbzI="; + hash = "sha256-13lq59H8xGNbZHalZo87xAaoQg61t2v+B/LXnPoEyoU="; }; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix index c39f04f22148..817036f96933 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "helm-dt"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "vmware-labs"; repo = "distribution-tooling-for-helm"; rev = "refs/tags/v${version}"; - hash = "sha256-G2gJNsrw3NIQaZf+htSLHHCPeKWtbXQw5B7d+yI53uE="; + hash = "sha256-3zEu4fnvjM1SvyOyj6NzQteyfEh5X7ro/G0gkzt7ghY="; }; vendorHash = "sha256-CIVgNS74V75etC9WBzoxu6aoMHlUYxWd22h2NG1uNn0="; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index 8268bbd30707..6a6241f12134 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "aslafy-z"; repo = "helm-git"; rev = "v${version}"; - sha256 = "sha256-/J/RAFNsxwG9aiCe28daJmC2D6Gz7CrPjucqkhC++y0="; + sha256 = "sha256-gMx61fhAaiYHYd/so65DEBKANZZO826AFLU1FIE3hSs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json index 6f9adbdf9ea3..61f642c70b4a 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "a6899f064a179d0681b5e18f5b82fa10120badf8e74c79a4eedebe000a9eaa56" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "22972425bc5554ce4d9958a3b7b5b3c1d4d80d9e6dd9494e9853fc659b944724" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "d253cfce051c549a3ed0826d60e5c7bec7bbd9f8a64f98a9d5ec8238e9914cc3" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "2b89cf256067bb292cc24e0a93688c2e4704387910a37cda38ef83727121c780" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "74e897222e53a2750b3ee8249964e0e47fa5c5caae9d611a18499be6b51cdee3" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "2437c19cfe19a8d62097430e8f51cab2ed740b42b18ee060bc7a18a7421f8ac9" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "162a158c191591ec4ca3b7f446fdf9e23eb8366407091b992087abdc6349325f" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "e7ba4d17e439863f71f303d871f6c700fdafc3b96fb69323cb59f2319ab844d4" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "313e268ab348dd8d4708928e7bc0fb45b7f518aeb7dfaa9631d3d7d61ba1f8be" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "90abbf66bae88eec6016c2a5053523dcbcdf94d215775b4bd773d322b236fc84" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "60f19d4935f5b4b2b776c634eb9701268b94ccd100fc9c2968c096ba1fb5154f" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "fd166a50cbe9be3e3a41d5e3292357168578622a5d1211642206b9afd6cf1ddc" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix index 165a8aac3278..49d730df7498 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.31.12+k3s1"; - k3sCommit = "2b53c7e4c81742fbb2b0e7e90e3bb907d1fe0e24"; - k3sRepoSha256 = "07pi1vjpm01q2riq0dic6p27nqj4wzwwzllxgmr7gfim1xx643gd"; - k3sVendorHash = "sha256-osqhQJq+Qst3LpYdhXkAY6Pxay381PmoxD5Ji/ZV86Q="; + k3sVersion = "1.31.13+k3s1"; + k3sCommit = "a4ca1794628ec6d699b5768ef9fc1b99e1694efc"; + k3sRepoSha256 = "0zlvbkidan1jpdbcqqvpr46701rcnch4q7iczbpadbx7ixq7qmwj"; + k3sVendorHash = "sha256-wR4GNGd9QK/6IVdoXmcPDQwj0dvA/ofwVBgWXDmHz1U="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.14.1"; - k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; + k3sRootVersion = "0.15.0"; + k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; k3sCNIVersion = "1.7.1-k3s1"; k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "2.0.5-k3s2.32"; - containerdSha256 = "1q285ijgxhf4w9xgqqg7yi29mb4jqpifk6bqkjih456qxxkiyk2z"; + containerdVersion = "2.1.4-k3s1.32"; + containerdSha256 = "05dcyv5kxic99ghi8wb1b544kmq0ccc06yiln2yfh49h11hngw50"; criCtlVersion = "1.31.0-k3s2"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json index 7056eec19db2..86876032dbbd 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "b2b652c75ad0e2138ed3925e43c12bd9b79be8a42a577dde9dcb518933e5501b" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "50ba2c60c4541a2f09436e7fd91b8b782b2055f91b60ee668d70b29b9f6f1783" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "3f690edd5e28c28ea3a52beb3ec009726f6e72f4a67096f2ce2b1a4fa3b01e3d" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "079ef47f09b80397402a818c748aeebd6ba41a405f04c81c80ef05fbffc11dee" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "343fa41d0c67b1b1bb4cd962b0f8d5f9cf175ef1b3bca4348cdbf91670a1d782" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "7718b0be16c4cd336ca79df2bb1a0688fe1d76fdb83c584adb47a44ce70a630e" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "efc96a222a2fd0b13104e6fd87dd6bbda9a96abeb20a1a1cc203044ce0a38749" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "2dcb0dcbb9d50ceef87be1125b6d6ca7a7f7ac233c3715d67db0680153486ed6" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "04ac1b2f03bceb238ad600ef70ca7a78672d741e8ce430749b8eedbb1dd0ac47" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "dfe042271ed97ef15a418cb219d31952914b4e78027d8dd871382e5e6bdbc7d1" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "d76ec4a39d66da2a98e7c55dc6811350b4333a2eeae9c0bd4fc401203d92d9e8" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "b92d129d8e182fd8079be5fa1442116e47cb8e298f9a3ced0e401b2d02929675" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix index d024b3754349..f8c20d143a40 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.32.8+k3s1"; - k3sCommit = "fe896f7e7cf8be1cfffe7151c6860deb08e2a005"; - k3sRepoSha256 = "1knj7jzxb70zvqjn7pbjz78cm06w0402id5frib94y0i4rsmqd6g"; - k3sVendorHash = "sha256-MbXTUvdnoLFVGYKEGBYWNkuL2Es0Io4q2E5qaUptwRQ="; + k3sVersion = "1.32.9+k3s1"; + k3sCommit = "062b953493abc18cbf3a85d76a71d70a9ea4b5cd"; + k3sRepoSha256 = "0hsdkrdqb9dbi60k8fczxg23n72mp191qmpd0kqa0x1s6hq2pjw2"; + k3sVendorHash = "sha256-ou169BNhsrY66iLVPufvOp1lYdiqR5e7mzNGDLOlW2I="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.14.1"; - k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; + k3sRootVersion = "0.15.0"; + k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; k3sCNIVersion = "1.7.1-k3s1"; k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "2.0.5-k3s2.32"; - containerdSha256 = "1q285ijgxhf4w9xgqqg7yi29mb4jqpifk6bqkjih456qxxkiyk2z"; + containerdVersion = "2.1.4-k3s1.32"; + containerdSha256 = "05dcyv5kxic99ghi8wb1b544kmq0ccc06yiln2yfh49h11hngw50"; criCtlVersion = "1.31.0-k3s2"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json index fed1f0404194..ad770df1ac81 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "13832518d409f950121a9c681b878f868120c73d42d3823f55cea49f61b69497" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "580c09a6f8c088de023ff8ce256371e807edb45d60db9e53505db263e8987110" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "1a3738a77c4a3fef4a85c16d7f2eadcd337605f9279fcddbc3eb4f982fbd2238" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "c1d71ab864b6b7de087d0827a1810c5fd271134e317af8730ec9211eaf34b097" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "94b084b7f9756e986855301658af957042e3ebb7c71848860f823b35844e98fa" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "940581b495178e35865db8bc7791052bfc3f62bc01fc960e7de27807b50473bd" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "1be4d940daea065ad97bc254882b12fb30af2f13ed2b26a7cd16aeacec29f048" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "7a31e2d1d3bb220fe9073bf58051046745dfb871ca51230e56ec5789cb97d875" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "a89d7916b65ed066e761fe07831aa157b91b30bc1369ea9be3d1e5f0fe1dc74c" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "2ea460f5c783cec0479e6cf8d82e11ed6b6fee6c8e7622243fadd5f8b7476beb" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "6d898c35a9dc96d427f4258605ce61daf7587f26ea2822b711896224b746b38f" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "b0408ae107ce0ddbd47b62242d8e2e97532b1cfeeef1a38cad0cc54dfd289edc" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix index 6a79967ddd7b..5da897e2b304 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.33.4+k3s1"; - k3sCommit = "148243c49519922720fe1b340008dbce8fb02516"; - k3sRepoSha256 = "1870l3mq5nsh8i82wvwsz7nqiv1xzyqypm66rfmp999s2qlssyaa"; - k3sVendorHash = "sha256-JbnoV8huyOS7Q91QjqTKvPEtkYQxjR10o0d5z25Ycsg="; + k3sVersion = "1.33.5+k3s1"; + k3sCommit = "fab4a5c3de46748494cf7ad5dccc89b213965b08"; + k3sRepoSha256 = "0c0phxnx09gainay4cgbcc2j1ddci73a9i0q92zf32whkbp06112"; + k3sVendorHash = "sha256-v+tfVL9sDyiDRB3/IDDfyDekFAdjdUtTTChu6l5Qvg0="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.14.1"; - k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; + k3sRootVersion = "0.15.0"; + k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; k3sCNIVersion = "1.7.1-k3s1"; k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "2.0.5-k3s2"; - containerdSha256 = "0011p1905jsswz1zqzkylzjfvi50mc60ifgjnjxwnjrk2rnwbmbz"; - criCtlVersion = "1.31.0-k3s2"; + containerdVersion = "2.1.4-k3s1"; + containerdSha256 = "0fg9py52hac5bdmrabvkcpc1aawxl5xc0ij9zx964qkkc7fa19ca"; + criCtlVersion = "1.33.0-k3s2"; } diff --git a/pkgs/applications/networking/cluster/k3s/docs/examples/STORAGE.md b/pkgs/applications/networking/cluster/k3s/docs/examples/STORAGE.md index fc9a6440ff9a..f61a13eee01d 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/examples/STORAGE.md +++ b/pkgs/applications/networking/cluster/k3s/docs/examples/STORAGE.md @@ -87,36 +87,22 @@ In order to support Rook/Ceph, the following NixOS kernelModule configuration is boot.kernelModules = [ "rbd" ]; ``` -## ZFS Snapshot Support +## ZFS ContainerD Support -K3s's builtin containerd does not support the zfs snapshotter. However, it is possible to configure it to use an external containerd: +The [ZFS snapshotter](https://github.com/containerd/zfs) can be enabled for k3s' embedded ContainerD though it requires mounting a dataset to a specific path used by k3s: `/var/lib/rancher/k3s/agent/containerd/io.containerd.snapshotter.v1.zfs` + +For example: + +```bash +$ zfs create -o mountpoint=/var/lib/rancher/k3s/agent/containerd/io.containerd.snapshotter.v1.zfs /containerd +``` + +You can now configure k3s to use zfs by passing the `--snapshotter` flag. ``` -virtualisation.containerd = { - enable = true; - settings = - let - fullCNIPlugins = pkgs.buildEnv { - name = "full-cni"; - paths = with pkgs;[ - cni-plugins - cni-plugin-flannel - ]; - }; - in { - plugins."io.containerd.grpc.v1.cri".cni = { - bin_dir = "${fullCNIPlugins}/bin"; - conf_dir = "/var/lib/rancher/k3s/agent/etc/cni/net.d/"; - }; - # Optionally set private registry credentials here instead of using /etc/rancher/k3s/registries.yaml - # plugins."io.containerd.grpc.v1.cri".registry.configs."registry.example.com".auth = { - # username = ""; - # password = ""; - # }; - }; -}; -# TODO describe how to enable zfs snapshotter in containerd -services.k3s.extraFlags = toString [ - "--container-runtime-endpoint unix:///run/containerd/containerd.sock" -]; +services.k3s = { + ... + extraFlags = [ + "--snapshotter=zfs" + ]; ``` diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 84f804dcc332..ac98e9a17248 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -36,13 +36,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-9VyYG1wtYJf/eOvHhNWKgs439uSbHmsz7caoq0odZXM=", + "hash": "sha256-BF1Js7K6CqxcE5+H/fWFsSvhrNr1UCg2T4Bz9BOSF0w=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.44.0", + "rev": "v4.45.0", "spdx": "MIT", - "vendorHash": "sha256-HABnNXDWP1s8Gcv1ZW/fNr+dOyUnJ4nTMujjRXsVxu4=" + "vendorHash": "sha256-t3BENz/43pI33HkWrFnV3ISE3oZOAWyYodjKQcnyE/4=" }, "akamai": { "hash": "sha256-cM3/GwtS4Y7WG1Rg3D58FOvzfwMSNhcggD3bwJcWgE8=", @@ -135,13 +135,13 @@ "vendorHash": "sha256-hG1XnJtN95+jW6AGnV4+EkKaVZwG0PPTMLyHFQ3nXtc=" }, "awscc": { - "hash": "sha256-1O7domWvsZR5/i+B5XMBaT/gWbr+bjxi0y++CVaX+y0=", + "hash": "sha256-wAQLtx+eVtKucdokQLfq1zTAOdMPI2Frio5ILxLGyt8=", "homepage": "https://registry.terraform.io/providers/hashicorp/awscc", "owner": "hashicorp", "repo": "terraform-provider-awscc", - "rev": "v1.56.0", + "rev": "v1.57.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-qnHVii/lpZtswy9CtjOsfgCcWfH5sPwZ+evgxzEIrjQ=" + "vendorHash": "sha256-xIROXf39bvPjtiKpfn7bfL7SXwHOqUxNqlhrCmDLYGA=" }, "azuread": { "hash": "sha256-7dbBhQz0MDUAaz4U1ewM2RayWtp5gbo3FrrQ762Tb6A=", @@ -243,13 +243,13 @@ "vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8=" }, "checkly": { - "hash": "sha256-hZn0kNk2CtgaCfwrrnbBhdAO54d5QoP40rmxSliqJN0=", + "hash": "sha256-nKD9qjIRudq/MK+c8eC+hv8oDiW+ycYVnDO8+DHg3W4=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.13.0", + "rev": "v1.14.0", "spdx": null, - "vendorHash": "sha256-BPkpXDckVv/rtR1WCqKthmTCPzy+yAjgqUFYY3RT/+E=" + "vendorHash": "sha256-Lz8ixBnWqecxBqS+XVrpkVg1X2Ew28axO+jmo+Zb8cE=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -534,13 +534,13 @@ "vendorHash": "sha256-cQybnUaDLVmQrtFkiI5k3OwqN9Oks+J1H2kbkNjO4jc=" }, "google-beta": { - "hash": "sha256-HDTjSxx3TE69B7DvJbn/b67IH/S4IXvXGVTFwrgAWZE=", + "hash": "sha256-efZ/NHcYSv7CSO6gN6DY43px6kJR7KrlOp+HamrvssY=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.3.0", + "rev": "v7.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9tXElUSD6WSfEn6Urt0GZFkxGXj/iUO83ZkKw3GfAgo=" + "vendorHash": "sha256-Bii3UrY1WbhewgsURxq7gGVqT1WSszFkif0V88hiyZo=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -552,20 +552,20 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-HmHqRFdyzJLxkTIqde+NCv3FHILL4xjYFqlOiVCQprs=", + "hash": "sha256-KVNwgn7swWXRNJNpXV8oy++s+CrDZhMPDDP40qIZIlY=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v4.8.0", + "rev": "v4.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0l2Y8mWsJzZ/j7isUullkZ48z/MyDYFid4crH8b0Hp8=" + "vendorHash": "sha256-JS0moRxd+Vxzg4Wq5Med4/daVSZPver+JifAdgt2sQk=" }, "gridscale": { - "hash": "sha256-zD3KiTLKALVOvFOewWyrd65p0XmLOi/bSIP27dXwveU=", + "hash": "sha256-52EVQm2YsbEOY7R6W1Xd7FAFKTuzIhlyb0gek7iZwSc=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v2.2.0", + "rev": "v2.2.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -633,11 +633,11 @@ "vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM=" }, "huaweicloud": { - "hash": "sha256-0bfwqqI/o+erzfF2f0Hp0ULl6FxHjqXQAcdphTGI0CY=", + "hash": "sha256-uMWYrO5X8+CrafIN+NyYX3C1U2r9JAsAsAG5czlxyDY=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.78.4", + "rev": "v1.79.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -831,13 +831,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-G9/xg4wpqPesRg3+iJU6j71eP8iiFBuQNbSOBpvRR50=", + "hash": "sha256-XXtDXByaSnnUGLPiwUNTPTHqDOED7IJQsf8b9x0/R8E=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2025.9.18", + "rev": "2025.9.25", "spdx": "0BSD", - "vendorHash": "sha256-cmmTZNYnUebEUiRYZ300VqMz0AiuiTYLZyVOozqC8wo=" + "vendorHash": "sha256-1kequbTeMoCkLGlnr1TtXDj2agMGMugO2+czrt91ZHE=" }, "minio": { "hash": "sha256-+I1nTNxLVny0pgdMF7vXPC3WxkInSXnbeHcqgrWG55s=", @@ -903,13 +903,13 @@ "vendorHash": "sha256-pez5anuq3hHXH7XMthT7y8+rjCHsMV3Vqk/DBCpbkdg=" }, "nomad": { - "hash": "sha256-0ShkpPAxCT9lmfrVUoyjx7DhwlSYz9uEIujsKSB+dgA=", + "hash": "sha256-+lWAVb9ffyTfnkR3qZzgggRVjizdrgQ96Tj/K4ngZWQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.5.0", + "rev": "v2.5.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-U8eA/9og4LIedhPSEN9SyInLQuJSzvm0AeFhzC3oqyQ=" + "vendorHash": "sha256-CIR59EIgC5kkwfITQYrzoU8quCx5iCDRNOdYphVVk6Y=" }, "ns1": { "hash": "sha256-xIl0jUYmXe2tom8HwXLQRbdSWWyZkRtdDc0XqkQ0RcQ=", @@ -1147,13 +1147,13 @@ "vendorHash": "sha256-39OiEYntUmX2fJZh7G/LcCNFXFmHwdLgFGYz6BUEyOA=" }, "routeros": { - "hash": "sha256-XKKbw8tMtRkOU2lJEieK3CEokNAkiS1Wr1l5XnKW8qI=", + "hash": "sha256-k+q4n20bvYK7nn9ZGQEQH70xt6ugNKzK58XyzwrKh0Q=", "homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros", "owner": "terraform-routeros", "repo": "terraform-provider-routeros", - "rev": "v1.86.3", + "rev": "v1.88.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Je7pWso3kDttP5Isn3Atryg3RZOlvj3g6nTTzuvpA5Y=" + "vendorHash": "sha256-gkXP+0w5PDscLaiNK+WsJxz3eYhae5ajxHUmkYuBvwI=" }, "rundeck": { "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=", @@ -1165,13 +1165,13 @@ "vendorHash": null }, "sakuracloud": { - "hash": "sha256-8fNQ1g+XAu0K0adZSCLwhuLNk4qxUbcDNVYXVhOwNk8=", + "hash": "sha256-hS4hXmi30yiIkWNqXKhuIE3UtzcWrfu4w6XR6B9Vebc=", "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud", "owner": "sacloud", "repo": "terraform-provider-sakuracloud", - "rev": "v2.29.1", + "rev": "v2.30.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-Icua01a4ILF+oAO5nMeCGPZrWc3V/SVObWydO72CU3I=" + "vendorHash": "sha256-at8i4gCFrJxE9fVIL5uI7iSFex0gLXu1SnlPKlZAmrY=" }, "scaleway": { "hash": "sha256-FiC5FAag+ycf8Ti1iDXsJM5cb7xQUx8RLlv0gJ3+cNA=", @@ -1219,11 +1219,11 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-cZnG8WohzR4OPBoX9PHdbvsziPfcsR75apXZX8EwtEQ=", + "hash": "sha256-Lx7L9S6uw++51LehLJSESJXXjLUhpMP4LRVGme85y6k=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.21.1", + "rev": "v9.21.2", "spdx": "MPL-2.0", "vendorHash": "sha256-TMoZ1uR7G9oC7/9CiwC9rIJazqB9g6Xb+vxvYX2T9RY=" }, diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 079094595b7e..ee1c5084c27d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,24 +9,24 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.110"; + stable = "0.0.111"; ptb = "0.0.161"; canary = "0.0.761"; - development = "0.0.85"; + development = "0.0.89"; } else { - stable = "0.0.359"; - ptb = "0.0.190"; - canary = "0.0.858"; - development = "0.0.97"; + stable = "0.0.362"; + ptb = "0.0.192"; + canary = "0.0.867"; + development = "0.0.100"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-WwMEtpMlaR5psraDsvTNOb4nPwnGnVif4DgmdE9gCtc="; + hash = "sha256-o4U6i223Agtbt1N9v0GO/Ivx68OQcX/N3mHXUX2gruA="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; @@ -38,25 +38,25 @@ let }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-GW5LrPMr0uS5ko+FwKfU++4hhzqBQ6FDYBoM2fxDQcE="; + hash = "sha256-ZMsBR0LAISrM3dib8fehW/eZGkwSCinQF60jJG76O7M="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-bxKzOPiljJaY78aiX2BklfMHXgwKrLuWEQVmrNk3TdE="; + hash = "sha256-DHe0WwJOB3mm1HbQwEOJ9NWqxzhOBQynhjJXYSNvA/k="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-2Y95SW9b6SeZdeTUmIedAQYJ/5WylL4soGAbUSdDyuQ="; + hash = "sha256-AZ9enKJf6WZLELFLKrzeyAR/Q/pzD8SGvCPcInS8vsk="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-/dVr7ZS6bRccLPz85xxoniZEbkK1qQ3lqedhGuaBIRk="; + hash = "sha256-67B2wZRZEOKutMPsrRlc96UZWShYLAgwOoF2/QzBgzE="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-BVTQPr3Oox/mTNE7LTJfYuKhI8PlkJlznKiOffqpECs="; + hash = "sha256-PknNHr9txxp3+nO7FgHH7n04qx6p6Jzbs92/Hcfh13Y="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1ceb0e78b670..d3b9aec99a8a 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -124,21 +124,9 @@ rec { versionSuffix = "esr"; }; }; - - thunderbird-128 = common { - applicationName = "Thunderbird ESR"; - - version = "128.14.0esr"; - sha512 = "3ce2debe024ad8dafc319f86beff22feb9edecfabfad82513269e037a51210dfd84810fe35adcf76479273b8b2ceb8d4ecd2d0c6a3c5f6600b6b3df192bb798b"; - - updateScript = callPackage ./update.nix { - attrPath = "thunderbirdPackages.thunderbird-128"; - versionPrefix = "128"; - versionSuffix = "esr"; - }; - }; } // lib.optionalAttrs config.allowAliases { thunderbird-102 = throw "Thunderbird 102 support ended in September 2023"; thunderbird-115 = throw "Thunderbird 115 support ended in October 2024"; + thunderbird-128 = throw "Thunderbird 128 support ended in August 2025"; } diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch b/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch deleted file mode 100644 index 016e74415644..000000000000 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch +++ /dev/null @@ -1,28 +0,0 @@ -compatibility with newer spdlog/fmt versions - -diff --git a/plugins/module_identification/src/api/module_identification.cpp b/plugins/module_identification/src/api/module_identification.cpp -index 808875e8a68..3cf3cf1fb8b 100644 ---- a/plugins/module_identification/src/api/module_identification.cpp -+++ b/plugins/module_identification/src/api/module_identification.cpp -@@ -406,7 +406,7 @@ namespace hal - - const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1); - -- log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority); -+ log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, fmt::underlying(config.m_multithreading_priority)); - - auto stats = Statistics(); - -diff --git a/plugins/z3_utils/src/simplification.cpp b/plugins/z3_utils/src/simplification.cpp -index d64cab665f2..561fa7f1a23 100644 ---- a/plugins/z3_utils/src/simplification.cpp -+++ b/plugins/z3_utils/src/simplification.cpp -@@ -617,7 +617,7 @@ namespace hal - return false; - - default: { -- log_error("z3_utils", "commutative check not implemeted for type {}!", t); -+ log_error("z3_utils", "commutative check not implemeted for type {}!", fmt::underlying(t)); - return false; - } - } diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch b/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch deleted file mode 100644 index 58160330cd06..000000000000 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/resynthesis/src/resynthesis.cpp b/plugins/resynthesis/src/resynthesis.cpp -index 7a7e404114f..f2889667af8 100644 ---- a/plugins/resynthesis/src/resynthesis.cpp -+++ b/plugins/resynthesis/src/resynthesis.cpp -@@ -1058,7 +1058,7 @@ namespace hal - // delete the created directory and the contained files - std::filesystem::remove_all(base_path); - -- return OK(subgraph.size()); -+ return OK(static_cast(subgraph.size())); - } - - Result resynthesize_subgraph_of_type(Netlist* nl, const std::vector& gate_types, GateLibrary* target_gl) diff --git a/pkgs/applications/video/kodi/addons/plex-for-kodi/default.nix b/pkgs/applications/video/kodi/addons/plex-for-kodi/default.nix new file mode 100644 index 000000000000..086dce6bc82b --- /dev/null +++ b/pkgs/applications/video/kodi/addons/plex-for-kodi/default.nix @@ -0,0 +1,51 @@ +{ + lib, + addonDir, + buildKodiAddon, + fetchFromGitHub, + addonUpdateScript, + kodi-six, + six, + requests, +}: + +buildKodiAddon rec { + pname = "plex"; + namespace = "script.plex"; + version = "0.7.9-rev4"; + + src = fetchFromGitHub { + owner = "pannal"; + repo = "plex-for-kodi"; + rev = "v${version}"; + sha256 = "sha256-rNxTz3SKHHBm0WDCoZ/foJN2pBBiyI3a/tOdQdOCuXA="; + }; + + # Plex for Kodi writes to its own directory by default, needs to be patched to a non-store path. + # Once https://github.com/pannal/plex-for-kodi/pull/219 is merged, this can be replaced with a smaller patch that just sets the environment variable INSTALLATION_DIR_AVOID_WRITE, e.g. adding to main.py: + # import os; os.environ("INSTALLATION_DIR_AVOID_WRITE") = True + patches = [ ./plex-template-dir.patch ]; + + propagatedBuildInputs = [ + six + requests + kodi-six + ]; + + passthru = { + updateScript = addonUpdateScript { + attrPath = "kodi.packages.plex"; + }; + }; + + postInstall = '' + mv /build/source/addon.xml $out${addonDir}/${namespace}/ + ''; + + meta = with lib; { + homepage = "https://www.plex.tv"; + description = "Unofficial Plex for Kodi add-on"; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/plex-for-kodi/plex-template-dir.patch b/pkgs/applications/video/kodi/addons/plex-for-kodi/plex-template-dir.patch new file mode 100644 index 000000000000..28309f8f1226 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/plex-for-kodi/plex-template-dir.patch @@ -0,0 +1,79 @@ +diff --git a/lib/_included_packages/plexnet/gdm.py b/lib/_included_packages/plexnet/gdm.py +index ccc540ae..3dce02a3 100644 +--- a/lib/_included_packages/plexnet/gdm.py ++++ b/lib/_included_packages/plexnet/gdm.py +@@ -28,7 +28,7 @@ class GDMDiscovery(object): + from . import plexapp + return util.INTERFACE.getPreference("gdm_discovery", True) and self.thread and self.thread.is_alive() + +- ''' ++ r''' + def discover(self): + # Only allow discovery if enabled and not currently running + self._close = False +diff --git a/lib/templating/core.py b/lib/templating/core.py +index 30a53392..e0249e1d 100644 +--- a/lib/templating/core.py ++++ b/lib/templating/core.py +@@ -7,6 +7,7 @@ from kodi_six import xbmcvfs, xbmc + from ibis.context import ContextDict + from lib.logging import log as LOG, log_error as ERROR + from .util import deep_update ++from ..util import PROFILE + from lib.os_utils import fast_iglob + from .filters import * + +@@ -59,11 +60,22 @@ class TemplateEngine(object): + TEMPLATES = None + + def init(self, target_dir, template_dir, custom_template_dir): +- self.target_dir = target_dir ++ # Redirect template write target_dir to writable addon_data ++ writable_base = os.path.join(PROFILE, "resources/skins/Main/1080i") ++ os.makedirs(writable_base, exist_ok=True) ++ # Link media dir into addon dir, so templates can access it via relative path ++ link_path = os.path.join(PROFILE, "resources/skins/Main/media") ++ if not os.path.exists(link_path): ++ os.symlink( ++ os.path.join(os.path.dirname(target_dir), "media"), ++ link_path, ++ True ++ ) ++ self.target_dir = writable_base + self.template_dir = template_dir + self.custom_template_dir = custom_template_dir + self.get_available_templates() +- paths = [custom_template_dir, template_dir] ++ paths = [custom_template_dir, self.template_dir] + + LOG("Looking for templates in: {}", paths) + self.prepare_loader(paths) +diff --git a/lib/windows/kodigui.py b/lib/windows/kodigui.py +index be7ef154..e8cc09b9 100644 +--- a/lib/windows/kodigui.py ++++ b/lib/windows/kodigui.py +@@ -4,6 +4,7 @@ from __future__ import absolute_import + import threading + import time + import traceback ++import os + + from kodi_six import xbmc + from kodi_six import xbmcgui +@@ -41,13 +42,14 @@ class BaseFunctions(object): + + @classmethod + def open(cls, **kwargs): +- window = cls(cls.xmlFile, cls.path, cls.theme, cls.res, **kwargs) ++ window = cls(cls.xmlFile, util.PROFILE, cls.theme, cls.res, **kwargs) + window.modal() + return window + + @classmethod + def create(cls, show=True, **kwargs): +- window = cls(cls.xmlFile, cls.path, cls.theme, cls.res, **kwargs) ++ window = cls(cls.xmlFile, util.PROFILE, cls.theme, cls.res, **kwargs) ++ + if show: + window.show() + if xbmcgui.getCurrentWindowId() < 13000: diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 556e7cce0e5a..a554dbc68ea4 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.4.2"; + version = "1.4.3"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; tag = "v${version}"; - hash = "sha256-xa35HhziEUzuNIKT1h/nOXjV5/UYkbFlJcZMApaIGfQ="; + hash = "sha256-VUtTv6kH08CCOLlRq4lPyOOlduf/oSiGcQ3cHl7ks8I="; }; # Override vendorHash with overrideAttrs. # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash - vendorHash = "sha256-HP5XJ74ELaZT/bZgAPqe7vBPvJhHwyZVSNrUa+KToIE="; + vendorHash = "sha256-Q56kFnWw5TqeNGyv2n9QempfIdfPXX1qzdf/G68Pfp8="; extraDescription = " (previously known as Singularity)"; extraMeta.homepage = "https://apptainer.org"; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 05f6980f0be4..178607421f09 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -346,6 +346,9 @@ stdenvNoCC.mkDerivation { } fi '' + + optionalString (libc.w32api or null != null) '' + echo '-L${lib.getLib libc.w32api}${libc.libdir or "/lib/w32api"}' >> $out/nix-support/libc-ldflags + '' ) ## diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index d0e91615eb62..6d9780b3913c 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -126,6 +126,7 @@ let libc_dev = optionalString (libc != null) (getDev libc); libc_lib = optionalString (libc != null) (getLib libc); cc_solib = getLib cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; + cc_bin = getBin cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = optionalString (!nativeTools) (getBin coreutils); @@ -590,15 +591,21 @@ stdenvNoCC.mkDerivation { ] ++ optional (cc.langC or true) ./setup-hook.sh ++ optional (cc.langFortran or false) ./fortran-hook.sh - ++ optional (targetPlatform.isWindows) ( + ++ optional (targetPlatform.isWindows || targetPlatform.isCygwin) ( stdenvNoCC.mkDerivation { name = "win-dll-hook.sh"; dontUnpack = true; - installPhase = '' - echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out - echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out - echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out - ''; + installPhase = + if targetPlatform.isCygwin then + '' + echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_bin}/lib" >> $out + '' + else + '' + echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out + echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out + echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out + ''; } ); @@ -705,6 +712,11 @@ stdenvNoCC.mkDerivation { include '-idirafter' ''${dir} >> $out/nix-support/libc-cflags done '' + + optionalString (libc.w32api or null != null) '' + echo '-idirafter ${lib.getDev libc.w32api}${ + libc.incdir or "/include/w32api" + }' >> $out/nix-support/libc-cflags + '' + '' echo "${libc_lib}" > $out/nix-support/orig-libc diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 393d0a57d163..8f72881d3b91 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -8,6 +8,11 @@ echo "exporting $url (rev $rev) into $out" runHook preFetch +if [ -n "$gitConfigFile" ]; then + echo "using GIT_CONFIG_GLOBAL=$gitConfigFile" + export GIT_CONFIG_GLOBAL="$gitConfigFile" +fi + $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" --name "$name" \ ${leaveDotGit:+--leave-dotGit} \ ${fetchLFS:+--fetch-lfs} \ diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index b2f5f15a309d..45c7599b1c74 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,6 +1,8 @@ { + config, lib, stdenvNoCC, + writeText, git, git-lfs, cacert, @@ -64,6 +66,8 @@ lib.makeOverridable ( fetchTags ? false, # make this subdirectory the root of the result rootDir ? "", + # GIT_CONFIG_GLOBAL (as a file) + gitConfigFile ? config.gitConfigFile, }: /* @@ -148,6 +152,7 @@ lib.makeOverridable ( postFetch fetchTags rootDir + gitConfigFile ; rev = revWithTag; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 7f3616af92fc..f9c8af8428fe 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -59,6 +59,7 @@ Options: --fetch-submodules Fetch submodules. --fetch-tags Fetch all tags (useful for git describe). --builder Clone as fetchgit does, but url, rev, and out option are mandatory. + --no-add-path Do not actually add the contents of the git repo to the store. --root-dir dir Directory in the repository that will be copied to the output instead of the full repository. --quiet Only print the final json summary. " @@ -91,6 +92,7 @@ for arg; do --fetch-submodules) fetchSubmodules=true;; --fetch-tags) fetchTags=true;; --builder) builder=true;; + --no-add-path) noAddPath=true;; --root-dir) argfun=set_rootDir;; -h|--help) usage; exit;; *) @@ -519,7 +521,14 @@ else hash=$(nix-hash --type $hashType --base32 "$tmpOut") # Add the downloaded file to the Nix store. - finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpOut") + + if test -z "$noAddPath"; then + finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpOut") \ + || { printf "maybe try again with \`nix-prefetch-git --no-add-path <...>' ?\n" >&2; exit 1; } + else + printf "the path for \`%s' has NOT been added to the store\n" "$url" >&2 + finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$hash" "$storePathName") + fi if test -n "$expHash" -a "$expHash" != "$hash"; then echo "hash mismatch for URL \`$url'. Got \`$hash'; expected \`$expHash'." >&2 diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix index e3fdd5fb8672..9ccb3ff3058b 100644 --- a/pkgs/build-support/fetchgit/tests.nix +++ b/pkgs/build-support/fetchgit/tests.nix @@ -1,4 +1,14 @@ -{ testers, fetchgit, ... }: +{ + runCommand, + testers, + fetchgit, + nix-prefetch-git, + jq, + cacert, + nix, + closureInfo, + ... +}: { simple = testers.invalidateFetcherByDrvHash fetchgit { name = "simple-nix-source"; @@ -105,4 +115,98 @@ rootDir = "misc/systemd"; sha256 = "sha256-UhxHk4SrXYq7ZDMtXLig5SigpbITrVgkpFTmryuvpcM="; }; + + # Make sure that if an expected hash is given and the corresponding store path exists already, no fetch is done + cached-prefetch-avoids-fetch = + let + name = "cached-prefetch-avoids-fetch"; + url = "https://github.com/NixOS/nix"; + rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; + sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; + fetched = fetchgit { + inherit + name + url + rev + sha256 + ; + }; + in + runCommand "cached-prefetch-avoids-fetch" + { + nativeBuildInputs = [ + nix-prefetch-git + nix + ]; + } + '' + export NIX_REMOTE=local?root=$(mktemp -d) + nix-store --load-db < ${closureInfo { rootPaths = fetched; }}/registration + nix-prefetch-git --name "${name}" "${url}" "${rev}" "${sha256}" > $out + ''; + + prefetch-git-no-add-path = + testers.invalidateFetcherByDrvHash + ( + { + name, + url, + rev, + hash, + ... + }: + runCommand name + { + buildInputs = [ + nix-prefetch-git + nix + cacert + jq + ]; + outputHashMode = "recursive"; + outputHashAlgo = null; + outputHash = hash; + inherit url rev; + } + '' + store_root="$(mktemp -d)" + prefetch() { NIX_REMOTE="local?root=$store_root" nix-prefetch-git $@ "$url" --rev "$rev" | jq -r .path; } + path="$(prefetch --no-add-path)" + if test -e "$store_root/$path"; then + echo "$path exists in $NIX_REMOTE when it shouldn't" >&2 + exit 1 + fi + path_added="$(prefetch)" + if ! test -e "$store_root/$path"; then + echo "$path_added doesn't exist in NIX_REMOTE when it should" >&2 + exit 1 + fi + if test "$path" != "$path_added"; then + echo "Paths are different with and without --no-add-path: $path != $path_added" >&2 + exit 1 + fi + cp -r "$store_root/$path_added" "$out" + '' + ) + { + name = "nix-prefetch-git-no-add-path"; + url = "https://github.com/NixOS/nix"; + rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; + hash = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; + }; + + withGitConfig = + let + pkgs = import ../../.. { + config.gitConfig = { + url."https://github.com".insteadOf = "https://doesntexist.forsure"; + }; + }; + in + pkgs.testers.invalidateFetcherByDrvHash pkgs.fetchgit { + name = "fetchgit-with-config"; + url = "https://doesntexist.forsure/NixOS/nix"; + rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; + sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; + }; } diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index b7b1bfa5eb99..560b912d414f 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -35,6 +35,7 @@ if [ -n "$downloadToTemp" ]; then downloadedFile="$TMPDIR/file"; fi tryDownload() { local url="$1" + local target="$2" echo echo "trying $url" local curlexit=18; @@ -44,7 +45,7 @@ tryDownload() { # if we get error code 18, resume partial download while [ $curlexit -eq 18 ]; do # keep this inside an if statement, since on failure it doesn't abort the script - if "${curl[@]}" -C - --fail "$url" --output "$downloadedFile"; then + if "${curl[@]}" -C - --fail "$url" --output "$target"; then success=1 break else @@ -81,7 +82,9 @@ tryHashedMirrors() { if "${curl[@]}" --retry 0 --connect-timeout "${NIX_CONNECT_TIMEOUT:-15}" \ --fail --silent --show-error --head "$url" \ --write-out "%{http_code}" --output /dev/null > code 2> log; then - tryDownload "$url" + # Directly download to $out, because postFetch doesn't need to run, + # since hashed mirrors provide pre-built derivation outputs. + tryDownload "$url" "$out" # We skip postFetch here, because hashed-mirrors are # already content addressed. So if $outputHash is in the @@ -156,7 +159,7 @@ for url in $urls; do ;; esac fi - tryDownload "$url" + tryDownload "$url" "$downloadedFile" if test -n "$success"; then finish; fi done diff --git a/pkgs/build-support/fetchurl/tests.nix b/pkgs/build-support/fetchurl/tests.nix index 8d9064141f23..6d214a74d18a 100644 --- a/pkgs/build-support/fetchurl/tests.nix +++ b/pkgs/build-support/fetchurl/tests.nix @@ -22,4 +22,24 @@ ${jq}/bin/jq -r '.headers.Hello' $out | ${moreutils}/bin/sponge $out ''; }; + # Tests that downloadToTemp works with hashedMirrors + no-skipPostFetch = testers.invalidateFetcherByDrvHash fetchurl { + # Make sure that we can only download from hashed mirrors + url = "http://broken"; + # A file with this hash is definitely on tarballs.nixos.org + sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; + + # No chance + curlOptsList = [ + "--retry" + "0" + ]; + + downloadToTemp = true; + # Usually postFetch is needed with downloadToTemp to populate $out from + # $downloadedFile, but here we know that because the URL is broken, it will + # have to fallback to fetching the previously-built derivation from + # tarballs.nixos.org, which provides pre-built derivation outputs. + + }; } diff --git a/pkgs/build-support/setup-hooks/cygwin-dll-link.sh b/pkgs/build-support/setup-hooks/cygwin-dll-link.sh new file mode 100644 index 000000000000..d5724794921d --- /dev/null +++ b/pkgs/build-support/setup-hooks/cygwin-dll-link.sh @@ -0,0 +1,73 @@ +addLinkDLLPaths() { + addToSearchPath "LINK_DLL_FOLDERS" "$1/lib" + addToSearchPath "LINK_DLL_FOLDERS" "$1/bin" +} + +addEnvHooks "$targetOffset" addLinkDLLPaths + +addOutputDLLPaths() { + for output in $(getAllOutputNames); do + addToSearchPath "LINK_DLL_FOLDERS" "${!output}/lib" + addToSearchPath "LINK_DLL_FOLDERS" "${!output}/bin" + done +} + +postInstallHooks+=(addOutputDLLPaths) + +_dllDeps() { + "$OBJDUMP" -p "$1" \ + | sed -n 's/.*DLL Name: \(.*\)/\1/p' \ + | sort -u +} + +_linkDeps() { + local target="$1" dir="$2" check="$3" + echo 'target:' "$target" + local dll + _dllDeps "$target" | while read dll; do + echo ' dll:' "$dll" + if [[ -e "$dir/$dll" ]]; then continue; fi + # Locate the DLL - it should be an *executable* file on $LINK_DLL_FOLDERS. + local dllPath="$(PATH="$(dirname "$target"):$LINK_DLL_FOLDERS" type -P "$dll")" + if [[ -z "$dllPath" ]]; then + if [[ -z "$check" || -n "${allowedImpureDLLsMap[$dll]}" ]]; then + continue + fi + echo unable to find $dll in $LINK_DLL_FOLDERS >&2 + exit 1 + fi + echo ' linking to:' "$dllPath" + CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath" "$dir" + # That DLL might have its own (transitive) dependencies, + # so add also all DLLs from its directory to be sure. + _linkDeps "$dllPath" "$dir" "" + done +} + +linkDLLs() { + if [ ! -d "$prefix" ]; then return; fi + ( + set -e + shopt -s globstar nullglob + + local -a allowedImpureDLLsArray + concatTo allowedImpureDLLsArray allowedImpureDLLs + + local -A allowedImpureDLLsMap; + + for dll in "${allowedImpureDLLsArray[@]}"; do + allowedImpureDLLsMap[$dll]=1 + done + + cd "$prefix" + + # Iterate over any DLL that we depend on. + local target + for target in {bin,libexec}/**/*.{exe,dll}; do + [[ ! -f "$target" || ! -x "$target" ]] || + _linkDeps "$target" "$(dirname "$target")" "1" + done + ) +} + +fixupOutputHooks+=(linkDLLs) diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index 0825eae7904f..1ab0fa692dba 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { if (builtins.elem system platforms) then sources.${system} else - throw "Source for ${pname} is not available for ${system}"; + throw "Source for 1password-cli is not available for ${system}"; nativeBuildInputs = [ installShellFiles @@ -63,23 +63,23 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - install -D ${mainProgram} $out/bin/${mainProgram} + install -D op $out/bin/op runHook postInstall ''; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' HOME=$TMPDIR - installShellCompletion --cmd ${mainProgram} \ - --bash <($out/bin/${mainProgram} completion bash) \ - --fish <($out/bin/${mainProgram} completion fish) \ - --zsh <($out/bin/${mainProgram} completion zsh) + installShellCompletion --cmd op \ + --bash <($out/bin/op completion bash) \ + --fish <($out/bin/op completion fish) \ + --zsh <($out/bin/op completion zsh) ''; dontStrip = stdenv.hostPlatform.isDarwin; doInstallCheck = true; - versionCheckProgram = "${builtins.placeholder "out"}/bin/${mainProgram}"; + versionCheckProgram = "${builtins.placeholder "out"}/bin/op"; versionCheckProgramArg = "--version"; passthru = { diff --git a/pkgs/by-name/_1/_1password-gui/linux.nix b/pkgs/by-name/_1/_1password-gui/linux.nix index 6cd427c2aae9..57e3c76dea8b 100644 --- a/pkgs/by-name/_1/_1password-gui/linux.nix +++ b/pkgs/by-name/_1/_1password-gui/linux.nix @@ -109,9 +109,9 @@ stdenv.mkDerivation { cp -a * $out/share/1password # Desktop file - install -Dt $out/share/applications resources/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace-fail 'Exec=/opt/1Password/${pname}' 'Exec=${pname}' + install -Dt $out/share/applications resources/1password.desktop + substituteInPlace $out/share/applications/1password.desktop \ + --replace-fail 'Exec=/opt/1Password/1password' 'Exec=1password' '' + (lib.optionalString (polkitPolicyOwners != [ ]) '' diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 68df9b533b2a..b3e7dc491ceb 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,56 +1,56 @@ { "stable": { "linux": { - "version": "8.11.10", + "version": "8.11.12", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.10.x64.tar.gz", - "hash": "sha256-AKqr1jMTFXPYYYJu8wD9P+xXwxobSbpjXwmBQhWYVhg=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.12.x64.tar.gz", + "hash": "sha256-znzmaEYOLVw6nUBk20oMdSngkO8iiSTHvM1y/t3Z55Y=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.10.arm64.tar.gz", - "hash": "sha256-Xz66LYXgX64P9TTmI8D8Wtrz7qKTBrZx+rP26yJqcTw=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.12.arm64.tar.gz", + "hash": "sha256-ENuvB8GExhHWjJ97JV0qc2cIn9HqXb202dzIxu1fz2A=" } } }, "darwin": { - "version": "8.11.10", + "version": "8.11.12", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.10-x86_64.zip", - "hash": "sha256-sQK+qHdGvpIi+h2az8PYq6kROmiaGKBbNGFGXJSe1eg=" + "url": "https://downloads.1password.com/mac/1Password-8.11.12-x86_64.zip", + "hash": "sha256-mr7DsYIEh21pHQX0cq9JlTZ4lHhkyYHCmwMaxEiK+5g=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.10-aarch64.zip", - "hash": "sha256-Hb+DEGM7ymDuf71uKTy8L/9bUWZ2+QD+w7h2tNvp0Pk=" + "url": "https://downloads.1password.com/mac/1Password-8.11.12-aarch64.zip", + "hash": "sha256-34ylS5Xq9By6nuUkEmLoi0wR5hAQx1vBhrYFq4mjSDs=" } } } }, "beta": { "linux": { - "version": "8.11.12-26.BETA", + "version": "8.11.14-19.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.12-26.BETA.x64.tar.gz", - "hash": "sha256-1i8DqaNSsWj2dIVKOrRH07OjqeunZ/y12m01gJwuQZA=" + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-19.BETA.x64.tar.gz", + "hash": "sha256-b9D+1iSkXJ23ZImB2XtNL/3uA4mcHw5o0blNU2sZX4Y=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.12-26.BETA.arm64.tar.gz", - "hash": "sha256-0naWYmWKqTgiYbEO8aSXMJTLGTLlRBgvrGxWIyTrZtE=" + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-19.BETA.arm64.tar.gz", + "hash": "sha256-hDrmXWPdlmyc9gtbMJ+M3tGlL6QdavrYi5vH4HF8a/Q=" } } }, "darwin": { - "version": "8.11.12-26.BETA", + "version": "8.11.14-19.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.12-26.BETA-x86_64.zip", - "hash": "sha256-0zv4U4x4dxdrsjthHrXszL5JGpe//xVsqE+VCXD1F4U=" + "url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-x86_64.zip", + "hash": "sha256-ULmPdLwFObQBM0CrEkBVgSFIEEeHtn3G0grC0WhWmbs=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.12-26.BETA-aarch64.zip", - "hash": "sha256-0/ZDkeyGcnA7P41FLYk4xNLdG89Y2BWDhApNSaYcKg8=" + "url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-aarch64.zip", + "hash": "sha256-lK0ATvTCPrwkLkPkkTBuPo8S2g/W4q9BNdSv3fdZorM=" } } } diff --git a/pkgs/by-name/_3/_3proxy/package.nix b/pkgs/by-name/_3/_3proxy/package.nix index c85a8cb392c2..2403efe6b346 100644 --- a/pkgs/by-name/_3/_3proxy/package.nix +++ b/pkgs/by-name/_3/_3proxy/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "3proxy"; repo = "3proxy"; - rev = version; + tag = version; sha256 = "sha256-uy6flZ1a7o02pr5O0pgl9zCjh8mE9W5JxotJeBMB16A="; }; diff --git a/pkgs/by-name/_6/_6tunnel/package.nix b/pkgs/by-name/_6/_6tunnel/package.nix index ac9b5d2f3881..4e4da7039586 100644 --- a/pkgs/by-name/_6/_6tunnel/package.nix +++ b/pkgs/by-name/_6/_6tunnel/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wojtekka"; repo = "6tunnel"; - rev = version; + tag = version; sha256 = "sha256-ftTAFjHlXRrXH6co8bX0RY092lAmv15svZn4BKGVuq0="; }; diff --git a/pkgs/by-name/_9/_9pfs/package.nix b/pkgs/by-name/_9/_9pfs/package.nix index 7305505aecb2..9d31973a4a52 100644 --- a/pkgs/by-name/_9/_9pfs/package.nix +++ b/pkgs/by-name/_9/_9pfs/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ftrvxmtrx"; repo = "9pfs"; - rev = version; + tag = version; sha256 = "sha256-nlJ4Zh13T78r0Dn3Ky/XLhipeMbMFbn0qGCJnUCBd3Y="; }; diff --git a/pkgs/by-name/aa/aaphoto/package.nix b/pkgs/by-name/aa/aaphoto/package.nix index 1f32649b6d2a..c79507711dae 100644 --- a/pkgs/by-name/aa/aaphoto/package.nix +++ b/pkgs/by-name/aa/aaphoto/package.nix @@ -9,7 +9,7 @@ llvmPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "aaphoto"; version = "0.45"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' - install -Dm644 NEWS README REMARKS TODO -t $out/share/doc/${pname} + install -Dm644 NEWS README REMARKS TODO -t $out/share/doc/aaphoto ''; meta = { diff --git a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix index c47ce2d356b3..e64a4e7adaa5 100644 --- a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix +++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "google"; repo = "aarch64-esr-decoder"; - rev = version; + tag = version; hash = "sha256-ZpSrz7iwwzNrK+bFTMn5MPx4Zjceao9NKhjAyjuPLWY="; }; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Utility for decoding aarch64 ESR register values"; homepage = "https://github.com/google/aarch64-esr-decoder"; - changelog = "https://github.com/google/aarch64-esr-decoder/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/google/aarch64-esr-decoder/blob/${version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jmbaur ]; mainProgram = "aarch64-esr-decoder"; diff --git a/pkgs/by-name/ab/aba/package.nix b/pkgs/by-name/ab/aba/package.nix index 768b176a3429..50b022ae117f 100644 --- a/pkgs/by-name/ab/aba/package.nix +++ b/pkgs/by-name/ab/aba/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { src = fetchFromSourcehut { owner = "~onemoresuza"; repo = "aba"; - rev = version; + tag = version; hash = "sha256-2zVQNchL4DFh2v2/kwupJTBSmXiKqlxzUMrP9TbfCMs="; }; diff --git a/pkgs/by-name/ab/abi-compliance-checker/package.nix b/pkgs/by-name/ab/abi-compliance-checker/package.nix index 4351670a8c6e..08b0161b220f 100644 --- a/pkgs/by-name/ab/abi-compliance-checker/package.nix +++ b/pkgs/by-name/ab/abi-compliance-checker/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lvc"; repo = "abi-compliance-checker"; - rev = version; + tag = version; sha256 = "1f1f9j2nf9j83sfl2ljadch99v6ha8rq8xm7ax5akc05hjpyckij"; }; diff --git a/pkgs/by-name/ab/abi-dumper/package.nix b/pkgs/by-name/ab/abi-dumper/package.nix index 863a42df406d..fc0eaffc4e55 100644 --- a/pkgs/by-name/ab/abi-dumper/package.nix +++ b/pkgs/by-name/ab/abi-dumper/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lvc"; repo = "abi-dumper"; - rev = version; + tag = version; sha256 = "sha256-BefDMeKHx4MNU6SyX5UpQnwdI+zqap7zunsgdWG/2xc="; }; diff --git a/pkgs/by-name/ac/acpi/package.nix b/pkgs/by-name/ac/acpi/package.nix index 4f4583a3d14b..d6fbf82ec640 100644 --- a/pkgs/by-name/ac/acpi/package.nix +++ b/pkgs/by-name/ac/acpi/package.nix @@ -4,13 +4,13 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "acpi"; version = "1.8"; src = fetchurl { - url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws="; + url = "mirror://sourceforge/acpiclient/${finalAttrs.version}/acpi-${finalAttrs.version}.tar.gz"; + hash = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws="; }; meta = { @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; }; -} +}) diff --git a/pkgs/by-name/ad/adapta-backgrounds/package.nix b/pkgs/by-name/ad/adapta-backgrounds/package.nix index bf4cc0ab8f10..18aac63bf065 100644 --- a/pkgs/by-name/ad/adapta-backgrounds/package.nix +++ b/pkgs/by-name/ad/adapta-backgrounds/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-backgrounds"; - rev = version; + tag = version; sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj"; }; diff --git a/pkgs/by-name/ad/adapta-gtk-theme/package.nix b/pkgs/by-name/ad/adapta-gtk-theme/package.nix index 02542511e9e8..7bb6862f0463 100644 --- a/pkgs/by-name/ad/adapta-gtk-theme/package.nix +++ b/pkgs/by-name/ad/adapta-gtk-theme/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; - rev = version; + tag = version; sha256 = "19skrhp10xx07hbd0lr3d619vj2im35d8p9rmb4v4zacci804q04"; }; diff --git a/pkgs/by-name/ad/adapta-kde-theme/package.nix b/pkgs/by-name/ad/adapta-kde-theme/package.nix index 67ba82d42556..54c5cb2de524 100644 --- a/pkgs/by-name/ad/adapta-kde-theme/package.nix +++ b/pkgs/by-name/ad/adapta-kde-theme/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "adapta-kde"; - rev = version; + tag = version; sha256 = "1q85678sff8is2kwvgd703ckcns42gdga2c1rqlp61gb6bqf09j8"; }; diff --git a/pkgs/by-name/ad/adementary-theme/package.nix b/pkgs/by-name/ad/adementary-theme/package.nix index 9c844a14655f..f3602d778131 100644 --- a/pkgs/by-name/ad/adementary-theme/package.nix +++ b/pkgs/by-name/ad/adementary-theme/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hrdwrrsk"; repo = "adementary-theme"; - rev = version; + tag = version; sha256 = "14y5s18g9r2c1ciw1skfksn09gvqgy8vjvwbr0z8gacf0jc2apqk"; }; diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix index 1e3331099c55..803b80a15027 100644 --- a/pkgs/by-name/ad/adguardian/package.nix +++ b/pkgs/by-name/ad/adguardian/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Lissy93"; repo = "AdGuardian-Term"; - rev = version; + tag = version; hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY="; }; diff --git a/pkgs/by-name/ad/adminneo/index.php b/pkgs/by-name/ad/adminneo/index.php deleted file mode 100644 index ea45735f92fc..000000000000 --- a/pkgs/by-name/ad/adminneo/index.php +++ /dev/null @@ -1,45 +0,0 @@ - - # * - # * - (lib.cmakeBool "VKI_RAY_TRACING" (!(stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit))) - ]; - - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/lib icd/amdvlk${suffix}.so - install -Dm644 -t $out/share/vulkan/icd.d icd/amd_icd${suffix}.json - install -Dm644 -t $out/share/vulkan/implicit_layer.d icd/amd_icd${suffix}.json - - patchelf --set-rpath "$rpath" $out/lib/amdvlk${suffix}.so - - runHook postInstall - ''; - - # Keep the rpath, otherwise vulkaninfo and vkcube segfault - dontPatchELF = true; - - passthru.updateScript = nix-update-script { - extraArgs = [ - "--url" - "https://github.com/GPUOpen-Drivers/AMDVLK" - "--version-regex" - "v-(.*)" - ]; - }; - - passthru.impureTests = { - amdvlk = callPackage ./test.nix { }; - }; - - meta = { - description = "AMD Open Source Driver For Vulkan"; - homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; - changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${finalAttrs.version}"; - license = lib.licenses.mit; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; - maintainers = with lib.maintainers; [ Flakebi ]; - }; -}) diff --git a/pkgs/by-name/am/amdvlk/test.nix b/pkgs/by-name/am/amdvlk/test.nix deleted file mode 100644 index 40da948c6836..000000000000 --- a/pkgs/by-name/am/amdvlk/test.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - makeImpureTest, - coreutils, - amdvlk, - vulkan-tools, -}: -makeImpureTest { - name = "amdvlk"; - testedPackage = "amdvlk"; - - sandboxPaths = [ - "/sys" - "/dev/dri" - ]; - - nativeBuildInputs = [ vulkan-tools ]; - - VK_ICD_FILENAMES = "${amdvlk}/share/vulkan/icd.d/amd_icd64.json"; - XDG_RUNTIME_DIR = "/tmp"; - - # AMDVLK needs access to /dev/dri/card0 (or another card), but normally it is rw-rw---- - # Change the permissions to be rw for everyone - prepareRunCommands = '' - function reset_perms() - { - # Reset permissions to previous state - for card in /dev/dri/card*; do - sudo ${coreutils}/bin/chmod "0''${cardPerms[$card]}" $card - done - } - - # Save permissions on /dev/dri/card* - declare -A cardPerms - for card in /dev/dri/card*; do - cardPerms[$card]=$(stat -c "%a" $card) - done - - sudo ${coreutils}/bin/chmod o+rw /dev/dri/card* - trap reset_perms EXIT - ''; - - testScript = '' - # Check that there is at least one card with write-access - if ! ls -l /dev/dri/card* | cut -b8-9 | grep -q rw; then - echo 'AMDVLK needs rw access to /dev/dri/card0 or a fitting card, please run `sudo chmod o+rw /dev/dri/card*`' - exit 1 - fi - - vulkaninfo --summary - echo "Checking version" - vulkaninfo --summary | grep '= ${amdvlk.version}' - ''; - - meta = with lib.maintainers; { - maintainers = [ Flakebi ]; - }; -} diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 85d16bbd509f..e21cbfa80f3d 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1758297686-ge5ccb5" + "@sourcegraph/amp": "^0.0.1759233723-gf92434" } }, "node_modules/@napi-rs/keyring": { @@ -228,9 +228,9 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1758297686-ge5ccb5", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1758297686-ge5ccb5.tgz", - "integrity": "sha512-fU/Lw/yYfeUwF0+1MUuCdDcqZVEygeLwjMPoIFl9kg8R3u2jgZGVqtbfaS8q6MI8CGCVPQTs/rDgP4nVE0jmyg==", + "version": "0.0.1759233723-gf92434", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1759233723-gf92434.tgz", + "integrity": "sha512-ts+dHxSHfT7sXNAvlRHyp/jwjGvKs08lf+KHaZ/2pMcqnBf94d9g+8u/AoPzUfeFq0WDAbeMl2rV4TDaJAM3aQ==", "dependencies": { "@napi-rs/keyring": "1.1.9" }, diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 72b03dbfa0c7..b379f2b13f1f 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1758297686-ge5ccb5"; + version = "0.0.1759233723-gf92434"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-D2jElEhvrcuuDIzfB+XAI4VCyYAOC6pu/xNMxkn16o4="; + hash = "sha256-r48Odw2PA9ei3WrCm+Q8eGXCY1TVzyrqJa9FLzW84vs="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-dePLix9roMYlnYMqBq1nwRQEHdyXdtSEgvsoo7yD3QQ="; + npmDepsHash = "sha256-Al8JZ2g68ZvMTxDbZM9grKz7C217YJxnjWnO8o8ySnI="; propagatedBuildInputs = [ ripgrep diff --git a/pkgs/by-name/an/analog/package.nix b/pkgs/by-name/an/analog/package.nix index add6dff6eebd..6bfb07561a27 100644 --- a/pkgs/by-name/an/analog/package.nix +++ b/pkgs/by-name/an/analog/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "c-amie"; repo = "analog-ce"; - rev = version; + tag = version; sha256 = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY="; }; diff --git a/pkgs/by-name/an/anders/package.nix b/pkgs/by-name/an/anders/package.nix index 9943da5a735d..4c512c9629be 100644 --- a/pkgs/by-name/an/anders/package.nix +++ b/pkgs/by-name/an/anders/package.nix @@ -13,7 +13,7 @@ ocamlPackages.buildDunePackage rec { src = fetchFromGitHub { owner = "groupoid"; repo = "anders"; - rev = version; + tag = version; sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4="; }; diff --git a/pkgs/by-name/an/anewer/package.nix b/pkgs/by-name/an/anewer/package.nix index ced157d208e9..5a42a3887571 100644 --- a/pkgs/by-name/an/anewer/package.nix +++ b/pkgs/by-name/an/anewer/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "ysf"; repo = "anewer"; - rev = version; + tag = version; sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d"; }; diff --git a/pkgs/by-name/an/angsd/package.nix b/pkgs/by-name/an/angsd/package.nix index 3a63cced6076..f9c6d2775d62 100644 --- a/pkgs/by-name/an/angsd/package.nix +++ b/pkgs/by-name/an/angsd/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "ANGSD"; repo = "angsd"; sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA="; - rev = version; + tag = version; }; patches = [ diff --git a/pkgs/by-name/an/anime-downloader/package.nix b/pkgs/by-name/an/anime-downloader/package.nix index 5167e9414b94..e65d02551123 100644 --- a/pkgs/by-name/an/anime-downloader/package.nix +++ b/pkgs/by-name/an/anime-downloader/package.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "anime-dl"; repo = "anime-downloader"; - rev = version; + tag = version; sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o="; }; diff --git a/pkgs/by-name/an/ansible-cmdb/package.nix b/pkgs/by-name/an/ansible-cmdb/package.nix index d88ae7ec2f63..99cf731a88da 100644 --- a/pkgs/by-name/an/ansible-cmdb/package.nix +++ b/pkgs/by-name/an/ansible-cmdb/package.nix @@ -26,7 +26,7 @@ buildPythonApplication { src = fetchFromGitHub { owner = "fboender"; repo = "ansible-cmdb"; - rev = version; + tag = version; hash = "sha256-HOFLX8fiid+xJOVYNyVbz5FunrhteAUPlvS3ctclVHo="; }; diff --git a/pkgs/by-name/ao/aoc-cli/package.nix b/pkgs/by-name/ao/aoc-cli/package.nix index c7cd4ba8476f..526a9b7dbd86 100644 --- a/pkgs/by-name/ao/aoc-cli/package.nix +++ b/pkgs/by-name/ao/aoc-cli/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "scarvalhojr"; repo = "aoc-cli"; - rev = version; + tag = version; hash = "sha256-UdeCKhEWr1BjQ6OMLP19OLWPlvvP7FGAO+mi+bQUPQA="; }; diff --git a/pkgs/by-name/ao/aocl-utils/package.nix b/pkgs/by-name/ao/aocl-utils/package.nix index bdeb5ce95216..663fb89c6496 100644 --- a/pkgs/by-name/ao/aocl-utils/package.nix +++ b/pkgs/by-name/ao/aocl-utils/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "amd"; repo = "aocl-utils"; - rev = version; + tag = version; hash = "sha256-1g5gERVxXKAeCyNR9/HheUfj+MPxJso3NzqDonvuyMo="; }; diff --git a/pkgs/by-name/ap/apfel/package.nix b/pkgs/by-name/ap/apfel/package.nix index 7c8ca609fd27..5afecc9172ae 100644 --- a/pkgs/by-name/ap/apfel/package.nix +++ b/pkgs/by-name/ap/apfel/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "scarrazza"; repo = "apfel"; - rev = version; + tag = version; hash = "sha256-0Ix7KwEZUG/NmGJ380DVJbUA0PcoEJDlcGSc09l5Tbc="; }; diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix index c37973851c16..316350825022 100644 --- a/pkgs/by-name/ap/app2unit/package.nix +++ b/pkgs/by-name/ap/app2unit/package.nix @@ -5,21 +5,25 @@ scdoc, fetchFromGitHub, nix-update-script, + installShellFiles, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "app2unit"; version = "1.1.2"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "app2unit"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-M2sitlrQNSLthSaDH+R8gUcZ8i+o1ktf2SB/vvjyJEI="; }; passthru.updateScript = nix-update-script { }; - nativeBuildInputs = [ scdoc ]; + nativeBuildInputs = [ + scdoc + installShellFiles + ]; buildPhase = '' scdoc < app2unit.1.scd > app2unit.1 @@ -27,6 +31,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' install -Dt $out/bin app2unit + installManPage app2unit.1 for link in \ app2unit-open \ @@ -54,4 +59,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with lib.maintainers; [ fazzi ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ap/appeditor/package.nix b/pkgs/by-name/ap/appeditor/package.nix index c5265297083d..4ab3c865f91f 100644 --- a/pkgs/by-name/ap/appeditor/package.nix +++ b/pkgs/by-name/ap/appeditor/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "donadigo"; repo = "appeditor"; - rev = version; + tag = version; sha256 = "sha256-A0YasHw5osGrgUPiUPuRBnv1MR/Pth6jVHGEx/klOGY="; }; diff --git a/pkgs/by-name/ap/appindicator-sharp/package.nix b/pkgs/by-name/ap/appindicator-sharp/package.nix index 40373d4e61af..24e8c314e7b1 100644 --- a/pkgs/by-name/ap/appindicator-sharp/package.nix +++ b/pkgs/by-name/ap/appindicator-sharp/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "appindicator-sharp"; - version = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37"; + version = "0-unstable-2016-01-18"; src = fetchFromGitHub { owner = "stsundermann"; repo = "appindicator-sharp"; - rev = version; + rev = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37"; sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l"; }; diff --git a/pkgs/by-name/ar/arc-icon-theme/package.nix b/pkgs/by-name/ar/arc-icon-theme/package.nix index 646a0d14c7da..7d17fdfc09c7 100644 --- a/pkgs/by-name/ar/arc-icon-theme/package.nix +++ b/pkgs/by-name/ar/arc-icon-theme/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "horst3180"; repo = "arc-icon-theme"; - rev = version; + tag = version; hash = "sha256-TfYtzwo69AC5hHbzEqB4r5Muqvn/eghCGSlmjMCFA7I="; }; diff --git a/pkgs/by-name/ar/arc-kde-theme/package.nix b/pkgs/by-name/ar/arc-kde-theme/package.nix index 2cc355efbe6d..b1cb4b83928e 100644 --- a/pkgs/by-name/ar/arc-kde-theme/package.nix +++ b/pkgs/by-name/ar/arc-kde-theme/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "arc-kde"; - rev = version; + tag = version; sha256 = "sha256-dxk8YpJB4XaZHD/O+WvQUFKJD2TE38VZyC5orn4N7BA="; }; diff --git a/pkgs/by-name/ar/arc-theme/package.nix b/pkgs/by-name/ar/arc-theme/package.nix index d92f85e0c870..ce38dabf68ac 100644 --- a/pkgs/by-name/ar/arc-theme/package.nix +++ b/pkgs/by-name/ar/arc-theme/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jnsh"; repo = "arc-theme"; - rev = version; + tag = version; sha256 = "sha256-7VmqsUCeG5GwmrVdt9BJj0eZ/1v+no/05KwGFb7E9ns="; }; diff --git a/pkgs/by-name/ar/arduino-mk/package.nix b/pkgs/by-name/ar/arduino-mk/package.nix index eb03147af25b..9f6b8168aeb8 100644 --- a/pkgs/by-name/ar/arduino-mk/package.nix +++ b/pkgs/by-name/ar/arduino-mk/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sudar"; repo = "Arduino-Makefile"; - rev = version; + tag = version; sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x"; }; diff --git a/pkgs/by-name/ar/arduinoOTA/package.nix b/pkgs/by-name/ar/arduinoOTA/package.nix index ac86e5fac134..8147d512dafa 100644 --- a/pkgs/by-name/ar/arduinoOTA/package.nix +++ b/pkgs/by-name/ar/arduinoOTA/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "arduino"; repo = "arduinoOTA"; - rev = version; + tag = version; hash = "sha256-HaNMkeV/PDEotYp8+rUKFaBxGbZO8qA99Yp2sa6glz8="; }; diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 3b8b9108386e..0dd904c7cd23 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "argocd"; - version = "3.1.6"; + version = "3.1.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-RdqMkyQBJaAJv660bCe+C84BFQNu06t3AaYSz4aMlBA="; + hash = "sha256-xySxnRw8MvMi4BJ/h8+4Lhf2ontC05hAliMG2e3xnQg="; }; ui = stdenv.mkDerivation { diff --git a/pkgs/by-name/ar/argp-standalone/package.nix b/pkgs/by-name/ar/argp-standalone/package.nix index 893aded31cff..eb566ed184b9 100644 --- a/pkgs/by-name/ar/argp-standalone/package.nix +++ b/pkgs/by-name/ar/argp-standalone/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "argp-standalone"; repo = "argp-standalone"; - rev = version; + tag = version; sha256 = "jWnoWVnUVDQlsC9ru7oB9PdtZuyCCNqGnMqF/f2m0ZY="; }; diff --git a/pkgs/by-name/ar/ariang/package.nix b/pkgs/by-name/ar/ariang/package.nix index 06dab7c14e24..0c74265af293 100644 --- a/pkgs/by-name/ar/ariang/package.nix +++ b/pkgs/by-name/ar/ariang/package.nix @@ -16,7 +16,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "mayswind"; repo = "AriaNg"; - rev = version; + tag = version; hash = "sha256-TisgE5VFOe/1LbDq43AHASMVhC85BglETYFcvsQpwMw="; }; diff --git a/pkgs/by-name/ar/aribb25/package.nix b/pkgs/by-name/ar/aribb25/package.nix index 211d2c548b6a..8af9c4f65b6e 100644 --- a/pkgs/by-name/ar/aribb25/package.nix +++ b/pkgs/by-name/ar/aribb25/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { domain = "code.videolan.org"; owner = "videolan"; repo = "aribb25"; - # rev = version; FIXME: uncomment in next release + # tag = version; FIXME: uncomment in next release rev = "c14938692b313b5ba953543fd94fd1cad0eeef18"; # 0.2.7 with build fixes sha256 = "1kb9crfqib0npiyjk4zb63zqlzbhqm35nz8nafsvdjd71qbd2amp"; }; diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix index db7b6f9c4c85..037dcbffd0f1 100644 --- a/pkgs/by-name/ar/arkade/package.nix +++ b/pkgs/by-name/ar/arkade/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; - rev = version; + tag = version; hash = "sha256-aWIMnqpf7HehGingl0z7lpUnr7P3k5tiD7+PVjF0Uso="; }; diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix index 559a00a907ac..f81a7db70d85 100644 --- a/pkgs/by-name/ar/armadillo/package.nix +++ b/pkgs/by-name/ar/armadillo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "15.0.2"; + version = "15.0.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-mQq0zLfv8bbXBAnpqn+kEZh3rF9dELohnphGCrPk1us="; + hash = "sha256-n1XsEPCpH7ZHmrTtKzelJEWu6RdwaiONFwtSIMAi/kM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ar/arp-scan/package.nix b/pkgs/by-name/ar/arp-scan/package.nix index 3f41678c5b21..a1216e9d8876 100644 --- a/pkgs/by-name/ar/arp-scan/package.nix +++ b/pkgs/by-name/ar/arp-scan/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "royhills"; repo = "arp-scan"; - rev = version; + tag = version; sha256 = "sha256-BS+ItZd6cSMX92M6XGYrIeAiCB2iBdvbMvKdLfwawLQ="; }; diff --git a/pkgs/by-name/ar/arrpc/package.nix b/pkgs/by-name/ar/arrpc/package.nix index f2e8fd195dfb..cd18d75510e1 100644 --- a/pkgs/by-name/ar/arrpc/package.nix +++ b/pkgs/by-name/ar/arrpc/package.nix @@ -5,16 +5,16 @@ }: buildNpmPackage rec { pname = "arrpc"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "OpenAsar"; repo = "arrpc"; tag = version; - hash = "sha256-3xkqWcLhmSIH6Al2SvM9qBpdcLzEqUmUCgwYBPAgVpo="; + hash = "sha256-WSwnCE3hs3Rj42XDbPtxuYL8tAlfzuWPkIypKzCu8EQ="; }; - npmDepsHash = "sha256-lw6pngFC2Pnk+I8818TOTwN4r+8IsjvdMYIyTsTi49g="; + npmDepsHash = "sha256-A98oNT1rGctSlJG9yLaa6i0VsGMIo1r2NoNk00SVupk="; dontNpmBuild = true; diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index 12e2fa59c7d6..b406469e77fa 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; - rev = version; + tag = version; hash = "sha256-E/tDd7wQKDgC91x1rGa8Ltn4GMPk3DJDvmMQNafVLyM="; }; diff --git a/pkgs/by-name/at/atomic-operator/package.nix b/pkgs/by-name/at/atomic-operator/package.nix index c289a06a56fb..3d77523dff28 100644 --- a/pkgs/by-name/at/atomic-operator/package.nix +++ b/pkgs/by-name/at/atomic-operator/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "swimlane"; repo = "atomic-operator"; - rev = version; + tag = version; hash = "sha256-DyNqu3vndyLkmfybCfTbgxk3t/ALg7IAkAMg4kBkH7Q="; }; diff --git a/pkgs/by-name/at/atomicparsley/package.nix b/pkgs/by-name/at/atomicparsley/package.nix index 75f736148ea2..0e50d3f862d4 100644 --- a/pkgs/by-name/at/atomicparsley/package.nix +++ b/pkgs/by-name/at/atomicparsley/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wez"; repo = "atomicparsley"; - rev = version; + tag = version; sha256 = "sha256-VhrOMpGNMkNNYjcfCqlHI8gdApWr1ThtcxDwQ6gyV/g="; }; diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index 19505c29fdf6..2488f2473f25 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage { pname = "attic"; - version = "0-unstable-2025-09-12"; + version = "0-unstable-2025-09-24"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "attic"; - rev = "7c5d79ad62cda340cb8c80c99b921b7b7ffacf69"; - hash = "sha256-q7q0pWT+wu5AUU1Qlbwq8Mqb+AzHKhaMCVUq/HNZfo8="; + rev = "12cbeca141f46e1ade76728bce8adc447f2166c6"; + hash = "sha256-0nZlCCDC5PfndsQJXXtcyrtrfW49I3KadGMDlutzaGU="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage { buildInputs = lib.optional needNixInclude nix ++ [ boost ]; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; - cargoHash = "sha256-NdzwYnD0yMEI2RZwwXl/evYx9zdBVMOUee+V7uq1cf0="; + cargoHash = "sha256-h041o0s+bciXnvSuk4j+/uCY/sRRQWDVf+WEb9GEYeY="; env = { ATTIC_DISTRIBUTOR = "nixpkgs"; diff --git a/pkgs/by-name/au/audiowaveform/package.nix b/pkgs/by-name/au/audiowaveform/package.nix index 4416dd8dd556..b03ab73e9b9f 100644 --- a/pkgs/by-name/au/audiowaveform/package.nix +++ b/pkgs/by-name/au/audiowaveform/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bbc"; repo = "audiowaveform"; - rev = version; + tag = version; sha256 = "sha256-7pcYxl6m7mkoXGawA3gr8NTfkJlkgl+DtK79CA8dRec="; }; diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 00b250550fb3..048595e17af2 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -15,13 +15,13 @@ let nodejs = nodejs_24; - version = "2025.8.3"; + version = "2025.8.4"; src = fetchFromGitHub { owner = "goauthentik"; repo = "authentik"; rev = "version/${version}"; - hash = "sha256-DkvxDwHCfSqEpZ9rRXNR8MP0Mz/y1kHAr38exrHQ39c="; + hash = "sha256-pIzDaoDWc58cY/XhsyweCwc4dfRvkaT/zqsV1gDSnCI="; }; meta = { @@ -48,8 +48,8 @@ let outputHash = { - "aarch64-linux" = "sha256-uJe1v43d3baBUESU+CQk6fYBdiNOBiT3Tt0vFIbI/HY="; - "x86_64-linux" = "sha256-jVi+pgcz96Dj25T4e/s+SHqsZfonzXs1WZYe0lCI48Q="; + "aarch64-linux" = "sha256-92UFGgYLmtN13hW0/BV0gJa6ImrVyn+zRpDp5KeRRhs="; + "x86_64-linux" = "sha256-Td0+H0os4bfv8cfIFhvUJ43y8y9dHv9P1UD0B5Wqe4I="; } .${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform"); diff --git a/pkgs/by-name/au/autologin/package.nix b/pkgs/by-name/au/autologin/package.nix index 091a2cb8ad5b..0711999710cb 100644 --- a/pkgs/by-name/au/autologin/package.nix +++ b/pkgs/by-name/au/autologin/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = "autologin"; - rev = version; + tag = version; hash = "sha256-Cy4v/1NuaiSr5Bl6SQMWk5rga8h1QMBUkHpN6M3bWOc="; }; diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 6c555c55bd64..7d5e98be0386 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.91"; + version = "2.0.92"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${version}"; - sha256 = "sha256-8KrUJ+WZ9AP9LWCsxWc+IE+rhnqkLp1NS/s9Tbef8u4="; + sha256 = "sha256-X1B2L8bh3iXPZ5NpaH+VP67i/ykmd0IVXu0dg6XmUGo="; }; - cargoHash = "sha256-scCOAcM5Dr3SOblg7HPqWPgxVYCsWLNS+g4XvCWZcug="; + cargoHash = "sha256-4ZV5ef033cZdMJaQD0gLNaKe8XfQzhF7mADm7N0NxvA="; meta = { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/au/automysqlbackup/package.nix b/pkgs/by-name/au/automysqlbackup/package.nix index 24f8dea0e6cd..da92e32ccfb2 100644 --- a/pkgs/by-name/au/automysqlbackup/package.nix +++ b/pkgs/by-name/au/automysqlbackup/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sixhop"; repo = "automysqlbackup"; - rev = version; + tag = version; sha256 = "sha256-C0p1AY4yIxybQ6a/HsE3ZTHumtvQw5kKM51Ap+Se0ZI="; }; diff --git a/pkgs/by-name/au/autotrace/package.nix b/pkgs/by-name/au/autotrace/package.nix index 0db4a5c722cc..8e910f39d80e 100644 --- a/pkgs/by-name/au/autotrace/package.nix +++ b/pkgs/by-name/au/autotrace/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "autotrace"; repo = "autotrace"; - rev = version; + tag = version; hash = "sha256-PbEK5+7jcYIwYmgxBIOpNyj2KJNPfqKBKb+wYwoLKSo="; }; diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix index 3c2ae64c1f98..08d4c5981165 100644 --- a/pkgs/by-name/av/avbroot/package.nix +++ b/pkgs/by-name/av/avbroot/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "avbroot"; - version = "3.22.0"; + version = "3.23.0"; src = fetchFromGitHub { owner = "chenxiaolong"; repo = "avbroot"; tag = "v${version}"; - hash = "sha256-Ijyw6fUf5jW5di7gvnV0Eh1kG4q/x8GbG4R0q74rWLs="; + hash = "sha256-P7t1Tuux04D1tEaMjFPWhaYz4NP3hk5hoJ6kKiHM1S8="; }; - cargoHash = "sha256-eYnKxMwdk4nlDFvzoMoWSH4NO753IY68dN/Ok0BZf0Q="; + cargoHash = "sha256-ahBzMU8R520EMUgdETr0+gz2fuxKcOV+6fuH4SiRz8U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/av/avra/package.nix b/pkgs/by-name/av/avra/package.nix index 1d7c1556380a..61f106ce8517 100644 --- a/pkgs/by-name/av/avra/package.nix +++ b/pkgs/by-name/av/avra/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Ro5bert"; repo = "avra"; - rev = version; + tag = version; hash = "sha256-joOj89WZ9Si5fcu1w1VHj5fOcnB9N2313Yb29A+nCCY="; }; diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix index 006cb27558a5..f1e60d1a16c2 100644 --- a/pkgs/by-name/aw/await/package.nix +++ b/pkgs/by-name/aw/await/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "slavaGanzin"; repo = "await"; - rev = version; + tag = version; hash = "sha256-p0rB1fPfBL1Vj4p7IZtmLhfB5LwwyRaiCVSeDZAXJAo="; }; diff --git a/pkgs/by-name/aw/aws-gate/package.nix b/pkgs/by-name/aw/aws-gate/package.nix index 6e72b6a6616f..0508bc26cfcc 100644 --- a/pkgs/by-name/aw/aws-gate/package.nix +++ b/pkgs/by-name/aw/aws-gate/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "xen0l"; repo = "aws-gate"; - rev = version; + tag = version; hash = "sha256-9w2jP4s1HXf1gYiXX05Dt2iXt0bR0U48yc8h9T5M+EQ="; }; diff --git a/pkgs/by-name/aw/aws-sdk-cpp/package.nix b/pkgs/by-name/aw/aws-sdk-cpp/package.nix index d17b9b16ae36..28b2e2bb146c 100644 --- a/pkgs/by-name/aw/aws-sdk-cpp/package.nix +++ b/pkgs/by-name/aw/aws-sdk-cpp/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; - rev = version; + tag = version; hash = "sha256-W4eKgUvN2NLYEOO47HTJYJpEmyn10gNK29RIrvoXkek="; }; diff --git a/pkgs/by-name/aw/awslogs/package.nix b/pkgs/by-name/aw/awslogs/package.nix index 173e59944b61..596e9c3727d1 100644 --- a/pkgs/by-name/aw/awslogs/package.nix +++ b/pkgs/by-name/aw/awslogs/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "jorgebastida"; repo = "awslogs"; - rev = version; + tag = version; sha256 = "sha256-o6xZqwlqAy01P+TZ0rB5rpEddWNUBzzHp7/cycpcwes="; }; diff --git a/pkgs/by-name/ay/ayatana-ido/package.nix b/pkgs/by-name/ay/ayatana-ido/package.nix index 6d50bbecd4f4..a8ce5c744536 100644 --- a/pkgs/by-name/ay/ayatana-ido/package.nix +++ b/pkgs/by-name/ay/ayatana-ido/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-ido"; - rev = version; + tag = version; sha256 = "sha256-KeErrT2umMaIVfLDr4CcQCmFrMb8/h6pNYbunuC/JtI="; }; diff --git a/pkgs/by-name/ba/baddns/package.nix b/pkgs/by-name/ba/baddns/package.nix index 65397f4b1e31..2aafc6a8c684 100644 --- a/pkgs/by-name/ba/baddns/package.nix +++ b/pkgs/by-name/ba/baddns/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "baddns"; - version = "1.10.185"; + version = "1.11.236"; pyproject = true; src = fetchFromGitHub { owner = "blacklanternsecurity"; repo = "baddns"; tag = version; - hash = "sha256-pstfEpcEk0k5T/Os9pEyxTQ62MTW/XFQPOwY/OyHHwY="; + hash = "sha256-GaUZ3WLIxACsdSe262Ie1R1m8K/5X2ILGs6PWm/poUI="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix index a2d8d1df8ac0..6e3e1d9aac98 100644 --- a/pkgs/by-name/ba/bark-server/package.nix +++ b/pkgs/by-name/ba/bark-server/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "bark-server"; - version = "2.2.6"; + version = "2.2.8"; src = fetchFromGitHub { owner = "Finb"; repo = "bark-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-PHUQA0Iv0iJ5Hmv129sQjtmdmnVfqEqYQqbyGux+gFg="; + hash = "sha256-O4Bo3OuC8uwgFpwAY/zwSUQW6EY7h90Dn3tUjZA3j4E="; # 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; diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index cb2f7bf294b7..dba759097368 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,13 +16,13 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.31.4"; + version = "1.31.5"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-Lv2wNqS32482jFThJ5dIqlyv/m8QzEHDdlCYs6wd9nY="; + hash = "sha256-HK6RBKOxIrFmiI2ibe8zt+XPONV9GWixGTjxhFd8d7M="; }; npmDepsHash = "sha256-D1/6H+7GXWeL3dWeXB4Ho5mzCCVzCQPVIPMJ+btF0k4="; diff --git a/pkgs/by-name/ba/bash-git-prompt/package.nix b/pkgs/by-name/ba/bash-git-prompt/package.nix new file mode 100644 index 000000000000..9bcee20b24b3 --- /dev/null +++ b/pkgs/by-name/ba/bash-git-prompt/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3, +}: + +stdenv.mkDerivation { + pname = "bash-git-prompt"; + version = "2.7.1-unstable-2025-04-23"; + + src = fetchFromGitHub { + owner = "magicmonty"; + repo = "bash-git-prompt"; + rev = "e733ada3e93fd9fdb6e9d1890e38e6e523522da7"; + hash = "sha256-FWeYzISY4+cS2xg6skfcpTXgbkBs41E/EzEb3JNdFoQ="; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + + # Copy all shell scripts + cp *.sh $out/ + + # Copy fish script + cp *.fish $out/ + + # Copy themes directory + cp -r themes $out/ + + # Copy documentation + cp README.md $out/ + cp LICENSE.txt $out/ + + runHook postInstall + ''; + + meta = { + description = "Informative, fancy bash prompt for Git users"; + homepage = "https://github.com/magicmonty/bash-git-prompt"; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.parrot7483 ]; + }; +} diff --git a/pkgs/by-name/ba/bazel-remote/package.nix b/pkgs/by-name/ba/bazel-remote/package.nix index 91a84898b204..48ea38654f86 100644 --- a/pkgs/by-name/ba/bazel-remote/package.nix +++ b/pkgs/by-name/ba/bazel-remote/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "buchgr"; repo = "bazel-remote"; rev = "v${version}"; - hash = "sha256-TKfoQEUYsLDJL9sINoCOBeB7SgH5MyyuUIOAhRoZLfU="; + hash = "sha256-9vPaTm/HTJ3ftlFg+AkcwXX7xyhmGTgKL3PXhtUHRDk="; }; - vendorHash = "sha256-bM545QqUXg8io6SNK4dtT+UL/MTvQW7pi+Mb3rb7R48="; + vendorHash = "sha256-uh8ST1AQ8OsFMfXly23TMMcheNmhb1MknmPMjB76GIQ="; subPackages = [ "." ]; diff --git a/pkgs/os-specific/linux/bcachefs-kernel-module/default.nix b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix similarity index 98% rename from pkgs/os-specific/linux/bcachefs-kernel-module/default.nix rename to pkgs/by-name/bc/bcachefs-tools/kernel-module.nix index a43e55225681..e2eab3c2b944 100644 --- a/pkgs/os-specific/linux/bcachefs-kernel-module/default.nix +++ b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix @@ -1,7 +1,7 @@ +bcachefs-tools: { lib, stdenv, - bcachefs-tools, kernelModuleMakeFlags, kernel, }: diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 4314f299e0b2..0f9da9bc2d07 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.31.3"; + version = "1.31.6"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-sXv6YFM91T08WF5dPU7iQNqWbB/QiL2kMaXm6ZtIDqI="; + hash = "sha256-9oiXMMrMMfu9VR0zSFM4yCAQaBgThDdEILSrxH9a84k="; }; nativeBuildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-04YrgYfhZ5NfA2BcF2H6Np1SXRiH6CJpkgc9hzlbMAo="; + hash = "sha256-E2d9uAaja6OsCMhmWFyqIVbGdad5fJ+tw3S7+X7YzpM="; }; outputs = [ @@ -118,6 +118,9 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { + # See NOTE in linux-kernels.nix + kernelModule = import ./kernel-module.nix finalAttrs.finalPackage; + tests = { version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/be/beanprice/package.nix b/pkgs/by-name/be/beanprice/package.nix index 58e2fa5a0ec7..e5bd5fba72aa 100644 --- a/pkgs/by-name/be/beanprice/package.nix +++ b/pkgs/by-name/be/beanprice/package.nix @@ -6,20 +6,22 @@ python3Packages.buildPythonApplication rec { pname = "beanprice"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "beancount"; repo = "beanprice"; tag = "v${version}"; - hash = "sha256-+bqYnTzZByJlCPUhThM2B9UjgdWzjF21Yiw3fQAZ6k4="; + hash = "sha256-Lhr8CRysZbI6dpPwRSN6DgvnKrxsIzH5YyZXRLU1l3Q="; }; build-system = with python3Packages; [ setuptools ]; dependencies = with python3Packages; [ beancount + curl-cffi + diskcache python-dateutil regex requests @@ -31,6 +33,12 @@ python3Packages.buildPythonApplication rec { regex ]; + # Disable tests that require internet access + disabledTestPaths = [ + "beanprice/price_test.py" + "beanprice/sources/yahoo_test.py" + ]; + pythonImportsCheck = [ "beanprice" ]; meta = { diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix index 295876fd9c32..fa2c511d2b8c 100644 --- a/pkgs/by-name/be/betterdisplay/package.nix +++ b/pkgs/by-name/be/betterdisplay/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "betterdisplay"; - version = "3.4.1"; + version = "4.0.4"; src = fetchurl { url = "https://github.com/waydabber/BetterDisplay/releases/download/v${finalAttrs.version}/BetterDisplay-v${finalAttrs.version}.dmg"; - hash = "sha256-GTyFtW0qlYjrGl8eFuXFGudlx7304wb4KxqHKFzsH+c="; + hash = "sha256-njk1epuekOiBN8Exkxs9J2OHVP4xu4on42F+TPlW75M="; }; dontPatch = true; diff --git a/pkgs/by-name/bi/bird-lg/package.nix b/pkgs/by-name/bi/bird-lg/package.nix index 9a751950ed02..3e65067056d9 100644 --- a/pkgs/by-name/bi/bird-lg/package.nix +++ b/pkgs/by-name/bi/bird-lg/package.nix @@ -9,13 +9,13 @@ let { modRoot, vendorHash }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "1.3.8"; + version = "1.3.11"; src = fetchFromGitHub { owner = "xddxdd"; repo = "bird-lg-go"; rev = "v${version}"; - hash = "sha256-j81cfHqXNsTM93ofxXz+smkjN8OdJXxtm9z5LdzC+r8="; + hash = "sha256-C0JC8vLLEk+d6vlrtuW7tHj06K7A3HBjKXZ5Nt+2i4I="; }; doDist = false; @@ -41,12 +41,12 @@ let bird-lg-frontend = generic { modRoot = "frontend"; - vendorHash = "sha256-luJuIZ0xN8mdtWwTlfEDnAwMgt+Tzxlk2ZIDPIwHpcY="; + vendorHash = "sha256-kNysGHtOUtYGHDFDlYNzdkCXGUll105Triy4UR7UP0M="; }; bird-lg-proxy = generic { modRoot = "proxy"; - vendorHash = "sha256-OVyfPmLTHV5RFdLgRHEH/GqxuG5MnGt9Koz0DxpSg+4="; + vendorHash = "sha256-iosWHHeJyqMPF+Y01+mj70HDKWw0FAZKDpEESAwS/i4="; }; in symlinkJoin { diff --git a/pkgs/by-name/bi/bitsnpicas/package.nix b/pkgs/by-name/bi/bitsnpicas/package.nix index a4657a92fd96..a99f7f86a92d 100644 --- a/pkgs/by-name/bi/bitsnpicas/package.nix +++ b/pkgs/by-name/bi/bitsnpicas/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bitsnpicas"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "kreativekorp"; repo = "bitsnpicas"; tag = "v${finalAttrs.version}"; - hash = "sha256-hw7UuzesqpmnTjgpfikAIYyY70ni7BxjaUtHAPEdkXI="; + hash = "sha256-eE1wxtZrv5G+8luMj6E1vpM+49mGnaMyEfzmbpVUdZE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bl/blst/package.nix b/pkgs/by-name/bl/blst/package.nix index 2fe0713166b6..8dee4bca7a6a 100644 --- a/pkgs/by-name/bl/blst/package.nix +++ b/pkgs/by-name/bl/blst/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "blst"; - version = "0.3.15"; + version = "0.3.16"; src = fetchFromGitHub { owner = "supranational"; repo = "blst"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q9/zGN93TnJt2c8YvSaURstoxT02ts3nVkO5V08m4TI="; + hash = "sha256-wQ5dHFnYqrWC4vl+7OJ/utcuTXdBtN26q0OsNPW0kfs="; }; buildPhase = '' diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix index fbb826c89b9e..13d5c1226156 100644 --- a/pkgs/by-name/bl/bluemap/package.nix +++ b/pkgs/by-name/bl/bluemap/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "bluemap"; - version = "5.11"; + version = "5.12"; src = fetchurl { url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar"; - hash = "sha256-DhsnuwVDvIb7eR4Hs2jOTufY2ysd+Awo0b8xg84quGU="; + hash = "sha256-k+tSIlgOj7o7aHPdJzXSW1zxx2pZ67TB3aJ4Fv7U0pM="; }; dontUnpack = true; diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix index f287f60f9262..40e24646d585 100644 --- a/pkgs/by-name/bl/bluesky-pds/package.nix +++ b/pkgs/by-name/bl/bluesky-pds/package.nix @@ -21,13 +21,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pds"; - version = "0.4.169"; + version = "0.4.182"; src = fetchFromGitHub { owner = "bluesky-social"; repo = "pds"; tag = "v${finalAttrs.version}"; - hash = "sha256-CInfhE9PeAbScVtMvvEyA5f6q0WIChTHf49/vh+Kqwc="; + hash = "sha256-FNfM3kr0PTJp9mKYtzd6uH5mUfupqv0aA3sAPRq+pF4="; }; sourceRoot = "${finalAttrs.src.name}/service"; @@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - fetcherVersion = 1; - hash = "sha256-bBGumJBpTWaSPpo4WUNvdF2PCOS6w60Xn6kgS12y6PU="; + fetcherVersion = 2; + hash = "sha256-pUCICsuuc3CeWGeJ6il0etLQkntPF9MKRiJsiNDfroo="; }; buildPhase = '' diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index af5bc8eda93b..4f7db4c8d37d 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.9.24"; + version = "0.9.25"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-flPMDpAEAICLR9TYz0vD62e26pJH2p/3u20sOEuKNx4="; + hash = "sha256-imbTZLq7yFxh/qaigySNaBBLqkJS1zY/gwjLslj3Jv4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index 873898272736..acedcd6ca3a8 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -15,6 +15,8 @@ jdk17, pango, cairo, + pkg-config, + libnotify, buildFHSEnv, makeDesktopItem, copyDesktopItems, @@ -38,14 +40,14 @@ in let bolt = stdenv.mkDerivation (finalAttrs: { pname = "bolt-launcher"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "AdamCake"; repo = "bolt"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-1BvjKlpUD4gJJOlrc2wsl9Pv2x1TBcejYsGiliMrwao="; + hash = "sha256-Gh1xaYAysZshEGzljnEYJuK8Mv4cwSWH1W4rEu2F/0s="; }; nativeBuildInputs = [ @@ -54,6 +56,7 @@ let luajit makeWrapper copyDesktopItems + pkg-config ]; buildInputs = [ @@ -67,7 +70,6 @@ let ]; cmakeFlags = [ - "-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include" "-G Ninja" ] ++ lib.optionals (stdenv.hostPlatform.isAarch64) [ @@ -125,6 +127,7 @@ buildFHSEnv { SDL2 sdl3 libGL + libnotify ]) ++ lib.optionals enableRS3 ( with pkgs; diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix index 02b3217e5bcb..92cb25cba6aa 100644 --- a/pkgs/by-name/bo/boringssl/package.nix +++ b/pkgs/by-name/bo/boringssl/package.nix @@ -65,7 +65,7 @@ buildGoModule (finalAttrs: { mkdir -p $bin/bin $dev $out/lib install -Dm755 bssl -t $bin/bin - install -Dm644 {libboringssl_gtest,libcrypto,libdecrepit,libpki,libssl,libtest_support_lib}.a -t $out/lib + install -Dm644 {libcrypto,libdecrepit,libpki,libssl}.a -t $out/lib cp -r ../include $dev diff --git a/pkgs/by-name/bp/bpfilter/package.nix b/pkgs/by-name/bp/bpfilter/package.nix index 158e8de49a67..4abd3bbec446 100644 --- a/pkgs/by-name/bp/bpfilter/package.nix +++ b/pkgs/by-name/bp/bpfilter/package.nix @@ -21,13 +21,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "bpfilter"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "facebook"; repo = "bpfilter"; tag = "v${finalAttrs.version}"; - hash = "sha256-qL5wRm6QmfMa5L+oZc5E2kAVqvJfCt5fBxjmtWzb2kA="; + hash = "sha256-mlJQIvOWF8WL4pX8KTKM1ddEFva+dvj5m2S3sWQJsKE="; }; nativeBuildInputs = [ @@ -40,10 +40,6 @@ clangStdenv.mkDerivation (finalAttrs: { pkg-config sphinx tinyxxd - - # bpfilter's cmake files requires this, even if we specify the version - # we're using without needing to detect the version during the build. - gitMinimal ]; buildInputs = [ diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix index eba1560b1bd5..6dce2ef52efd 100644 --- a/pkgs/by-name/br/bruijn/generated.nix +++ b/pkgs/by-name/br/bruijn/generated.nix @@ -24,8 +24,8 @@ mkDerivation { pname = "bruijn"; version = "0.1.0.0"; src = fetchzip { - url = "https://github.com/marvinborner/bruijn/archive/7d37a689cebcfa81821455ea7779a8052f7e1ab1.tar.gz"; - sha256 = "06rjlvwfyc2czc09r5sw9xiajlgpd1cma8qqj7v5af8dc1x1jxx5"; + url = "https://github.com/marvinborner/bruijn/archive/31ba54046e33618905fc99e0b079bd3aa2594284.tar.gz"; + sha256 = "11b3i32y36i29haym4agn1pgik20byldihgs2qsi5p7vy17z0a78"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/by-name/br/bruijn/version.txt b/pkgs/by-name/br/bruijn/version.txt index 98475c8a42d8..758d57bf33ac 100644 --- a/pkgs/by-name/br/bruijn/version.txt +++ b/pkgs/by-name/br/bruijn/version.txt @@ -1 +1 @@ -0-unstable-2025-09-24 +0-unstable-2025-09-28 diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index c2b711408f2b..a78062ddd9dc 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -17,7 +17,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.2.22"; + version = "1.2.23"; pname = "bun"; src = @@ -87,19 +87,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-64x+CcvqVyQUoKNnhI4ay/BSlKlGpZRAWgFLH7Oz/HY="; + hash = "sha256-IvX6P/9ysNO45+D4BR7K3y5Bkg1HSsYttSeRRICckAU="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-qXxof7XlTeTi+whpp6yaLZw691rBguK2gTjB3Y+YExs="; + hash = "sha256-anqYxUbQhKhF3tpi6ypblKahSmPqgc+RhtRr9Vv5EKk="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-58GgthtkZsbaKnJbPFGGT6BQomLSSJ8aEJ8nNkx0MnI="; + hash = "sha256-/MZyPIq6ZGpYRDWG0XhrkJ5kBh5YS0IUoLZ+BFElKEU="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-TERq8aAde0Dh4RuuvDUvmyv9Eoh+Ubl907WYec7idDo="; + hash = "sha256-zw7QqSB5nVdv/eTgyuZtcyvyPCUwQH8m9Zx4Md/+Hw4="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/by-name/by/byedpi/package.nix b/pkgs/by-name/by/byedpi/package.nix index c3ed44f2a0e0..83c7ac8538a4 100644 --- a/pkgs/by-name/by/byedpi/package.nix +++ b/pkgs/by-name/by/byedpi/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "byedpi"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "hufrea"; repo = "byedpi"; tag = "v${finalAttrs.version}"; - hash = "sha256-XeUcf8w6b0vZQwttopRnmg5320oF/Z+gHWcWMQ6kAkc="; + hash = "sha256-dDUmCIWy4uHIBmbonrpkrBnurYHfZAdz/jd3l0228Ec="; }; installPhase = '' diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index 24e2ee0d798b..021d03c96ca1 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -8,6 +8,7 @@ testers, installShellFiles, stdenv, + writableTmpDirAsHomeHook, }: let version = "2.10.2"; @@ -31,8 +32,6 @@ buildGo125Module { vendorHash = "sha256-wjcmWKVmLBAybILUi8tKEDnFbhtybf042ODH7jEq6r8="; - subPackages = [ "cmd/caddy" ]; - ldflags = [ "-s" "-w" @@ -48,6 +47,10 @@ buildGo125Module { nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + + __darwinAllowLocalNetworking = true; + postInstall = '' install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index 1322d48dc533..0b72008251e7 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -15,14 +15,14 @@ let "cli" "desktop" ]; - version = "0.51.0"; + version = "0.52.0"; cli = fetchurl { url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; - hash = "sha256-xMA7Q2VS73xG8/b3jAVz/HMmh8024nOxjcoh6bo/Cws="; + hash = "sha256-gxB5GeJXTrPDGRXxKV3kdYQ0VgmmIeO8rggRPQlTDqw="; }; desktop = fetchurl { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-kkwwaVqk2DGmnEM8ZQrCvhTSreT4HoiZ1rhheyqZfec="; + hash = "sha256-ANCMHJTeH0UyJvCpslbxc0I3BbfPfR7kr4UISWeo2ec="; }; appimageContents = appimageTools.extractType2 { inherit pname version; diff --git a/pkgs/by-name/ca/cardboard/package.nix b/pkgs/by-name/ca/cardboard/package.nix deleted file mode 100644 index 2c966d891715..000000000000 --- a/pkgs/by-name/ca/cardboard/package.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - fetchurl, - fetchgit, - ffmpeg, - libGL, - libX11, - libcap, - libdrm, - libinput, - libpng, - libxcb, - libxkbcommon, - libgbm, - meson, - ninja, - pandoc, - pixman, - pkg-config, - unzip, - wayland, - wayland-protocols, - wayland-scanner, - xcbutilerrors, - xcbutilimage, - xcbutilwm, -}: - -let - allSources = { - # cereal.wrap - cereal-wrap = fetchurl { - name = "cereal-1.3.0.tar.gz"; - url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz"; - hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU="; - }; - cereal-wrapdb = fetchurl { - name = "cereal-1.3.0-1-wrap.zip"; - url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip"; - hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY="; - }; - - # expected.wrap - expected-wrap = fetchgit { - name = "expected"; - url = "https://gitlab.com/cardboardwm/expected"; - rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e"; - hash = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo="; - }; - - # wlroots.wrap - wlroots-wrap = fetchgit { - name = "wlroots"; - url = "https://github.com/swaywm/wlroots"; - rev = "0.12.0"; - hash = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY="; - }; - - # the source itself - cardboard = fetchFromGitLab { - owner = "cardboardwm"; - repo = "cardboard"; - rev = "b54758d85164fb19468f5ca52588ebea576cd027"; - hash = "sha256-Kn5NyQSDyX7/nn2bKZPnsuepkoppi5XIkdu7IDy5r4w="; - }; - }; -in -stdenv.mkDerivation { - pname = "cardboard"; - version = "unstable-2021-05-10"; - - src = allSources.cardboard; - - outputs = [ - "out" - "dev" - "lib" - "man" - ]; - - nativeBuildInputs = [ - meson - ninja - pandoc - pkg-config - unzip - wayland-scanner - ]; - - buildInputs = [ - ffmpeg - libGL - libX11 - libcap - libdrm - libinput - libpng - libxcb - libxkbcommon - libgbm - pixman - wayland - wayland-protocols - xcbutilerrors - xcbutilimage - xcbutilwm - ]; - - postPatch = '' - pushd subprojects - tar xvf ${allSources.cereal-wrap} - unzip ${allSources.cereal-wrapdb} - cp -r ${allSources.expected-wrap} ${allSources.expected-wrap.name} - cp -r ${allSources.wlroots-wrap} ${allSources.wlroots-wrap.name} - popd - - # gcc12 - sed '1i#include ' -i cardboard/ViewAnimation.h - ''; - - # "Inherited" from Nixpkgs expression for wlroots - mesonFlags = [ - (lib.mesonBool "man" true) - (lib.mesonOption "wlroots:logind-provider" "systemd") - (lib.mesonEnable "wlroots:libseat" false) - ]; - - # gcc12 - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ]; - - passthru = { - providedSessions = [ "cardboard" ]; - }; - - meta = { - broken = true; # Upstream is archived, fails to build on gcc-13. - homepage = "https://gitlab.com/cardboardwm/cardboard"; - description = "Scrollable, tiling Wayland compositor inspired on PaperWM"; - license = lib.licenses.gpl3Only; - mainProgram = "cardboard"; - maintainers = with lib.maintainers; [ ]; - inherit (wayland.meta) platforms; - }; -} diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix index ed83b8c29fd4..aee2c09bbb97 100644 --- a/pkgs/by-name/ca/cargo-about/package.nix +++ b/pkgs/by-name/ca/cargo-about/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-2ofyZgznnR7StzBuxva+I/5FVxLtbECb2kY1KsUBWRw="; + sha256 = "sha256-cNKZpDlfqEXeOE5lmu79AcKOawkPpk4PQCsBzNtIEbs="; }; - cargoHash = "sha256-oB7v/c2LJICuQFPmw/51qabIClEbVikwm6/v/YM6lhA="; + cargoHash = "sha256-NnocSs6UkuF/mCM3lIdFk+r51Iz2bHuYzMT/gEbT/nk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index 753c2013a2fd..e74943cc599d 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.25.18"; + version = "0.25.19"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; tag = "v${version}"; - hash = "sha256-1CHUkXjb8+wOFQWo/04KcLaJcv/dLiDYwPrSnzWucXI="; + hash = "sha256-CroarDNmLSMQJy4Hy7TcK8LYcqQ+xVFj8iG8HLTKS60="; }; - cargoHash = "sha256-ESaESon1oJAlvsv6+TIb/lLsOQmjgheQWm82Lr0mJOE="; + cargoHash = "sha256-4Y1wTgS5C4VadOWb9Uv5Jrblfjz6Caqv+XQUETalIH0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index c6819a7d0507..a7c4216409fa 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.57.1"; + version = "0.57.3"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-R+vThHlPVquwTTM4ZufQzgjKfdxGhavUN7f9ucTvWoQ="; + hash = "sha256-qPevl75wmOYVhTgMiJOi+6j8LBWKzM7HPhd5mdf2B+8="; }; - cargoHash = "sha256-RYjRqpm1n45x2ccTjS1WeqfR7gRyOVLCilc/K4G63gM="; + cargoHash = "sha256-H2fy2NQvLQEzbQik+nrUvoYZaWQRXX6PpO9LcYfiF2I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/carl/package.nix b/pkgs/by-name/ca/carl/package.nix index 836a598c876a..7c44f0db531c 100644 --- a/pkgs/by-name/ca/carl/package.nix +++ b/pkgs/by-name/ca/carl/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "carl"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "b1rger"; repo = "carl"; rev = "v${version}"; - hash = "sha256-+l11eP+1qKrWbZhyUJgQ8FgQ+2rncx778F5RPzCfvV4="; + hash = "sha256-bUSQArlCfgJr/XJuuyMVNFOZzJlmpInaEGHHxRZsDW4="; }; doCheck = false; - cargoHash = "sha256-kzHMjrLCiiMLMTSozKq5jMWq3rGb+xsXhZoOuod7qGE="; + cargoHash = "sha256-KueQLeqiHZfjyEdpURKXp6MigAcXdov8Z/KwKsiqv9Y="; meta = { description = "cal(1) with more features and written in rust"; diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 588efb2944af..92edc587336d 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-Nu0u/lTl6qpzvHq8gEOxBqzL6kyFt+ZaQitLEbgpAfk="; + hash = "sha256-E6LMl0cArzVZ33xaG/2nvSgLy+Owr9br2fU3oFNyvGY="; }; - vendorHash = "sha256-21giZLgfNgDouU+T/8N28BEbJP2u44A3glZOwDBaiHY="; + vendorHash = "sha256-IJk6HTiF2B1paVZ4qa63DwivtpOf5V0OKQEKAs3BpYY="; subPackages = [ "cmd/cdncheck/" ]; diff --git a/pkgs/by-name/ce/celestegame/celeste/default.nix b/pkgs/by-name/ce/celestegame/celeste/default.nix new file mode 100644 index 000000000000..e56467ec5e04 --- /dev/null +++ b/pkgs/by-name/ce/celestegame/celeste/default.nix @@ -0,0 +1,171 @@ +{ + lib, + stdenvNoCC, + requireFile, + makeWrapper, + copyDesktopItems, + makeDesktopItem, + unzip, + yq, + dotnet-runtime_8, + + executableName ? "Celeste", + desktopItems ? null, + everest ? null, + overrideSrc ? null, + writableDir ? null, + launchFlags ? "", + launchEnv ? "", + # If we leave it to be the default (log.txt), + # Everest will try to delete log.txt when it starts, + # which doesn't work because the file system is read-only. + # https://github.com/EverestAPI/Everest/blob/050b4a1b4a7918b22d3d5140224f9c0472e1655a/Celeste.Mod.mm/Patches/Celeste.cs#L140-L155 + everestLogFilename ? "everest-log.txt", +}: + +# TODO: It appears that it is possible to package Celeste for aarch devices: +# https://github.com/pixelomer/Celeste-ARM64 +# However, I don't have an aarch device to do that. +# The ARM support doesn't seem promising because the builder needs to fetch fmod libraries somehow, which requires an account. +# Though this whole process of registration and downloading can possibly be automated, this is probably against the TOS. +let + pname = "celeste-unwrapped"; + version = "1.4.0.0"; + downloadPage = "https://maddymakesgamesinc.itch.io/celeste"; + description = "2D platformer game about climing a mountain"; + phome = "$out/lib/Celeste"; + + launchFlags' = + if launchFlags != "" && everest == null then + lib.warn "launchFlags is useless without Everest." "" + else + launchFlags; + launchEnv' = + if launchEnv != "" && everest == null then + lib.warn "launchEnv is useless without Everest." "" + else + '' + EVEREST_LOG_FILENAME=${everestLogFilename} + EVEREST_TMPDIR=${writableDir} + ${launchEnv} + ''; +in +stdenvNoCC.mkDerivation { + pname = "celeste-unwrapped"; + version = version; + + src = + if overrideSrc == null then + requireFile { + name = "celeste-linux.zip"; + hash = "sha256-phNDBBHb7zwMRaBHT5D0hFEilkx9F31p6IllvLhHQb8="; + url = downloadPage; + } + else + overrideSrc; + dontUnpack = true; + + nativeBuildInputs = [ + unzip + yq + makeWrapper + copyDesktopItems + ]; + desktopItems = + if desktopItems != null then + desktopItems + else + [ + (makeDesktopItem { + name = "Celeste"; + desktopName = "Celeste"; + genericName = "Celeste"; + comment = description; + exec = "${executableName}"; + icon = "Celeste"; + categories = [ "Game" ]; + }) + ]; + + postInstall = '' + mkdir -p ${phome} + unzip -q $src -d ${phome} + '' + + lib.optionalString (everest != null) '' + cp -r ${everest}/* $out + chmod -R +w ${phome} # Files copied from other derivations are not writable by default + + # There will still be a runtime error saying chmod failed for the splash, + # but it doesn't matter because we make it executable here. + # https://github.com/EverestAPI/Everest/blob/050b4a1b4a7918b22d3d5140224f9c0472e1655a/Celeste.Mod.mm/Mod/Everest/EverestSplashHandler.cs#L73-L81 + chmod +x ${phome}/EverestSplash/EverestSplash-linux + + # Everest determines whether it is FNA or XNA by the existence of the file. + # Creating this now prevents it from creating it in the future + # when the file system is read-only. + # https://github.com/EverestAPI/Everest/blob/050b4a1b4a7918b22d3d5140224f9c0472e1655a/Celeste.Mod.mm/Patches/Celeste.cs#L41-L47 + touch ${phome}/BuildIsFNA.txt + + # Please Piton by having the runtime. + # Otherwise it will try to download it. + # https://github.com/Popax21/Piton/blob/21c7868d06007f0c5e7d9030a0109fe892df1bf3/apphost/src/runtime.rs#L82-L89 + mkdir ${phome}/piton-runtime + ln -s ${dotnet-runtime_8}/share/dotnet/* -t ${phome}/piton-runtime + platform=linux-x86_64 + echo -n "$platform $(yq -r .\"$platform\".version ${phome}/piton-runtime.yaml)" > ${phome}/piton-runtime/piton-runtime-id.txt + + chmod +x ${phome}/MiniInstaller-linux + ${phome}/MiniInstaller-linux + + echo "${launchFlags'}" > ${phome}/everest-launch.txt + echo "${launchEnv'}" > ${phome}/everest-env.txt + '' + + ( + if writableDir != null then + '' + mv ${phome}/Celeste ${phome}/Celeste-unwrapped + ln -s ${writableDir}/Celeste ${phome}/Celeste + '' + else + '' + ln -s ${phome}/Celeste ${phome}/Celeste-unwrapped + '' + ) + + '' + makeWrapper ${phome}/Celeste-unwrapped $out/bin/${executableName} ${ + # If ${phome}/lib64-linux is not present in LD_LIBRARY_PATH, Everest will try to restart: + # https://github.com/EverestAPI/Everest/blob/7bd41c26850bbdfef937e2ed929174e864101c4c/Celeste.Mod.mm/Mod/Everest/BOOT.cs#L188-L201 + # It is hardcoded that it launches Celeste instead of Celeste-unwrapped. + # Therefore, we need to prevent it from restarting. + lib.optionalString (everest != null) "--prefix LD_LIBRARY_PATH : ${phome}/lib64-linux" + } --chdir ${phome} + + icon=$out/share/icons/hicolor/512x512/apps/Celeste.png + mkdir -p $(dirname $icon) + ln -s ${phome}/Celeste.png $icon + ''; + + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + postFixup = + lib.optionalString (everest != null) '' + rm -r ${phome}/Mods # Currently it is empty. + ln -s "${writableDir}"/{Mods,LogHistory,CrashLogs,${everestLogFilename}} -t ${phome} + '' + + lib.optionalString (writableDir != null) '' + ln -s "${writableDir}/log.txt" -t ${phome} + ''; + + meta = { + inherit downloadPage description; + homepage = "https://www.celestegame.com"; + license = with lib.licenses; [ unfree ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ ulysseszhan ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + }; +} diff --git a/pkgs/by-name/ce/celestegame/everest-bin/default.nix b/pkgs/by-name/ce/celestegame/everest-bin/default.nix new file mode 100644 index 000000000000..19909557f3f2 --- /dev/null +++ b/pkgs/by-name/ce/celestegame/everest-bin/default.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenvNoCC, + fetchzip, + icu, + autoPatchelfHook, +}: + +let + pname = "everest"; + version = "5806"; + phome = "$out/lib/Celeste"; +in +stdenvNoCC.mkDerivation { + inherit pname version; + src = fetchzip { + url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5806.0/main.zip"; + extension = "zip"; + hash = "sha256-Hw/BNvWfhdO7bvYrY/Px12BRG1SYcCBeAXBH4QnKyeY="; + }; + buildInputs = [ + icu + ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; + postInstall = '' + mkdir -p ${phome} + cp -r * ${phome} + ''; + dontAutoPatchelf = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + postFixup = '' + autoPatchelf ${phome}/MiniInstaller-linux + ''; + meta = { + description = "Celeste mod loader"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ ulysseszhan ]; + homepage = "https://everestapi.github.io"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; + +} diff --git a/pkgs/by-name/ce/celestegame/everest/default.nix b/pkgs/by-name/ce/celestegame/everest/default.nix new file mode 100644 index 000000000000..5ef0ee79b589 --- /dev/null +++ b/pkgs/by-name/ce/celestegame/everest/default.nix @@ -0,0 +1,107 @@ +{ + lib, + fetchurl, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + autoPatchelfHook, + mono, + git, + icu, +}: + +let + pname = "everest"; + version = "5806"; + phome = "$out/lib/Celeste"; +in +buildDotnetModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "EverestAPI"; + repo = "Everest"; + rev = "e47f67fc8c4b0b60b0a75112c5c90704ed371040"; + fetchSubmodules = true; + leaveDotGit = true; # MonoMod.SourceGen.Internal needs .git + hash = "sha256-uxb9LwCDGJIc+JN2EqNqHdLLwULnG7Bd/Az3H1zKf3E="; + }; + + nativeBuildInputs = [ + git + autoPatchelfHook + ]; + + buildInputs = [ + icu # For autoPatchelf + mono # See upstream README + ]; + + postPatch = '' + # MonoMod.ILHelpers.Patcher complains at build phase: You must install .NET to run this application. + sed -i 's|||' Celeste.Mod.mm/Celeste.Mod.mm.csproj + + autoPatchelf lib-ext/piton/piton-linux_x64 + ''; + + dotnet-sdk = dotnetCorePackages.sdk_9_0; + + preConfigure = '' + # Microsoft.SourceLink.GitHub complains: Unable to determine repository url, the source code won't be available via source link. + cd external/MonoMod + git -c safe.directory='*' remote add origin https://github.com/MonoMod/MonoMod.git + cd ../.. + ''; + + nugetDeps = ./deps.json; + + # Needed for ILAsm projects: https://github.com/NixOS/nixpkgs/issues/370754#issuecomment-2571475814 + linkNugetPackages = true; + + # Microsoft.NET.Sdk complains: The process cannot access the file xxx because it is being used by another process. + enableParallelBuilding = false; + + preBuild = '' + # See .azure-pipelines/prebuild.ps1 + sed -i 's|0\.0\.0-dev|1.${version}.0-nixos-'$(git rev-parse --short=5 HEAD)'|' Celeste.Mod.mm/Mod/Everest/Everest.cs + cat Celeste.Mod.mm/Mod/Everest/Everest.cs + cat <<-EOF > Celeste.Mod.mm/Mod/Helpers/EverestVersion.cs + namespace Celeste.Mod.Helpers { + internal static class EverestBuild${version} { + public static string EverestBuild = "EverestBuild${version}"; + } + } + EOF + ''; + + installPath = builtins.replaceStrings [ "$out" ] [ (placeholder "out") ] phome; + + postInstall = '' + mkdir tmp-EverestSplash + mv ${phome}/EverestSplash* tmp-EverestSplash + mv tmp-EverestSplash ${phome}/EverestSplash + cp ${phome}/piton-runtime.yaml ${phome}/EverestSplash + ''; + + executables = [ ]; + + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + dontAutoPatchelf = true; + + meta = { + description = "Celeste mod loader"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ ulysseszhan ]; + homepage = "https://everestapi.github.io"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ + binaryNativeCode + fromSource + ]; + }; +} diff --git a/pkgs/by-name/ce/celestegame/everest/deps.json b/pkgs/by-name/ce/celestegame/everest/deps.json new file mode 100644 index 000000000000..b969cfd4b5a4 --- /dev/null +++ b/pkgs/by-name/ce/celestegame/everest/deps.json @@ -0,0 +1,1037 @@ +[ + { + "pname": "DotNetZip", + "version": "1.16.0", + "hash": "sha256-RlzHkO7DxCvRkr+gpM8Abs34XbovmBTmXfO7LtnE75E=" + }, + { + "pname": "IsExternalInit", + "version": "1.0.3", + "hash": "sha256-UfyGrj+hAfsvS/R7tlugTToD//ax9Fy0CameinRn1AU=" + }, + { + "pname": "Jdenticon-net", + "version": "3.1.2", + "hash": "sha256-tee3C3lYVDiic/8zZkNSuz8fNx7DXQFReIdrlQWRmww=" + }, + { + "pname": "KeraLua", + "version": "1.3.2", + "hash": "sha256-15C9K/S9L3yzB4wmDRNWQoWNskUVcm6qZjCbQQFGMPI=" + }, + { + "pname": "MAB.DotIgnore", + "version": "3.0.2", + "hash": "sha256-iAX3oCX2092oKXEASUhMkh2A1kh1cBRSkkMJ6BmszRA=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "3.0.1", + "hash": "sha256-y4VQ8teCZOnCJyg0rh3s1SbbqfoEclB5T6lCfMrxWUw=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "3.1.10", + "hash": "sha256-51D1XkqFMPHJzOmt1HQ0Bf1n9K0auwEyxTJuqA/8xHY=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "5.0.0", + "hash": "sha256-z22ZDldoIlDUYeF9Rje0aVPlYAGKIpdj5wDzn1CW+jQ=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "6.0.36", + "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "7.0.20", + "hash": "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.19", + "hash": "sha256-QySX2bih1UvwmLcn9cy1j+RuvZZwbcFKggL5Y/WcTnw=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "3.0.3", + "hash": "sha256-CbtnZSF+lvyeIfEUC8a0Jf4EMvYAxa9mvWF9lyLymMk=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "3.1.32", + "hash": "sha256-OV3Ie8JGTEwNI4Y6DJFh+ZUrBTwrSdFjEbfljfAwn3s=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "5.0.17", + "hash": "sha256-iHn2yGpaL5EM8L7nJJ2aRCIZ+kE98NS+KWUvrWnjzhg=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "6.0.36", + "hash": "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "7.0.20", + "hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.19", + "hash": "sha256-u50rdLuoADSDCthx2Fg+AnT192TalHhFrzFCfMgmTn4=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "1.1.0", + "hash": "sha256-cwZU5VeF6aRZJqoIevJtF9hdYC1rKEf1GuqgCmoVAzE=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "8.0.0", + "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + }, + { + "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", + "version": "3.3.4", + "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.12.0", + "hash": "sha256-mm/OKG3zPLAeTVGZtuLxSG+jpQDOchn1oyHqBBJW2Ho=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.12.0", + "hash": "sha256-m1i1Q5pyEq4lAoYjNE9baEjTplH8+bXx5wSA+eMmehk=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.CodeStyle", + "version": "4.12.0", + "hash": "sha256-c9JyQNTMTr8WoNGzk3KDyaQuZjpkyBnM5I3P5oJwIkU=" + }, + { + "pname": "Microsoft.Net.Compilers.Toolset", + "version": "4.12.0", + "hash": "sha256-/iTvMab/y3xJOD0v02J2Pe4pGtm52YzAwZ74AgO5nrw=" + }, + { + "pname": "Microsoft.NET.HostModel", + "version": "3.1.16", + "hash": "sha256-42cFtaZFzM93I0gZjuDbcEYWM5Pld+kx2MkWu0J66ww=" + }, + { + "pname": "Microsoft.NET.Sdk.IL", + "version": "8.0.0", + "hash": "sha256-guQcVwSaVwJ0uJvUYZqk1bZ9ATLBk3zWHZmTW7EV1KM=" + }, + { + "pname": "Microsoft.NETCore.App", + "version": "2.1.0", + "hash": "sha256-RJksv5W7LhWJYGmkwYHfiU0s9XLCvT05KxSMz6U1/OE=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "3.0.3", + "hash": "sha256-hIdA8ncOXoDM6/ryKCTVz/vZrqFLffxAgpN/qfl2L6Y=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "3.1.32", + "hash": "sha256-ajR6pZv0zuzWDyxEnWtAuhasV5biV5lvweEbefTISiM=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "5.0.17", + "hash": "sha256-exMpVamk8ZzfCQDQcDmQDYJplDcOOU99ic7NSDKUgtE=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "6.0.36", + "hash": "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "7.0.20", + "hash": "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.19", + "hash": "sha256-a9t/bX+WIKOu9q2R52b/hPGwOpkAgpYuP42SW2QXTak=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "3.0.0", + "hash": "sha256-PHovvd+mPN9HoCF0rFEnS015p7Yj76+e9cfSU4JAI+I=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "3.1.0", + "hash": "sha256-nuAvHwmJ2s3Ob1qNDH1+uV3awOZaWlaV3FenTmPUWyM=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "5.0.0", + "hash": "sha256-kQ8wpR4crWoqy/jrskat34Y3Nr3nbxoSpEPMnxycwtw=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "6.0.36", + "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "7.0.20", + "hash": "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.19", + "hash": "sha256-4ymel0R1c0HrX0plAWubJPzev52y0Fsx1esyQ1R7bXc=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "3.0.3", + "hash": "sha256-mxA9JF2WyEDV8yahdwhe4qfCTbIFroUfmMzPBa91b/o=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "3.1.32", + "hash": "sha256-h4HjfRnvH81dW84S3TCPcCfxeQLiLN7b1ZleRNsprFY=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "5.0.17", + "hash": "sha256-2NpVvrbqct3M1fKiSe/zyt41mf1aV6WUdxIlJod27Ek=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "6.0.36", + "hash": "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "7.0.20", + "hash": "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.19", + "hash": "sha256-Ou51zUFTPESAAzP/z0+sLDAAXC54+oDlESBBT12M2lM=" + }, + { + "pname": "Microsoft.NETCore.DotNetAppHost", + "version": "2.1.0", + "hash": "sha256-LV8pnNFsKGFONyCTGsd8qB5A+EUIiyvbYWAr0eOEFoI=" + }, + { + "pname": "Microsoft.NETCore.DotNetHostPolicy", + "version": "2.1.0", + "hash": "sha256-FqQm4BLznzRmF1nhk3nEwrdeAdCY35eBmHk6/4+MCPY=" + }, + { + "pname": "Microsoft.NETCore.DotNetHostResolver", + "version": "2.1.0", + "hash": "sha256-5nQTmMhaEvbuT+1f7u0t0tEK3SCVUeXhsExq8tiYBI0=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "2.1.0", + "hash": "sha256-v09ltBAKTX8iAKuU2nCl+Op/ilVJQ0POZUh2z+u0rVo=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "3.1.0", + "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "3.1.1", + "hash": "sha256-ByV7aEFjGR4L4Tudg4KaJ96lnzr7RhOxzWGE0p5XFRY=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "2.1.0", + "hash": "sha256-+KdWdA9I392SRqMb9KaiiRZatfvJ9RcdbtyGUkpHW7U=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies", + "version": "1.0.3", + "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net35", + "version": "1.0.3", + "hash": "sha256-sWFWERqIZw2Rp1f71GX8tIVuA0saTVI64sQaRw81ePk=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net452", + "version": "1.0.3", + "hash": "sha256-RTPuFG8D7gnwINEoEtAqmVm4oTW8K4Z87v1o4DDeLMI=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net461", + "version": "1.0.3", + "hash": "sha256-vVIonl+4dlCQuxibOZoGR3o1DAhjAYpFW15dnkUpjMk=" + }, + { + "pname": "Microsoft.SourceLink.Common", + "version": "1.1.0", + "hash": "sha256-bVbHHr6Mo1NUdaaQgfj1GvGPzrobRlYb2pI7f4VDslk=" + }, + { + "pname": "Microsoft.SourceLink.Common", + "version": "8.0.0", + "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "1.1.0", + "hash": "sha256-Y5zUGJfiSj8/rQ1lK0t5Zje8rjoUhgbWrR8IpwtzB34=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "8.0.0", + "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "8.0.0", + "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ=" + }, + { + "pname": "Mono.Cecil", + "version": "0.10.4", + "hash": "sha256-NFGkoRKoG+C/drjcK8o5as3wRV2AyJYeeQPOH7NcKpo=" + }, + { + "pname": "Mono.Cecil", + "version": "0.11.5", + "hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA=" + }, + { + "pname": "MonoMod.Backports", + "version": "1.1.0", + "hash": "sha256-ruRX10/u+lRfMKr0UMbCVYS/nUK5fzV4+8ujJXBnles=" + }, + { + "pname": "MonoMod.Core", + "version": "1.0.0", + "hash": "sha256-Y55fgMd0d35qztqqC0drzn3NdSMYLiWie8IL9LbmFnc=" + }, + { + "pname": "MonoMod.ILHelpers", + "version": "1.0.0", + "hash": "sha256-N6ybnOMkEtxXy/PdJAEkqHggHYSLETbCMF+mgNGXAvo=" + }, + { + "pname": "MonoMod.Patcher", + "version": "25.0.0-prerelease.1", + "hash": "sha256-+5kddzc3FheDIRNoTPWQREc1ufVFjfPFiiKrXTPCTWQ=" + }, + { + "pname": "MonoMod.RuntimeDetour", + "version": "25.0.0", + "hash": "sha256-yyP3kTN+OcOoO8xmHZfebKB/EtWNi7V6aJnXUTjVU/8=" + }, + { + "pname": "MonoMod.RuntimeDetour.HookGen", + "version": "22.7.31.1", + "hash": "sha256-kjxLqU4/DprV1vyPfvC7nTTa6ShLS3HBFGiDXmHAEJw=" + }, + { + "pname": "MonoMod.Utils", + "version": "25.0.0", + "hash": "sha256-PL7/F0zXnLRb5icD5zl/QCeMyTEsJZKOvSBvM1t8BEY=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + }, + { + "pname": "NuGetizer", + "version": "1.2.3", + "hash": "sha256-KxvcV650WNBqpSn3S6xVjH95PT5mnUb3pPYBPleWHRM=" + }, + { + "pname": "Nullable", + "version": "1.3.1", + "hash": "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM=" + }, + { + "pname": "PolySharp", + "version": "1.14.1", + "hash": "sha256-l6hz+SG+cEO817xTMq4DbJSJVnRe6Ffr+uJGVj/t170=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.App", + "version": "2.1.0", + "hash": "sha256-qFtPLe3t/V9DZTaYhAO6MbVsyzH4hcQQUvyIJ6ywbEw=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost", + "version": "2.1.0", + "hash": "sha256-NMuEFKc68Vn4bVoX6kdGSQeyDpktUYliUg6Lbj4E8FU=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy", + "version": "2.1.0", + "hash": "sha256-U/WlbUpImqPjZf075WgBOb1o1i1H3VOL4QbzHfQ9Itk=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver", + "version": "2.1.0", + "hash": "sha256-vcB6FY1GDP+kTsmp9OXpPg50sXKqOSJzWUSuNlN1+rs=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", + "version": "6.0.0", + "hash": "sha256-i/UcSf9HhYBtscSZKsaPReL/ntN8EQhmEpFIkEfoGhQ=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", + "version": "6.0.0", + "hash": "sha256-flN7eEFoqIUmbuGHgVu/R1F7trwjOXwxmBVw/+Jv2Hg=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.0", + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, + { + "pname": "System.Collections.Immutable", + "version": "6.0.0", + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" + }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Drawing.Common", + "version": "8.0.0", + "hash": "sha256-xPNnKUTcZiqnTtRgI2YazMoZgay/prwKrJjbZUbVmcg=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.3.0", + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.ObjectModel", + "version": "4.3.0", + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.7.0", + "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.7.0", + "hash": "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.3.0", + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.7.0", + "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.5.0", + "hash": "sha256-wM75ACJUeypeOdaBUj4oTYiSWmg7A1usMpwRQXjSGK8=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "8.0.0", + "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.3.0", + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.3", + "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.3.0", + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Security.AccessControl", + "version": "4.7.0", + "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Permissions", + "version": "4.7.0", + "hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.7.0", + "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "4.7.1", + "hash": "sha256-OUA8ttAKGgqD5KUwtnO2OewBF/tJI0nO3YcunK5qMPg=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "7.0.0", + "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.0", + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.3.0", + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" + }, + { + "pname": "System.ValueTuple", + "version": "4.5.0", + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" + }, + { + "pname": "System.Windows.Extensions", + "version": "4.7.0", + "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + }, + { + "pname": "YamlDotNet", + "version": "16.1.3", + "hash": "sha256-xsti5h1ZUCS9Jvb4UGKdHrEudJIQXrbOe0USxSjWqjc=" + } +] diff --git a/pkgs/by-name/ce/celestegame/package.nix b/pkgs/by-name/ce/celestegame/package.nix new file mode 100644 index 000000000000..dd9afc490cff --- /dev/null +++ b/pkgs/by-name/ce/celestegame/package.nix @@ -0,0 +1,222 @@ +{ + lib, + callPackage, + buildFHSEnv, + fetchzip, + makeDesktopItem, + writeShellScript, + autoPatchelfHook, + runtimeShell, + + overrideSrc ? null, + # A package. Omit to build without Everest. + everest ? null, + # If build with Everest, must set writableDir to the path of a writable dir + # so that the mods can be installed there. + # It must be an absolute path. + # Example: "/home/kat/.local/share/Everest" + writableDir ? null, + # Optionally set paths of symlinks to the installation dir of Celeste. + # You can use this in Olympus so that you don't have to change installation dir path + # every time the nix store path changes. + # The links are updated every time the command `Celeste` is run. + gameDir ? [ ], + # This will be appended to everest-launch.txt. + launchFlags ? "", + # This will be appended to everest-env.txt. + launchEnv ? "", +}: + +# For those who would like to use steam-run or alike to launch Celeste +# (useful when using the `olympus` package with its `celesteWrapper` argument overridden), +# install `celestegame.passthru.celeste-unwrapped` instead of `celestegame`, and if you want Everest, +# override `everest` to `celestegame.passthru.everest-bin` instead of `celestegame.passthru.everest` +# (steam-run cannot launch the latter for some currently unclear reason). +# For those who would like to launch Celeste without the need of any additional wrapper like steam-run, +# install `celestegame` with the `writableDir` argument overridden. + +let + pname = "celeste"; + phome = "$out/${celesteHomeRelative}"; + executableName = "Celeste"; + + writableDir' = + if writableDir == null && everest != null then + lib.warn "writableDir is not set, so mods will not work." "/tmp" + else + writableDir; + gameDir' = lib.toList gameDir; + + everestLogFilename = "everest-log.txt"; + + celeste = callPackage ./celeste { + inherit + executableName + everest + overrideSrc + launchFlags + launchEnv + everestLogFilename + ; + desktopItems = [ desktopItem ]; + writableDir = writableDir'; + }; + celesteHomeRelative = "lib/Celeste"; + celesteHome = "${celeste}/${celesteHomeRelative}"; + + desktopItem = makeDesktopItem { + name = "Celeste"; + desktopName = "Celeste"; + genericName = "Celeste"; + comment = celeste.meta.description; + exec = executableName; + icon = "Celeste"; + categories = [ "Game" ]; + }; + +in +buildFHSEnv { + inherit pname executableName; + version = celeste.version + (lib.optionalString (everest != null) "+everest.${everest.version}"); + + multiPkgs = + pkgs: + with pkgs; + [ + glib + glibc_multi + kdePackages.wayland + libxkbcommon + libgcc + mesa + libdrm + expat + alsa-lib + at-spi2-atk + libGL + pcre2 + libffi + zlib + util-linux.lib + libselinux + nspr + systemd + gtk3 + pango + harfbuzz + fontconfig + fribidi + cairo + libepoxy + tinysparql + libthai + libpng + freetype + pixman + libcap + graphite2 + bzip2 + brotli + libjpeg + json-glib + libxml2 + sqlite + libdatrie + ffmpeg + nss + dbus.lib + acl + attr + gmp + readline + libpulseaudio + pipewire + vulkan-loader + ] + ++ (with xorg; [ + libX11 + libXcomposite + libXdamage + libXfixes + libXext + libxcb + libXcursor + libXinerama + libXi + libXrandr + libXScrnSaver + libXxf86vm + libXau + libXdmcp + ]); + + targetPkgs = pkgs: [ celeste ]; + + extraInstallCommands = '' + icon=$out/share/icons/hicolor/512x512/apps/Celeste.png + mkdir -p $(dirname $icon) + ln -s ${celesteHome}/Celeste.png $icon + cp -r ${desktopItem}/* $out + ''; + + extraPreBwrapCmds = '' + export NIX_CELESTE_LAUNCHER=$(realpath --no-symlinks $0) + ''; + + runScript = writeShellScript executableName ( + lib.optionalString (writableDir' != null) '' + mkdir -p "${writableDir'}" + touch "${writableDir'}/log.txt" + + # This script is symlinked to gameDir/Celeste, which gets launched by Olympus + # (if the user set up Olympus to use gameDir as the location of Celeste). + # Writing the script like this makes Olympus able to launch Celeste wihout any wrapper without any problems. + echo "#! ${runtimeShell} + exec $NIX_CELESTE_LAUNCHER"' "$@"' > "${writableDir'}/Celeste" + chmod +x "${writableDir'}/Celeste" + '' + + lib.optionalString (everest != null) '' + mkdir -p "${writableDir'}"/{LogHistory,Mods,CrashLogs} + touch "${writableDir'}/${everestLogFilename}" + + # Needed to prevent restarting; see comments in postInstall of ./celeste/default.nix. + export LD_LIBRARY_PATH="${celesteHome}/lib64-linux:$LD_LIBRARY_PATH" + '' + + lib.optionalString (gameDir' != [ ]) ( + lib.concatMapStrings (link: '' + mkdir -p "$(dirname "${link}")" + if [ -L "${link}" ]; then + if [ ${celesteHome} != "$(readlink "${link}")" ]; then + rm "${link}" + ln -s ${celesteHome} "${link}" + fi + else + rm -r "${link}" + ln -s ${celesteHome} "${link}" + fi + '') gameDir' + ) + + '' + cd /${celesteHomeRelative} + exec ./Celeste-unwrapped "$@" + '' + ); + + passthru.celeste-unwrapped = celeste; + passthru.everest = callPackage ./everest { }; + passthru.everest-bin = callPackage ./everest-bin { }; + + passthru.updateScript = ./update.sh; + + meta = { + inherit (celeste.meta) + homepage + downloadPage + description + license + sourceProvenance + platforms + ; + maintainers = with lib.maintainers; [ ulysseszhan ]; + }; +} diff --git a/pkgs/by-name/ce/celestegame/update.sh b/pkgs/by-name/ce/celestegame/update.sh new file mode 100755 index 000000000000..2a1aefdc7675 --- /dev/null +++ b/pkgs/by-name/ce/celestegame/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -eu -o pipefail + +branch=stable # set to one of dev, beta, stable +case $branch in + dev) branches='"dev", "beta", "stable"' ;; + beta) branches='"beta", "stable"' ;; + stable) branches='"stable"' ;; +esac + +endpoint=$(curl -s https://everestapi.github.io/everestupdater.txt) +endpoint="$endpoint$([[ "$endpoint" == *"?"* ]] && echo '&' || echo '?')supportsNativeBuilds=true" + +latest=$(curl -s "$endpoint" | jq -r "map(select(.branch | IN($branches))) | max_by(.date)") +commit=$(echo "$latest" | jq -r .commit) +version=$(echo "$latest" | jq -r .version) +url=$(echo "$latest" | jq -r .mainDownload) + +update-source-version celestegame.passthru.everest $version --rev=$commit +"$(nix-build --attr celestegame.passthru.everest.fetch-deps --no-out-link)" +update-source-version celestegame.passthru.everest-bin $version "" $url diff --git a/pkgs/by-name/cg/cgal/package.nix b/pkgs/by-name/cg/cgal/package.nix index 8a4af395fa99..8ccae7b37b7e 100644 --- a/pkgs/by-name/cg/cgal/package.nix +++ b/pkgs/by-name/cg/cgal/package.nix @@ -8,13 +8,13 @@ mpfr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cgal"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz"; - sha256 = "0zwvyp096p0vx01jks9yf74nx6zjh0vjbwr6sl6n6mn52zrzpk8a"; + url = "https://github.com/CGAL/cgal/releases/download/v${finalAttrs.version}/CGAL-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-8wxb58JaKj6iS8y6q1z2P6/aY8AnnzTX5/izISgh/tY="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; @@ -30,18 +30,18 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with lib; { + meta = { description = "Computational Geometry Algorithms Library"; homepage = "http://cgal.org"; - license = with licenses; [ + license = with lib.licenses; [ gpl3Plus lgpl3Plus ]; - platforms = platforms.all; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ raskin drew-dirac ylannl ]; }; -} +}) diff --git a/pkgs/by-name/ch/chatgpt-retrieval-plugin/package.nix b/pkgs/by-name/ch/chatgpt-retrieval-plugin/package.nix deleted file mode 100644 index 6e53f0438127..000000000000 --- a/pkgs/by-name/ch/chatgpt-retrieval-plugin/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - python3Packages, - fetchFromGitHub, - python3, - nix-update-script, - dasel, -}: - -python3Packages.buildPythonApplication { - pname = "chatgpt-retrieval-plugin"; - version = "0-unstable-2023-03-28"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "openai"; - repo = "chatgpt-retrieval-plugin"; - rev = "958bb787bf34823538482a9eb3157c5bf994a182"; - hash = "sha256-fCNGzK5Uji6wGDTEwAf4FF/i+RC7ny3v4AsvQwIbehY="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'fastapi = "^0.92.0"' 'fastapi = ">=0.92.0"' \ - --replace 'python-dotenv = "^0.21.1"' 'python-dotenv = "*"' \ - --replace 'python-multipart = "^0.0.6"' 'python-multipart = "^0.0.5"' \ - --replace 'redis = "4.5.1"' 'redis = "^4.5.1"' \ - --replace 'tiktoken = "^0.2.0"' 'tiktoken = "^0.3.0"' \ - --replace 'packages = [{include = "server"}]' 'packages = [{include = "server"}, {include = "models"}, {include = "datastore"}, {include = "services"}]' - - substituteInPlace server/main.py \ - --replace 'directory=".well-known"' 'directory="/var/lib/chatgpt-retrieval-plugin/.well-known"' \ - --replace '0.0.0.0' '127.0.0.1' \ - --replace '8000' '8080' - - ${dasel}/bin/dasel put -t string -f pyproject.toml -v '.well-known/*' '.tool.poetry.include.[]' - ''; - - nativeBuildInputs = with python3Packages; [ - poetry-core - ]; - - propagatedBuildInputs = with python3.pkgs; [ - fastapi - arrow - tiktoken - python-multipart - python-dotenv - openai - weaviate-client - pinecone-client - pymilvus - uvicorn - python-pptx - tenacity - pypdf2 - qdrant-client - redis - docx2txt - ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - broken = true; # dependencies are not up to date, the project doesn't look well maintained, this doesn't look like it's going in the right direction. I'm happy to handle maintainership to whoever wants to. - homepage = "https://github.com/openai/chatgpt-retrieval-plugin"; - description = "Tool to search and find personal or work documents by asking questions in everyday language"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; - }; -} diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 0e0683eda207..339d80d64f0a 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -37,14 +37,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.471"; + version = "3.2.473"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-dAUokMpBvd2lAKNQJJqAthBUNoI3S1C7gat4Jda7bZk="; + hash = "sha256-FfzAMuFF+ftjcKn+6uYgoeUPoBDnkVTBCPSeom6KR5k="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 699f650eb86d..09b812473b71 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.6.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; tag = "v.${finalAttrs.version}"; - hash = "sha256-j4WYdLQvNZAMb+16zO4M24CNKJFTITN9VXa1jFKduOk="; + hash = "sha256-HlSM1QhkBuB7JGdCeVoi3HVAGa3drxictbtPayrDNUo="; }; outputs = [ diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 447fb84165d0..f6414f19a199 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -18,18 +18,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.10.0"; + version = "4.10.1"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-YEu1qTI2ExfS+WKFxNGkubr+HOCCuWGpZFk3hS3srCU="; + hash = "sha256-SUbEanFIvjj2wyy/nuq+91F5on7wuLWcpVt1U8XWjRI="; }; sourceRoot = "${finalAttrs.src.name}/src-tauri"; - cargoHash = "sha256-NksWHI2TJR0YMGRIDHBxrQPGHiir2Kn4bxnSvO7EzoA="; + cargoHash = "sha256-NL5vsuSNKduRW2TaXWFA0pjszVa8EYU5cRaTZHCooLU="; postPatch = let diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 0d19a7278a25..3b2220d8588b 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.10.0"; + version = "4.10.1"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; tag = "v${version}"; - hash = "sha256-KpN6ul+kzGarBKnXXSP3gf9KlRII869xnfT95mzacRc="; + hash = "sha256-Hn49a+nGtF5kJ1ZM+rOXWH+dFG1nMSI/rIDF+9qlQk4="; }; - npmDepsHash = "sha256-N5xHu4AmgRdd3gM+YTu+fbtAw1YDp4SMXdXUbbJnIZc="; + npmDepsHash = "sha256-896W5XbAGUcUa8gxeR72hg9fwTaUOR5a5hex8vS33gU="; nativeBuildInputs = [ python3 diff --git a/pkgs/by-name/ci/civetweb/package.nix b/pkgs/by-name/ci/civetweb/package.nix index 5691d1af3233..7c12e2456849 100644 --- a/pkgs/by-name/ci/civetweb/package.nix +++ b/pkgs/by-name/ci/civetweb/package.nix @@ -40,6 +40,13 @@ stdenv.mkDerivation rec { # The civetweb unit tests rely on downloading their fork of libcheck. "-DCIVETWEB_BUILD_TESTING=OFF" + + # The default stack size in civetweb is 102400 (see the CMakeLists [1]). + # This can lead to stack overflows even in basic usage; + # Setting this value to 0 lets the OS choose the stack size instead, which results in a more suitable value. + # + # [1] https://github.com/civetweb/civetweb/blob/cafd5f8fae3b859b7f8c29feb03ea075c7221497/CMakeLists.txt#L56 + "-DCIVETWEB_THREAD_STACK_SIZE=0" ]; meta = { diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 41acd208a49d..4c777b7c6946 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,18 +1,12 @@ { - "name": "claude-code", - "version": "1.0.17", + "name": "@anthropic-ai/claude-code", + "version": "2.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "dependencies": { - "@anthropic-ai/claude-code": "^1.0.126" - } - }, - "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.126", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.126.tgz", - "integrity": "sha512-DvzpL0LLB5nXRgJi4h+peDVys8sjfy5/QJMiketpqUd9SebTE673KnZ28lwEY4s944t/ywA80oNaJLXHMbqfcQ==", + "name": "@anthropic-ai/claude-code", + "version": "2.0.1", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index ee1c6a6853b3..cbd8df60ec7c 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -2,21 +2,19 @@ lib, buildNpmPackage, fetchzip, - nodejs_20, + writableTmpDirAsHomeHook, + versionCheckHook, }: - -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "1.0.126"; - - nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin + version = "2.0.1"; src = fetchzip { - url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-U6uYRkmVqMoJDAAzLHpF9G5OglPhLqPuwe6gWMQPx78="; + url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; + hash = "sha256-LUbDPFa0lY74MBU4hvmYVntt6hVZy6UUZFN0iB4Eno8="; }; - npmDepsHash = "sha256-m+GYa3uPfkUDV+p95uQToY3n/k0JG8hbppBn0GUeV+8="; + npmDepsHash = "sha256-DehkeMZvzn+hvcCDzJfd4p9oYc1GSZm8gu8vKS4Uncw="; postPatch = '' cp ${./package-lock.json} package-lock.json @@ -24,7 +22,7 @@ buildNpmPackage rec { dontNpmBuild = true; - AUTHORIZED = "1"; + env.AUTHORIZED = "1"; # `claude-code` tries to auto-update by default, this disables that functionality. # https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview#environment-variables @@ -35,6 +33,14 @@ buildNpmPackage rec { --unset DEV ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + versionCheckHook + ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "--version"; + passthru.updateScript = ./update.sh; meta = { @@ -46,7 +52,8 @@ buildNpmPackage rec { malo markus1189 omarjatoi + xiaoxiangmoe ]; mainProgram = "claude"; }; -} +}) diff --git a/pkgs/by-name/cl/claude-code/update.sh b/pkgs/by-name/cl/claude-code/update.sh index 923307d4df3c..b9aed11abae8 100755 --- a/pkgs/by-name/cl/claude-code/update.sh +++ b/pkgs/by-name/cl/claude-code/update.sh @@ -1,15 +1,10 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nodePackages.npm nix-update +#!nix-shell --pure -i bash --packages nodejs nix-update git set -euo pipefail version=$(npm view @anthropic-ai/claude-code version) -# Generate updated lock file -cd "$(dirname "${BASH_SOURCE[0]}")" -npm i --package-lock-only @anthropic-ai/claude-code@"$version" -rm -f package.json - # Update version and hashes -cd - -nix-update claude-code --version "$version" +AUTHORIZED=1 NIXPKGS_ALLOW_UNFREE=1 nix-update claude-code --version="$version" --generate-lockfile +nix-update vscode-extensions.anthropic.claude-code --use-update-script --version "$version" diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index b4cbc85702d1..10f9dcc93525 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, - nodejs_20, + nodejs_22, installShellFiles, makeWrapper, stdenv, @@ -11,27 +11,33 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "3.14.1"; + version = "4.1.0"; - nodejs = nodejs_20; + nodejs = nodejs_22; src = fetchFromGitHub { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-3nCfo54p7O4Oik3fTf842IahEQnu26oPS5aOgHdhJKg="; + hash = "sha256-ntKxMlRBE0WoaO2Fmpymhm7y7kCwe197sotNzpK92C4="; }; - npmDepsHash = "sha256-NWi+LJWLT2z3980d3rxBkNYzmMS6JwuP49ltGtKRd5c="; + npmDepsHash = "sha256-GsJlrz41q9GvFpYZcauuGXgMCG6mqSuI5gy+hxlJfUQ="; nativeBuildInputs = [ installShellFiles makeWrapper ]; + buildPhase = '' + runHook preBuild + node scripts/bundle-cjs.js ${version} false + runHook postBuild + ''; + installPhase = '' mkdir -p $out/bin $out/lib/clever-tools - cp build/clever.cjs $out/lib/clever-tools/clever.cjs + cp build/${version}/clever.cjs $out/lib/clever-tools/clever.cjs makeWrapper ${nodejs}/bin/node $out/bin/clever \ --add-flags "$out/lib/clever-tools/clever.cjs" \ diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix index afab7d22bcba..75d614d1a623 100644 --- a/pkgs/by-name/cl/clickable/package.nix +++ b/pkgs/by-name/cl/clickable/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "clickable"; - version = "8.4.0"; + version = "8.5.0"; format = "pyproject"; src = fetchFromGitLab { owner = "clickable"; repo = "clickable"; rev = "v${version}"; - hash = "sha256-mqAJBxYHOsMiSjWjtam/GvxjNBZ8mkOuBibmFORGhEg="; + hash = "sha256-hQkRntdOlWLK+vVrdiWEkYIMK+ymEEC5ajh7+L2fH2g="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix index f60fb44710e5..56ef195e8f7a 100644 --- a/pkgs/by-name/cl/clickhouse-backup/package.nix +++ b/pkgs/by-name/cl/clickhouse-backup/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.6.35"; + version = "2.6.39"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-GQH9yV1CdOmdboxH16sIBvj+7dDMLt4q2C2xSFjvbi8="; + hash = "sha256-fx300EyGm9iy4kozcffh8KZz/EYF6yqkdNLSqW1dYQg="; }; - vendorHash = "sha256-je1iVJW+yHMcIm8Y0vd5Ti/JGp1yvmA1lLMvvw81qag="; + vendorHash = "sha256-MwyjjEePxcwcESfBhmFtYy8aOI50HL7x05cJyGk5gGg="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index fffeaa3145c0..53ad8758f507 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -32,7 +32,7 @@ let llvmStdenv = llvmPackages_19.stdenv; in llvmStdenv.mkDerivation (finalAttrs: { - pname = "clickhouse" + lib.optionalString lts "-lts"; + pname = "clickhouse"; inherit version; src = fetchFromGitHub rec { diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix index 6ba0f7439e1e..4497d9078c68 100644 --- a/pkgs/by-name/cl/clickhouse/lts.nix +++ b/pkgs/by-name/cl/clickhouse/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.8.2.29-lts"; - hash = "sha256-S+1fZuYlZUMkiBlMtufMT5aAi9uwbFMjYW7Dmkt/Now="; + version = "25.8.7.3-lts"; + hash = "sha256-wH/UxMgnsK6OIGxEv9CYA67f8PWC0u6IAiW2iY/KThk="; lts = true; nixUpdateExtraArgs = [ "--version-regex" diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index 1b0a81348266..1fc35212e7d4 100644 --- a/pkgs/by-name/cl/clickhouse/package.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.8.2.29-lts"; - hash = "sha256-S+1fZuYlZUMkiBlMtufMT5aAi9uwbFMjYW7Dmkt/Now="; + version = "25.9.2.1-stable"; + hash = "sha256-BygRxiDhhs91/UPWY7f3jAGyTtyAj98RdDXLwjs8Abo="; lts = false; nixUpdateExtraArgs = [ "--version-regex" diff --git a/pkgs/by-name/cl/clifm/package.nix b/pkgs/by-name/cl/clifm/package.nix index 744b1b5e487e..87440b66df19 100644 --- a/pkgs/by-name/cl/clifm/package.nix +++ b/pkgs/by-name/cl/clifm/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clifm"; - version = "1.26"; + version = "1.26.3"; src = fetchFromGitHub { owner = "leo-arch"; repo = "clifm"; tag = "v${finalAttrs.version}"; - hash = "sha256-eNgghfK2NSSrzn0X1XNcaE+jErlLG5rhg4+RLjERsFU="; + hash = "sha256-lYeYElTeQpOnptL/c/06OWpsmI/Jkd7rlKGw0mKc9/c="; }; buildInputs = [ diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix index 769593eac8b9..600fc8a98bb3 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.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "cloud-nuke"; tag = "v${version}"; - hash = "sha256-ALeUZs3LHhkWU1ecnzp/rpNhobCw4QLX2Pm6yN0dB40="; + hash = "sha256-TDZiX4Ik07Ysz3I7gdEF8SVJnt+EBPlH0RBIaE7+1KQ="; }; - vendorHash = "sha256-TczKygsgAqDzNBJ8MOwCcMShD2Y8/F2awaeqg/OMCxg="; + vendorHash = "sha256-Qml8P9m8quUZAarsS7h3TGbcXBCJ2fRD3uyi8Do+lAw="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix index 9b9324b7e867..502042599017 100644 --- a/pkgs/by-name/cl/cloudflared/package.nix +++ b/pkgs/by-name/cl/cloudflared/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2025.8.1"; + version = "2025.9.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; tag = version; - hash = "sha256-7qPyzxsCgRs/Jzwdg4MrtqD7arS7o420BkmbtXTlJe4="; + hash = "sha256-xFkRwbRfJCpwTW9T9g2Tnn6qAwoTT9bxOCEkTM01+B4="; }; vendorHash = null; diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix index bfa724559d5b..aabf5dc3f4ed 100644 --- a/pkgs/by-name/co/cobalt/package.nix +++ b/pkgs/by-name/co/cobalt/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cobalt"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-6WbJjPz+1KX04xMCiylJZiAPjF6jKPTPz7rObgFF4dY="; + hash = "sha256-0MwIJJ7oNUFMNqMzew9HgaZsfBNczBli20vsxtIWZq0="; }; - cargoHash = "sha256-Y9+zJ89XrVk3mZD1s9N7oaXvcBP5RNjp3hMjX1Wz3HA="; + cargoHash = "sha256-4oLEInL5hocCkP20lrOzfwPm5ram8Xw6p1qSva1tzNQ="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/co/coc-docker/package.nix b/pkgs/by-name/co/coc-docker/package.nix new file mode 100644 index 000000000000..5bc473f46974 --- /dev/null +++ b/pkgs/by-name/co/coc-docker/package.nix @@ -0,0 +1,26 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-docker"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "josa42"; + repo = "coc-docker"; + tag = "v${finalAttrs.version}"; + hash = "sha256-orSwQys+w2TKLau0gROyKh54vq7AwlVLsoU1EzALIDQ="; + }; + + npmDepsHash = "sha256-ow9viEFfyBUM2yDa63+pQCg6R5cAmznanqfI131fRxc="; + + meta = { + description = "Docker language server extension using dockerfile-language-server-nodejs for coc.nvim"; + homepage = "https://github.com/josa42/coc-docker"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/by-name/co/cocom-tool-set/package.nix b/pkgs/by-name/co/cocom-tool-set/package.nix new file mode 100644 index 000000000000..f4d2b2358d43 --- /dev/null +++ b/pkgs/by-name/co/cocom-tool-set/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + bison, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "cocom"; + version = "0.996"; + + src = fetchurl { + url = "mirror://sourceforge/cocom/cocom-${finalAttrs.version}.tar.gz"; + hash = "sha256-4UOrVW15o17zHsHiQIl8m4qNC2aT5QorbkfX/UsgBRk="; + }; + + env = { + RANLIB = "${stdenv.cc.targetPrefix}gcc-ranlib"; + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-int" + "-Wno-error=implicit-function-declaration" + ]; + }; + + autoreconfFlags = "REGEX"; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + bison + ]; + + hardeningDisable = [ "format" ]; + + meta = { + description = "Tool set oriented towards the creation of compilers"; + homepage = "https://cocom.sourceforge.net/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ puffnfresh ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 23d42815dfb1..1ffbca17e0c2 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -16,20 +16,20 @@ let sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/linux/x64/Cursor-1.5.11-x86_64.AppImage"; - hash = "sha256-PlZPgcDe6KmEcQYDk1R4uXh1R34mKuPLBh/wbOAYrAY="; + url = "https://downloads.cursor.com/production/3ccce8f55d8cca49f6d28b491a844c699b8719a3/linux/x64/Cursor-1.6.45-x86_64.AppImage"; + hash = "sha256-MlrevU26gD6hpZbqbdKQwnzJbm5y9SVSb3d0BGnHtpc="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/linux/arm64/Cursor-1.5.11-aarch64.AppImage"; - hash = "sha256-a1M9KumU8wLN5t6hrqMfkcbfPyt9maqCsAW8xTS+0BY="; + url = "https://downloads.cursor.com/production/3ccce8f55d8cca49f6d28b491a844c699b8719a3/linux/arm64/Cursor-1.6.45-aarch64.AppImage"; + hash = "sha256-eFHYRwVXhWB3zCnJFYodIxjR2ewP8ETgwyjBdB86oTk="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-HotafPJPDywp9UAnQUsQurfxtfPepZWAegAmwNp9J2Q="; + url = "https://downloads.cursor.com/production/3ccce8f55d8cca49f6d28b491a844c699b8719a3/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-UGmMX9Wr69i2EqQSLkj9/ROs8HpLtc/x0IYDJdzvD6U="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-LZxahFX3e7YQtUPcjxKYsOrjZSuPKyPKyIrJxC5XYLw="; + url = "https://downloads.cursor.com/production/3ccce8f55d8cca49f6d28b491a844c699b8719a3/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-lcuJiAgHXPEUZHNeanBq10znXKFKJ6yrluuZjdaQbyA="; }; }; @@ -39,7 +39,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = finalCommandLineArgs; - version = "1.5.11"; + version = "1.6.45"; pname = "cursor"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/co/commonsLang/package.nix b/pkgs/by-name/co/commonsLang/package.nix index baded0fb551b..86cd8a10029f 100644 --- a/pkgs/by-name/co/commonsLang/package.nix +++ b/pkgs/by-name/co/commonsLang/package.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "3.18.0"; + version = "3.19.0"; pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-rdX5zWVkN1FdGcivRgWDIvm7wzdZGoEQJ/cG34TuWxQ="; + hash = "sha256-BipGZH6z6s2GKPSdgU4UCjBhIM+o0cB9/QyXRJLIADo="; }; installPhase = '' diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 30552686f8d1..80deaa80aad9 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -1,60 +1,61 @@ { lib, fetchFromGitHub, - buildNpmPackage, + fetchNpmDeps, + npmHooks, rustPlatform, pkg-config, openssl, + nodejs, }: rustPlatform.buildRustPackage rec { pname = "cook-cli"; - version = "0.14.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${version}"; - hash = "sha256-jaAgmqUuqldcBlrwqXsausXPP35RZqM1VasYyA0pPO8="; + hash = "sha256-alrmQOt9PY155fIWXmp1m2dfhhkMOd4PkfkBWS2XXRg="; }; - cargoHash = "sha256-JVWa5vQcskXEgOqAxr2CKQDMjYakA1HqinDbKfRp/Wo="; + cargoHash = "sha256-tYD49UrLzPPS8G2zy2GKFBK4SGYXQ7UEjFWKcHvUTSY="; + + # Build without the self-updating feature + buildNoDefaultFeatures = true; nativeBuildInputs = [ pkg-config openssl + nodejs + npmHooks.npmConfigHook ]; buildInputs = [ openssl ]; - postPatch = '' - rm -rf "ui/public" - ln -s ${passthru.ui} "ui/public" - ''; - OPENSSL_NO_VENDOR = 1; - passthru.ui = buildNpmPackage { - name = "ui"; - src = "${src}/ui"; - npmDepsHash = "sha256-zx8G6Raop1EZAVy1YCF5ag5aL9NutRxbPfTARmjP2SY="; - makeCacheWritable = true; - npmFlags = [ "--legacy-peer-deps" ]; - installPhase = '' - runHook preInstall - mv public/ $out - runHook postInstall - ''; + npmDeps = fetchNpmDeps { + inherit src; + hash = "sha256-HxC9Tf+PZvvETuNqm1W3jaZx7SpYXlxZlI8FwGouK+s="; }; + preBuild = '' + npm run build-css + ''; + meta = { changelog = "https://github.com/cooklang/cookcli/releases/tag/v${version}"; description = "Suite of tools to create shopping lists and maintain recipes"; homepage = "https://cooklang.org/"; license = lib.licenses.mit; mainProgram = "cook"; - maintainers = [ lib.maintainers.emilioziniades ]; + maintainers = [ + lib.maintainers.emilioziniades + lib.maintainers.ginkogruen + ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index b550bf0482b3..a9f77f8eabc7 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.373.0"; + version = "1.377.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-LomewSlAKI38rl7eYpfvBx9Mw9tfxXbrlPb/Ex7czZo="; + hash = "sha256-IWahEODv+3MM+9udhgoziP8ptZHHc09sVuBHrFf8msA="; stripRoot = false; }; diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix index 9e46ded4bf5e..9b00d7c421a0 100644 --- a/pkgs/by-name/co/copybara/package.nix +++ b/pkgs/by-name/co/copybara/package.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "copybara"; - version = "20250915"; + version = "20250929"; src = fetchurl { url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar"; - hash = "sha256-vDyLBavzdVzhX3fPpVUpc7Y6Dn9UGQpfoISyUX9ixek="; + hash = "sha256-7fI7YeGFmOc/t4JPW8dszX0/MctIJdCfRuJVjEn+7vQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/copywrite/package.nix b/pkgs/by-name/co/copywrite/package.nix index c692d52735ac..5cf5c474a26d 100644 --- a/pkgs/by-name/co/copywrite/package.nix +++ b/pkgs/by-name/co/copywrite/package.nix @@ -12,14 +12,14 @@ let commitHash = "d5bc935e4801a02fdbd953f8f0ae7989eaef50cf"; # matches tag release shortCommitHash = builtins.substring 0 7 commitHash; in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "copywrite"; version = "0.22.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "copywrite"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gPVlHgFlLxoAj4pkg3OxD4CGQaLdAL312/Zn/pJ+7fg="; }; @@ -28,7 +28,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/hashicorp/copywrite/cmd.version=${version}" + "-X github.com/hashicorp/copywrite/cmd.version=${finalAttrs.version}" "-X github.com/hashicorp/copywrite/cmd.commit=${shortCommitHash}" ]; @@ -65,8 +65,8 @@ buildGoModule rec { description = "Automate copyright headers and license files at scale"; mainProgram = "copywrite"; homepage = "https://github.com/hashicorp/copywrite"; - changelog = "https://github.com/hashicorp/copywrite/releases/tag/v${version}"; + changelog = "https://github.com/hashicorp/copywrite/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ dvcorreia ]; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index 9d6bcc14f575..2f60f0f352b0 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -36,14 +36,10 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-app-library" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - postPatch = '' - substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" - ''; - passthru = { tests = { inherit (nixosTests) diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index db22e05c964e..719f4650bde2 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -45,8 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; passthru = { diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 1b8e42fab2e0..c861f9a5ead8 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -53,8 +53,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-edit" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; passthru = { diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index ba97add394a1..f931d3df52e6 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -40,11 +40,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-files" - "--set" - "applet-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-files-applet" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; # This is needed since by setting cargoBuildFlags, it would build both the applet and the main binary diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index 5c8a30e81af9..a66a3ac5a144 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -57,11 +57,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter" - "--set" - "daemon-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter-daemon" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; postPatch = '' diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index ce660c1ad14d..9847ce7966f0 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -41,8 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-idle" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; postPatch = '' diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix index 08aad02cf6b4..63558e905a57 100644 --- a/pkgs/by-name/co/cosmic-initial-setup/package.nix +++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix @@ -3,6 +3,7 @@ stdenv, rustPlatform, fetchFromGitHub, + fetchpatch2, just, libcosmicAppHook, libinput, @@ -24,6 +25,8 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-orwK9gcFXK4/+sfwRubcz0PP6YAFqsENRHnlSLttLxM="; + buildFeatures = [ "nixos" ]; + # cargo-auditable fails during the build when compiling the `crabtime::function` # procedural macro. It panics because the `--out-dir` flag is not passed to # the rustc wrapper. @@ -47,6 +50,12 @@ rustPlatform.buildRustPackage (finalAttrs: { patches = [ ./disable-language-page.patch ./disable-timezone-page.patch + # TODO: Remove in next update + (fetchpatch2 { + name = "fix-layout-and-themes-page.patch"; + url = "https://patch-diff.githubusercontent.com/raw/pop-os/cosmic-initial-setup/pull/53.diff?full_index=1"; + hash = "sha256-081qyQnPhh+FRPU/JKJVCK+l3SKjHAIV5b6/7WN6lb8="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index 6595b2bd6595..f2617f151cc7 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -36,8 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-launcher" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable"; diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index 470359ee8e12..9ff3f7ac8299 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -39,8 +39,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-notifications" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; passthru = { diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 1f9ad5881177..ff40a8512385 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -36,8 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; passthru = { diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 5cd04cc15067..a213b228531a 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -30,10 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-DodFIfthiGFSvXWfPsPjFhNY6G7z3lb6pfc5HtUXhMo="; - postPatch = '' - substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" - ''; - nativeBuildInputs = [ just pkg-config @@ -64,8 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-player" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; postInstall = '' diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index c1885e1fc39c..95f1be48c2fc 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -39,8 +39,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; passthru = { diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index 43052df88163..19e6b35a9007 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -34,8 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-screenshot" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; passthru.tests = { diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index fcc20c1b18ee..31c4217cca33 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -66,8 +66,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; preFixup = '' diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 96b3f223db9a..234b522ceb37 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -47,8 +47,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-store" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; passthru = { diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 390b2a7bab0a..cbd95303c28d 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -47,8 +47,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "prefix" (placeholder "out") "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-term" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; passthru = { diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix index e585d41f6230..c16b06157b8e 100644 --- a/pkgs/by-name/cr/crispy-doom/package.nix +++ b/pkgs/by-name/cr/crispy-doom/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ Gliczy keenanweaver - neonfuz ]; }; }) diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix index a86a6d505721..a989199bd2fa 100644 --- a/pkgs/by-name/da/dablin/package.nix +++ b/pkgs/by-name/da/dablin/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dablin"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; rev = version; - sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; + sha256 = "sha256-dx+KPPFCx78HtNvEb00URX/eu49Wtj7fksPjDtpkk5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix index b4cb49acaca6..f5d69221eba4 100644 --- a/pkgs/by-name/da/dapr-cli/package.nix +++ b/pkgs/by-name/da/dapr-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - hash = "sha256-LX2X9L+aEIFr1lYV7lAlVZM/nQMmdLY9f8XBMm31be0="; + hash = "sha256-Z8Fuisx2hK6QAJ5NDh0f11t/hoHhbD2+/mZMsUFxPaQ="; }; vendorHash = "sha256-qEbuu4+pQ6g3m1FtisYc26lG/4zY/boQM8d6qA5c1eo="; diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index 735d493dbbf9..c925ed3be313 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -23,13 +23,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.92.1"; + version = "1.93.2"; src = fetchFromGitHub { owner = "sass"; repo = "dart-sass"; tag = version; - hash = "sha256-ee1ED6CeRQnv+jopgupelWybiH3h05Lk1TUgYUS8rNo="; + hash = "sha256-YE4s0um3WR6N0KsXgLjvoiqjr8dQg8WOyZRbfoZlbqE="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index 3a3031be8587..30e98a706e5a 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -94,11 +94,11 @@ "dependency": "direct main", "description": { "name": "cli_pkg", - "sha256": "eeeea1e0773c5d53fb80a179f82f12c96c50487a37b3cf0174499eb9884c55b2", + "sha256": "da207d78c602f97fad700975282ea516dcb6bab97d20836287eac8fac563f3a5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.12.0" + "version": "2.14.0" }, "cli_repl": { "dependency": "direct main", @@ -174,11 +174,11 @@ "dependency": "transitive", "description": { "name": "dart_mappable", - "sha256": "15f41a35da8ee690bbfa0059fa241edeeaea73f89a2ba685b354ece07cd8ada6", + "sha256": "0e219930c9f7b9e0f14ae7c1de931c401875110fd5c67975b6b9492a6d3a531b", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.6.0" + "version": "4.6.1" }, "dart_style": { "dependency": "transitive", @@ -474,11 +474,11 @@ "dependency": "direct main", "description": { "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.1" + "version": "1.5.2" }, "protobuf": { "dependency": "direct main", diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index 9b4d127eb4d0..4cb2ec023d5c 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "databricks-cli"; - version = "0.269.0"; + version = "0.270.0"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-E9wxDwWBLJYh1DKREfxxJ2kts6Gd52mxjCxjelI9NaM="; + hash = "sha256-DCgj2IXGidWET8jCmmmuz9viOjdO89UqloZ5yvnXluk="; }; # Otherwise these tests fail asserting that the version is 0.0.0-dev @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}" ''; - vendorHash = "sha256-1XQ88nSziZ2+iWrHk4P0wGJo3jR9dGKMsdRZLqG+ouQ="; + vendorHash = "sha256-U5H20Csk8EhIqmUBN8DVYA5jta2LoGLs/EYiZbGo6Tc="; excludedPackages = [ "bundle/internal" diff --git a/pkgs/by-name/da/davis/package.nix b/pkgs/by-name/da/davis/package.nix index 528b02fd54da..91fb72806781 100644 --- a/pkgs/by-name/da/davis/package.nix +++ b/pkgs/by-name/da/davis/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "davis"; - version = "5.1.3"; + version = "5.2.0"; src = fetchFromGitHub { owner = "tchapi"; repo = "davis"; tag = "v${finalAttrs.version}"; - hash = "sha256-2gM6G1ZqHOUNmFjo3icHdV7xX/kbi0MO98GDzsBTGGo="; + hash = "sha256-Ih06CKwgR2ljw3w9YfgVUdBCjt5Nbs34fMsErRUkfcc="; }; - vendorHash = "sha256-RNvFviWu1ZNPWguzL9MbOsWctKfPeJGWZJ8Y2HDEXkI="; + vendorHash = "sha256-e0qSI5naqM/mUSMduiku0yQkYMGw1y9Uwa5oYlxaDzs="; composerNoPlugins = false; diff --git a/pkgs/by-name/dc/dcw-gmt/package.nix b/pkgs/by-name/dc/dcw-gmt/package.nix index c99acb2d29ef..c0b17fd92bf0 100644 --- a/pkgs/by-name/dc/dcw-gmt/package.nix +++ b/pkgs/by-name/dc/dcw-gmt/package.nix @@ -1,15 +1,18 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, }: stdenv.mkDerivation (finalAttrs: { pname = "dcw-gmt"; - version = "2.1.2"; - src = fetchurl { - url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-S7hA0HXIuj4UrrQc8XwkI2v/eHVmMU+f91irmXd0XZk="; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "GenericMappingTools"; + repo = "dcw-gmt"; + tag = finalAttrs.version; + hash = "sha256-OgFonNbhvzRfQZksnwIbgASbMGnL0bmD4wkXZBl3kIU="; }; installPhase = '' @@ -18,16 +21,20 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - homepage = "https://www.soest.hawaii.edu/pwessel/dcw/"; + homepage = "https://github.com/GenericMappingTools/dcw-gmt"; description = "Vector basemap of the world, for use with GMT"; longDescription = '' - DCW-GMT is an enhancement to the original 1:1,000,000 scale vector basemap - of the world, available from the Princeton University Digital Map and - Geospatial Information Center. It contains more state boundaries (the - largest 8 countries are now represented) than the original data - source. Information about DCW can be found on Wikipedia - (https://en.wikipedia.org/wiki/Digital_Chart_of_the_World). This data is - for use by GMT, the Generic Mapping Tools. + The Digital Chart of the World is a comprehensive 1:1,000,000 scale vector + basemap of the world. The charts were designed to meet the needs of pilots + and air crews in medium- and low-altitude en route navigation and to + support military operational planning, intelligence briefings, and other + needs. For basic background information about DCW, see the [Wikipedia + entry](http://en.wikipedia.org/wiki/Digital_Chart_of_the_World). + + DCW-GMT is an enhancement to DCW in a few ways: + + - It contains more state boundaries (the largest 8 countries, Great Britain and Norway are now represented). + - The data have been reformatted to save space and are distributed as a single deflated netCDF-4 file. ''; license = licenses.lgpl3Plus; maintainers = with lib.maintainers; [ tviti ]; diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix index ea4c6ffe7f3e..9b9df7745c68 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.12.4"; + version = "6.12.5"; src = fetchFromGitHub { owner = "jeessy2"; repo = "ddns-go"; rev = "v${version}"; - hash = "sha256-MtnX8/xrslpQYyj2/TIG6x6BNWSLw0dajTB/D02+sRY="; + hash = "sha256-8k3WxNSt+DvfdmWH/V3rAlOSHeyf+g5mmXQZghCf7K4="; }; vendorHash = "sha256-f94Ox/8MQgy3yyLRTK0WFHebntSUAGlbr4/IY+wrz4w="; diff --git a/pkgs/by-name/de/deco/package.nix b/pkgs/by-name/de/deco/package.nix index d23229c09197..c6fbf6b5a1c7 100644 --- a/pkgs/by-name/de/deco/package.nix +++ b/pkgs/by-name/de/deco/package.nix @@ -5,17 +5,18 @@ scsh, feh, xorg, + xdg-user-dirs, }: stdenv.mkDerivation { pname = "deco"; - version = "unstable-2019-04-03"; + version = "0-unstable-2025-07-07"; src = fetchFromGitHub { - owner = "ebzzry"; + owner = "vedatechnologiesinc"; repo = "deco"; - rev = "dd8ec7905bc85d085eb2ee3bddabea451054288c"; - sha256 = "sha256-/3GeNvWOCRPOYTUbodXDUxR5QVDEyx6x2Jt5PxsPdvk="; + rev = "2fd28241ed28c07b9d641061d4e1bf3cacfcc7a0"; + hash = "sha256-kjXEvgYO1p/dX9nXQ3HHcXmJdtxDM6xzKqDQu3yM4Tw="; }; installPhase = '' @@ -25,17 +26,18 @@ stdenv.mkDerivation { ''; postFixup = '' - substituteInPlace $out/bin/deco --replace "/usr/bin/env scsh" "${scsh}/bin/scsh" - substituteInPlace $out/bin/deco --replace "feh" "${feh}/bin/feh" - substituteInPlace $out/bin/deco --replace "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo" + substituteInPlace $out/bin/deco --replace-fail "/usr/bin/env scsh" "${scsh}/bin/scsh" + substituteInPlace $out/bin/deco --replace-fail "feh" "${feh}/bin/feh" + substituteInPlace $out/bin/deco --replace-fail "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo" + substituteInPlace $out/bin/deco --replace-fail "xdg-user-dir" "${xdg-user-dirs}/bin/xdg-user-dir" ''; - meta = with lib; { - homepage = "https://github.com/ebzzry/deco"; + meta = { + homepage = "https://github.com/vedatechnologiesinc/deco"; description = "Simple root image setter"; - license = licenses.mit; - maintainers = [ maintainers.ebzzry ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ebzzry ]; + platforms = lib.platforms.unix; mainProgram = "deco"; }; diff --git a/pkgs/by-name/de/deepsea/package.nix b/pkgs/by-name/de/deepsea/package.nix deleted file mode 100644 index 35cc2b5943fe..000000000000 --- a/pkgs/by-name/de/deepsea/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - buildGoModule, - fetchFromGitHub, - lib, -}: - -buildGoModule rec { - pname = "deepsea"; - version = "0.9"; - - src = fetchFromGitHub { - owner = "dsnezhkov"; - repo = "deepsea"; - rev = "v${version}"; - sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig"; - }; - - vendorHash = null; - - meta = with lib; { - description = "Phishing tool for red teams and pentesters"; - longDescription = '' - DeepSea phishing gear aims to help RTOs and pentesters with the - delivery of opsec-tight, flexible email phishing campaigns carried - out on the outside as well as on the inside of a perimeter. - ''; - homepage = "https://github.com/dsnezhkov/deepsea"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check - }; -} diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 89197cbe96a5..18bcab716b2e 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -15,7 +15,7 @@ }: let - version = "1.9"; + version = "1.9.1"; devenvNixVersion = "2.30.4"; devenv_nix = @@ -42,10 +42,10 @@ rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; tag = "v${version}"; - hash = "sha256-MG+c0mo4g9UHSuqibX3OVkiADWmMn/PWDfVhD4U29PM="; + hash = "sha256-v86pQGIWHJPkRryglJSXOp0aEoU6ZtURuURsXLqfqSE="; }; - cargoHash = "sha256-7uB9oC0jHWBFeUtIyVpTjeximU6eSxSCiBzo/whoKxQ="; + cargoHash = "sha256-41VmzZvoRd2pL5/o6apHztpS2XrL4HGPIJPBkUbPL1I="; buildAndTestSubdir = "devenv"; diff --git a/pkgs/by-name/de/devspace/package.nix b/pkgs/by-name/de/devspace/package.nix index 0cba8fd7831c..89ab36c97249 100644 --- a/pkgs/by-name/de/devspace/package.nix +++ b/pkgs/by-name/de/devspace/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.3.17"; + version = "6.3.18"; src = fetchFromGitHub { owner = "devspace-sh"; repo = "devspace"; rev = "v${version}"; - hash = "sha256-b0eRiPt4g8JEoQPdl3qXsEXuYIy+VvVBU8/cPIqW/20="; + hash = "sha256-33uhg2OY0owgP1rzdxcZzpN0cuYPRfX8vcwCJF9MVoo="; }; vendorHash = null; diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix index 249a7b61a222..9201fc2b853a 100644 --- a/pkgs/by-name/di/di-tui/package.nix +++ b/pkgs/by-name/di/di-tui/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "di-tui"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "acaloiaro"; repo = "di-tui"; rev = "v${version}"; - hash = "sha256-YXTVJN8t58MS0Q4kKbasFNkmB/Jz4ctebBnbKqOP2is="; + hash = "sha256-Qd+Rwyw0aC5RGucvl3v3mHbV6dB9VHvk9/nh/glWU90="; }; vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I="; diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index f71d576652a7..0410978a4393 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -106,12 +106,12 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "303"; + version = "304"; pyproject = true; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-kalURmsdYl0HOnzAkJ6aGRvYcjnb8BeWimokmpqE+Ds="; + hash = "sha256-lJdZRIyoVq1PsmiicsSxJ0Mgsy5IcAUar6l8QvJoxOw="; }; outputs = [ diff --git a/pkgs/by-name/di/discordo/package.nix b/pkgs/by-name/di/discordo/package.nix index fbee6757311d..d399e7686b81 100644 --- a/pkgs/by-name/di/discordo/package.nix +++ b/pkgs/by-name/di/discordo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "discordo"; - version = "0-unstable-2025-08-06"; + version = "0-unstable-2025-09-27"; src = fetchFromGitHub { owner = "ayn2op"; repo = "discordo"; - rev = "cdd97ff900a099ca520e5a720c547780dd6de162"; - hash = "sha256-dJwinbkSVXxcNV9zXZaNnyZi1XorfNBITuYb9D987Vk="; + rev = "5cecfddae7a092a1cbb91a8bdec1ce27d013467f"; + hash = "sha256-jbZJAUrwgbwcc1vugrTzW1P74Ll3OWh+5MQCdwnAVrw="; }; - vendorHash = "sha256-6JpLXLoozkPWl7z0KGFIgr78bMR4DegvyEWODBKuWpE="; + vendorHash = "sha256-RASyQEesppDckC/bE1vbKiVqZ4f72RI8IAbSTGGgzmo="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/dn/dn42-cacert/package.nix b/pkgs/by-name/dn/dn42-cacert/package.nix new file mode 100644 index 000000000000..32fe459e9f00 --- /dev/null +++ b/pkgs/by-name/dn/dn42-cacert/package.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation { + pname = "dn42-cacert"; + + # check it on its homepage + version = "0-unstable-2016-01-16"; + + src = ./root-ca.crt; + + dontUnpack = true; + + dontBuild = true; + + installPhase = '' + install -Dm644 $src $out/etc/ssl/certs/dn42-ca.crt + ''; + + meta = { + description = "DN42 Root CA certificate"; + homepage = "https://wiki.dn42.dev/services/Certificate-Authority.md"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ Cryolitia ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/dn/dn42-cacert/root-ca.crt b/pkgs/by-name/dn/dn42-cacert/root-ca.crt new file mode 100644 index 000000000000..210ad0424366 --- /dev/null +++ b/pkgs/by-name/dn/dn42-cacert/root-ca.crt @@ -0,0 +1,89 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 137808117760 (0x2016010000) + Signature Algorithm: sha256WithRSAEncryption + Issuer: C=XD, O=dn42, OU=dn42 Certificate Authority, CN=dn42 Root Authority CA + Validity + Not Before: Jan 16 00:12:04 2016 GMT + Not After : Dec 31 23:59:59 2030 GMT + Subject: C=XD, O=dn42, OU=dn42 Certificate Authority, CN=dn42 Root Authority CA + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (2048 bit) + Modulus: + 00:c1:19:10:de:01:86:11:f1:82:0c:b0:d4:e5:ff: + 9a:c8:e3:aa:f4:00:08:82:c0:cf:7f:05:7a:21:97: + c1:b5:8b:a3:d1:54:ee:fa:04:0f:77:d5:5c:98:4b: + d9:88:18:c1:17:10:92:e5:24:fa:ef:61:eb:5d:7b: + 11:e5:be:ba:89:f2:60:c9:3b:82:05:3a:74:54:60: + 23:66:1a:d8:cd:28:7b:f1:ea:55:25:9a:8c:04:a0: + ff:9d:48:54:4c:9d:bc:2d:a0:df:71:ae:64:47:0d: + e7:75:05:f4:c5:02:2a:d2:0c:be:a3:63:54:62:2b: + ad:29:eb:6a:08:a4:5e:a8:eb:f1:52:14:4e:d1:5d: + 41:2f:d3:19:ba:e4:82:36:7a:d1:a3:f2:84:f6:07: + b2:f6:0c:30:db:db:76:ee:e9:14:05:c7:8f:75:b7: + 3f:d5:d5:35:56:d0:92:44:df:26:1e:00:fa:ae:cb: + 7a:c9:50:67:5d:69:f8:f9:fd:25:a7:1d:db:40:b1: + 42:bc:45:57:e1:c9:1c:42:ba:69:80:1e:ea:25:99: + 12:9f:6f:23:a3:d2:2e:4a:cd:15:e4:7c:49:f9:d1: + c0:f0:19:0c:15:50:ce:a6:51:bb:aa:16:b2:82:ec: + f4:61:44:8c:1c:dd:65:60:04:77:b0:4d:99:67:17: + fb:09 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 54:76:88:B2:C0:B5:30:D0:FC:4F:C9:6D:3B:F9:8C:55:11:AC:15:15 + X509v3 Authority Key Identifier: + keyid:54:76:88:B2:C0:B5:30:D0:FC:4F:C9:6D:3B:F9:8C:55:11:AC:15:15 + + X509v3 Name Constraints: + Permitted: + DNS:.dn42 + IP:172.20.0.0/255.252.0.0 + IP:FD42:0:0:0:0:0:0:0/FFFF:0:0:0:0:0:0:0 + + Signature Algorithm: sha256WithRSAEncryption + 5c:a4:3b:41:a0:81:69:e2:71:99:4d:75:4b:5a:20:0d:2a:d9: + ec:ea:bc:8d:4f:b0:6c:f3:2e:41:1a:a0:75:f3:de:7e:3a:e0: + a7:b9:db:cd:f5:16:e4:6a:cb:e7:cc:2a:8f:ee:7f:14:0a:a5: + b5:f9:66:48:81:e5:68:1e:0c:a6:a3:3c:a7:2b:e3:95:cf:e3: + 63:15:0d:16:09:63:d9:66:31:3b:42:2e:7c:1a:e5:28:8e:5e: + 3d:9e:28:99:48:e9:47:86:11:e2:04:29:60:2b:96:95:99:ae: + 3f:ab:ff:3f:45:ab:7e:07:45:4e:4d:0b:18:40:3d:3b:02:9c: + 4e:a9:0f:a5:c2:3f:4a:30:77:ae:66:5c:b3:8d:b2:41:6b:e2: + 98:01:7d:e0:6b:52:70:4d:3d:b8:a9:48:f5:02:d2:d9:40:66: + b6:5e:44:25:11:55:ac:31:02:d7:67:72:6a:6a:bc:74:34:5f: + 75:dc:9a:4f:83:28:40:e0:2a:dc:3f:41:43:5a:47:07:2b:b7: + a7:3f:d0:15:a2:42:d7:30:22:f2:f6:e4:b4:f6:3b:38:ca:6b: + 4c:e7:3c:a4:70:cb:de:af:0a:14:ff:23:25:ca:04:cd:9e:49: + c3:4b:e4:0a:b5:0b:84:b5:ef:b4:5b:63:07:47:63:cd:5c:50: + 0b:42:0a:a9 +-----BEGIN CERTIFICATE----- +MIID8DCCAtigAwIBAgIFIBYBAAAwDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMC +WEQxDTALBgNVBAoMBGRuNDIxIzAhBgNVBAsMGmRuNDIgQ2VydGlmaWNhdGUgQXV0 +aG9yaXR5MR8wHQYDVQQDDBZkbjQyIFJvb3QgQXV0aG9yaXR5IENBMCAXDTE2MDEx +NjAwMTIwNFoYDzIwMzAxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJYRDENMAsGA1UE +CgwEZG40MjEjMCEGA1UECwwaZG40MiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAd +BgNVBAMMFmRuNDIgUm9vdCBBdXRob3JpdHkgQ0EwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQDBGRDeAYYR8YIMsNTl/5rI46r0AAiCwM9/BXohl8G1i6PR +VO76BA931VyYS9mIGMEXEJLlJPrvYetdexHlvrqJ8mDJO4IFOnRUYCNmGtjNKHvx +6lUlmowEoP+dSFRMnbwtoN9xrmRHDed1BfTFAirSDL6jY1RiK60p62oIpF6o6/FS +FE7RXUEv0xm65II2etGj8oT2B7L2DDDb23bu6RQFx491tz/V1TVW0JJE3yYeAPqu +y3rJUGddafj5/SWnHdtAsUK8RVfhyRxCummAHuolmRKfbyOj0i5KzRXkfEn50cDw +GQwVUM6mUbuqFrKC7PRhRIwc3WVgBHewTZlnF/sJAgMBAAGjgaowgacwDgYDVR0P +AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFR2iLLAtTDQ/E/J +bTv5jFURrBUVMB8GA1UdIwQYMBaAFFR2iLLAtTDQ/E/JbTv5jFURrBUVMEQGA1Ud +HgQ9MDugOTAHggUuZG40MjAKhwisFAAA//wAADAihyD9QgAAAAAAAAAAAAAAAAAA +//8AAAAAAAAAAAAAAAAAADANBgkqhkiG9w0BAQsFAAOCAQEAXKQ7QaCBaeJxmU11 +S1ogDSrZ7Oq8jU+wbPMuQRqgdfPefjrgp7nbzfUW5GrL58wqj+5/FAqltflmSIHl +aB4MpqM8pyvjlc/jYxUNFglj2WYxO0IufBrlKI5ePZ4omUjpR4YR4gQpYCuWlZmu +P6v/P0WrfgdFTk0LGEA9OwKcTqkPpcI/SjB3rmZcs42yQWvimAF94GtScE09uKlI +9QLS2UBmtl5EJRFVrDEC12dyamq8dDRfddyaT4MoQOAq3D9BQ1pHByu3pz/QFaJC +1zAi8vbktPY7OMprTOc8pHDL3q8KFP8jJcoEzZ5Jw0vkCrULhLXvtFtjB0djzVxQ +C0IKqQ== +-----END CERTIFICATE----- diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index 192d9017452c..705be1ce8bb4 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.10"; + version = "1.9.11"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-aLZ1Jl2h5KmZQ8zNyNqivAkf4Gjqh2eQfoKLabdXhBI="; + hash = "sha256-TS9niQd3jlALQrFu6H2SucZwwQp0k2BRHqZCYfbz+CI="; }; # https://github.com/NixOS/nixpkgs/issues/318830 diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index 0674bd40a886..f6f0c720a8ff 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.50.1"; + version = "1.51.0"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${version}"; - hash = "sha256-fh819FxXugCUF9TMxCAIog0SP52YnPHL6gvVtoS6fN8="; + hash = "sha256-vRvcsh4b/QlU+f7646t8O5F8VT/K6zBxbUpos+hh0fw="; }; - npmDepsHash = "sha256-P7BSVGoHBJrR5AUT70a10BqKNJxG+GW8FpkaKTEUA/c="; + npmDepsHash = "sha256-AT9ZE7ip63t6vK/GBVM9JCmir68jrxMN54RoREmjSIk="; dontNpmBuild = true; diff --git a/pkgs/by-name/dq/dq/package.nix b/pkgs/by-name/dq/dq/package.nix index 20f9673af874..f43d7b08e4e5 100644 --- a/pkgs/by-name/dq/dq/package.nix +++ b/pkgs/by-name/dq/dq/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dq"; - version = "20250201"; + version = "20251001"; src = fetchFromGitHub { owner = "janmojzis"; repo = "dq"; tag = finalAttrs.version; - hash = "sha256-SFX71SNLvBTxDC8xWOMAp2gYz+8K5fod2hSTzQAXpo8="; + hash = "sha256-+3NGtHx9DI7s3V8aIJkW25apYAoFuLuiQ4TGsr981c8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -31,7 +31,12 @@ stdenv.mkDerivation (finalAttrs: { description = "Recursive DNS/DNSCurve server and comandline tool"; homepage = "https://github.com/janmojzis/dq"; changelog = "https://github.com/janmojzis/dq/releases/tag/${finalAttrs.version}"; - license = lib.licenses.cc0; + license = with lib.licenses; [ + bsd0 + cc0 + mit + mit0 + ]; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ sikmir ]; }; diff --git a/pkgs/by-name/dw/dwm/package.nix b/pkgs/by-name/dw/dwm/package.nix index 98bcd4190a00..29660cad7c46 100644 --- a/pkgs/by-name/dw/dwm/package.nix +++ b/pkgs/by-name/dw/dwm/package.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { tags. ''; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ neonfuz ]; platforms = lib.platforms.all; mainProgram = "dwm"; }; diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 8b7e32d5ef52..b81ca34bac16 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -12,24 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "easytier"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "EasyTier"; repo = "EasyTier"; tag = "v${version}"; - hash = "sha256-89uRsLeSNR2I+QX0k1VJ0sMrUYLbApEJClk3aFr0faY="; + hash = "sha256-vGQHrpImPMF44LXVnKRpj47Nr534wTlVZJiBDm4GkGs="; }; - # remove if rust 1.89 merged - postPatch = '' - substituteInPlace easytier/Cargo.toml \ - --replace-fail 'rust-version = "1.89.0"' "" - substituteInPlace easytier-rpc-build/Cargo.toml \ - --replace-fail 'rust-version = "1.89.0"' "" - ''; - - cargoHash = "sha256-rioo3Eg5xGg4PI4beXWheeymVNq+zZP9uhbfU584u0g="; + cargoHash = "sha256-B9GkvSXyZXTBsnV7wbipjdZ0EkVrL/aw8Ff7uUvfKPo="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index 2ac0efe095f1..e9c2d499ea42 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -24,13 +24,13 @@ buildGoModule rec { pname = "ecapture"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-vVDr0KKfjFg282FLt23foYWoW5XSFdEgGfXgdiWrfk4="; + hash = "sha256-1FyZMUII+bPQDmNK1eJkfeoTjdhe/jj2qiooWuNFsNg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix index 8751d37efa46..4a743965e37e 100644 --- a/pkgs/by-name/ec/ecs-agent/package.nix +++ b/pkgs/by-name/ec/ecs-agent/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.99.0"; + version = "1.99.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = "amazon-ecs-agent"; - hash = "sha256-b+GxUVqKnMlZITrZ0/MO6kZVw5mLrrgLVdKAe0xS/7w="; + hash = "sha256-aGmXu+ho5H6vPTBWR5OvqDcmFQN87BOl99HGIek24CE="; }; vendorHash = null; diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix index 8ba53b0dc062..9760b78020ad 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation rec { pname = "ed-odyssey-materials-helper"; - version = "2.255"; + version = "3.0.1"; src = fetchFromGitHub { owner = "jixxed"; repo = "ed-odyssey-materials-helper"; tag = version; - hash = "sha256-V5uC+f/KqUL13mMTUDtHLbqebfj6mRV+Fmb7OAjMxXg="; + hash = "sha256-tdpt0/TO7K1bK6OMCR9s5TbN1/v1ZywCzO/IvdOfsSA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index 7d66a8e1179d..1b9cc33da3cc 100644 --- a/pkgs/by-name/ei/eigenwallet/package.nix +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { name = "eigenwallet"; - version = "3.0.1"; + version = "3.0.4"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-/yVx/FW+sVYPtpQNl03A3JNe4CbxRbo4OkvY/Kxnw8Y="; + hash = "sha256-2BC6ii4mS3lGowqNl5VEAjUXYjXXnQQDNcfAytCTi7M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix index 490165cf6d7a..ea53de4cbf49 100644 --- a/pkgs/by-name/el/electron-mail/package.nix +++ b/pkgs/by-name/el/electron-mail/package.nix @@ -7,11 +7,11 @@ let pname = "electron-mail"; - version = "5.3.0"; + version = "5.3.3"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - hash = "sha256-QGYsD8Ec6/G4X2dGZfH7LwT6o6X599kP6V34y6WxP64="; + hash = "sha256-i1oJ/DNGspE7ELuN7MI0e8/69SZwirqahBa7Jf5kP7s="; }; appimageContents = appimageTools.extract { inherit pname version src; }; @@ -22,7 +22,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix index e0d1bdc94f08..6ff1c3c0176b 100644 --- a/pkgs/by-name/en/ente-web/package.nix +++ b/pkgs/by-name/en/ente-web/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ente-web-${enteApp}"; - version = "1.2.4"; + version = "1.2.8"; src = fetchFromGitHub { owner = "ente-io"; @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { sparseCheckout = [ "web" ]; tag = "photos-v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-KCRwQmYmf2DXe3WQS8Rc8h397F0xEth4x36Yz4Ke4Y0="; + hash = "sha256-OIpqGFp10ncgM8OBJF+Eer3ESnvcuvWihl5cu5SuOvs="; }; sourceRoot = "${finalAttrs.src.name}/web"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/web/yarn.lock"; - hash = "sha256-vm1pQrS4yWvSeTo++964kM+OK0JED8et/dHqLG6lJH0="; + hash = "sha256-g6g4VCn6pQWIqhaUctMISHvbQv+o+B+MFSWKT+S7YVU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index bbe6bf7e13fb..86e0ad202eb4 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -1,13 +1,10 @@ { lib, stdenv, - writeShellApplication, + writeScriptBin, fetchFromGitHub, cjson, cmake, - git, - makeBinaryWrapper, - unzip, curl, freetype, glew, @@ -25,15 +22,11 @@ }: let version = "2.83.2"; - fakeGit = writeShellApplication { - name = "git"; - - text = '' - if [ "$1" = "describe" ]; then - echo "${version}" - fi - ''; - }; + fakeGit = writeScriptBin "git" '' + if [ "$1" = "describe" ]; then + echo "${version}" + fi + ''; in stdenv.mkDerivation { pname = "etlegacy-unwrapped"; @@ -51,9 +44,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake fakeGit - git - makeBinaryWrapper - unzip ]; buildInputs = [ @@ -102,8 +92,6 @@ stdenv.mkDerivation { (lib.cmakeFeature "INSTALL_DEFAULT_BINDIR" "${placeholder "out"}/bin") ]; - hardeningDisable = [ "fortify" ]; - meta = { description = "ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3 license"; homepage = "https://etlegacy.com"; diff --git a/pkgs/by-name/et/etlegacy/package.nix b/pkgs/by-name/et/etlegacy/package.nix index 82831ad81481..ac9927f3b810 100644 --- a/pkgs/by-name/et/etlegacy/package.nix +++ b/pkgs/by-name/et/etlegacy/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, symlinkJoin, etlegacy-assets, etlegacy-unwrapped, @@ -9,6 +10,7 @@ symlinkJoin { name = "etlegacy"; version = "2.83.2"; + paths = [ etlegacy-assets etlegacy-unwrapped @@ -23,8 +25,6 @@ symlinkJoin { --add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy" wrapProgram $out/bin/etlded.* \ --add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy" - makeWrapper $out/bin/etl.* $out/bin/etl - makeWrapper $out/bin/etlded.* $out/bin/etlded ''; meta = { @@ -39,7 +39,7 @@ symlinkJoin { for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age. ''; - mainProgram = "etl"; + mainProgram = "etl." + (if stdenv.hostPlatform.isi686 then "i386" else "x86_64"); maintainers = with lib.maintainers; [ ashleyghooper ]; diff --git a/pkgs/by-name/eu/eureka-editor/package.nix b/pkgs/by-name/eu/eureka-editor/package.nix index d098577c7f1d..8ac7d27ee672 100644 --- a/pkgs/by-name/eu/eureka-editor/package.nix +++ b/pkgs/by-name/eu/eureka-editor/package.nix @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; badPlatforms = platforms.darwin; - maintainers = with maintainers; [ neonfuz ]; }; } diff --git a/pkgs/by-name/ex/expliot/package.nix b/pkgs/by-name/ex/expliot/package.nix index ca03735602ec..4cbddc41bd9f 100644 --- a/pkgs/by-name/ex/expliot/package.nix +++ b/pkgs/by-name/ex/expliot/package.nix @@ -1,79 +1,52 @@ { lib, - fetchFromGitHub, fetchFromGitLab, python3, }: -let - py = python3.override { - self = py; - packageOverrides = self: super: { - - cmd2 = super.cmd2.overridePythonAttrs (oldAttrs: rec { - version = "1.5.0"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-cBqMmXXEq8ReXROQarFJ+Vn4EoaRBjRzI6P4msDoKmI="; - }; - dependencies = oldAttrs.dependencies ++ [ - python3.pkgs.attrs - python3.pkgs.colorama - ]; - doCheck = false; - }); - - paho-mqtt = super.paho-mqtt.overridePythonAttrs (oldAttrs: rec { - version = "1.6.1"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - tag = "v${version}"; - hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; - }; - build-system = with self; [ setuptools ]; - doCheck = false; - }); - }; - }; -in -with py.pkgs; - +with python3.pkgs; buildPythonApplication rec { pname = "expliot"; - version = "0.9.8"; + version = "0.11.1"; pyproject = true; src = fetchFromGitLab { owner = "expliot_framework"; repo = "expliot"; tag = version; - hash = "sha256-7Cuj3YKKwDxP2KKueJR9ZO5Bduv+lw0Y87Rw4b0jbGY="; + hash = "sha256-aFJVT5vE9YKirZEINKFzYWDffoVgluoUyvMmOifLq1M="; }; - pythonRelaxDeps = [ - "pymodbus" - "pynetdicom" - "cryptography" - "python-can" - "pyparsing" - "zeroconf" + build-system = [ + poetry-core ]; - build-system = [ setuptools ]; + pythonRelaxDeps = [ + "cryptography" + "paho-mqtt" + "pynetdicom" + "setuptools" + "xmltodict" + "zeroconf" + ]; dependencies = [ aiocoap awsiotpythonsdk bluepy - python-can cmd2 cryptography + distro + jsonschema paho-mqtt pyi2cflash pymodbus pynetdicom pyparsing - pyserial pyspiflash + python-can + python-magic + pyudev + setuptools upnpy xmltodict zeroconf @@ -84,7 +57,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "expliot" ]; - meta = with lib; { + meta = { description = "IoT security testing and exploitation framework"; longDescription = '' EXPLIoT is a Framework for security testing and exploiting IoT @@ -95,8 +68,8 @@ buildPythonApplication rec { purpose of the framework i.e. IoT exploitation. ''; homepage = "https://expliot.readthedocs.io/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "expliot"; }; } diff --git a/pkgs/by-name/fa/fastcdr/package.nix b/pkgs/by-name/fa/fastcdr/package.nix index 28d8c2e55e1e..d5055ba2f0e1 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.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-CDR"; rev = "v${finalAttrs.version}"; - hash = "sha256-8TllhOdQQ1pPQriaUq8cgx/aEvmhiJx/09ESzRK7X3k="; + hash = "sha256-FAovCJa5iNiF73FBPJvPar2dwfIkDIqfk7DaFSe5Zq0="; }; patches = [ diff --git a/pkgs/by-name/fa/fastchess/package.nix b/pkgs/by-name/fa/fastchess/package.nix index 33ff803c7070..b5d8f46b6d18 100644 --- a/pkgs/by-name/fa/fastchess/package.nix +++ b/pkgs/by-name/fa/fastchess/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastchess"; - version = "1.5.0-alpha"; + version = "1.6.0-alpha"; src = fetchFromGitHub { owner = "Disservin"; repo = "fastchess"; tag = "v${finalAttrs.version}"; - hash = "sha256-hpp10ioAh063LpZa5t2HCX+Fsr8Z6fhPIaTzMgtT1go="; + hash = "sha256-CyV9pKCqVXvgm/Lx62v6l3cr2xsVBs1iMOXAsGbpfXI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 56eb881306cb..633ab0818aef 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.17.18"; + version = "8.17.68"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-FP6vGezki4BViwLuKisxnCDaOUwFVQB2hag92lrwRyk="; + hash = "sha256-HnMTTzn6YMTYEXvtwU7R3K9JWG1ipb3RS/Oa46bzqJQ="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix index f1c9268a0da8..c5d17a81a6ff 100644 --- a/pkgs/by-name/fi/fire/package.nix +++ b/pkgs/by-name/fi/fire/package.nix @@ -78,14 +78,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fire"; - version = "1.0.2-unstable-2025-08-16"; + version = "1.5.0b-unstable-2025-09-20"; src = fetchFromGitHub { owner = "jerryuhoo"; repo = "Fire"; - rev = "e74e9351a18921c5b7419646eee377e38524c47a"; + rev = "34a424a4fc50984213b6e98e3aaae3dcb8e960c4"; fetchSubmodules = true; - hash = "sha256-2hx5nba7o+ot+KtypSZJb3pKJk8mUIdI1sNqnT2va0Q="; + hash = "sha256-ZTsZ/J5aeyjg4pxhjjIkgoTB5sSg2jpeKAp/uc4V+aQ="; }; postPatch = @@ -101,6 +101,9 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'set(FORMATS' 'set(FORMATS ${formatsListing}) #' \ --replace-fail 'BUNDLE_ID "''${BUNDLE_ID}"' 'BUNDLE_ID "''${BUNDLE_ID}" LV2URI "https://www.bluewingsmusic.com/Fire/"' \ --replace-fail 'COPY_PLUGIN_AFTER_BUILD TRUE' 'COPY_PLUGIN_AFTER_BUILD FALSE' + + # Regression tests require big sound files stored in LFS, skip them + rm -v tests/RegressionTests.cpp '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Remove hardcoded LTO flags: needs extra setup on Linux diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index 3db6fcdf3220..9f048d2803cb 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "1.7.10"; + version = "1.8.0"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; tag = "v${finalAttrs.version}"; - hash = "sha256-6C9ztbmYONhnNPZtZC0dQzU5qM8fqyigPVDKBhO7x8Y="; + hash = "sha256-MCHJ0rvFuUVdcmS0orrI/yvTBP4yZU467wSrUJT9asw="; }; buildInputs = [ php84 ]; @@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-WCh0NeTfunWrh2gur7+2Otcoa3U21ldi4JvualiatG8="; + vendorHash = "sha256-FiSnAsqRCWfugbmXEirLBUT6jyjr3OtlewTyv4oUfPc="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-NELRAxCnvUNC1LTfktufkcNc/R8gkn6S/jt7VlOWRtg="; + hash = "sha256-S5fGoXsbsV1aJsZuMV235GJiGrXgExJeZ2Q4K4/2D+g="; }; composerRepository = php84.mkComposerRepository { diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 5f4a9d51862e..06091fb1427d 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -152,13 +152,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-J1/Uup/HJP2COkUaDXg6pO6pKTq/44WKqWFqbv89bZk="; + hash = "sha256-3VwDwRjYo9/ifkl2Vt9pTmLabt+XyS0FXi0el+YgC/A="; }; env = { @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-9neZKkuQSOPRrBmjYQ5HYHAORNIjSaSAGN+bDqxb4wk="; + hash = "sha256-WZdfon6mnM+5caWW6yInQx5B1GjCxQ0XLbJlbvHa3Zc="; }; patches = [ diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index bef14d454396..ebcd6c591bf5 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage { pname = "forecast"; - version = "0-unstable-2025-09-17"; + version = "0-unstable-2025-09-27"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "forecast"; - rev = "eb09f7131a0e6e31229a01c83892ef489bed917a"; - hash = "sha256-aNMt4CK6k/pepxSq6s8SLu4l2qXdpbMUaQ0AJ5KvU+E="; + rev = "f782e617c2ed4335414dd332dfa7cee27a67252d"; + hash = "sha256-5nXcOOOdwTBYrtHfCM6J48E1Kobm6XIc4w5ftzMC8/Q="; }; - cargoHash = "sha256-rSl09TD844DK5/8+wjQ07uvMMEwRznjyLSwWXvgnsn8="; + cargoHash = "sha256-gehtv89/80JVCWVmHfRkTQynAMiEy1DBUUuoGu3Xts4="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix index a6b84032a51d..8ac15a2f1a5b 100644 --- a/pkgs/by-name/fo/fosrl-newt/package.nix +++ b/pkgs/by-name/fo/fosrl-newt/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "newt"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "fosrl"; repo = "newt"; tag = version; - hash = "sha256-uIlBAqe93MqMSN0Nghlfa1cLbMlcg3iMCzIu0U16h5o="; + hash = "sha256-CtE4Ug1659Xu90CRMIxXeqfVaw9kOK4WpsW/u3S0ztA="; }; - vendorHash = "sha256-FeDNv1mLTvXYUDOHzyPP7uA+fOt/j0VT7CM6IyoMuTQ="; + vendorHash = "sha256-VR5YOprMP3wvwb0lnW9KyUWGs/4Zm5GKBe4vnkN32cY="; postPatch = '' substituteInPlace main.go \ diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix index 1cba17d66d1f..2ea4efd1c053 100644 --- a/pkgs/by-name/fo/fosrl-olm/package.nix +++ b/pkgs/by-name/fo/fosrl-olm/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "olm"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "fosrl"; repo = "olm"; tag = version; - hash = "sha256-yGknbxoBMaI6GwIf8hVfWmgFAgI4kxYrNq/puy4aG2M="; + hash = "sha256-9QqVfq7tYOtPsKMgH0YAhpiwMHh+yJT4npF0f9yl5wU="; }; - vendorHash = "sha256-DqZU64jwg2AHmze1oWOmDgltB+k1mLSHQyAxnovLaVo="; + vendorHash = "sha256-4j7l1vvorcdbHE4XXOUH2MaOSIwS70l8w7ZBmp3a/XQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index 807f10243d04..4bcef84d11e2 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -29,16 +29,16 @@ in buildNpmPackage (finalAttrs: { pname = "pangolin"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "fosrl"; repo = "pangolin"; tag = finalAttrs.version; - hash = "sha256-fXswhcnspyayyvvl1HEuQylKHzdgwucm1ClokJMeqys="; + hash = "sha256-o55S9Fr1gnyuXFAVgugrnFyJIv7nKMZ3Lc4+m/aVrII="; }; - npmDepsHash = "sha256-ivG/7KTmWPjnXzO+ISc+2bsNqW/0VPhFbg1229A64cw="; + npmDepsHash = "sha256-0vqH3nAB4HqfwS7Oy/qewzLyx48vS+rKiAwwbTkSOOc="; nativeBuildInputs = [ esbuild diff --git a/pkgs/by-name/fo/foxglove-cli/package.nix b/pkgs/by-name/fo/foxglove-cli/package.nix index 0810cd04cb85..2b84d9ebec43 100644 --- a/pkgs/by-name/fo/foxglove-cli/package.nix +++ b/pkgs/by-name/fo/foxglove-cli/package.nix @@ -11,16 +11,16 @@ }: buildGoModule (finalAttrs: { pname = "foxglove-cli"; - version = "1.0.25"; + version = "1.0.26"; src = fetchFromGitHub { owner = "foxglove"; repo = "foxglove-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-zmX3eCh5NYCbYlbx6bIxwF6Qktj+kwV4KpVsTI9ofZ8="; + hash = "sha256-WDCxkfWzx/tCnzQGP1MZRKfwM3PbwOHyyLUKgVTLmFU="; }; - vendorHash = "sha256-fL/eOGx81pdIPWHt14cf4VoIqmfUmbkKa8/y0QQKYko="; + vendorHash = "sha256-GjgDRFzW4zqVooHx9WEgWkcnZ+zQsr09OuZxtc9rZD4="; env.CGO_ENABLED = 0; tags = [ "netgo" ]; diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index 9737a14c701d..cd4432b931fa 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -52,6 +52,12 @@ stdenv.mkDerivation (finalAttrs: { ./disable-debug.patch ]; + postPatch = '' + substituteInPlace src/meson.build --replace-fail \ + "'src' / rust_target / meson.project_name()" \ + "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()" + ''; + # Dirty approach to add patches after cargoSetupPostUnpackHook # We should eventually use a cargo vendor patch hook instead preConfigure = '' @@ -104,6 +110,8 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index 124107d22a61..63674e57902b 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gale"; - version = "1.9.7"; + version = "1.10.0"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-XEc8h7A1q+WfPl2HojFt2oIlAnNswq3X0o6jMZrEjCQ="; + hash = "sha256-SnPYuMYdoY69CWMztuDxw0ohRDU2uECNhBs46hLg+eA="; }; postPatch = '' @@ -36,13 +36,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-QQXP/x7AjDtUpe6h+pC6vUsIAptv1kN/1MJZjHAIdMo="; + hash = "sha256-DYhPe59qfsSjyMIN31RL0mrHfmE6/I1SF+XutettkO8="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-zaTbb1+JK9mA9Tvnatw8lse5PBhKknDM48mN/sWLQ6w="; + cargoHash = "sha256-tWQRYD6hMU7cvtelGryLdpfoEnUKYt7yYNwHTFZ4pLw="; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index 9441b0c68b46..08a1990c4506 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.24.0"; + version = "5.25.0"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${version}"; - hash = "sha256-UtimuNuxAKychkyBuv4dWD9g7NfuuhysaHyFzfSqzEo="; + hash = "sha256-mTj3lMdgWlIZO4qxGNyd5il9MXMg2nOBZ6yFQhWKTzM="; }; - vendorHash = "sha256-IP0OID0u9s0u65W18WzSXjZDTsvPHSzGHisI4vWaNMk="; + vendorHash = "sha256-v8fnooABoHxdK2dyTgkmukMdjR73a5p8g20J1a+WYnE="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index ad47eea59f57..d1ec6e4457b3 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -11,16 +11,16 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.5.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-A4O94X0TCc8lgX52+VQ1lSGREmpPIFLpu65Vwxsqso8="; + hash = "sha256-1QeVFPl6IH1iQFxrDZ0U8eTeLd+fIgSw1CkAiSGaL/s="; }; - npmDepsHash = "sha256-d33dWwrCND/5veeIQ8iz87nTxu6wd7FskrGgvwBuruk="; + npmDepsHash = "sha256-l5AFQH5h6CPNnuSP0jjla3UbBhjPDVEc8fL5NWcT1XQ="; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix index a936f7017e75..c0095d4eb9f3 100644 --- a/pkgs/by-name/ge/geographiclib/package.nix +++ b/pkgs/by-name/ge/geographiclib/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "geographiclib"; - version = "2.5.2"; + version = "2.6"; src = fetchFromGitHub { owner = "geographiclib"; repo = "geographiclib"; tag = "v${version}"; - hash = "sha256-bFErzgjxBCtN12UNtnGPuS6bg1sI31gR7WZjawsY3Yo="; + hash = "sha256-G0D44iP3ApYlxNxF+hrB20v3X+4gp2p94gQLygqgB3E="; }; outputs = [ diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index d24d9bf22c1e..512738906806 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "gf"; - version = "0-unstable-2025-04-11"; + version = "0-unstable-2025-09-21"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "162249220bde1c9fef7d87f8bb9128be9323d93f"; - hash = "sha256-wP8ELlqtMwYv6/jQzKahaX7vlMKLUBgxm5Io49tphsM="; + rev = "5fc7f422c8344277601860646c6ff6e72c8e7041"; + hash = "sha256-YdeF4pBKLn3r3xM7ppX30D196RmO/P8WDj0Zsh7Vdmc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/git-credential-oauth/package.nix b/pkgs/by-name/gi/git-credential-oauth/package.nix index df1abb977d41..28f1ae37b76d 100644 --- a/pkgs/by-name/gi/git-credential-oauth/package.nix +++ b/pkgs/by-name/gi/git-credential-oauth/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "hickford"; repo = "git-credential-oauth"; rev = "v${version}"; - hash = "sha256-9AoIyQ05Y/usG0Tlehn7U8zjBxC1BYNjNVRtgWgzLbo="; + hash = "sha256-T10QGMp6keneUzdz7p/4huySIJFp4AmX253pZ3hYSYY="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index 6d82f58517b8..e5884ee9b448 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, - buildGo124Module, + buildGoModule, fetchFromGitHub, git, nix-update-script, installShellFiles, }: -buildGo124Module rec { +buildGoModule (finalAttrs: { pname = "git-spice"; - version = "0.16.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; - tag = "v${version}"; - hash = "sha256-SILcEXyUo73c8gPDDESCkm/eQIh8elM850qwJqTyO6E="; + tag = "v${finalAttrs.version}"; + hash = "sha256-9Gt4dS1Wu3w/iS0vtYO3XHyknKQEveob9slwNA/HAks="; }; - vendorHash = "sha256-T6zSwQdDWYQqe8trIlhpU8dUQXtz8OGmnW5L5AVjGn8="; + vendorHash = "sha256-VCUNaWi14Pc39ncWzZZsdsZSd+IxYFhbm1cfTZ40dMw="; subPackages = [ "." ]; @@ -32,7 +32,7 @@ buildGo124Module rec { ldflags = [ "-s" "-w" - "-X=main._version=${version}" + "-X=main._version=${finalAttrs.version}" ]; __darwinAllowLocalNetworking = true; @@ -55,9 +55,9 @@ buildGo124Module rec { meta = { description = "Manage stacked Git branches"; homepage = "https://abhinav.github.io/git-spice/"; - changelog = "https://github.com/abhinav/git-spice/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/abhinav/git-spice/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.vinnymeller ]; mainProgram = "gs"; }; -} +}) diff --git a/pkgs/by-name/gi/github-copilot-cli/package-lock.json b/pkgs/by-name/gi/github-copilot-cli/package-lock.json new file mode 100644 index 000000000000..2d53b9d57986 --- /dev/null +++ b/pkgs/by-name/gi/github-copilot-cli/package-lock.json @@ -0,0 +1,58 @@ +{ + "name": "@github/copilot", + "version": "0.0.328", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@github/copilot", + "version": "0.0.328", + "dependencies": { + "keytar-forked-forked": "^7.10.2", + "node-pty": "npm:@devm33/node-pty@^1.0.8" + }, + "bin": { + "copilot": "index.js" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/keytar-forked-forked": { + "version": "7.10.3", + "resolved": "https://registry.npmjs.org/keytar-forked-forked/-/keytar-forked-forked-7.10.3.tgz", + "integrity": "sha512-ipErTUO1NPXmngYhnMrda0yOIOPSNbVJ2BRjk3kNozLx3UmGICnzCfEDemuLY6HgP+rV0c9F+Opt+89+Ydbw6w==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.3.0" + } + }, + "node_modules/node-addon-api": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.5.0.tgz", + "integrity": "sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==", + "license": "MIT", + "engines": { + "node": "^18 || ^20 || >= 21" + } + }, + "node_modules/node-pty": { + "name": "@devm33/node-pty", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@devm33/node-pty/-/node-pty-1.0.9.tgz", + "integrity": "sha512-5yzbTTywkaFk1iRwte2aWEpyDfcpDjCofVD1BiOUQI+fsCvp/+RdJnB4jgnULrdlWOEWuBf+bg4/NZKVApPhoQ==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^7.1.0" + } + }, + "node_modules/node-pty/node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "license": "MIT" + } + } +} diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix new file mode 100644 index 000000000000..2006f6db64d3 --- /dev/null +++ b/pkgs/by-name/gi/github-copilot-cli/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildNpmPackage, + fetchzip, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "github-copilot-cli"; + version = "0.0.328"; + + src = fetchzip { + url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz"; + hash = "sha256-9oTaVjvwyS8KY8N5kUEiAs+l6vEd/BZ0AGJI0p9Jie0="; + }; + + npmDepsHash = "sha256-WK6t3IW4uF+MDu7Y5GRinbm8iDcYB8RhJ15GE9VBcjQ="; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + dontNpmBuild = true; + + passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; + + meta = { + description = "GitHub Copilot CLI brings the power of Copilot coding agent directly to your terminal"; + homepage = "https://github.com/github/copilot-cli"; + changelog = "https://github.com/github/copilot-cli/releases/tag/v${finalAttrs.version}"; + downloadPage = "https://www.npmjs.com/package/@github/copilot"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + dbreyfogle + ]; + mainProgram = "copilot"; + }; +}) diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 9c42d3918216..23d0a1e0c561 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-4kBxVPiK3HoPvh8wR7xMUt0Zy5u4LRK6KfQCdk3q7fk="; + hash = "sha256-BAfOenO/LrMfOPI+DStKdPp14t4+1AP8Z8/uoqU6Wfw="; }; - cargoHash = "sha256-r0ccEi81Znjhod87Ax5yBlKXEVT44kN4wr3HzMqyezo="; + cargoHash = "sha256-yqmXXkviRbY9YS+JjAx5iXLu6cvMWotcf/PsrpfER5k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gl/glabels/package.nix b/pkgs/by-name/gl/glabels/package.nix deleted file mode 100644 index 04453acfb028..000000000000 --- a/pkgs/by-name/gl/glabels/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, - barcode, - gnome, - gnome-common, - autoreconfHook, - gtk3, - gtk-doc, - libxml2, - librsvg, - libtool, - libe-book, - gsettings-desktop-schemas, - intltool, - itstool, - makeWrapper, - pkg-config, - yelp-tools, - qrencode, -}: - -stdenv.mkDerivation rec { - pname = "glabels"; - version = "3.4.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; - }; - - patches = [ - # Pull patch pending upstream inclusion for -fno-common toolchain support: - # https://github.com/jimevins/glabels/pull/76 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/jimevins/glabels/commit/f64e3f34e3631330fff2fb48ab271ff9c6160229.patch"; - sha256 = "13q6g4bxzvzwjnvzkvijds2b6yvc4xqbdwgqnwmj65ln6ngxz8sa"; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - makeWrapper - intltool - ]; - buildInputs = [ - barcode - gtk3 - gtk-doc - yelp-tools - gnome-common - gsettings-desktop-schemas - itstool - libxml2 - librsvg - libe-book - libtool - qrencode - ]; - - preFixup = '' - wrapProgram "$out/bin/glabels-3" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Create labels and business cards"; - homepage = "https://github.com/jimevins/glabels"; - license = with licenses; [ - gpl3Plus - lgpl3Plus - ]; - platforms = platforms.unix; - maintainers = [ maintainers.nico202 ]; - }; -} diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 38f0691a5313..7b2c720408e4 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.5.5"; + version = "3.6.2"; outputs = [ "out" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; - hash = "sha256-OPA0diWAtB8MCaw2DOyh89DVi7lQmyCsQ2gqfK7dGW8="; + hash = "sha256-KiX7yHwuy2AWLqqmiHz9YhbvRBEusE9TuXKtaA9YsME="; }; # TODO: build this from source diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix index 34e558286453..deca628d8c34 100644 --- a/pkgs/by-name/gn/gnmic/package.nix +++ b/pkgs/by-name/gn/gnmic/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "openconfig"; repo = "gnmic"; tag = "v${version}"; - hash = "sha256-tuEkpuUs245jj0/wzZjqTWeMZNJhiylZD7e0XOc/c14="; + hash = "sha256-qN5EnZR1sXni2m1nyH61xLIX7c9sk5SGtAxrolfNHzs="; }; - vendorHash = "sha256-piHSVATQjHjKIWNIjm8p2A0ivQzDR2PQj0ovfYDk/FA="; + vendorHash = "sha256-QHqsL2XMkIB+CN7uXdn3gpVoaxEfDjdf1ADhd/bYVis="; ldflags = [ "-s" diff --git a/pkgs/by-name/gn/gnome-commander/package.nix b/pkgs/by-name/gn/gnome-commander/package.nix index d714f1ea93c4..0e9b29b98274 100644 --- a/pkgs/by-name/gn/gnome-commander/package.nix +++ b/pkgs/by-name/gn/gnome-commander/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-commander"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-commander"; tag = finalAttrs.version; - hash = "sha256-rSaj1Fg2seZKlzlERZZmz80kxJT1vZ+INiJlWfZ9m6g="; + hash = "sha256-4l+hw9zPYhkaOpXMEnn4vXF1q0JLE0CB4oRGr2iXqtw="; }; # hard-coded schema paths diff --git a/pkgs/by-name/gn/gnunet/package.nix b/pkgs/by-name/gn/gnunet/package.nix index 106963786606..2c5d643a1c5b 100644 --- a/pkgs/by-name/gn/gnunet/package.nix +++ b/pkgs/by-name/gn/gnunet/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnunet"; - version = "0.25.0"; + version = "0.25.1"; src = fetchurl { url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz"; - hash = "sha256-LepmLuhgWUaFKvAtKAbKZP2t7cxxju72uG4LJoIsNv8="; + hash = "sha256-ITNsFs1X+R+dX9U1lILZFRp83w1jlvi2GCjBfMxmj1w="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index afb45254578d..618952753b36 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "golds"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "go101"; repo = "golds"; tag = "v${version}"; - hash = "sha256-RM9ltqkOByOg1ZUF7ZXZcWTivlUKrNbZYgcFpwRwNUk="; + hash = "sha256-6jtBwET3JSSh2DQq9MtLn2YokfK9ODYtYrcfI0W8m5I="; }; # nixpkgs is not using the go distpack archive and missing a VERSION file in the source diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index c607f35c2cdb..8cb60604b78e 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -170,11 +170,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "140.0.7339.185"; + version = "140.0.7339.207"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-cPAbDVevr/vtBwLn+bcPmQHNfLrh+Ogw3rDKV5pwB2M="; + hash = "sha256-5g0t+EEJJeItjqKiTpp5qE/bkGKkxvOvLaxh5jCDPss="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -275,11 +275,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "140.0.7339.186"; + version = "140.0.7339.214"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/acyk4e3hewde2niid4gmhjus7t7q_140.0.7339.186/GoogleChrome-140.0.7339.186.dmg"; - hash = "sha256-ygXHbTJ4z7knRzTQG9uEgas7360wHgV9vaYYm0iyGOg="; + url = "http://dl.google.com/release2/chrome/mfmmq5vcqbb2jdp3e77lsymylu_140.0.7339.214/GoogleChrome-140.0.7339.214.dmg"; + hash = "sha256-oTyyTHMs3VhGRXWoVlGXvNvwnOWb1eF7iswfJkl8Pe0="; }; dontPatch = true; diff --git a/pkgs/by-name/go/gose/package.nix b/pkgs/by-name/go/gose/package.nix index 8bf797737061..1e5454430544 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.11.3"; + version = "0.11.4"; src = fetchFromGitHub { repo = "gose"; owner = "stv0g"; tag = "v${version}"; - hash = "sha256-dcx1uLLLFepqGTIJQNf3I1GzbXwrVPt7Jb8TW3AGnhU="; + hash = "sha256-T6PD6MI1IOAgtPOJuPSZp4te9BokKfj+TZHLRqt2FCo="; }; frontend = buildNpmPackage { @@ -37,7 +37,7 @@ buildGoModule { inherit version; inherit src; - vendorHash = "sha256-cvZLR5c8WqarhnXBFAyxUUQtqX2fhveonUtsrFjFmq0="; + vendorHash = "sha256-PTu4OzVjGVExuNDsK01p3/gAwNhDZbPewhI476m5i/M="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/gr/grafanactl/package.nix b/pkgs/by-name/gr/grafanactl/package.nix index c722331eea54..28ee2c72b09b 100644 --- a/pkgs/by-name/gr/grafanactl/package.nix +++ b/pkgs/by-name/gr/grafanactl/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "grafanactl"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "grafana"; repo = "grafanactl"; tag = "v${finalAttrs.version}"; - hash = "sha256-MKP1G2AfLLn4nphZ7aK07EGfORiARrHznEG38KcjJyM="; + hash = "sha256-XHcNyPSN01CGkuj9p54yAAWFlwoWLF6cm5Q2f8iZtVM="; }; - vendorHash = "sha256-haVFCR59lnx0FQ2BojIlupYhD0tuvttuD5iBgMF2F6k="; + vendorHash = "sha256-fHlktADqw3p377g3vXr2LZdBfWfNZOHxnp9H8/C31Gg="; ldflags = [ "-X main.version=v${finalAttrs.version}" diff --git a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix index 6cde3ea0b05d..9bbd3b0c67ef 100644 --- a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix +++ b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "graphene-hardened-malloc"; - version = "2025090300"; + version = "2025092700"; src = fetchFromGitHub { owner = "GrapheneOS"; repo = "hardened_malloc"; rev = finalAttrs.version; - hash = "sha256-SpcdZIo9YOmVBq2yG4n174gjAoThnnWbQcWK2BfQ2BM="; + hash = "sha256-t7PnBwpGh53+ZqTbnm8lYaNBtUgLev9kbvFlbfSCBrU="; }; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/gr/gridtracker2/package-lock.json b/pkgs/by-name/gr/gridtracker2/package-lock.json index 20b28aac55c2..3bdeac72dadd 100644 --- a/pkgs/by-name/gr/gridtracker2/package-lock.json +++ b/pkgs/by-name/gr/gridtracker2/package-lock.json @@ -1,35 +1,35 @@ { "name": "GridTracker2", - "version": "2.250820.0", + "version": "2.250914.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "GridTracker2", - "version": "2.250820.0", + "version": "2.250914.1", "hasInstallScript": true, "dependencies": { - "@electron-toolkit/preload": "3.0.1", - "@electron-toolkit/utils": "3.0.0", - "@electron/remote": "2.1.2", - "electron-log": "5.2.0", + "@electron-toolkit/preload": "^3.0.1", + "@electron-toolkit/utils": "^3.0.0", + "@electron/remote": "^2.1.2", + "electron-log": "^5.2.0", "electron-updater": "6.6.5", - "mqtt": "5.10.1" + "mqtt": "^5.10.1" }, "devDependencies": { - "@electron-toolkit/eslint-config": "1.0.2", - "@electron-toolkit/eslint-config-prettier": "2.0.0", - "electron": "35.7.0", + "@electron-toolkit/eslint-config": "^1.0.2", + "@electron-toolkit/eslint-config-prettier": "^2.0.0", + "electron": "35.7.5", "electron-builder": "26.0.12", - "eslint": "8.57.0", - "eslint_d": "14.0.4", - "prettier": "3.3.2" + "eslint": "^8.57.0", + "eslint_d": "^14.0.4", + "prettier": "^3.3.2" } }, "node_modules/@babel/runtime": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz", - "integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz", + "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -79,9 +79,9 @@ } }, "node_modules/@electron-toolkit/preload": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@electron-toolkit/preload/-/preload-3.0.1.tgz", - "integrity": "sha512-EzoQmpK8jqqU8YnM5jRe0GJjGVJPke2KtANqz8QtN2JPT96ViOvProBdK5C6riCm0j1T8jjAGVQCZLQy9OVoIA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@electron-toolkit/preload/-/preload-3.0.2.tgz", + "integrity": "sha512-TWWPToXd8qPRfSXwzf5KVhpXMfONaUuRAZJHsKthKgZR/+LqX1dZVSSClQ8OTAEduvLGdecljCsoT2jSshfoUg==", "license": "MIT", "peerDependencies": { "electron": ">=13.0.0" @@ -205,7 +205,7 @@ "node_modules/@electron/node-gyp": { "version": "10.2.0-electron.1", "resolved": "git+ssh://git@github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2", - "integrity": "sha512-lBSgDMQqt7QWMuIjS8zNAq5FI5o5RVBAcJUGWGI6GgoQITJt3msAkUrHp8YHj3RTVE+h70ndqMGqURjp3IfRyQ==", + "integrity": "sha512-4MSBTT8y07YUDqf69/vSh80Hh791epYqGtWHO3zSKhYFwQg+gx9wi1PqbqP6YqC4WMsNxZ5l9oDmnWdK5pfCKQ==", "dev": true, "license": "MIT", "dependencies": { @@ -492,9 +492,9 @@ } }, "node_modules/@electron/remote": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", - "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.3.tgz", + "integrity": "sha512-XlpxC8S4ttj/v2d+PKp9na/3Ev8bV7YWNL7Cw5b9MAWgTphEml7iYgbc7V0r9D6yDOfOkj06bchZgOZdlWJGNA==", "license": "MIT", "peerDependencies": { "electron": ">= 13.0.0" @@ -650,9 +650,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "dev": true, "license": "MIT", "dependencies": { @@ -767,9 +767,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", "dev": true, "license": "MIT", "engines": { @@ -818,42 +818,28 @@ } }, "node_modules/@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", + "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", "dev": true, "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" + "@humanwhocodes/retry": "^0.4.0" }, "engines": { "node": ">=18.18.0" } }, - "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", "deprecated": "Use @eslint/config-array instead", "dev": true, "license": "Apache-2.0", "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", + "@humanwhocodes/object-schema": "^2.0.3", "debug": "^4.3.1", "minimatch": "^3.0.5" }, @@ -952,9 +938,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", - "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", "dev": true, "license": "MIT", "engines": { @@ -965,9 +951,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "dev": true, "license": "MIT", "engines": { @@ -1003,9 +989,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", "dev": true, "license": "MIT", "dependencies": { @@ -1321,9 +1307,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.17.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.2.tgz", - "integrity": "sha512-gL6z5N9Jm9mhY+U2KXZpteb+09zyffliRkZyZOHODGATyC5B1Jt/7TzuuiLkFsSUMLbS1OLmlj/E+/3KF4Q/4w==", + "version": "22.18.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.3.tgz", + "integrity": "sha512-gTVM8js2twdtqM+AE2PdGEe9zGQY4UvmFjan9rZcVb6FGdStfjWoWejdmy4CfWVO9rh5MiYQGZloKAGkJt8lMw==", "license": "MIT", "dependencies": { "undici-types": "~6.21.0" @@ -1739,9 +1725,9 @@ "license": "MIT" }, "node_modules/bl": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.2.tgz", - "integrity": "sha512-6J3oG82fpJ71WF4l0W6XslkwAPMr+Zcp+AmdxJ0L8LsXNzFeO8GYesV2J9AzGArBjrsb2xR50Ocbn/CL1B44TA==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.3.tgz", + "integrity": "sha512-nHB8B5roHlGX5TFsWeiQJijdddZIOHuv1eL2cM2kHnG3qR91CYLsysGe+CvxQfEd23EKD0eJf4lto0frTbddKA==", "license": "MIT", "dependencies": { "@types/readable-stream": "^4.0.0", @@ -1793,6 +1779,18 @@ "concat-map": "0.0.1" } }, + "node_modules/broker-factory": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/broker-factory/-/broker-factory-3.1.9.tgz", + "integrity": "sha512-MzvndyD6EcbkBtX4NXm/HfdO1+cOR5ONNdMCXEKfHpxGdMtuDz7+o+nJf7HMtyPH1sUVf/lEIP+DMluC5PgaBQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.3", + "fast-unique-numbers": "^9.0.23", + "tslib": "^2.8.1", + "worker-factory": "^7.0.45" + } + }, "node_modules/buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", @@ -2394,9 +2392,9 @@ } }, "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -2513,9 +2511,9 @@ } }, "node_modules/detect-libc": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", - "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", + "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2717,9 +2715,9 @@ } }, "node_modules/electron": { - "version": "35.7.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-35.7.0.tgz", - "integrity": "sha512-ZnbVqFK40pr83Jzw6IQ9pQT+obCG0DepSMKtOEe8WP2TgZbjvCOO4GzrR+a7Ze62JMRmtNOHsS4hFss6qjtSrQ==", + "version": "35.7.5", + "resolved": "https://registry.npmjs.org/electron/-/electron-35.7.5.tgz", + "integrity": "sha512-dnL+JvLraKZl7iusXTVTGYs10TKfzUi30uEDTqsmTm0guN9V2tbOjTzyIZbh9n3ygUjgEYyo+igAwMRXIi3IPw==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -2812,9 +2810,9 @@ } }, "node_modules/electron-log": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.2.0.tgz", - "integrity": "sha512-VjLkvaLmbP3AOGOh5Fob9M8bFU0mmeSAb5G2EoTBx+kQLf2XA/0byzjsVGBTHhikbT+m1AB27NEQUv9wX9nM8w==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.4.3.tgz", + "integrity": "sha512-sOUsM3LjZdugatazSQ/XTyNcw8dfvH1SYhXWiJyfYodAAKOZdHs0txPiLDXFzOZbhXgAgshQkshH2ccq0feyLQ==", "license": "MIT", "engines": { "node": ">= 14" @@ -3112,9 +3110,9 @@ } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "license": "MIT", @@ -3122,8 +3120,8 @@ "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", @@ -3169,14 +3167,15 @@ } }, "node_modules/eslint_d": { - "version": "14.0.4", - "resolved": "https://registry.npmjs.org/eslint_d/-/eslint_d-14.0.4.tgz", - "integrity": "sha512-VZuLiR03gKOCbXptTSrjfhmL4GBfGswyq2gJWUSDqMSc37XR2ryuKUtnLe1Y3+cphI7Rn7S9sHgXAFYDno3RiQ==", + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/eslint_d/-/eslint_d-14.3.0.tgz", + "integrity": "sha512-Y8IRgZsOlYrSipIeaHpmuFu5+TEUDNZcgNKx2ARSUJp3DZCsFW9+V2bBhXCDQmBSolqjn2jZVZ5FBuhy0s3z2w==", "dev": true, "license": "MIT", "dependencies": { + "debug": "^4.3.7", "eslint": "^9.8.0", - "supports-color": "^9.4.0" + "supports-color": "^7.2.0" }, "bin": { "eslint_d": "bin/eslint_d.js" @@ -3210,9 +3209,9 @@ } }, "node_modules/eslint_d/node_modules/@eslint/js": { - "version": "9.34.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz", - "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==", + "version": "9.35.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.35.0.tgz", + "integrity": "sha512-30iXE9whjlILfWobBkNerJo+TXYsgVM5ERQwMcMKCHckHflCmf7wXDAHlARoWnh0s1U72WqlbeyE7iAcCzuCPw==", "dev": true, "license": "MIT", "engines": { @@ -3223,19 +3222,19 @@ } }, "node_modules/eslint_d/node_modules/eslint": { - "version": "9.34.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz", - "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==", + "version": "9.35.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.35.0.tgz", + "integrity": "sha512-QePbBFMJFjgmlE+cXAlbHZbHpdFVS2E/6vzCy7aKlebddvl1vadiC4JFV5u/wqTkNUwEV8WrQi257jf5f06hrg==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.21.0", "@eslint/config-helpers": "^0.3.1", "@eslint/core": "^0.15.2", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.34.0", + "@eslint/js": "9.35.0", "@eslint/plugin-kit": "^0.3.5", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -3384,19 +3383,6 @@ "node": "*" } }, - "node_modules/eslint_d/node_modules/supports-color": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz", - "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/eslint-config-prettier": { "version": "9.1.2", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.2.tgz", @@ -3633,16 +3619,16 @@ "license": "MIT" }, "node_modules/fast-unique-numbers": { - "version": "8.0.13", - "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz", - "integrity": "sha512-7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==", + "version": "9.0.23", + "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-9.0.23.tgz", + "integrity": "sha512-jcRIaHo46nfvyvKRMaFSKXmez4jALQ3Qw49gxM5F4siz8HqkyKPPEexpCOYwBSJI1HovrDr4fEedM8QAJ7oX3w==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.8", - "tslib": "^2.6.2" + "@babel/runtime": "^7.28.3", + "tslib": "^2.8.1" }, "engines": { - "node": ">=16.1.0" + "node": ">=18.2.0" } }, "node_modules/fastq": { @@ -4335,7 +4321,6 @@ "version": "10.0.1", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz", "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==", - "dev": true, "license": "MIT", "engines": { "node": ">= 12" @@ -4428,9 +4413,9 @@ } }, "node_modules/isbinaryfile": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.4.tgz", - "integrity": "sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.6.tgz", + "integrity": "sha512-I+NmIfBHUl+r2wcDd6JwE9yWje/PIVY/R5/CmV8dXLZd5K+L9X2klAOwfAHNnondLXkbHyTAleQAWonpTJBTtw==", "dev": true, "license": "MIT", "engines": { @@ -4957,27 +4942,27 @@ } }, "node_modules/mqtt": { - "version": "5.10.1", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.10.1.tgz", - "integrity": "sha512-hXCOki8sANoQ7w+2OzJzg6qMBxTtrH9RlnVNV8panLZgnl+Gh0J/t4k6r8Az8+C7y3KAcyXtn0mmLixyUom8Sw==", + "version": "5.14.1", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.14.1.tgz", + "integrity": "sha512-NxkPxE70Uq3Ph7goefQa7ggSsVzHrayCD0OyxlJgITN/EbzlZN+JEPmaAZdxP1LsIT5FamDyILoQTF72W7Nnbw==", "license": "MIT", "dependencies": { - "@types/readable-stream": "^4.0.5", - "@types/ws": "^8.5.9", + "@types/readable-stream": "^4.0.21", + "@types/ws": "^8.18.1", "commist": "^3.2.0", "concat-stream": "^2.0.0", - "debug": "^4.3.4", + "debug": "^4.4.1", "help-me": "^5.0.0", - "lru-cache": "^10.0.1", + "lru-cache": "^10.4.3", "minimist": "^1.2.8", - "mqtt-packet": "^9.0.0", + "mqtt-packet": "^9.0.2", "number-allocator": "^1.0.14", - "readable-stream": "^4.4.2", - "reinterval": "^1.1.0", - "rfdc": "^1.3.0", + "readable-stream": "^4.7.0", + "rfdc": "^1.4.1", + "socks": "^2.8.6", "split2": "^4.2.0", - "worker-timers": "^7.1.4", - "ws": "^8.17.1" + "worker-timers": "^8.0.23", + "ws": "^8.18.3" }, "bin": { "mqtt": "build/bin/mqtt.js", @@ -5029,9 +5014,9 @@ } }, "node_modules/node-abi": { - "version": "3.75.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz", - "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==", + "version": "3.77.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", + "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5452,9 +5437,9 @@ } }, "node_modules/prettier": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", - "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", + "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", "dev": true, "license": "MIT", "bin": { @@ -5641,12 +5626,6 @@ "ieee754": "^1.2.1" } }, - "node_modules/reinterval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz", - "integrity": "sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==", - "license": "MIT" - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -5967,7 +5946,6 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 6.0.0", @@ -5978,7 +5956,6 @@ "version": "2.8.7", "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", - "dev": true, "license": "MIT", "dependencies": { "ip-address": "^10.0.1", @@ -6550,38 +6527,51 @@ "node": ">=0.10.0" } }, - "node_modules/worker-timers": { - "version": "7.1.8", - "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.1.8.tgz", - "integrity": "sha512-R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw==", + "node_modules/worker-factory": { + "version": "7.0.45", + "resolved": "https://registry.npmjs.org/worker-factory/-/worker-factory-7.0.45.tgz", + "integrity": "sha512-FFPCiSv7MD6ZDEfiik/ErM8IrIAWajaXhezLyCo3v0FjhUWud6GXnG2BiTE91jLywXGAVCT8IF48Hhr+D/omMw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.24.5", - "tslib": "^2.6.2", - "worker-timers-broker": "^6.1.8", - "worker-timers-worker": "^7.0.71" + "@babel/runtime": "^7.28.3", + "fast-unique-numbers": "^9.0.23", + "tslib": "^2.8.1" + } + }, + "node_modules/worker-timers": { + "version": "8.0.24", + "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-8.0.24.tgz", + "integrity": "sha512-Ydu/7TRHlxIRjYSGDge1F92L7y9kzInpwR4CkocRVObPE0eRqC6d+0GFh52Hm+m520RHVKiytOERtCUu5sQDVQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.3", + "tslib": "^2.8.1", + "worker-timers-broker": "^8.0.10", + "worker-timers-worker": "^9.0.10" } }, "node_modules/worker-timers-broker": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz", - "integrity": "sha512-FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ==", + "version": "8.0.10", + "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-8.0.10.tgz", + "integrity": "sha512-xvo/9GiuduENbJNdWnvZtkriIkjBKKVbMyw7GXvrBu3n1JHemzZgxqaCcCBNlpfXnRXXF4ekqvXWLh1gb65b8w==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.24.5", - "fast-unique-numbers": "^8.0.13", - "tslib": "^2.6.2", - "worker-timers-worker": "^7.0.71" + "@babel/runtime": "^7.28.3", + "broker-factory": "^3.1.9", + "fast-unique-numbers": "^9.0.23", + "tslib": "^2.8.1", + "worker-timers-worker": "^9.0.10" } }, "node_modules/worker-timers-worker": { - "version": "7.0.71", - "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz", - "integrity": "sha512-ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ==", + "version": "9.0.10", + "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-9.0.10.tgz", + "integrity": "sha512-cfCmAkuoN+nGGJShta/g7CQVP3h7rvQA642EQg72fOHCWP5S2P83rLxDiaGv811Hd+19Cgdqt/tpRBIZ5kj/dw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.24.5", - "tslib": "^2.6.2" + "@babel/runtime": "^7.28.3", + "tslib": "^2.8.1", + "worker-factory": "^7.0.45" } }, "node_modules/wrap-ansi": { diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix index 281b022469ae..5efab3b56bf1 100644 --- a/pkgs/by-name/gr/gridtracker2/package.nix +++ b/pkgs/by-name/gr/gridtracker2/package.nix @@ -3,23 +3,13 @@ stdenv, copyDesktopItems, buildNpmPackage, - electron_35, + electron, fetchFromGitLab, makeBinaryWrapper, makeDesktopItem, - at-spi2-atk, - gtk3, - libappindicator-gtk3, - libnotify, - libsecret, - libuuid, - nss, - xdg-utils, - xorg, }: let - version = "2.250820.0"; - electron = electron_35; + version = "2.250914.1"; in buildNpmPackage (finalAttrs: { pname = "gridtracker2"; @@ -29,10 +19,10 @@ buildNpmPackage (finalAttrs: { owner = "gridtracker.org"; repo = "gridtracker2"; tag = "v${version}"; - hash = "sha256-d40oq8UXNFaybjbbhqV8Gfkj8SEdTuF92Y0elW9dksY="; + hash = "sha256-ME68kGRlIRPs5tUOGb3g2CXJKC52QuMuTMc1ctAMzlk="; }; - npmDepsHash = "sha256-q9QGNYMmeNCouPW9GFsVHSYK9T8N7H4hg6hkOtjmLAY="; + npmDepsHash = "sha256-MUXwJPo/A0gxtUbM3MOWfMcspM1losuDhc5XTc2oqCo="; nativeBuildInputs = [ makeBinaryWrapper @@ -91,21 +81,6 @@ buildNpmPackage (finalAttrs: { runHook postBuild ''; - runtimeInputs = [ - at-spi2-atk - gtk3 - libnotify - libsecret - libuuid - nss - xdg-utils - xorg.libXScrnSaver - xorg.libXtst - ] - ++ lib.optionals stdenv.isLinux [ - libappindicator-gtk3 - ]; - installPhase = '' runHook preInstall @@ -120,8 +95,6 @@ buildNpmPackage (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/gridtracker2 \ --add-flags $out/share/gridtracker2/resources/app.asar \ - --prefix PATH : "${lib.makeBinPath finalAttrs.runtimeInputs}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.runtimeInputs}" \ --add-flags "--no-sandbox --disable-gpu-sandbox" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index 7cfe020022fd..8b67de42d3d2 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -12,6 +12,7 @@ libnotify, slurp, wl-clipboard, + unixtools, bash, nix-update-script, }: @@ -54,6 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { libnotify slurp wl-clipboard + unixtools.getopt ] }" ''; diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix index 499838ab3892..b19fe0f056b5 100644 --- a/pkgs/by-name/gr/grpc_cli/package.nix +++ b/pkgs/by-name/gr/grpc_cli/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.75.0"; + version = "1.75.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-2SeL/O6FaAnrPXMHAPKCSzx3hlcKLuC5y+ljJ1gewkE="; + hash = "sha256-SnKK52VLO4MM/ftfmzRV/LeLfOucdIyHMyWk6EKRfvM="; fetchSubmodules = true; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix similarity index 73% rename from pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix rename to pkgs/by-name/ha/hal-hardware-analyzer/package.nix index 4fed26932415..081e0b6db4e4 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix @@ -4,7 +4,6 @@ boost, cmake, fetchFromGitHub, - fetchpatch, graphviz, igraph, llvmPackages, @@ -12,44 +11,25 @@ nlohmann_json, pkg-config, python3Packages, - qtbase, - qtsvg, - quazip, + libsForQt5, rapidjson, spdlog, verilator, - wrapQtAppsHook, z3, + nix-update-script, }: stdenv.mkDerivation rec { - version = "4.4.1"; + version = "4.5.0"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; - rev = "v${version}"; - sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A="; + tag = "v${version}"; + hash = "sha256-4HLM/7JCDxWRWusGL4lUa8KXCn9pe3Vkr+lOxHOraNU="; }; - patches = [ - (fetchpatch { - name = "de-vendor-nlohmann-json.patch"; - # https://github.com/emsec/hal/pull/596 - url = "https://github.com/emsec/hal/commit/f8337d554d80cfa2588512696696fd4c878dd7a3.patch"; - hash = "sha256-QjgvcduwbFccC807JFOevlTfO3KiL9T3HSqYmh3sXAQ="; - }) - (fetchpatch { - name = "fix-vendored-igraph-regression.patch"; - # https://github.com/emsec/hal/pull/596 - url = "https://github.com/emsec/hal/commit/fe1fe74719ab4fef873a22e2b28cce0c57d570e0.patch"; - hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E="; - }) - ./4.4.1-newer-spdlog-fmt-compat.patch - ./resynthesis-fix-narrowing-conversion.patch - ]; - # make sure bundled dependencies don't get in the way - install also otherwise # copies them in full to the output, bloating the package postPatch = '' @@ -64,11 +44,11 @@ stdenv.mkDerivation rec { cmake ninja pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg boost rapidjson igraph @@ -77,7 +57,7 @@ stdenv.mkDerivation rec { graphviz verilator z3 - quazip + libsForQt5.quazip ] ++ (with python3Packages; [ python @@ -116,7 +96,10 @@ stdenv.mkDerivation rec { done ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { + changelog = "https://github.com/emsec/hal/blob/${src.tag}/CHANGELOG.md"; description = "Comprehensive reverse engineering and manipulation framework for gate-level netlists"; mainProgram = "hal"; homepage = "https://github.com/emsec/hal"; diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 8d237bffd68c..984c448e203f 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2025.8"; + version = "2025.9"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; tag = version; - hash = "sha256-Jtr1/MDR6pAaagVdhR2HZM91PTEPaQkDYMmALIWkHFU="; + hash = "sha256-yjia9tNNaXCTQFe8xfUeBYVHhW214AaOeCLFjAG703E="; }; - cargoHash = "sha256-HseKOow4BjiPsGmwslZqBlvCoreY2BcnBu3BHg5965c="; + cargoHash = "sha256-GmcRm6/dvY3stjV2ON8NVlVWZ5m0LXa9Kv0gqycbRoY="; nativeBuildInputs = [ copyDesktopItems @@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec { xorg.libX11 xorg.libXcursor xorg.libXi + xorg.libxcb ]; desktopItems = [ diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix index ddd2ed5bfdc5..a2b4efeaa48a 100644 --- a/pkgs/by-name/ha/harbor-cli/package.nix +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "harbor-cli"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "goharbor"; repo = "harbor-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-Mfy1v6uefaFI059o11/GKaiswXwJJKAH1w6kbzd2Vkk="; + hash = "sha256-wdUXLgmdxkWzvLCuIJSkos1z7nyETZv3mNzGtBBJVUM="; }; - vendorHash = "sha256-/pBLFEGPewRNi/h5EyUueTyp5iTu2R5wLppiHSF3XxE="; + vendorHash = "sha256-OJTyX+HXyC6avsgUCzEfU0ej493J8p77r59j+X/Vqwk="; excludedPackages = [ "dagger" diff --git a/pkgs/by-name/he/helmfile/package.nix b/pkgs/by-name/he/helmfile/package.nix index b5dcdbcd5d0c..0892be8d042c 100644 --- a/pkgs/by-name/he/helmfile/package.nix +++ b/pkgs/by-name/he/helmfile/package.nix @@ -1,25 +1,25 @@ { lib, stdenv, - buildGo125Module, + buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, pluginsDir ? null, }: -buildGo125Module rec { +buildGoModule rec { pname = "helmfile"; - version = "1.1.5"; + version = "1.1.7"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-7A/WPBXk17HCAr9F7UZwNO2+N4tvtfPo9wNwtw1HKy4="; + hash = "sha256-DOLlibBuwzP31ZMakcuaeG/fdMDOXqgd8PKts4/gFVo="; }; - vendorHash = "sha256-CNvmIK8xUm1CdwdXU5FVUShmaA3CEgR4H7GmOH2KwzE="; + vendorHash = "sha256-l7KQ67Rx2lsaUkpTHBJM6PRqqTdbwkkaeOhsUxj1MMI="; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index 9199db9cfe2d..f740a2dadd21 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hexpatch"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "Etto48"; repo = "HexPatch"; tag = "v${version}"; - hash = "sha256-Q9OrI48CbC7fVbngKYtQq9IKa6HbdAcT3JcJlmNvH+I="; + hash = "sha256-ThHRf3zLNpOiIpB7drLqMBdyRl6MqW45oFpz44uBwsY="; }; - cargoHash = "sha256-LGWIzbzP4+uY+4QL1tdNMLHtvrVGpFtbmVUbmdn8oAI="; + cargoHash = "sha256-kMLLtrXjduQ2nyiNtiZOhlEfADhn1IKysF29WO6R8CE="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 776849ab97fb..0d12bcc13811 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; - version = "3.6.17"; + version = "3.6.18"; src = fetchurl { # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key. # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28 url = "https://github.com/HMCL-dev/HMCL/releases/download/release-${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; - hash = "sha256-LNEb5YpvuMQGPy1114+y+59ZZNfBuC/Il813NkqHDMg="; + hash = "sha256-x8UcHdBYXdnTabJh2hxsknYipYNBJW2vKxJKHhryMLQ="; }; icon = fetchurl { diff --git a/pkgs/by-name/ho/holo-cli/package.nix b/pkgs/by-name/ho/holo-cli/package.nix index 9135732513de..44dc53470480 100644 --- a/pkgs/by-name/ho/holo-cli/package.nix +++ b/pkgs/by-name/ho/holo-cli/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "holo-cli"; - version = "0.5.0-unstable-2025-08-29"; + version = "0.5.0-unstable-2025-09-22"; src = fetchFromGitHub { owner = "holo-routing"; repo = "holo-cli"; - rev = "31bca792c76e2ecb4d864a96cb20cc770135be74"; - hash = "sha256-XNVeuAAsSdU9CM/HL/3UkBSgxngPheKuwTMkzm+MQ4Q="; + rev = "7d99e7de5eb5226728ee57153c03362c90eb65b2"; + hash = "sha256-O509LNSpak+MJPQheYLPtJQcNGPyZLMHMasKScoVnls="; }; cargoHash = "sha256-bsoxWjOMzRRtFGEaaqK0/adhGpDcejCIY0Pzw1HjQ5U="; diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix index 2c9c6c652a20..63b2477849b4 100644 --- a/pkgs/by-name/ho/horizon-eda/base.nix +++ b/pkgs/by-name/ho/horizon-eda/base.nix @@ -24,13 +24,13 @@ in # This base is used in horizon-eda and python3Packages.horizon-eda rec { pname = "horizon-eda"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - hash = "sha256-Y2oopRycYSxtiKuQZSfTBVP7RmpZ0JA+QyZgnrpoAes="; + hash = "sha256-gigfwam7+KvmGAxex7Bi7a8xAmiNZ+YBZ5iMXneD4cw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hp/hping/package.nix b/pkgs/by-name/hp/hping/package.nix index ff8d2a72302b..23edf38d2a76 100644 --- a/pkgs/by-name/hp/hping/package.nix +++ b/pkgs/by-name/hp/hping/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Command-line oriented TCP/IP packet assembler/analyzer"; - homepage = "http://www.hping.org/"; + homepage = "https://github.com/antirez/hping"; license = licenses.gpl2Only; platforms = platforms.unix; }; diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 4be01da58be8..767b8056f247 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.150.0"; + version = "0.150.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-TWBwF/GPNPLNSEBmG0wVvqY+mgQpZk2MiQoLxB+dBuU="; + hash = "sha256-FNAGdau+czPy+4jtugs+ZHtHrMCsXoZZgJIG4a4r0bs="; }; vendorHash = "sha256-/jbShK+wEybD8hh5+1+Qd+NJkmp3w+BYf2UsTPEgwhw="; diff --git a/pkgs/applications/audio/hushboard/default.nix b/pkgs/by-name/hu/hushboard/package.nix similarity index 60% rename from pkgs/applications/audio/hushboard/default.nix rename to pkgs/by-name/hu/hushboard/package.nix index b354be1ac63c..16fadc50b2eb 100644 --- a/pkgs/applications/audio/hushboard/default.nix +++ b/pkgs/by-name/hu/hushboard/package.nix @@ -1,31 +1,39 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, gobject-introspection, gtk3, libappindicator, libpulseaudio, librsvg, - pycairo, - pygobject3, - six, wrapGAppsHook3, - xlib, + nix-update-script, + fetchpatch, }: -buildPythonApplication { +python3Packages.buildPythonApplication { pname = "hushboard"; - version = "unstable-2021-03-17"; - format = "setuptools"; + version = "0-unstable-2024-04-28"; + pyproject = true; src = fetchFromGitHub { owner = "stuartlangridge"; repo = "hushboard"; - rev = "c16611c539be111891116a737b02c5fb359ad1fc"; - sha256 = "06jav6j0bsxhawrq31cnls8zpf80fpwk0cak5s82js6wl4vw2582"; + rev = "13f5e62add99355f90798006742f62397be8be0c"; + hash = "sha256-z5ZSqcdKUHWt7kgW7ISZJei2YzVZHJGOqJ2IXv3qiWQ="; }; + patches = [ + # https://github.com/stuartlangridge/hushboard/pull/30 + (fetchpatch { + url = "https://github.com/stuartlangridge/hushboard/commit/b17b58cd00eb9af8184f8dcb010bbae7f9bc470c.patch"; + hash = "sha256-C03hq2ttXY8DJzrarQvFIzo29d+owZVIHZRA28fq7Z8="; + }) + ]; + + build-system = with python3Packages; [ setuptools ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection @@ -37,7 +45,7 @@ buildPythonApplication { libpulseaudio ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ pycairo pygobject3 six @@ -62,15 +70,21 @@ buildPythonApplication { cp hushboard-512.png $out/share/icons/hicolor/512x512/apps/hushboard.png ''; - # There are no tests + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + # no tests doCheck = false; - meta = with lib; { + pythonImportsCheck = [ + "hushboard" + ]; + + meta = { homepage = "https://kryogenix.org/code/hushboard/"; - license = licenses.mit; + license = lib.licenses.mit; description = "Mute your microphone while typing"; mainProgram = "hushboard"; - platforms = platforms.linux; - maintainers = with maintainers; [ keysmashes ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ keysmashes ]; }; } diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index 5534ddcf6f6d..45d2518f7270 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -12,18 +12,19 @@ libjxl, libspng, libwebp, + pango, pixman, }: stdenv.mkDerivation (finalAttrs: { pname = "hyprgraphics"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprgraphics"; tag = "v${finalAttrs.version}"; - hash = "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A="; + hash = "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ="; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { libjxl libspng libwebp + pango pixman ]; diff --git a/pkgs/by-name/ic/icoextract/package.nix b/pkgs/by-name/ic/icoextract/package.nix index 0c671cd7658c..e1145478497c 100644 --- a/pkgs/by-name/ic/icoextract/package.nix +++ b/pkgs/by-name/ic/icoextract/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "icoextract"; - version = "0.1.5"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "jlu5"; repo = "icoextract"; rev = version; - hash = "sha256-McVG8966NCEpzc9biawLvUgbQUtterkIud/9GwOeltI="; + hash = "sha256-GJCe7oFUidJt21F4NmOXspxZGRQXIjQvFjFhMYsHLjk="; }; build-system = with python3Packages; [ setuptools ]; @@ -29,9 +29,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "icoextract" ]; postInstall = '' - substituteInPlace exe-thumbnailer.thumbnailer \ - --replace Exec=exe-thumbnailer Exec=$out/bin/exe-thumbnailer - install -Dm644 exe-thumbnailer.thumbnailer -t $out/share/thumbnailers ''; diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix index d812dab74b90..9a9b3fa8a591 100644 --- a/pkgs/by-name/im/immich-cli/package.nix +++ b/pkgs/by-name/im/immich-cli/package.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { pname = "immich-cli"; - version = "2.2.92"; + version = "2.2.94"; inherit (immich) src pnpmDeps; postPatch = '' diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix index 07a84cb71302..fdfb91acc17c 100644 --- a/pkgs/by-name/im/immich-go/package.nix +++ b/pkgs/by-name/im/immich-go/package.nix @@ -9,13 +9,13 @@ }: buildGoModule rec { pname = "immich-go"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; tag = "v${version}"; - hash = "sha256-TvvoFe7uyuollKTsioIkdcXTDOZqE+hPkZTPk+PNEqQ="; + hash = "sha256-H/ch6W9PrVg7MnQ6/QcMhadihjWx5oHlC7z4oZmjyvQ="; # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # The intention here is to write the information into files in the `src`'s @@ -32,7 +32,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-qJdxpOUB5OPKIz39cqELJorstsagwrJ0W5AKBDlIxzs="; + vendorHash = "sha256-EAlslQsLuOp1yrSi0wsNoSqyHnGvLHrf8np4rKrn9yY="; # options used by upstream: # https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index 93f4f8e6fd05..b8efe38c1b14 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "1.13.0"; + version = "1.13.2"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-wcJogDi93tuFbVdwI5YZEyVQGzO4QC/ASDsRquVq31s="; + hash = "sha256-AoRqlTEwcS+RhN59/opqlYAftihmN20mW6Vn6RbLzSw="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-GtX2mRfw4eo3WKfxdMoOAryQKHddFPcVCuXhHmLA/Oc="; + npmDepsHash = "sha256-ZH1D0Q5SCoOwr8CLe2HLMy4xJoO3VLha4MfE9fBmhec="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index b5d2474af232..dfa10d273b76 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -34,7 +34,7 @@ }: let pnpm = pnpm_10; - version = "1.143.1"; + version = "1.144.1"; esbuild' = buildPackages.esbuild.override { buildGoModule = @@ -108,14 +108,14 @@ let owner = "immich-app"; repo = "immich"; tag = "v${version}"; - hash = "sha256-lP/IrKV2B1Gq43jqVa1hIpx4HOJoiYBDUOvyTJB0t7k="; + hash = "sha256-lSe50nbVWNWej137JgfJawIOPhtMVoolHahfrd1ENJc="; }; pnpmDeps = pnpm.fetchDeps { pname = "immich"; inherit version src; fetcherVersion = 2; - hash = "sha256-ShKgfsYc9n+B+NnSaJOSyLb4ev43ZsympYhRgPZtlxs="; + hash = "sha256-+CwwTqjI+xOGCAb66lZplNMBwR2xJZBs6E0OyGHbSAE="; }; web = stdenv.mkDerivation { diff --git a/pkgs/by-name/ip/iproute2mac/package.nix b/pkgs/by-name/ip/iproute2mac/package.nix index a6c5003492a5..fda316a05fc9 100644 --- a/pkgs/by-name/ip/iproute2mac/package.nix +++ b/pkgs/by-name/ip/iproute2mac/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "iproute2mac"; - version = "1.5.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "brona"; repo = "iproute2mac"; - rev = "v${finalAttrs.version}"; - hash = "sha256-hmSqJ2gc0DOXUuFrp1ZG8usjFdo07zjV/1JLs5r/E04="; + tag = "v${finalAttrs.version}"; + hash = "sha256-aemeZnZlnmIKdLz5Myjn51dYTvfovFPQeytJbNxbI4E="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix index e4953f51ffad..231b8217a495 100644 --- a/pkgs/by-name/jo/john/package.nix +++ b/pkgs/by-name/jo/john/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { owner = "openwall"; repo = "john"; rev = "f9fedd238b0b1d69181c1fef033b85c787e96e57"; - hash = "sha256-zvoN+8Sx6qpVg2JeRLOIH1ehfl3tFTv7r5wQZ44Qsbc="; + hash = "sha256-XMT5Sbp2XrAnfTHxXyJdw0kA/ZtfOiYrX/flCFLHJ6s="; }; patches = lib.optionals withOpenCL [ @@ -130,15 +130,18 @@ stdenv.mkDerivation { done ''; - meta = with lib; { + meta = { description = "John the Ripper password cracker"; - license = [ licenses.gpl2Plus ] ++ lib.optionals enableUnfree [ licenses.unfreeRedistributable ]; + license = [ + lib.licenses.gpl2Plus + ] + ++ lib.optionals enableUnfree [ lib.licenses.unfreeRedistributable ]; homepage = "https://github.com/openwall/john/"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ offline matthewbauer cherrykitten ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/jq/jqp/package.nix b/pkgs/by-name/jq/jqp/package.nix index 25dc3356d295..2c7442258216 100644 --- a/pkgs/by-name/jq/jqp/package.nix +++ b/pkgs/by-name/jq/jqp/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "jqp"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "noahgorstein"; repo = "jqp"; rev = "v${version}"; - sha256 = "sha256-i22qALVa8EUaTwgN6DocGJArNyOvkQbFuH++EQKBuIc="; + sha256 = "sha256-pCWvmX6VvcKlPoMkVGfVkPTOx+sE+v2ey39/jOhgtsg="; }; - vendorHash = "sha256-GbY0x4BgV0+QdVMkITLF/W//oO72FbjV6lNJRm6ecys="; + vendorHash = "sha256-FBAf+np/8Zy+p1mPyP1O8md2sAkkeiFu60UYtkszG8g="; subPackages = [ "." ]; diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix index b6b5bc3d30c1..3cf6e3ef99d2 100644 --- a/pkgs/by-name/js/jsoncons/package.nix +++ b/pkgs/by-name/js/jsoncons/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jsoncons"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "danielaparker"; repo = "jsoncons"; tag = "v${finalAttrs.version}"; - hash = "sha256-5uI3AWNfsmgmUU9qnkdLeI1eXwuA2WRqeYG4eUoGdp4="; + hash = "sha256-aWJTJiEBpWVvNl3l8MB30NakqXVni+VoalV66Sg2g9M="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 6fb2d51b1597..ac1bdb377641 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jujutsu"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "jj-vcs"; repo = "jj"; tag = "v${finalAttrs.version}"; - hash = "sha256-EKYM18UavIbZeI5/F5OKUzyjQip0yb6WPt6BZ2YpYww="; + hash = "sha256-OW8kSDBBSZr0G3U27AAkZ3cH3TJmSARbg9Pc4qZ6tA0="; }; - cargoHash = "sha256-iIMmtuf4uDe2PX/X3UW8sDt3kPTij8Nlh/SU92abvUw="; + cargoHash = "sha256-/zC2z0evYs8VKta0uClTtl4l3tbDRcsVedGF2jtfQGA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix index 63db788a5470..5238cc8bf1fc 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.12.1"; + version = "5.13.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = "kafkactl"; tag = "v${version}"; - hash = "sha256-f4Y8JOXw4bWW3fCnRZ02AE2HcdgeEfUlZgO7VoZeJ6k="; + hash = "sha256-YJpRXCTI0Mwi4Zxeex8oxgzElk7l8Qus75lR42/wSww="; }; vendorHash = "sha256-sVvEHMXpjas+l93IZfAChDX5eDm0lkUNCr5r1JaVQ9I="; diff --git a/pkgs/by-name/kc/kcli/package.nix b/pkgs/by-name/kc/kcli/package.nix deleted file mode 100644 index ab609f2d8752..000000000000 --- a/pkgs/by-name/kc/kcli/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "kcli"; - version = "1.8.3"; - - src = fetchFromGitHub { - owner = "cswank"; - repo = "kcli"; - rev = version; - sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; - }; - - vendorHash = null; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Kafka command line browser"; - homepage = "https://github.com/cswank/kcli"; - license = licenses.mit; - maintainers = with maintainers; [ cswank ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check - }; -} diff --git a/pkgs/by-name/kd/kddockwidgets/package.nix b/pkgs/by-name/kd/kddockwidgets/package.nix index 4799d8cb31e8..8de443074cde 100644 --- a/pkgs/by-name/kd/kddockwidgets/package.nix +++ b/pkgs/by-name/kd/kddockwidgets/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "KDDockWidgets"; - version = "2.2.5"; + version = "2.3.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "KDDockWidgets"; rev = "v${version}"; - sha256 = "sha256-4xaTfNwfAIQox2YcusEZJt5f9/Kld+zveFEiIVw5dRc="; + sha256 = "sha256-NNGIR2MTaNs2zFeN9vmHxoRuss2IR7FQ8F34b00L9z4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ke/keka/package.nix b/pkgs/by-name/ke/keka/package.nix index 9a14753cb219..82c36600c333 100644 --- a/pkgs/by-name/ke/keka/package.nix +++ b/pkgs/by-name/ke/keka/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "keka"; - version = "1.4.6"; + version = "1.6.0"; src = fetchzip { url = "https://github.com/aonez/Keka/releases/download/v${finalAttrs.version}/Keka-${finalAttrs.version}.zip"; - hash = "sha256-IgPnXHVtAaSOsaAYvo0ELRqvXpF2qAnJ/1QZ+FHzqn4="; + hash = "sha256-E0KvDgjx86myZk5+QsydonDaT31CS+B1QGOUXCOaJxY="; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,7 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://www.keka.io"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ emilytrau ]; + maintainers = with lib.maintainers; [ + emilytrau + iedame + ]; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index bdde5f7fc485..2109e9759c36 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -45,26 +45,27 @@ makeBinaryWrapper, autoSignDarwinBinariesHook, cairo, + fetchpatch, }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.42.2"; + version = "0.43.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-YDfKYzj5LRx1XaKUpBKo97CMW4jPhVQq0aXx/Qfcdzo="; + hash = "sha256-Wd61Q1sG55oDxPuHJpmvSWuptwJIuzgn2sB/dzNRc1c="; }; goModules = (buildGo124Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-q5LMyogAqgUFfln7LVkhuXzYSMuYmOif5sj15KkOjB4="; + vendorHash = "sha256-bjtzvEQmpsrwD0BArw9N6/HqMB3T5xeqxpx89FV7p2A="; }).goModules; buildInputs = [ @@ -141,7 +142,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 - ]; hardeningDisable = [ diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix index c5e9151b9c25..732b093bdd8b 100644 --- a/pkgs/by-name/kn/knowsmore/package.nix +++ b/pkgs/by-name/kn/knowsmore/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knowsmore"; - version = "0.1.46"; + version = "0.1.49"; pyproject = true; src = fetchFromGitHub { owner = "helviojunior"; repo = "knowsmore"; tag = "v${version}"; - hash = "sha256-yY3BLouIUvSBeNlq4XcEHKLi00BWeGUXNOP2p5NIFXc="; + hash = "sha256-1qWbDf5lh9HogjjPoI51znpcQrriB2Eg4eA4xDQDYA8="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix index c5700c3b3e0b..756d3595f4c5 100644 --- a/pkgs/by-name/ko/komodo/package.nix +++ b/pkgs/by-name/ko/komodo/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "komodo"; - version = "1.19.4"; + version = "1.19.5"; src = fetchFromGitHub { owner = "moghtech"; repo = "komodo"; tag = "v${version}"; - hash = "sha256-zUfCcd5ptHQZmg6L5M23d7YuLjjFjutNCtxziXMpF/Q="; + hash = "sha256-dLBgdcrIp5QM2TVIa86qX7m1c5n+qOIQJtqJPGvIZ+0="; }; - cargoHash = "sha256-9bNbTk9kHLgHoYMRU4Le7WtEbrqQKjJVnetsoe0YTqE="; + cargoHash = "sha256-jf/Jp28g3inGn5jQp3cACdhl//tbXTMc1vP1K3g/CyQ="; # disable for check. document generation is fail # > error: doctest failed, to rerun pass `-p komodo_client --doc` diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix index 754bc9e9d1b9..4f9f4bebcbaf 100644 --- a/pkgs/by-name/ko/kopia-ui/package.nix +++ b/pkgs/by-name/ko/kopia-ui/package.nix @@ -73,7 +73,7 @@ buildNpmPackage { type = "Application"; desktopName = "KopiaUI"; comment = "Fast and secure open source backup."; - icon = "kopia-ui"; + icon = "kopia"; exec = "kopia-ui"; categories = [ "Utility" ]; }) diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix index ec6002b9b74b..257d0dcac4cc 100644 --- a/pkgs/by-name/ko/koreader/package.nix +++ b/pkgs/by-name/ko/koreader/package.nix @@ -138,7 +138,6 @@ stdenv.mkDerivation { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ contrun - neonfuz liberodark ]; }; diff --git a/pkgs/by-name/ks/ksmbd-tools/package.nix b/pkgs/by-name/ks/ksmbd-tools/package.nix index 9c885eb6e2ca..08507db5d269 100644 --- a/pkgs/by-name/ks/ksmbd-tools/package.nix +++ b/pkgs/by-name/ks/ksmbd-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.5.3"; + version = "3.5.4"; src = fetchFromGitHub { owner = "cifsd-team"; repo = "ksmbd-tools"; rev = version; - sha256 = "sha256-f2B+24AboAWLIrtuHWn8YMEPzWahIafc3kfx0zKyz8g="; + sha256 = "sha256-O8JqAu2aZ+SkK+rkL2Q7jikN2/pJZcfeG7tDVdrrO4Y="; }; buildInputs = [ diff --git a/pkgs/by-name/ks/ksnip/package.nix b/pkgs/by-name/ks/ksnip/package.nix index bcc93b06418a..a06b8e76337f 100644 --- a/pkgs/by-name/ks/ksnip/package.nix +++ b/pkgs/by-name/ks/ksnip/package.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: { - Many configuration options. ''; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ x3ro ]; platforms = lib.platforms.linux; mainProgram = "ksnip"; }; diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix index 3149d30e9fb2..6b3bd12cbb70 100644 --- a/pkgs/by-name/ku/kube-bench/package.nix +++ b/pkgs/by-name/ku/kube-bench/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "kube-bench"; - version = "0.12.0"; + version = "0.13.0"; __darwinAllowLocalNetworking = true; # required for tests @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "aquasecurity"; repo = "kube-bench"; tag = "v${finalAttrs.version}"; - hash = "sha256-XOx0PKywl2Cyh7JgRRRTt9Y20aTFRCFBx+dGByuGHww="; + hash = "sha256-5P8kF8k25E7dezhQ7oKKlu/6y9Ofq3nAeenAI7IOBwE="; }; - vendorHash = "sha256-CXyzrV6XcAfI9wnASh4jWna2yb7aWiSbm7q9WVdecDU="; + vendorHash = "sha256-vueIQbsF34lkmIFpH8DiOSjxEBevxxiJLd0L/sQwJBE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ku/kubecolor/package.nix b/pkgs/by-name/ku/kubecolor/package.nix index 15aa4a760d6f..cded2b298a30 100644 --- a/pkgs/by-name/ku/kubecolor/package.nix +++ b/pkgs/by-name/ku/kubecolor/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kubecolor"; repo = "kubecolor"; rev = "v${version}"; - sha256 = "sha256-FyHTceFpB3Osj8SUw+IRk+JWnoREVZgl8YHczDyY+Ak="; + sha256 = "sha256-T0xqcDDmp/XjDxUnh/wCfs+b4cQG78d/61rdypCEDoY="; }; - vendorHash = "sha256-eF0NcymLmRsFetkI67ZVUfOcIYtht0iYFcPIy2CWr+M="; + vendorHash = "sha256-QenYTQTNXaBvzpyVHOCx3lEheiWZMfulEfzB+ll+q+4="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix index 5884bf1fa717..b2ffae8d0c14 100644 --- a/pkgs/by-name/ku/kubelogin-oidc/package.nix +++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix @@ -4,25 +4,25 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "kubelogin"; - version = "1.34.0"; + version = "1.34.1"; src = fetchFromGitHub { owner = "int128"; repo = "kubelogin"; - tag = "v${version}"; - hash = "sha256-eQFPuNSHSRcFLG7UbAb5A++EJawZWHaxmFt0XQVB3Ng="; + tag = "v${finalAttrs.version}"; + hash = "sha256-zAIiNpzYr4aVR4O93y9S9aiGUgeg9xlj7wFn4vh43zY="; }; subPackages = [ "." ]; ldflags = [ "-s" "-w" - "-X main.version=v${version}" + "-X main.version=v${finalAttrs.version}" ]; - vendorHash = "sha256-jzKUJkugCDwGtbEXGrjDIAbbe5yQ+1jfn22Q3whLRe4="; + vendorHash = "sha256-LF6Esggl7ygC/t9lCZGzZIZtukCbMFCAo2RFLbvEnoU="; # test all packages preCheck = '' @@ -38,11 +38,11 @@ buildGoModule rec { meta = { description = "Kubernetes credential plugin implementing OpenID Connect (OIDC) authentication"; mainProgram = "kubectl-oidc_login"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ benley nevivurn ]; }; -} +}) diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix index b64b3bc12c29..58da9e54c13b 100644 --- a/pkgs/by-name/ku/kubeone/package.nix +++ b/pkgs/by-name/ku/kubeone/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-TDT7qAwd9wewnfICEX+ZI4z9jma0L+SZcZJeQOuv9dc="; + hash = "sha256-afAyjBalBdWAnTAedAYh3GslLx//aAHQAsEbBIpiczg="; }; vendorHash = "sha256-Wnnwp1GRlE1q8MSc23pOmSn9fKu5uHVzkivfuF2lnEk="; diff --git a/pkgs/by-name/ku/kubernetes-kcp/package.nix b/pkgs/by-name/ku/kubernetes-kcp/package.nix index ee5a10dc922e..a42e8b34e71f 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.28.1"; + version = "0.28.3"; src = fetchFromGitHub { owner = "kcp-dev"; repo = "kcp"; tag = "v${version}"; - hash = "sha256-GwfrFaGLrfUTxLoacGCHHzJ41+tA7flb4wvjWJntj+g="; + hash = "sha256-gZMheiMvAUAV3YqWNA1WmOWpV5hEU7GtQzz57F4rX38="; }; - vendorHash = "sha256-mJaWEZhuMiIy8NYlRJDc39nKfWxP4xlFuM9jiqmkJ0c="; + vendorHash = "sha256-w7mC3CJv/UKQe6jOqwzSZSYIu0K/Z4aNUnAcSg6MwG0="; subPackages = [ "cmd/kcp" ]; diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix index e19bdacc7ce5..cf45985ab589 100644 --- a/pkgs/by-name/ku/kubevirt/package.nix +++ b/pkgs/by-name/ku/kubevirt/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - hash = "sha256-1q9zqgFkH/Hijp1+2GwlCD/whmoN9S+892ojOI/aSC4="; + hash = "sha256-50OaBnQrYn3LZLvsfvGU5ZssPbdKyyAnebqn85iVoYk="; }; vendorHash = null; diff --git a/pkgs/by-name/ku/kurve/package.nix b/pkgs/by-name/ku/kurve/package.nix index 0bb705321c0a..5bb27e5c5dd0 100644 --- a/pkgs/by-name/ku/kurve/package.nix +++ b/pkgs/by-name/ku/kurve/package.nix @@ -13,24 +13,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kurve"; - version = "0.4.0"; + version = "2.0.0"; dontWrapQtApps = true; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "kurve"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ra+ySuvBqmVOTD8TlWDJklXYuwXPb/2a3BSY+gQMiiA="; + hash = "sha256-qw/6V3TWGZFL8dgyDUxzBr4U6/jaX9uwpyg3Bd3pKdg="; }; installPhase = '' runHook preInstall # Substitute Qt Websocket paths in QML files to ensure they work with Nix - substituteInPlace package/contents/ui/components/ProcessMonitorFallback.qml --replace-fail "import QtWebSockets 1.9" "import \"file:${qt6.qtwebsockets}/lib/qt-6/qml/QtWebSockets\"" + substituteInPlace package/contents/ui/components/ProcessMonitorFallback.qml --replace-fail "import QtWebSockets" "import \"file:${qt6.qtwebsockets}/lib/qt-6/qml/QtWebSockets\"" # Set cava path so it gets discovered by nix as runtime dependency - substituteInPlace package/contents/ui/Cava.qml --replace-fail "cava" "${cava}/bin/cava" + substituteInPlace package/contents/ui/Cava.qml --replace-fail "cava -p" "${cava}/bin/cava -p" substituteInPlace package/contents/ui/FullRepresentation.qml --replace-fail "cava -v" "${cava}/bin/cava -v" # Set python path so it gets discovered by nix as runtime dependency diff --git a/pkgs/by-name/ld/ldeep/package.nix b/pkgs/by-name/ld/ldeep/package.nix index 452bbb414da5..0698d02538b5 100644 --- a/pkgs/by-name/ld/ldeep/package.nix +++ b/pkgs/by-name/ld/ldeep/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.88"; + version = "1.0.89"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; tag = version; - hash = "sha256-Auh9KCyPO1bWKY1wd9As5eycJfUhj0IhX/9xp99skhA="; + hash = "sha256-aod+0wd4Ek8mTiP4H5C5vUJ+94THMrFGDGVzWEH3G+U="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix index 9de4a75e4ddd..0c8765e211b3 100644 --- a/pkgs/by-name/li/liana/package.nix +++ b/pkgs/by-name/li/liana/package.nix @@ -39,16 +39,16 @@ let in rustPlatform.buildRustPackage rec { pname = "liana"; - version = "12.0"; # keep in sync with lianad + version = "13.0"; # keep in sync with lianad src = fetchFromGitHub { owner = "wizardsardine"; repo = "liana"; tag = "v${version}"; - hash = "sha256-TZUNYr7p4P/++eX9ZNU/d1IurPrkZn/PJmJOsB01VMY="; + hash = "sha256-zr9FZZSLPMk2d5vyZqrj12RG4UCdmkyKLjTU7XpgedE="; }; - cargoHash = "sha256-Hb5icOKgQiDzFLWwUfkwXcr1vn80QcAr+fKwG37PkYc="; + cargoHash = "sha256-uLSlx1WWCcngL1WSP3jOvwFJd/gbz/g9AT6Of9rwEMw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/li/lianad/package.nix b/pkgs/by-name/li/lianad/package.nix index e4590334f008..19f7204a73dd 100644 --- a/pkgs/by-name/li/lianad/package.nix +++ b/pkgs/by-name/li/lianad/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "lianad"; - version = "12.0"; # keep in sync with liana + version = "13.0"; # keep in sync with liana src = fetchFromGitHub { owner = "wizardsardine"; repo = "liana"; rev = "v${version}"; - hash = "sha256-TZUNYr7p4P/++eX9ZNU/d1IurPrkZn/PJmJOsB01VMY="; + hash = "sha256-zr9FZZSLPMk2d5vyZqrj12RG4UCdmkyKLjTU7XpgedE="; }; - cargoHash = "sha256-Hb5icOKgQiDzFLWwUfkwXcr1vn80QcAr+fKwG37PkYc="; + cargoHash = "sha256-uLSlx1WWCcngL1WSP3jOvwFJd/gbz/g9AT6Of9rwEMw="; buildInputs = [ udev ]; diff --git a/pkgs/by-name/li/libcerf/package.nix b/pkgs/by-name/li/libcerf/package.nix index 8e49899bed6c..d405eeddf822 100644 --- a/pkgs/by-name/li/libcerf/package.nix +++ b/pkgs/by-name/li/libcerf/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libcerf"; - version = "3.1"; + version = "3.2"; src = fetchurl { url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; - sha256 = "sha256-TAfiqOK00OTUjbng/JGRtDoOEg5XfVXYfibe6HRcb6s="; + sha256 = "sha256-6o0RDXPsJKZDBCyjlARhzLsbZUHiExDstwq05NwUSu8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix index d32b458a3c28..11b83ef7a87c 100644 --- a/pkgs/by-name/li/libfabric/package.nix +++ b/pkgs/by-name/li/libfabric/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "2.2.0"; + version = "2.3.0"; enableParallelBuilding = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = "libfabric"; rev = "v${version}"; - sha256 = "sha256-BY3a7CxtMJl5/+7t4BzJRTbMnDs1oL3UhDOPRB+D3+U="; + sha256 = "sha256-pxSv6mg51It4+P1nAgXdWizTGpI31rn5+n3f4vD6ooY="; }; outputs = [ diff --git a/pkgs/by-name/li/libnick/package.nix b/pkgs/by-name/li/libnick/package.nix index c5307902ff76..78580c2db7dd 100644 --- a/pkgs/by-name/li/libnick/package.nix +++ b/pkgs/by-name/li/libnick/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libnick"; - version = "2025.8.0"; + version = "2025.9.2"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "libnick"; tag = finalAttrs.version; - hash = "sha256-LgvU5a3W5Oii6pRAAKZo28yOyPRUMjxwEXDZ2jXJPGM="; + hash = "sha256-Trz1SQxv/VplAKHO62aGxHb8k9KSUSReH+hYLaUagUY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libnspsl/package.nix b/pkgs/by-name/li/libnspsl/package.nix index a8df91f2bb6f..a7905669ef5d 100644 --- a/pkgs/by-name/li/libnspsl/package.nix +++ b/pkgs/by-name/li/libnspsl/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libnspsl"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/libnspsl-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs="; + hash = "sha256-NoTOwy9VXa7UMZk+C/bL2TdPbJCERiN+CJ8LYdaUrIA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/li/libomemo-c/package.nix b/pkgs/by-name/li/libomemo-c/package.nix index e1f87d39b180..3d9a9da507d0 100644 --- a/pkgs/by-name/li/libomemo-c/package.nix +++ b/pkgs/by-name/li/libomemo-c/package.nix @@ -2,24 +2,39 @@ lib, stdenv, fetchFromGitHub, - cmake, + meson, + ninja, + pkg-config, openssl, + protobuf_25, + protobufc, }: stdenv.mkDerivation rec { pname = "libomemo-c"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dino"; repo = "libomemo-c"; rev = "v${version}"; - hash = "sha256-GvHMp0FWoApbYLMhKfNxSBel1xxWWF3TZ4lnkLvu2s4="; + hash = "sha256-HoZykdGVDsj4L5yN3SHGF5tjMq5exJyC15zTLBlpX/c="; }; - nativeBuildInputs = [ cmake ]; - buildsInputs = [ openssl ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + protobuf_25 + protobufc + ]; + buildInputs = [ + openssl + protobufc + ]; + mesonFlags = [ + "-Dtests=false" + ]; meta = with lib; { description = "Fork of libsignal-protocol-c adding support for OMEMO XEP-0384 0.5.0+"; diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index 60d581976885..5306a4035e40 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2025-09-14"; + version = "0-unstable-2025-09-26"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "39ca959b131e75dcd0cb4016e545b4e91b7081ae"; - hash = "sha256-8G54UuuuZpi/sqEWfK/XNXEjjL9LGmffNAnQ+g/XQPM="; + rev = "7e3c2ccde32aaa327e109318d275dc16d44653b0"; + hash = "sha256-MkA/pQQhQseoVEOrv/Nfv4gYfx/LmEMN2eFF6McvQnk="; }; dontConfigure = true; diff --git a/pkgs/by-name/li/librttopo/package.nix b/pkgs/by-name/li/librttopo/package.nix index 339f618cd88c..12ea18a9c3a5 100644 --- a/pkgs/by-name/li/librttopo/package.nix +++ b/pkgs/by-name/li/librttopo/package.nix @@ -27,11 +27,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook validatePkgConfig - geos # for geos-config ]; buildInputs = [ geos ]; + configureFlags = [ + "--with-geosconfig=${lib.getExe' (lib.getDev geos) "geos-config"}" + ]; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/by-name/li/libspatialite/package.nix b/pkgs/by-name/li/libspatialite/package.nix index 483c54c33917..94f860b8895a 100644 --- a/pkgs/by-name/li/libspatialite/package.nix +++ b/pkgs/by-name/li/libspatialite/package.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config validatePkgConfig - geos # for geos-config ]; buildInputs = [ @@ -62,6 +61,10 @@ stdenv.mkDerivation (finalAttrs: { libiconv ]; + configureFlags = [ + "--with-geosconfig=${lib.getExe' (lib.getDev geos) "geos-config"}" + ]; + enableParallelBuilding = true; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/li/libupnp/package.nix b/pkgs/by-name/li/libupnp/package.nix index fe04627bb624..300f98ae4cb8 100644 --- a/pkgs/by-name/li/libupnp/package.nix +++ b/pkgs/by-name/li/libupnp/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.18"; + version = "1.14.25"; outputs = [ "out" @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "pupnp"; repo = "pupnp"; - rev = "release-${version}"; - sha256 = "sha256-eQKtZioZjI53J1fsoer032pzqebbK5IabOnkAXwBPos="; + tag = "release-${version}"; + hash = "sha256-emMZKskaFYmLnIZLduHlZ5I3praaBgXY2JHLDAGPO28="; }; nativeBuildInputs = [ @@ -33,6 +33,12 @@ stdenv.mkDerivation rec { --replace '\''${prefix}/' "" ''; + # Fix broken cmake files + # https://gitlab.archlinux.org/archlinux/packaging/packages/libupnp/-/commit/69a99f8ccd4c6f335db9b5842f0facde585721eb + postFixup = '' + sed -e 's|/COMPONENT||g' -e 's|/UPNP_Development||g' -i ${placeholder "dev"}/lib/cmake/*/*.cmake + ''; + meta = { description = "Open source UPnP development kit for Linux"; diff --git a/pkgs/by-name/li/linux-router/package.nix b/pkgs/by-name/li/linux-router/package.nix index 1f8d51d5401c..0596e28d10ff 100644 --- a/pkgs/by-name/li/linux-router/package.nix +++ b/pkgs/by-name/li/linux-router/package.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation rec { ''; changelog = "https://github.com/garywill/linux-router/releases/tag/${version}"; license = lib.licenses.lgpl21Only; - maintainers = with lib.maintainers; [ x3ro ]; platforms = lib.platforms.linux; mainProgram = "lnxrouter"; }; diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix index 456c9fad593e..fd59958d36cc 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.13"; + version = "2.7.14"; src = fetchFromGitHub { owner = "littlefs-project"; repo = "littlefs-fuse"; rev = "v${version}"; - hash = "sha256-tdX4I3o7m3VVH/RyTGt9tBCjQPE22/ydAQBmTMPdcE0="; + hash = "sha256-TWvBEoH4YvK4Jdg+QAMyskBUYhCWnmdtEoVXwoKJqIo="; }; buildInputs = [ fuse ]; installPhase = '' diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index e84c6b84bb91..abd8342e999c 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,10 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.3.26-6"; - hash_aarch64-darwin = "sha256-2ss6lMU4vb3m23v1qQWFn4U1p+fZ2mSGVVkKw3ETgXc="; - version_x86_64-linux = "0.3.26-6"; - hash_x86_64-linux = "sha256-UKdopw/sMuXY460KA9Oj8ckANdFDt2VApEsSZ1Gh1Wo="; + version_aarch64-darwin = "0.3.27-4"; + hash_aarch64-darwin = "sha256-KEgUgfYG6yHZzTaKpGiSkyhZcb3W2KTlIhnbQdKpYm0="; + version_x86_64-linux = "0.3.27-4"; + hash_x86_64-linux = "sha256-CU7kfcyo054UvjSar5QB2aGrCPAdh1EMqEJyZkv7Mdk="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix index 111b2b956b0c..fb802c55dfc4 100644 --- a/pkgs/by-name/ma/mackerel-agent/package.nix +++ b/pkgs/by-name/ma/mackerel-agent/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.85.1"; + version = "0.85.2"; src = fetchFromGitHub { owner = "mackerelio"; repo = "mackerel-agent"; rev = "v${version}"; - sha256 = "sha256-ngBBpvDk5HsMNoZy45mlEBn3dgG8j1b98tShdR6QmQQ="; + sha256 = "sha256-3A3x32JytJGXebgZeJcToHXNqRB+rbyziT5Zwgc9rEM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 374af784b297..2447cb920604 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -19,8 +19,8 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(10\\.5\\.[0-9]+)$"; - version = "10.5.10"; - srcHash = "sha256-fQqUoSo8saERRfgx4OT26VQktejzYPPqBIL2OA0PQy0="; + version = "10.5.11"; + srcHash = "sha256-2XX6SNWlu+2Kh0rJodp0Ipzu8/gdjygCxeD2BVYDcTc="; vendorHash = "sha256-uryErnXPVd/gmiAk0F2DVaqz368H6j97nBn0eNW7DFk="; npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0="; lockfileOverlay = '' diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index 431bb16e24b1..fabbae2157a0 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "md-tui"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "henriklovhaug"; repo = "md-tui"; tag = "v${version}"; - hash = "sha256-K+s4p0d4b3c8Xqw8RGaEZb62zsbKo84J0yXM4j+n95I="; + hash = "sha256-pOo+gifWomZh3hTfqaIRMPEPR5TPinzl8NgYcCit7t4="; }; - cargoHash = "sha256-AgWOjsa6n4kaXjQSCqW4lYqhhMqvdemEFlCJp99KiUg="; + cargoHash = "sha256-07U69UdiAqdIv5JVfvbLNfQD/SfPfaiYZsMr6y/r8UY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix index 75bac29f308f..e6781ce540fa 100644 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ b/pkgs/by-name/me/mealie/mealie-frontend.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/frontend/yarn.lock"; - hash = "sha256-712mc/xksjXgnc0inthxE+ztSDl/4107oXw3vKcZD2g="; + hash = "sha256-e+3LCoOzfjSG4CjzOLXTcXGkmzNwFTLCrN0l5odOBMs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index bed561c1c343..7a141243ed9c 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -11,12 +11,12 @@ }: let - version = "3.1.2"; + version = "3.2.1"; src = fetchFromGitHub { owner = "mealie-recipes"; repo = "mealie"; tag = "v${version}"; - hash = "sha256-8ZLXXA4NKR7GaCdgk8XDMjAssQsKP1wZpEZPYWpglwk="; + hash = "sha256-LIWubw+iO17giSvGCl5LzI429725sisp5u4Z4usJOGA="; }; frontend = callPackage (import ./mealie-frontend.nix src version) { }; diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index f7846ded9061..71a465e67e0f 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-QW6wPljY259baHHucJjIBihinocafNALfLVN4s/gN1Q="; + hash = "sha256-PaKMwLoBKqrZyAaveriD0vu/8giHnj/LGlil8mWPZlU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index 55837ab5d8d3..e46f26f28d4e 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -15,16 +15,16 @@ in buildGoModule (finalAttrs: { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "bluenviron"; repo = "mediamtx"; tag = "v${finalAttrs.version}"; - hash = "sha256-omeaOAhH4adNpA0VXxcZkre3tGZUwHxBrIT85X3D+n0="; + hash = "sha256-7RpuDn3pZl/noI0SlP7iL9dMqiPiBPQXOuq2U6FYPnM="; }; - vendorHash = "sha256-YSH8cu7+LIsJ3/o2FYBYlnc6adORJdzhCqQVH0252Ec="; + vendorHash = "sha256-ZyHOn+n6RYeSd3stkozwJ1prCY7J9oTIxhJsxm/ORn0="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index 777665570211..ddabba60a3cb 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "melange"; - version = "0.31.4"; + version = "0.31.5"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "melange"; rev = "v${version}"; - hash = "sha256-ONPQi7QNDyh/KVPFn9YNaMBSi205S7lgM6m3wWXb424="; + hash = "sha256-aa5r7755c2b69HB7bLk6ccs8k34iuNXATqRgZ98MyB4="; # 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; diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index 3eeadda88be0..dfd9ea5bce99 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -14,12 +14,12 @@ protoc-gen-validate, }: let - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "usememos"; repo = "memos"; rev = "v${version}"; - hash = "sha256-M1o7orU4xw/t9PjSFXNj7tiYTarBv7kIIj8X0r3QD8s="; + hash = "sha256-5CeeOpdXs+6Vus4er8JVhJM0a7BKtGsF4SPdOoX5xQk="; }; memos-protobuf-gen = stdenvNoCC.mkDerivation { @@ -52,7 +52,7 @@ let outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-lV92s/KLzWs/KSLbsb61FaA9+PEDMLshl/srDcjdRcU="; + outputHash = "sha256-BOBnNcBp/vjTaS7N1z5kRWZoKokJXEMNs5rS32ZBtKU="; }; memos-web = stdenvNoCC.mkDerivation (finalAttrs: { @@ -62,7 +62,7 @@ let inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/web"; fetcherVersion = 1; - hash = "sha256-TEWaFWFQ0sHdgfFFvolnwoa4hTaFkzqqyFep56Cevp4="; + hash = "sha256-qY3jPbdEy+lWoBV/xKNTGQ58xvcoBoG0vPwN5f9+wj4="; }; pnpmRoot = "web"; nativeBuildInputs = [ @@ -93,7 +93,7 @@ buildGoModule { memos-protobuf-gen ; - vendorHash = "sha256-xiBxnrjJsskRCcUBGKnrc5s5tuhMFSqRoELcr5ww/XU="; + vendorHash = "sha256-+v2OElo2ZC0OEhNsNe23J0PR0y1opm/HckW+vUmJ8e4="; preBuild = '' rm -rf server/router/frontend/dist diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix index bae7b8412c1c..28bcc83c412d 100644 --- a/pkgs/by-name/me/memray/package.nix +++ b/pkgs/by-name/me/memray/package.nix @@ -10,24 +10,16 @@ python3Packages.buildPythonApplication rec { pname = "memray"; - version = "1.18.0"; + version = "1.19.0"; pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; tag = "v${version}"; - hash = "sha256-bShFMuDJlvBA3rQJRwXlsgRk4q+gdFQjOpDzOrp4/8k="; + hash = "sha256-yOiN4KES+zCHp/n0pN73Yv6ibEtUGy1pqiH/3WECqkA="; }; - # AttributeError: 'Label' object has no attribute 'renderable'. - # In textual==0.6.0, the `renderable` property was renamed to `content` - # https://github.com/Textualize/textual/pull/6041 - postPatch = '' - substituteInPlace tests/unit/test_tui_reporter.py \ - --replace-fail ".renderable" ".content" - ''; - build-system = with python3Packages; [ distutils setuptools diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix index c206410dfddf..f34100339455 100644 --- a/pkgs/by-name/me/merkaartor/package.nix +++ b/pkgs/by-name/me/merkaartor/package.nix @@ -7,7 +7,7 @@ gdal, proj, protobuf, - qt5, + qt6, withGeoimage ? true, exiv2, withGpsdlib ? (!stdenv.hostPlatform.isDarwin), @@ -25,24 +25,25 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; - rev = version; + tag = version; hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec="; }; nativeBuildInputs = [ cmake pkg-config - qt5.qttools - qt5.wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ gdal proj protobuf - qt5.qtnetworkauth - qt5.qtsvg - qt5.qtwebengine + qt6.qt5compat + qt6.qtnetworkauth + qt6.qtsvg + qt6.qtwebengine ] ++ lib.optional withGeoimage exiv2 ++ lib.optional withGpsdlib gpsd diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix index 968abd246781..a8080e0219ca 100644 --- a/pkgs/by-name/me/metal-cli/package.nix +++ b/pkgs/by-name/me/metal-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "metal-cli"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "equinix"; repo = "metal-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-x4Q1MKgcamGYb3/0ksbHEaL1mjedx0Tu9IZJ5dTgRpQ="; + hash = "sha256-o2CXcwGowmQ4/BBXZXbR0uJ0AOARj2KbKhhtlRr7qpM="; }; - vendorHash = "sha256-X+GfM73LAWk2pT4ZOPT2pg8YaKyT+SNjQ14LgB+C7Wo="; + vendorHash = "sha256-oAghUkEhOkpCfRkDF+/Tfo45ihbXJabRkk7J3ghP36I="; ldflags = [ "-s" diff --git a/pkgs/by-name/me/meteor-git/package.nix b/pkgs/by-name/me/meteor-git/package.nix index d0f247f2263c..4128fc7c752c 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.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "stefanlogue"; repo = "meteor"; rev = "v${version}"; - hash = "sha256-T4/SO6GW668w5bskfZbdAFBXiKIS9FXuMXOii8ZfOVc="; + hash = "sha256-oqfJDIT+4n9ySwmN5DoTvAcEY9wmI/bhVSYFHudMwl0="; }; vendorHash = "sha256-jKd/eJwp5SZvTrP3RN7xT7ibAB0PQondGR3RT+HQXIo="; diff --git a/pkgs/by-name/mi/micropython/fix-cross-compilation.patch b/pkgs/by-name/mi/micropython/fix-cross-compilation.patch new file mode 100644 index 000000000000..cfbae1de1c3c --- /dev/null +++ b/pkgs/by-name/mi/micropython/fix-cross-compilation.patch @@ -0,0 +1,31 @@ +--- a/ports/unix/Makefile ++++ b/ports/unix/Makefile +@@ -31,7 +31,7 @@ + QSTR_GLOBAL_DEPENDENCIES += $(VARIANT_DIR)/mpconfigvariant.h + + # OS name, for simple autoconfig +-UNAME_S := $(shell uname -s) ++UNAME_S := @UNAME_S@ + + # include py core make definitions + include $(TOP)/py/py.mk +@@ -151,7 +151,7 @@ + # If the variant enables it, enable modbluetooth. + ifeq ($(MICROPY_PY_BLUETOOTH),1) + ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1) +-HAVE_LIBUSB := $(shell (which pkg-config > /dev/null && pkg-config --exists libusb-1.0) 2>/dev/null && echo '1') ++HAVE_LIBUSB := $(shell (which @PKG_CONFIG@ > /dev/null && @PKG_CONFIG@ --exists libusb-1.0) 2>/dev/null && echo '1') + + # Figure out which BTstack transport to use. + ifeq ($(HAVE_LIBUSB),1) +@@ -180,8 +180,8 @@ + endif + else + # Use system version of libffi. +-LIBFFI_CFLAGS := $(shell pkg-config --cflags libffi) +-LIBFFI_LDFLAGS := $(shell pkg-config --libs libffi) ++LIBFFI_CFLAGS := $(shell @PKG_CONFIG@ --cflags libffi) ++LIBFFI_LDFLAGS := $(shell @PKG_CONFIG@ --libs libffi) + endif + + ifeq ($(UNAME_S),Linux) diff --git a/pkgs/by-name/mi/micropython/fix-mpy-cross-path.patch b/pkgs/by-name/mi/micropython/fix-mpy-cross-path.patch new file mode 100644 index 000000000000..a69b021c7062 --- /dev/null +++ b/pkgs/by-name/mi/micropython/fix-mpy-cross-path.patch @@ -0,0 +1,13 @@ +--- a/mpy-cross/mpy_cross/__init__.py ++++ b/mpy-cross/mpy_cross/__init__.py +@@ -61,6 +61,10 @@ + def _find_mpy_cross_binary(mpy_cross): + if mpy_cross: + return mpy_cross ++ # Check for MPY_CROSS environment variable first (for cross-compilation) ++ env_mpy_cross = os.environ.get("MPY_CROSS") ++ if env_mpy_cross: ++ return env_mpy_cross + return os.path.abspath(os.path.join(os.path.dirname(__file__), "../build/mpy-cross")) + + diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix index efb64c675551..dadd165c0785 100644 --- a/pkgs/by-name/mi/micropython/package.nix +++ b/pkgs/by-name/mi/micropython/package.nix @@ -7,6 +7,7 @@ python3, libffi, readline, + buildPackages, }: stdenv.mkDerivation rec { @@ -43,6 +44,33 @@ stdenv.mkDerivation rec { extraPrefix = "lib/mbedtls/"; hash = "sha256-Sllp/iWWEhykMJ3HALw5KzR4ta22120Jcl51JZCkZE0="; }) + ./fix-cross-compilation.patch + ./fix-mpy-cross-path.patch + ]; + + postPatch = '' + # Fix cross-compilation by replacing uname and pkg-config + substituteInPlace ports/unix/Makefile \ + --subst-var-by UNAME_S "${ + { + "x86_64-linux" = "Linux"; + "i686-linux" = "Linux"; + "aarch64-linux" = "Linux"; + "armv7l-linux" = "Linux"; + "armv6l-linux" = "Linux"; + "riscv64-linux" = "Linux"; + "powerpc64le-linux" = "Linux"; + "x86_64-darwin" = "Darwin"; + "aarch64-darwin" = "Darwin"; + } + .${stdenv.hostPlatform.system} or stdenv.hostPlatform.parsed.kernel.name + }" \ + --subst-var-by PKG_CONFIG "${stdenv.cc.targetPrefix}pkg-config" + ''; + + depsBuildBuild = [ + buildPackages.stdenv.cc + buildPackages.python3 ]; nativeBuildInputs = [ @@ -58,8 +86,25 @@ stdenv.mkDerivation rec { makeFlags = [ "-C" "ports/unix" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ] + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ + # Workaround for false positive gcc warning in mbedtls on aarch64 + "CFLAGS_EXTRA=-Wno-array-bounds" ]; # also builds mpy-cross + # Build mpy-cross for the build platform first when cross-compiling + preBuild = '' + # Build mpy-cross for the build platform + make -C mpy-cross \ + CC="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" \ + CROSS_COMPILE="" + '' + + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + # Set MPY_CROSS environment variable for cross-compilation + export MPY_CROSS="$PWD/mpy-cross/build/mpy-cross" + ''; + enableParallelBuilding = true; doCheck = true; @@ -87,7 +132,6 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin install -Dm755 ports/unix/build-standard/micropython -t $out/bin - install -Dm755 mpy-cross/build/mpy-cross -t $out/bin runHook postInstall ''; diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 6bd6597c3800..dc7bafcb9624 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; tag = "v${finalAttrs.version}"; - hash = "sha256-SAeQ7nFsr37I8XncV3eMT8JCb74CdM+xPrNBX+qf8Bc="; + hash = "sha256-AgzLv6HkmHmWLQuWv2QXWhzB8jxvEKLyznVj67J6Wl8="; }; postPatch = '' diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index ab074ffc6079..c94fde332299 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.162.0", + "version": "3.163.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_linux_x86_64", - "hash": "sha256-CTlnYQ1qiykfhcSys0v2F9m+avHVG2dw9VqhF/Vm8Ao=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_linux_x86_64", + "hash": "sha256-xDdeWcPNDiqCM/wcEsuxrnklZPOeSA0nm/6yiShO8jk=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_linux_aarch64", - "hash": "sha256-MpDdSB4jytSStz+xNJsv91ng1y4IYDoxioTWb/fq2KE=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_linux_aarch64", + "hash": "sha256-qFO1g/Tqk8sFyO10g5r4dYmuczHPb90s/p8aqc7c5+Y=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_mac_universal", - "hash": "sha256-DtcvrrwiGEgHfCBRhwvfvL16NfaVPOZ04XSUzr8TOaE=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_mac_universal", + "hash": "sha256-zB35GeHBbb6Bsj1uX4K67AxEcDIvIxe8PU/m6lGCc2E=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_mac_universal", - "hash": "sha256-DtcvrrwiGEgHfCBRhwvfvL16NfaVPOZ04XSUzr8TOaE=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_mac_universal", + "hash": "sha256-zB35GeHBbb6Bsj1uX4K67AxEcDIvIxe8PU/m6lGCc2E=" } } } diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index c45fa665d84a..cfd958959841 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; - version = "4.10.0"; + version = "4.10.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "silverpill"; repo = "mitra"; rev = "v${version}"; - hash = "sha256-r3sV066IzJ/dQomt/HPxWPcUYXohoOhP4g3Jn/5HXyg="; + hash = "sha256-JGiPCvfWsluWeJk14cbAVUJO69OKXG/+93FrGMRlCxU="; }; - cargoHash = "sha256-zGyWj1SgaoCT4OvMrhMgOD49glBBYQKLGoeanhl8W9U="; + cargoHash = "sha256-DmQo/DDD5b1bpBiB5JfpIDD9cQ+ColorY4kTW1Xh9lo="; # require running database doCheck = false; diff --git a/pkgs/by-name/mk/mkcal/package.nix b/pkgs/by-name/mk/mkcal/package.nix index 5dab56aada40..c0ba8cd527f1 100644 --- a/pkgs/by-name/mk/mkcal/package.nix +++ b/pkgs/by-name/mk/mkcal/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mkcal"; - version = "0.7.27"; + version = "0.7.28"; src = fetchFromGitHub { owner = "sailfishos"; repo = "mkcal"; tag = finalAttrs.version; - hash = "sha256-7QgkGULCqlsao91WmqHjVYJDN0b1JFEmPMRs2SvFv3k="; + hash = "sha256-tL42f8egP/anB4jOaAjmIh7C2pQyR3fgTDJ1E9t8EWk="; }; outputs = [ diff --git a/pkgs/by-name/ml/mlocate/package.nix b/pkgs/by-name/ml/mlocate/package.nix index 3a3bd207764f..2f2bc4803f5c 100644 --- a/pkgs/by-name/ml/mlocate/package.nix +++ b/pkgs/by-name/ml/mlocate/package.nix @@ -4,24 +4,24 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mlocate"; version = "0.26"; src = fetchurl { - url = "https://releases.pagure.org/mlocate/mlocate-${version}.tar.xz"; - sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh"; + url = "https://releases.pagure.org/mlocate/mlocate-${finalAttrs.version}.tar.xz"; + hash = "sha256-MGPfef4Zj7lhjhgMVLrzEFsz2I/mAv8thXCq+UTxJj4="; }; makeFlags = [ "dbfile=/var/cache/locatedb" ]; - meta = with lib; { - description = "Merging locate is an utility to index and quickly search for files"; + meta = { + description = "Utility to index and quickly search for files"; homepage = "https://pagure.io/mlocate"; - license = licenses.gpl2Only; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index e8a9169c3363..db228c21e1cb 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -8,12 +8,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "models-dev"; - version = "0-unstable-2025-09-26"; + version = "0-unstable-2025-09-29"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "ac659a30024a3d2d9729ec4b8572985a78f0d4aa"; - hash = "sha256-GZ1fIoSp/1gFGbOyuzOY1ufjWfz7py4tLzrpBkRV50Q="; + rev = "47a71d06c57055a7c347ff04b3c7cfcaf1fa9462"; + hash = "sha256-fv6u/Hpmt5KUGSN/P7mrqbWAx7kHsMeIjiLaRUQqG90="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 49c922ec44f9..466e0de71535 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -35,11 +35,13 @@ libXrandr, nix-update-script, onnxruntime, + opencv4, openhmd, openvr, orc, pcre2, pkg-config, + protobuf_21, python3, SDL2, shaderc, @@ -62,7 +64,14 @@ serviceSupport ? true, tracingSupport ? false, }: - +let + # For some reason protobuf 32 causes a segfault during startup + # Pin to last (known) working version + # See https://github.com/NixOS/nixpkgs/issues/439075 + opencv4' = opencv4.override { + protobuf = protobuf_21; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "monado"; version = "25.0.0"; @@ -124,8 +133,7 @@ stdenv.mkDerivation (finalAttrs: { libXext libXrandr onnxruntime - # FIXME: OpenCV support causes a segfault on start. See https://github.com/NixOS/nixpkgs/issues/439075 - # opencv4 + opencv4' openhmd openvr orc diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix index 647e53b7d8a5..d9529c76e3bb 100644 --- a/pkgs/by-name/mo/morgen/package.nix +++ b/pkgs/by-name/mo/morgen/package.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.6.17"; + version = "3.6.18"; src = fetchurl { name = "morgen-${version}.deb"; url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-k1JaAYE63bLMwTBH+TmhHa8KBY5YL12GhXrRS0WiilA="; + hash = "sha256-OvV+GNKQBzUpHEOfaBV6SGRxA/gvRWFkP5D7CihY7pU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/morty/package.nix b/pkgs/by-name/mo/morty/package.nix deleted file mode 100644 index 9e210f3a78c3..000000000000 --- a/pkgs/by-name/mo/morty/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - nixosTests, -}: - -buildGoModule { - pname = "morty"; - version = "unstable-2021-04-22"; - - src = fetchFromGitHub { - owner = "asciimoo"; - repo = "morty"; - rev = "f5bff1e285d3f973cacf73318e55175edafd633f"; - sha256 = "sha256-ik2VAPdxllt76UVFt77c1ltxIwFNahAKjn3FuErNFYo="; - }; - - vendorHash = "sha256-3sllcoTDYQBAyAT7e9KeKNrlTEbgnoZc0Vt0ksQByvo="; - - passthru.tests = { inherit (nixosTests) morty; }; - - meta = with lib; { - description = "Privacy aware web content sanitizer proxy as a service"; - mainProgram = "morty"; - longDescription = '' - Morty rewrites web pages to exclude malicious HTML tags and attributes. - It also replaces external resource references to prevent third party information leaks. - - The main goal of morty is to provide a result proxy for searx, but it can be used as a standalone sanitizer service too. - ''; - homepage = "https://github.com/asciimoo/morty"; - maintainers = with maintainers; [ - leenaars - SuperSandro2000 - ]; - license = licenses.agpl3Only; - }; -} diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index 088ece466bd4..f030fca0be29 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mozillavpn"; - version = "2.31.0"; + version = "2.31.1"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-++j3BMTkg5TG09hmsUGDcKbkvTGrd9u0FaRebbOsI3s="; + hash = "sha256-+Aexwj/iNIhriiUrMhtj2c9S3e5jGN7OvREXUzi/03s="; }; patches = [ ]; diff --git a/pkgs/by-name/mp/mpd-notification/package.nix b/pkgs/by-name/mp/mpd-notification/package.nix index f488d46f4e5b..1dcb84f8d8e2 100644 --- a/pkgs/by-name/mp/mpd-notification/package.nix +++ b/pkgs/by-name/mp/mpd-notification/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mpd-notification"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "eworm-de"; repo = "mpd-notification"; rev = version; - hash = "sha256-8iBG1IdbERB2gOALvVBNJ3/hhiou3D/azSRkRD+u9O8="; + hash = "sha256-2rnZkVKrk8jgZz/EcZGQ34tLZrVttjq3tq8k2xSl00A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix index 6d9651656416..3b88692c8a6a 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -14,13 +14,13 @@ }: buildDotnetModule (finalAttrs: { pname = "msbuild-structured-log-viewer"; - version = "2.3.42"; + version = "2.3.60"; src = fetchFromGitHub { owner = "KirillOsenkov"; repo = "MSBuildStructuredLog"; rev = "v${finalAttrs.version}"; - hash = "sha256-C6fArtGQd6XugbzI2TjTKQj0O6JGFz+kjsBF5pVJpPY="; + hash = "sha256-IjiZfsrkaTgqNBPD4Zw9t6DzAlMjnXZgkpFk7pwgsWI="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix index e447cc6269a0..904aaed6012c 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "mtail"; - version = "3.2.16"; + version = "3.2.18"; src = fetchFromGitHub { owner = "jaqx0r"; repo = "mtail"; rev = "v${version}"; - hash = "sha256-yugtprUVSy9+a7YGtgIffafE8hQrKku1RMHn2tq64KU="; + hash = "sha256-Z3FPZNWGyXtY2KLRF/oJIuN+lXE14SQce72pTKBsZEk="; }; vendorHash = "sha256-SMdEowzg53uori/Ge+GE4542wswBU2kgdyAXxeKQiiU="; diff --git a/pkgs/by-name/mt/mtxclient/package.nix b/pkgs/by-name/mt/mtxclient/package.nix index 1ce611fc08ca..dba49625017a 100644 --- a/pkgs/by-name/mt/mtxclient/package.nix +++ b/pkgs/by-name/mt/mtxclient/package.nix @@ -12,29 +12,27 @@ openssl, re2, spdlog, + gtest, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mtxclient"; version = "0.10.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Y0FMCq4crSbm0tJtYq04ZFwWw+vlfxXKXBo0XUgf7hw="; }; - postPatch = '' - # See https://github.com/gabime/spdlog/issues/1897 - sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt - ''; + patches = [ + ./remove-network-tests.patch + ]; cmakeFlags = [ - # Network requiring tests can't be disabled individually: - # https://github.com/Nheko-Reborn/mtxclient/issues/22 - "-DBUILD_LIB_TESTS=OFF" - "-DBUILD_LIB_EXAMPLES=OFF" + (lib.cmakeBool "BUILD_LIB_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "BUILD_LIB_EXAMPLES" false) ]; nativeBuildInputs = [ @@ -53,6 +51,10 @@ stdenv.mkDerivation rec { spdlog ]; + checkInputs = [ gtest ]; + + doCheck = true; + meta = with lib; { description = "Client API library for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/mtxclient"; @@ -60,11 +62,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fpletz pstn + rebmit rnhmjoj ]; platforms = platforms.all; - # Should be fixable if a higher clang version is used, see: - # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/mt/mtxclient/remove-network-tests.patch b/pkgs/by-name/mt/mtxclient/remove-network-tests.patch new file mode 100644 index 000000000000..166370bd6a2a --- /dev/null +++ b/pkgs/by-name/mt/mtxclient/remove-network-tests.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d9f92932246ebec8ab5d1cc462366a17818d014..ce27390bd754a33986188dd2bf29cd0c818c2d58 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,36 +398,6 @@ if(BUILD_LIB_TESTS) + + file(COPY tests/fixtures DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + +- add_executable(client_api tests/client_api.cpp) +- target_link_libraries(client_api +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(client_api PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(media_api tests/media_api.cpp) +- target_link_libraries(media_api +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(media_api PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(e2ee tests/e2ee.cpp) +- target_link_libraries(e2ee +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(e2ee PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(device tests/device.cpp) +- target_link_libraries(device +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(device PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- + add_executable(utils tests/utils.cpp) + target_link_libraries(utils + MatrixClient::MatrixClient +@@ -435,21 +405,6 @@ if(BUILD_LIB_TESTS) + GTest::Main) + target_include_directories(utils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) + +- add_executable(pushrules tests/pushrules.cpp) +- target_link_libraries(pushrules +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(pushrules PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(connection tests/connection.cpp) +- target_link_libraries(connection +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(connection PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- + add_executable(identifiers tests/identifiers.cpp) + target_link_libraries(identifiers + MatrixClient::MatrixClient +@@ -498,13 +453,7 @@ if(BUILD_LIB_TESTS) + GTest::GTest + GTest::Main) + +- add_test(BasicConnectivity connection) +- add_test(ClientAPI client_api) +- add_test(MediaAPI media_api) +- add_test(Encryption e2ee) +- add_test(Devices device) + add_test(Utilities utils) +- add_test(Pushrules pushrules) + add_test(Identifiers identifiers) + add_test(Errors errors) + add_test(CryptoStructs crypto) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index 748ba7ca4913..d536e153cd37 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -20,6 +20,7 @@ assert withParmetis -> mpiSupport; assert withPtScotch -> mpiSupport; let + scotch' = scotch.override { inherit withPtScotch; }; profile = if mpiSupport then "debian.PAR" else "debian.SEQ"; LMETIS = toString ([ "-lmetis" ] ++ lib.optional withParmetis "-lparmetis"); LSCOTCH = toString ( @@ -47,7 +48,7 @@ let ); in stdenv.mkDerivation (finalAttrs: { - name = "mumps"; + pname = "mumps"; version = "5.8.1"; # makeFlags contain space and one should use makeFlagsArray+ # Setting this magic var is an optional solution @@ -78,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { "LIBEXT_SHARED=.dylib" ] ++ [ - "ISCOTCH=-I${lib.getDev scotch}/include" + "ISCOTCH=-I${lib.getDev scotch'}/include" "LMETIS=${LMETIS}" "LSCOTCH=${LSCOTCH}" "ORDERINGSF=${ORDERINGSF}" @@ -107,16 +108,14 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional mpiSupport mpi ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - # Parmetis should be placed before scotch to avoid conflict of header file "parmetis.h" - buildInputs = - lib.optional withParmetis parmetis - ++ lib.optional mpiSupport scalapack - ++ [ - blas - lapack - metis - scotch - ]; + buildInputs = [ + blas + lapack + metis + scotch' + ] + ++ lib.optional mpiSupport scalapack + ++ lib.optional withParmetis parmetis; doInstallCheck = true; diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 1d81becd76cc..7fab7e2d0482 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "museum"; - version = "1.2.4"; + version = "1.2.8"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; tag = "photos-v${finalAttrs.version}"; - hash = "sha256-2kcIXnQPNB6V8ElTxoAETFCSyIIOGme15pYVXNLPlAg="; + hash = "sha256-CHdDtIEohEWKULkEZMs2+fsQR0HL++ejdCL2KA9SXt0="; }; - vendorHash = "sha256-px4pMqeH73Fe06va4+n6hklIUDMbPmAQNKKRIhwv6ec="; + vendorHash = "sha256-iltf6TVTzMhNpQxLtp/wqOCVXeJCmPvmlfWARbNgc4g="; sourceRoot = "${finalAttrs.src.name}/server"; diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix index f4f3b4c35f7a..7ee3f0b750e8 100644 --- a/pkgs/by-name/my/mydumper/package.nix +++ b/pkgs/by-name/my/mydumper/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "mydumper"; - version = "0.19.3-3"; + version = "0.20.1-2"; src = fetchFromGitHub { owner = "mydumper"; repo = "mydumper"; tag = "v${version}"; - hash = "sha256-CrjI6jwktBxKn7hgL8+pCikbtCFUK6z90Do9fWmLZlQ="; + hash = "sha256-ypFXxmKnG1yiJjvHGmYJJz5ZjhhGHCRklG7y83jypms="; # as of mydumper v0.16.5-1, mydumper extracted its docs into a submodule fetchSubmodules = true; }; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 073b2d38efc1..558c716f764f 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.111.0"; + version = "1.112.6"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-Ot7z6ZGOUeezp4r8mbGIhkvtkyigma1nLfVydZTVoMg="; + hash = "sha256-r/MCU/S1kkKQPkhmp9ZHTtgZxMu5TFCl5Yejp73gATw="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-uRdCxQENxAsQsYgxSVwVxpG8BhEd/VrYbNLNXCo9cRw="; + hash = "sha256-3QYKriP/5KqBD9x0H89MPzoqifVxFDBQfu4wa5aRfiY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix index efce66782045..8ee45785f8cd 100644 --- a/pkgs/by-name/nc/nchat/package.nix +++ b/pkgs/by-name/nc/nchat/package.nix @@ -12,7 +12,8 @@ cmake, gperf, nix-update-script, - withWhatsApp ? (!stdenv.isDarwin), # macOS 12.0+ required + withWhatsApp ? true, + apple-sdk_12, }: let @@ -87,6 +88,10 @@ stdenv.mkDerivation rec { readline sqlite zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # For SecTrustCopyCertificateChain, see https://github.com/NixOS/nixpkgs/pull/445063#pullrequestreview-3261846621 + apple-sdk_12 ]; cmakeFlags = [ diff --git a/pkgs/by-name/ne/neardal/package.nix b/pkgs/by-name/ne/neardal/package.nix deleted file mode 100644 index b1aa85d1f173..000000000000 --- a/pkgs/by-name/ne/neardal/package.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoconf, - automake, - pkg-config, - glib, - readline, - makeWrapper, -}: - -stdenv.mkDerivation { - pname = "neardal"; - version = "unstable-0.7-post-git-2015-09-30"; - - src = fetchFromGitHub { - owner = "connectivity"; - repo = "neardal"; - rev = "5b1c8b5c2c45c10f11cee12fbcb397f8953850d7"; - sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; - }; - - nativeBuildInputs = [ - pkg-config - makeWrapper - autoconf - automake - ]; - buildInputs = [ - glib - readline - ]; - - preConfigure = '' - substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" - substituteInPlace "demo/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" - sh autogen.sh - ''; - - configureFlags = [ - "--disable-dependency-tracking" - "--disable-traces" - ]; - - meta = with lib; { - broken = true; # 2022-11-13 - description = "C APIs to exchange datas with the NFC daemon 'Neard'"; - license = licenses.lgpl2; - homepage = "https://01.org/linux-nfc"; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/ne/nerdfetch/package.nix b/pkgs/by-name/ne/nerdfetch/package.nix index b0ba6d8a74f2..1c883297567d 100644 --- a/pkgs/by-name/ne/nerdfetch/package.nix +++ b/pkgs/by-name/ne/nerdfetch/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "nerdfetch"; - version = "8.4.0"; + version = "8.4.2"; src = fetchFromGitHub { owner = "ThatOneCalculator"; repo = "NerdFetch"; - rev = "v${finalAttrs.version}"; - hash = "sha256-KMu/cMjRFEyfRxoKDGn4PfubGCrotVsKQ9wwc1wQaVM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-G1BWggVPxpIKK82pKHD4Jxyis4CY156Jox2/xHRQfrI="; }; dontUnpack = true; @@ -30,6 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = with lib; { description = "POSIX *nix (Linux, macOS, Android, *BSD, etc) fetch script using Nerdfonts"; homepage = "https://github.com/ThatOneCalculator/NerdFetch"; + changelog = "https://github.com/ThatOneCalculator/NerdFetch/releases/tag/${finalAttrs.version}"; maintainers = with maintainers; [ ByteSudoer ]; license = licenses.mit; mainProgram = "nerdfetch"; diff --git a/pkgs/by-name/ne/nest/package.nix b/pkgs/by-name/ne/nest/package.nix index 827e0a2f417a..d30f94fd0ddd 100644 --- a/pkgs/by-name/ne/nest/package.nix +++ b/pkgs/by-name/ne/nest/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "nest"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "nest"; repo = "nest-simulator"; rev = "v${version}"; - hash = "sha256-hysOe1ZZpCClVOGo0+UeCP7imAakXrZlnJ4V95zfiyA="; + hash = "sha256-4tGLRAsJLOHl9frdo35p/uoTiT2zfstx1e+fv5+ZBCs="; }; postPatch = '' diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix index 3be0b399a04a..45c7fb599a65 100644 --- a/pkgs/by-name/ne/netpbm/package.nix +++ b/pkgs/by-name/ne/netpbm/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.11.1"; + version = "11.12.0"; outputs = [ "bin" @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "5104"; - sha256 = "sha256-zgA3EZPrXD8JOO9O2nuLt4ouPbbUJAlFKlX+2QOz8Uw="; + rev = "5121"; + sha256 = "sha256-u5/chGsu+imk6GtptDz/EIyCe3CmoWiQ6CAcLASqpqU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json index d17a2085dc38..a86b6071929b 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.json +++ b/pkgs/by-name/ne/nexusmods-app/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Argon", - "version": "0.24.2", - "hash": "sha256-QUwH6v4XKPU9T/mO/TNvMhoUv8yZHMr/Yg39NO+YV+0=" + "version": "0.31.0", + "hash": "sha256-YCv5pEi5JJRJlyncpqO1eTzMi5jYeecWdj5YphUOgpY=" }, { "pname": "AutoFixture", @@ -21,18 +21,23 @@ }, { "pname": "Avalonia", - "version": "11.2.3", - "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" + "version": "11.2.8", + "hash": "sha256-GbZIXopQh6VSRLAg47TRWHvMYEl5/c7rtvNmFnlDhAo=" }, { "pname": "Avalonia", "version": "11.3.0", "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg=" }, + { + "pname": "Avalonia", + "version": "11.3.5", + "hash": "sha256-gW1t+B32H9aVC+ogE5X+4bwjsmbdOcyH83T8Br7IDuY=" + }, { "pname": "Avalonia.Angle.Windows.Natives", - "version": "2.1.22045.20230930", - "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + "version": "2.1.25547.20250602", + "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M=" }, { "pname": "Avalonia.AvaloniaEdit", @@ -51,13 +56,13 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.3.0", - "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0=" + "version": "11.3.5", + "hash": "sha256-umZ6rfL9Qw1/jWpAiMyPu8f6i8ah4u3iR6uJVS6IUfw=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.3.0", - "hash": "sha256-McFggedX7zb9b0FytFeuh+3nPdFqoKm2JMl2VZDs/BQ=" + "version": "11.3.5", + "hash": "sha256-JgMIQ2aFgLkLcL/auPUwQTlmPlurree5HXfLYGGP3o8=" }, { "pname": "Avalonia.Controls.TreeDataGrid", @@ -66,38 +71,38 @@ }, { "pname": "Avalonia.Desktop", - "version": "11.3.0", - "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I=" + "version": "11.3.5", + "hash": "sha256-SJyN+znfG/GUYkw3yNFMxd0Y7Hc9QvckRHPRc/QpkvM=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.3.0", - "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0=" + "version": "11.3.5", + "hash": "sha256-7GORVuABhwQymfvSclY6ZGtRN6yXaKs1FKuXuR3ZXmo=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.3.0", - "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4=" + "version": "11.3.5", + "hash": "sha256-Kq5rZkiQWayrMRD90ex24zxESHTxof0PX8IvA+RutAc=" }, { "pname": "Avalonia.Headless", - "version": "11.3.0", - "hash": "sha256-GMO3gnygbeHAwz21v9yIRGOq1Y8mRIPIQW0jeD0fNao=" + "version": "11.3.5", + "hash": "sha256-CYAAEvzYOUBkAY4Y4EFKbzmvv/dNyHLn5n104/tFoCM=" }, { "pname": "Avalonia.Labs.Panels", - "version": "11.2.0", - "hash": "sha256-DhzjF4nhq8XXrCVHh9Eu1NTjVF2oPDNoto4BDQU7EJk=" + "version": "11.3.1", + "hash": "sha256-HUS1bIZSs3KiqJA8Vkg9Rqsylpus8pOeIw3ZGhwJS4E=" }, { "pname": "Avalonia.Native", - "version": "11.3.0", - "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs=" + "version": "11.3.5", + "hash": "sha256-EIpaS2XtO/1Dx0XVSf9XapKMUHmVSXwK/rwgeioPCDo=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.3.0", - "hash": "sha256-yY/xpe4Te6DLa1HZCWZgIGpdKeZqvknRtpkpBTrZhmU=" + "version": "11.3.5", + "hash": "sha256-WG+89BKJLaaXQVZ2GukCxFB0zkjF3srscQxStVmgvKo=" }, { "pname": "Avalonia.Remote.Protocol", @@ -106,8 +111,8 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.3.0", - "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I=" + "version": "11.3.5", + "hash": "sha256-1bAKPdK+ftcdfdiUkwasmpjf3ai07T81PkRjKWFyNf8=" }, { "pname": "Avalonia.Skia", @@ -119,6 +124,11 @@ "version": "11.3.0", "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc=" }, + { + "pname": "Avalonia.Skia", + "version": "11.3.5", + "hash": "sha256-DW2ectX/V583KqirUetmFioMNsuUa0ai2k5WKObFMO4=" + }, { "pname": "Avalonia.Svg.Skia", "version": "11.3.0", @@ -126,23 +136,23 @@ }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.3.0", - "hash": "sha256-o5scZcwaflLKXQD6VLGZYe4vvQ322Xzgh7F3IvriMfk=" + "version": "11.3.5", + "hash": "sha256-BXf+iZxBEO2pFeAiN0bJNOndFJE+L573qZFiLqRRWG8=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.3.0", - "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0=" + "version": "11.3.5", + "hash": "sha256-hkEJC/2usaYDDdIeVKuWfORd+tlg39+xf/2Eiflvb8I=" }, { "pname": "Avalonia.Win32", - "version": "11.3.0", - "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE=" + "version": "11.3.5", + "hash": "sha256-SNAx4QaNyrhE0BLWhHFtdsB35a5T9qfIQhdMC1YUrzA=" }, { "pname": "Avalonia.X11", - "version": "11.3.0", - "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU=" + "version": "11.3.5", + "hash": "sha256-v85I2pFMOixIANKCngr2/HyTflYxiSihe08q6Z4513Q=" }, { "pname": "AvaloniaEdit.TextMate", @@ -186,18 +196,18 @@ }, { "pname": "BenchmarkDotNet", - "version": "0.14.0", - "hash": "sha256-Ynfhr0OsW0dKp81caryZXcrBJsA2YScuKQOCiLVg1rI=" + "version": "0.15.2", + "hash": "sha256-tzwxe5UbYxnVknfpbbEcZx+gsLw9XIzvDk79QkgAO7M=" }, { "pname": "BenchmarkDotNet.Annotations", - "version": "0.14.0", - "hash": "sha256-BKtno0khZ2jZtXF05l9/vsYjbQIqxAimoaSkxyx6L9A=" + "version": "0.15.2", + "hash": "sha256-RG84sV7tHcVdQTI4QJ+VUVBmtNhhE399KpD0CERPefg=" }, { "pname": "BitFaster.Caching", - "version": "2.5.2", - "hash": "sha256-rZz3zNPt7DB+H5VDpI3nOrh5Nl4XYvU50CJXGfl3+5A=" + "version": "2.5.4", + "hash": "sha256-PWuVT1kKjL8ulMtv9hWmg0nMChFh8skr34xUl3mQ0Y8=" }, { "pname": "BsDiff", @@ -211,8 +221,8 @@ }, { "pname": "CliWrap", - "version": "3.6.7", - "hash": "sha256-9j3GILP25inLJoQe0E8sF8egVt8ISqEQBGdIShev4Mk=" + "version": "3.9.0", + "hash": "sha256-WC1bX8uy+8VZkrV6eK8nJ24Uy81Bj4Aao27OsP1sGyE=" }, { "pname": "ColorDocument.Avalonia", @@ -229,6 +239,11 @@ "version": "2.9.1", "hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo=" }, + { + "pname": "CommunityToolkit.HighPerformance", + "version": "8.4.0", + "hash": "sha256-q9RZZvLlvk1sXuIr5wdBxyTf9o0G2mk23xtNGDf6vGs=" + }, { "pname": "coverlet.collector", "version": "6.0.2", @@ -236,8 +251,8 @@ }, { "pname": "DiffEngine", - "version": "15.5.3", - "hash": "sha256-oZG++i9oWBJhSPHERAQwVODA0GWtp//r2oHpnjgmCeA=" + "version": "16.3.0", + "hash": "sha256-JkkAUk7dwYYLz1TwO5T34aZf+VW+uTKuYF/hmRcxBuo=" }, { "pname": "DiffPlex", @@ -259,11 +274,6 @@ "version": "8.4.1", "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4=" }, - { - "pname": "DynamicData", - "version": "9.0.1", - "hash": "sha256-dvo4eSHg8S9oS5QhvfCrbV+y7BVtlYRwH7PN7N1GubM=" - }, { "pname": "DynamicData", "version": "9.0.4", @@ -274,15 +284,20 @@ "version": "9.3.2", "hash": "sha256-00fzA28aU48l52TsrDSJ9ucljYOunmH7s2qPyR3YjRA=" }, + { + "pname": "DynamicData", + "version": "9.4.1", + "hash": "sha256-CX4NQj2LTk/8f4xDE5rUVBsqcY74H/1qUHFTrVX+9/0=" + }, { "pname": "EmptyFiles", - "version": "8.5.0", - "hash": "sha256-mLraPiJa1JiXOWQ17GUp8MWuBNrIjcYYjItQRfMjP8s=" + "version": "8.11.1", + "hash": "sha256-1rmycQh9HW08BtLk+lu90MSNuy+O7JPrE+NbupPnZ2I=" }, { "pname": "EnumerableAsyncProcessor", - "version": "2.1.0", - "hash": "sha256-WljvqFPe95cjtm+VfaeLvQDFW2j9QQBWJAd0bM8VXN0=" + "version": "3.8.4", + "hash": "sha256-LODca+81cZ5UmFf2JqoIIkoS1whnGWorGFV8wJVG7Qc=" }, { "pname": "ExCSS", @@ -311,8 +326,8 @@ }, { "pname": "FluentAssertions", - "version": "7.1.0", - "hash": "sha256-AHHBQ5l7RCnjitxNE2aElBkdlg3BCcN9z+r9QrM+GeA=" + "version": "7.2.0", + "hash": "sha256-UG1FEj2sReJQf/zM4kh/XDtPCNaLfGdhg0VxEKLJV/s=" }, { "pname": "FluentAssertions.Analyzers", @@ -364,6 +379,11 @@ "version": "4.9.0", "hash": "sha256-cuoMMfh5adQgVh9ZNqZ3mF9bLoArXRuzzZ6TIdFkh+M=" }, + { + "pname": "GameFinder.Common", + "version": "4.4.0", + "hash": "sha256-7tk84DGPBM2M8KvuTnDm4hLVmLUMd8GSLDFhsjl7Ra0=" + }, { "pname": "GameFinder.Common", "version": "4.9.0", @@ -374,6 +394,11 @@ "version": "4.9.0", "hash": "sha256-g0suL5aVnDXFltlKzuds8PQxVCEtNsNdl52owlSg0jg=" }, + { + "pname": "GameFinder.RegistryUtils", + "version": "4.4.0", + "hash": "sha256-6Yk3A88xSWO7wr+1bJQtH6D2DRzQ0AOb8HkmSb34MPk=" + }, { "pname": "GameFinder.RegistryUtils", "version": "4.9.0", @@ -389,6 +414,11 @@ "version": "4.9.0", "hash": "sha256-Dp2EUsWbjXKOfZF8nzWWLESgt7VadvF65iqXE8LZ45g=" }, + { + "pname": "GameFinder.StoreHandlers.GOG", + "version": "4.4.0", + "hash": "sha256-8LWj1MaEKhukBXs0ZIt5pt5z1H1i3VuoJONqqH6gNvY=" + }, { "pname": "GameFinder.StoreHandlers.GOG", "version": "4.9.0", @@ -399,16 +429,31 @@ "version": "4.9.0", "hash": "sha256-l1WIlBYoA04eK0k1EU8C46MdEeNXix5MIWCo67Dzhlo=" }, + { + "pname": "GameFinder.StoreHandlers.Steam", + "version": "4.4.0", + "hash": "sha256-D6ABxneqdc+467RvYMs8qULyYHNTs7I0GsmXBIpiZMM=" + }, { "pname": "GameFinder.StoreHandlers.Steam", "version": "4.9.0", "hash": "sha256-Cw7eMevnbyJz3N4jUfWZ9SsQvMEbtFKHgc6HPnDD3+Y=" }, + { + "pname": "GameFinder.StoreHandlers.Xbox", + "version": "4.4.0", + "hash": "sha256-xLZJ4J79ptEjPduwdY8E288UJRQ92JnHSjkJc6Ubt+4=" + }, { "pname": "GameFinder.StoreHandlers.Xbox", "version": "4.9.0", "hash": "sha256-/lkl+POQgiwlYxNJ4h4Dtp7w+hI5YUDv1sizAk8FCzc=" }, + { + "pname": "GameFinder.Wine", + "version": "4.4.0", + "hash": "sha256-lmGF+gzipCBIu/c4wR2Qgqq6/5Dd4ZhqlxUuCRX7pmY=" + }, { "pname": "GameFinder.Wine", "version": "4.9.0", @@ -424,26 +469,6 @@ "version": "2.4.1", "hash": "sha256-bY8RXB3fIsgYIrlLeEuq8dsOfIn8zcbZ0dj2Ra1sFZg=" }, - { - "pname": "Google.Protobuf", - "version": "3.22.5", - "hash": "sha256-KuPCqobX6vE9RYElAN9vw+FPonFipms7kE/cRDCLmSQ=" - }, - { - "pname": "Grpc.Core.Api", - "version": "2.52.0", - "hash": "sha256-ISgN3zWwvV8qD7JFkaYveLbke09+UtUBy3Tux+ZHLNc=" - }, - { - "pname": "Grpc.Net.Client", - "version": "2.52.0", - "hash": "sha256-4Rhb8PIoV2BiohfRwzx1GYDPbcfqxGAmL2uB0atFFTk=" - }, - { - "pname": "Grpc.Net.Common", - "version": "2.52.0", - "hash": "sha256-XoY+jt+JIt6SzvCjUSXKKa9Q8Bu5UrNJv2z1hCBKDrY=" - }, { "pname": "Halgari.Jamarino.IntervalTree", "version": "1.0.0-alpha", @@ -465,9 +490,9 @@ "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" }, { - "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.3", - "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "8.3.1.1", + "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", @@ -480,9 +505,9 @@ "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" }, { - "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.3", - "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "8.3.1.1", + "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", @@ -491,23 +516,23 @@ }, { "pname": "HotChocolate.Language.SyntaxTree", - "version": "15.0.3", - "hash": "sha256-PXlle10Q2Yuhcip1WhY922G5ObD4yRwYyPyUqci7Z7A=" + "version": "15.1.10", + "hash": "sha256-LdmdJTqobPNBkqnRp48u8T+jVLoxsaP9rwvR95aR2eI=" }, { "pname": "HotChocolate.Transport.Abstractions", - "version": "15.0.3", - "hash": "sha256-uRSetnfWOwar73WO/wplsHexCzpbZf6xYxVBLWaIwLo=" + "version": "15.1.10", + "hash": "sha256-8hyAutW63FJYaDlNzey8yc0LLVSP2zzj/XILV5e/u/g=" }, { "pname": "HotChocolate.Transport.Http", - "version": "15.0.3", - "hash": "sha256-9SkFbGb/uYmIGPDT1LnF3m42c8sEeCZBv4OuClMEU6w=" + "version": "15.1.10", + "hash": "sha256-e6f1EegRAbJJLXQOtvX+qImG9x3ymWVpcPBY3pkl9l0=" }, { "pname": "HotChocolate.Utilities", - "version": "15.0.3", - "hash": "sha256-9y7iNQqv1wrkuGZ3ovXkQQ+seSB4bZwexfmlneoeEAg=" + "version": "15.1.10", + "hash": "sha256-OaWkx/vCeiAb+Crp583ye/uUNib0Lq39i1HDP2quqyc=" }, { "pname": "HtmlAgilityPack", @@ -771,18 +796,18 @@ }, { "pname": "Iced", - "version": "1.17.0", - "hash": "sha256-6/5E5v5mqSG7yiE2zHUChZZeC47NRgLzQFD4+7bqKaU=" + "version": "1.21.0", + "hash": "sha256-0xYTYX4935Ejm7yUqMWHhJtCNuj4oqK6Weojl6FIfHo=" }, { "pname": "ini-parser-netstandard", - "version": "2.5.2", - "hash": "sha256-idb2hvuDlxl83x0yttGHnTgEQmwLLdUT7QfMeGDXVJE=" + "version": "2.5.3", + "hash": "sha256-Z/YtxBavsRGM98HLoqmvIz2R6TYgEzm1UdrrDKe8GGQ=" }, { "pname": "JetBrains.Annotations", - "version": "2024.3.0", - "hash": "sha256-BQYhE7JDJ9Bw588KyWzOvQFvQTiRa0K9maVkI9lZgBc=" + "version": "2025.2.2", + "hash": "sha256-Bf7m0P3DQB47GrMbnNlXd3i9/GMS5Bg6gILWpdsjVvY=" }, { "pname": "Jitbit.FastCache", @@ -799,6 +824,16 @@ "version": "1.3.8", "hash": "sha256-OmT3JwO4qpkZDL7XqiFqZCyxySj64s9t+mXcN1T+IyA=" }, + { + "pname": "K4os.Compression.LZ4.Streams", + "version": "1.3.8", + "hash": "sha256-v4P53XAJ7WnOcQ014pUv/Pi0lQu0WnkDwiBt/QVO304=" + }, + { + "pname": "K4os.Hash.xxHash", + "version": "1.0.8", + "hash": "sha256-ILTWT8NFB7itGpDloJh65B5ZuWHrN2dOUQdm8gNy4W8=" + }, { "pname": "LinqGen", "version": "0.3.1", @@ -824,15 +859,20 @@ "version": "2.0.0-rc2", "hash": "sha256-pHMtCkoz4sz2MLlVGFbFwwONLC3vzy+9Cg0OmEJ+f/s=" }, + { + "pname": "Loqui", + "version": "2.73.2", + "hash": "sha256-SSIeIlL2OXNqDPV8QMJpQTHO+49MWIW41DYbMrSID+o=" + }, { "pname": "Magick.NET-Q16-AnyCPU", - "version": "14.0.0", - "hash": "sha256-hsFqy7F1s9pO3SWnOuKc4AWEoG7fR8CKSkjfo7pKvzY=" + "version": "14.8.1", + "hash": "sha256-IqayPpqskU8UGBdFFnxaaegs63XAQ8nw+AonMWRCXt0=" }, { "pname": "Magick.NET.Core", - "version": "14.0.0", - "hash": "sha256-mwh8d7qmM7m6IbnLSPNq8ZMcD24/1ypM3Gdf6GZm0ao=" + "version": "14.8.1", + "hash": "sha256-ZySDgeA+0pp7FiHsNbeGKAn0Naxmd1gpfJVh3WbhmNo=" }, { "pname": "Markdig", @@ -851,23 +891,23 @@ }, { "pname": "MemoryPack", - "version": "1.21.3", - "hash": "sha256-x0riT7EvbuyX91wq9PIEwDQe1aiBrYD9R9Io16JvprM=" + "version": "1.21.4", + "hash": "sha256-igv/uFoMWP1KBc/Mh8wjgKlQKvum/i6vXnANEzOy0Pg=" }, { "pname": "MemoryPack.Core", - "version": "1.21.3", - "hash": "sha256-99ys+oZfBxcmal9PE14bxmR+svGk+J3FqAzxG7qVOHg=" + "version": "1.21.4", + "hash": "sha256-H2h883BIxKgx217wSpoyyGBNz71dsonGWnrSHBCOxVg=" }, { "pname": "MemoryPack.Generator", - "version": "1.21.3", - "hash": "sha256-TdbsUp0jB/1T4nU1dHS25iizpXLXJ0KWzqo3skMV6KE=" + "version": "1.21.4", + "hash": "sha256-EfYSagDue/bGYs7d5iP/jMzQCyDY0aOnCMaQbvyR/pQ=" }, { "pname": "MemoryPack.Streaming", - "version": "1.21.3", - "hash": "sha256-WWJx+aMHnjKVPrOSt0QE0iFh/rNhZCCbUrnww3HdqfI=" + "version": "1.21.4", + "hash": "sha256-DHGELlkoiLzBPCBSZZmfFe6IUdaIMmwn39iQGVCGhIs=" }, { "pname": "MicroCom.Runtime", @@ -881,13 +921,13 @@ }, { "pname": "Microsoft.AspNetCore.WebUtilities", - "version": "9.0.0", - "hash": "sha256-LFyhPIJNZLBqOEF4uZ1SpqN/NhjpCHqhzO4R2ApXuj0=" + "version": "9.0.2", + "hash": "sha256-iYxVk00qENlwYsT8z7Y/VF2VOKmAfTb3NZgRQhqBc2Y=" }, { "pname": "Microsoft.AspNetCore.WebUtilities", - "version": "9.0.4", - "hash": "sha256-KG2H4FIuJhiallEfPqi1Kgs93tOkfrEw7qJniu0TuF0=" + "version": "9.0.8", + "hash": "sha256-HZMVbD6PNLKM5/2UhidPxmxeNcu8cemBwMx5hsyaPB8=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -899,11 +939,6 @@ "version": "1.1.1", "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" - }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "7.0.0", @@ -921,8 +956,8 @@ }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.3", - "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY=" + "version": "3.11.0", + "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", @@ -941,8 +976,8 @@ }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.1.0", - "hash": "sha256-g3RLyeHfdOOF6H89VLJi06/k8/eJ6j2dgNYZ/MBdfNU=" + "version": "4.14.0", + "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE=" }, { "pname": "Microsoft.CodeAnalysis.Common", @@ -961,8 +996,8 @@ }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.1.0", - "hash": "sha256-pM9WXvxZI3SS89CGVjxqtAyZyfyiZQzW0UnNCDiQrQA=" + "version": "4.14.0", + "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", @@ -1021,8 +1056,8 @@ }, { "pname": "Microsoft.CodeCoverage", - "version": "17.14.0", - "hash": "sha256-dvhelCipcrKwLvwilqwU4Md2YONCHteV+vcWnvBlLEI=" + "version": "17.14.1", + "hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs=" }, { "pname": "Microsoft.Composition", @@ -1031,18 +1066,23 @@ }, { "pname": "Microsoft.Diagnostics.NETCore.Client", - "version": "0.2.251802", - "hash": "sha256-9ZH4rrfACzJP5oiarDW4cD2nczv1SNgZr4GW1J9hlUA=" + "version": "0.2.410101", + "hash": "sha256-+GC6mbob+nA9m40niHEJ/GanLYhvAx4RVjWaexcjmCA=" + }, + { + "pname": "Microsoft.Diagnostics.NETCore.Client", + "version": "0.2.510501", + "hash": "sha256-vaYSgSoyPH0XJ+CVZq+XlSyL1tJgZ5kEXKMwYx+1I9w=" }, { "pname": "Microsoft.Diagnostics.Runtime", - "version": "2.2.332302", - "hash": "sha256-5R9xK0owZEhXsucqPKnPaTiwhXBnLo92L2AY7IjyxNg=" + "version": "3.1.512801", + "hash": "sha256-nDE0cI9oVGPE4aKsmq81ojRizZC/Oi+5W4N97bg3c4A=" }, { "pname": "Microsoft.Diagnostics.Tracing.TraceEvent", - "version": "3.1.8", - "hash": "sha256-JFrNrQrXjOJI7v4MpQEDMfmfndM4ThtDZkATAGin9lE=" + "version": "3.1.21", + "hash": "sha256-Zk2nRqnBMWdn5FHexMOGxFiqX95sJkYdLVd3T8TMPT8=" }, { "pname": "Microsoft.DotNet.PlatformAbstractions", @@ -1051,13 +1091,13 @@ }, { "pname": "Microsoft.Extensions.AmbientMetadata.Application", - "version": "9.7.0", - "hash": "sha256-nRG56q5zBJ6is+qCJhuJPf4b6orz4fJ5uOF6bERUN5A=" + "version": "9.8.0", + "hash": "sha256-IFcw83BEZVbKV0L0E9Jkdaz30Zm3U8+MDvftLyXKUOg=" }, { "pname": "Microsoft.Extensions.Compliance.Abstractions", - "version": "9.7.0", - "hash": "sha256-a9ter/qJUM0GkzqIQqPXsTuiAG5cD/Hjj8pG2/Hlx/k=" + "version": "9.8.0", + "hash": "sha256-LYrL4TF7BRFGCzFvHivDevqAFlZxsnSrI/+n28fKMmU=" }, { "pname": "Microsoft.Extensions.Configuration", @@ -1074,6 +1114,11 @@ "version": "9.0.7", "hash": "sha256-Su+YntNqtLuY0XEYo1vfQZ4sA0wrHu0ZrcM33blvHWI=" }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "9.0.8", + "hash": "sha256-GnD1Ar/yZfCZQw2k/2jKteLG1lF/Dk7S3tgMvn+SFqc=" + }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "8.0.0", @@ -1084,11 +1129,21 @@ "version": "9.0.0", "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.2", + "hash": "sha256-icRtfbi0nDRUYDErtKYx0z6A1gWo5xdswsSM6o4ozxc=" + }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "9.0.7", "hash": "sha256-45ZR8liM/A6II+WPX9X6v9+g2auAKInPbVvY6a79VLk=" }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.8", + "hash": "sha256-hes+QZM3DQ1R/8CDOdWObk6s1oGhzFqka8Qc7Baf9PY=" + }, { "pname": "Microsoft.Extensions.Configuration.Binder", "version": "8.0.0", @@ -1104,6 +1159,11 @@ "version": "9.0.7", "hash": "sha256-9iT3CPY6Vpwi1RCVwveHVteTgpAXloBAo8KCwIPsePg=" }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "9.0.8", + "hash": "sha256-N8WMvnbCKsUtpK08B1CYi5LOuq6Sbv3Nois4CKjDQJ8=" + }, { "pname": "Microsoft.Extensions.Configuration.CommandLine", "version": "8.0.0", @@ -1114,6 +1174,11 @@ "version": "9.0.7", "hash": "sha256-L+emOXCVXAu2PNLLd1Bn/v/imrjLJsiAjvWmA0YPgGg=" }, + { + "pname": "Microsoft.Extensions.Configuration.CommandLine", + "version": "9.0.8", + "hash": "sha256-U8YasTaEsniloNaSPvlcXmGPfgTzjP8RvCfnLVx1onE=" + }, { "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", "version": "8.0.0", @@ -1124,6 +1189,11 @@ "version": "9.0.7", "hash": "sha256-r1ndSWcgGv7f7twBcplfCHRdBtV4Z77TsVpfirSrZPk=" }, + { + "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", + "version": "9.0.8", + "hash": "sha256-g3FgfS11nS02dwDnpjpiD+r7nyUZ2eifGl8r2rfwanY=" + }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", "version": "8.0.0", @@ -1134,6 +1204,11 @@ "version": "9.0.7", "hash": "sha256-9+XLNylnsYd/IcLZfDyW/Q+nuYB51BQJeyA+ZMsKan0=" }, + { + "pname": "Microsoft.Extensions.Configuration.FileExtensions", + "version": "9.0.8", + "hash": "sha256-W7PnvqPcdJnJIPaEh1qRDh/WCVSz/KQy+GAMhMNhKE4=" + }, { "pname": "Microsoft.Extensions.Configuration.Json", "version": "8.0.0", @@ -1144,6 +1219,11 @@ "version": "9.0.7", "hash": "sha256-4lWXlwwGPgv3nrL5V890LPVKxSDM8w4UJYYQlSA28/M=" }, + { + "pname": "Microsoft.Extensions.Configuration.Json", + "version": "9.0.8", + "hash": "sha256-/QFT/SksJcsZ2Cjw0WkJzLnp+mT2m+38avEOgttrAaM=" + }, { "pname": "Microsoft.Extensions.Configuration.UserSecrets", "version": "8.0.0", @@ -1154,6 +1234,11 @@ "version": "9.0.7", "hash": "sha256-YvYQT27sflpwyklvtgLjc2tphvZSdMnpGDf92vkDrR8=" }, + { + "pname": "Microsoft.Extensions.Configuration.UserSecrets", + "version": "9.0.8", + "hash": "sha256-QcSfPQku3Hh5UIvuR3r3JYFDo2DFIZOx/i0/JmtOPWE=" + }, { "pname": "Microsoft.Extensions.DependencyInjection", "version": "8.0.0", @@ -1166,13 +1251,13 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.6", - "hash": "sha256-m5vMZj3q3hHQDla/bKbfEk1lUj55p4/bktaqIWAVFRs=" + "version": "9.0.7", + "hash": "sha256-/TCCT7WPZpEWP9E3M441y+SZsmdqQ/WMTgL+ce7p2hw=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.7", - "hash": "sha256-/TCCT7WPZpEWP9E3M441y+SZsmdqQ/WMTgL+ce7p2hw=" + "version": "9.0.8", + "hash": "sha256-fJOwbtlmP6mXGYqHRCqtb7e08h5mFza6Wmd1NbNq3ug=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -1196,18 +1281,23 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "9.0.6", - "hash": "sha256-40rY38OwSqueIWr/KMvJX9u+vipN+AaRQ6eNCZLqrog=" + "version": "9.0.2", + "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "9.0.7", "hash": "sha256-Ltlh01iGj6641DaZSFif/2/2y3y9iFk7GEd+HuRnxPs=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.8", + "hash": "sha256-uFBeyx8WTgDX2z8paf6ZAQ45WexaWG8uzO5x+qGrPRU=" + }, { "pname": "Microsoft.Extensions.DependencyInjection.AutoActivation", - "version": "9.7.0", - "hash": "sha256-vQcW1llTiPIlmzh/GZD3DtK1yh6wbz2IA79epDh3iNE=" + "version": "9.8.0", + "hash": "sha256-hIoJx/VgT1K8tsQRWI90vjLsWI68T2kwc93od5z/xaw=" }, { "pname": "Microsoft.Extensions.Diagnostics", @@ -1216,14 +1306,19 @@ }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "9.0.0", - "hash": "sha256-JMbhtjdcWRlrcrbgPlowfj26+pM+MYhnPIaYKnv9byU=" + "version": "9.0.2", + "hash": "sha256-ImTZ6PZyKEdq1XvqYT5DPr6cG0BSTrsrO7rTDuy29fc=" }, { "pname": "Microsoft.Extensions.Diagnostics", "version": "9.0.7", "hash": "sha256-3ju8IiGd0vjPTGLZ3o5kSlzZezGT80Xz0eDxUKXYkqE=" }, + { + "pname": "Microsoft.Extensions.Diagnostics", + "version": "9.0.8", + "hash": "sha256-jV71HdeEU/T60f5qr2ND5GY6/Qk4iPiMUbnjEq8S6Qo=" + }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", "version": "8.0.0", @@ -1239,10 +1334,15 @@ "version": "9.0.7", "hash": "sha256-kQ+554vO7LEsZlkmwsnhaucVWAPQpzdvNHo0Q6EkCyI=" }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "9.0.8", + "hash": "sha256-nsgRtkUUC5q+Wc76lu3xxRgOT0dw+EXGa4pFCeI0iEo=" + }, { "pname": "Microsoft.Extensions.Diagnostics.ExceptionSummarization", - "version": "9.7.0", - "hash": "sha256-Q45y2ZmbfoAV1BEKJApYssjeHLT3P0Id046hSt23e/c=" + "version": "9.8.0", + "hash": "sha256-CPx+IGyiHpnwDWjZCOQhBQ5wr958eTU+L+FMBxGac6g=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", @@ -1259,6 +1359,11 @@ "version": "9.0.7", "hash": "sha256-e/oPQDche6WBSJlVwNIhSu4qknO2TmMMkhX+OqbYGFA=" }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "9.0.8", + "hash": "sha256-9X3roHvoAFzlTwVSlkbksB9EosKjVHeXuR5Jm682Wvk=" + }, { "pname": "Microsoft.Extensions.FileProviders.Physical", "version": "8.0.0", @@ -1269,6 +1374,11 @@ "version": "9.0.7", "hash": "sha256-L7XMdKdZa4UT01TKEjunha3RAK5BBi2E020wRbrvUOU=" }, + { + "pname": "Microsoft.Extensions.FileProviders.Physical", + "version": "9.0.8", + "hash": "sha256-lVnOgpxjO5VaCgviGeQ0R8kAIiDN1nKqpbj8CrCDpic=" + }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", "version": "8.0.0", @@ -1279,6 +1389,11 @@ "version": "9.0.7", "hash": "sha256-KjxkTcn1aNZUdoFb6v/xhdG92D5FmwdW2MFL1xAH1x8=" }, + { + "pname": "Microsoft.Extensions.FileSystemGlobbing", + "version": "9.0.8", + "hash": "sha256-1dmTABLD1Zo2vdZFsASTx8T8MRI8emN//KuNP3OiWKw=" + }, { "pname": "Microsoft.Extensions.Hosting", "version": "8.0.0", @@ -1289,6 +1404,11 @@ "version": "9.0.7", "hash": "sha256-viFduZ4bUscmz3XhqsQ63hzw4+46j9vTnYBL72Eekzo=" }, + { + "pname": "Microsoft.Extensions.Hosting", + "version": "9.0.8", + "hash": "sha256-0tnVesvcSrqvLarEVEf0kqJXdveLQCY7rCLis8b206Q=" + }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", "version": "8.0.0", @@ -1305,24 +1425,29 @@ "hash": "sha256-TKWnynGXUb6Ka/q2gMsrOWQYMfaTnlzsATMJIQgltY4=" }, { - "pname": "Microsoft.Extensions.Http", - "version": "9.0.0", - "hash": "sha256-MsStH3oUfyBbcSEoxm+rfxFBKI/rtB5PZrSGvtDjVe0=" + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "9.0.8", + "hash": "sha256-N1XwGfMh2a9grBfObp9md7YPSm7rlNZO5NG8OmHn8W4=" }, { "pname": "Microsoft.Extensions.Http", - "version": "9.0.7", - "hash": "sha256-+n+4Cyq4Du6NBB8TXbbwyiEOw11GqUCsgqHuYxhXwGo=" + "version": "9.0.2", + "hash": "sha256-TL1TPa3xgD1d6Ix4/Iifyw1tov3Ew/BQy4bxaj7FRZU=" + }, + { + "pname": "Microsoft.Extensions.Http", + "version": "9.0.8", + "hash": "sha256-KeKjH5A/23ZmhY/zUWdKlh8mkJhE1BiCfX0ziVqTipA=" }, { "pname": "Microsoft.Extensions.Http.Diagnostics", - "version": "9.7.0", - "hash": "sha256-iRhlbmVt2Ijz5KOMyFlFvykUxqHS86WwWAlw76Vj8zo=" + "version": "9.8.0", + "hash": "sha256-z2gxaX168Gdjk8lpXU/JoOEm1xS68qk0WIyK8L+H/a4=" }, { "pname": "Microsoft.Extensions.Http.Resilience", - "version": "9.7.0", - "hash": "sha256-rqqM0wu3VZd6xArKcl710w3gNN7gBBgAGFkrcGI/I8Q=" + "version": "9.8.0", + "hash": "sha256-Ojo4YGMyVETFUImGLzDC6yOB/W/uTp/sC+gIpHXx/Jw=" }, { "pname": "Microsoft.Extensions.Logging", @@ -1334,6 +1459,11 @@ "version": "2.1.1", "hash": "sha256-HnEBmAhweBalCAeX+KZ4kEL3GXEVDBg6Uq4H4LJ56oo=" }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "6.0.0", + "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=" + }, { "pname": "Microsoft.Extensions.Logging", "version": "8.0.0", @@ -1346,8 +1476,8 @@ }, { "pname": "Microsoft.Extensions.Logging", - "version": "9.0.6", - "hash": "sha256-XFcRh5/aGtsNIUnEOLdusdpCVD7K6/6Ixwc2U/+a3c8=" + "version": "9.0.2", + "hash": "sha256-vPCb4ZoiwZUSGJIOhYiLwcZLnsd0ZZhny6KQkT88nI0=" }, { "pname": "Microsoft.Extensions.Logging", @@ -1355,14 +1485,14 @@ "hash": "sha256-7n8guHFss8HPnJuAByfzn9ipguDz7dack/udL1uH3h0=" }, { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "2.0.0", - "hash": "sha256-cBBNcoREIdCDnwZtnTG+BoAFmVb71P1nhFOAH07UsfQ=" + "pname": "Microsoft.Extensions.Logging", + "version": "9.0.8", + "hash": "sha256-SEVCMpVwjcQtTSs4lirb89A36MxLQwwqdDFWbr1VvP8=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "3.0.3", - "hash": "sha256-UFawgCAhbN5HCtJy39XO4sz5N/P/Zyrs0uqrQHc4SPI=" + "version": "2.0.0", + "hash": "sha256-cBBNcoREIdCDnwZtnTG+BoAFmVb71P1nhFOAH07UsfQ=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", @@ -1379,6 +1509,11 @@ "version": "9.0.0", "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.2", + "hash": "sha256-mCxeuc+37XY0bmZR+z4p1hrZUdTZEg+FRcs/m6dAQDU=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "9.0.4", @@ -1386,13 +1521,13 @@ }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "9.0.6", - "hash": "sha256-lhOMYT4+hua7SlgASGFBDhOkrNOsy35WyIxU3nVsD08=" + "version": "9.0.7", + "hash": "sha256-G8x9e+2D2FzUsYNkXHd4HKQ71iEv5njFiGlvS+7OXLQ=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "9.0.7", - "hash": "sha256-G8x9e+2D2FzUsYNkXHd4HKQ71iEv5njFiGlvS+7OXLQ=" + "version": "9.0.8", + "hash": "sha256-vaUApbwsqKt7+AItgusbCKKdTyOg/5KCdSZjDZarw20=" }, { "pname": "Microsoft.Extensions.Logging.Configuration", @@ -1409,6 +1544,11 @@ "version": "9.0.7", "hash": "sha256-ZgS/4d6hmFtCLWdBL4DtlEFXV84295jWJrgzUPQ1IVI=" }, + { + "pname": "Microsoft.Extensions.Logging.Configuration", + "version": "9.0.8", + "hash": "sha256-/6sIAQlXXDdWnERGXN9XqqOFf1Q71uFSMiThwdIPzEY=" + }, { "pname": "Microsoft.Extensions.Logging.Console", "version": "8.0.0", @@ -1419,6 +1559,11 @@ "version": "9.0.7", "hash": "sha256-KUsy31YvvO8CTwHoNw4DbBOp+/o2sYscvQL7fvCPUvQ=" }, + { + "pname": "Microsoft.Extensions.Logging.Console", + "version": "9.0.8", + "hash": "sha256-8cz7l8ubkRIBd6gwDJcpJd66MYNU0LsvDH9+PU+mTJo=" + }, { "pname": "Microsoft.Extensions.Logging.Debug", "version": "8.0.0", @@ -1429,6 +1574,11 @@ "version": "9.0.7", "hash": "sha256-i9BN2CvK4f5X8WFSeyaeXO5znFArIsCFIZQuIM4BtYE=" }, + { + "pname": "Microsoft.Extensions.Logging.Debug", + "version": "9.0.8", + "hash": "sha256-IPMzdLmY/l0IP25DTQ13qdA/wwX0V3wq+sTHp8bX0UM=" + }, { "pname": "Microsoft.Extensions.Logging.EventLog", "version": "8.0.0", @@ -1439,6 +1589,11 @@ "version": "9.0.7", "hash": "sha256-prMqE+YP+o7P3eIlPFEhTlkBktCFFbgcO1xq3Z3GFfc=" }, + { + "pname": "Microsoft.Extensions.Logging.EventLog", + "version": "9.0.8", + "hash": "sha256-W/yr3lXCwbtY5DTq50q5vM4Jeibj8j//xZF2qa6lgcc=" + }, { "pname": "Microsoft.Extensions.Logging.EventSource", "version": "8.0.0", @@ -1449,16 +1604,26 @@ "version": "9.0.7", "hash": "sha256-EMltfPMFkNWKNedONLi2JNB1YX/4khIfK6us5p/uQr0=" }, + { + "pname": "Microsoft.Extensions.Logging.EventSource", + "version": "9.0.8", + "hash": "sha256-AFjHG4fiHgbJbgcr6u0/M83vf0XtdoeA5ZGSrIV31Co=" + }, { "pname": "Microsoft.Extensions.ObjectPool", - "version": "9.0.0", - "hash": "sha256-mX2Y2bHwScjXh1xQOweawmwo7jYLw+MhePibk/96dMY=" + "version": "9.0.2", + "hash": "sha256-btrvR6oEoXa152biijpLMDAf0v4fNlvHgkA+9BZZhko=" }, { "pname": "Microsoft.Extensions.ObjectPool", "version": "9.0.7", "hash": "sha256-ZpWn5yt4dLFKFMKN+yqSzEWKHmtKpPmHJnLMKmWNZ0A=" }, + { + "pname": "Microsoft.Extensions.ObjectPool", + "version": "9.0.8", + "hash": "sha256-nhzUsWbmnKS9mZXOlRk0O5iy2lJpYw7YW0JDJKQ37XU=" + }, { "pname": "Microsoft.Extensions.Options", "version": "2.0.0", @@ -1476,14 +1641,19 @@ }, { "pname": "Microsoft.Extensions.Options", - "version": "9.0.6", - "hash": "sha256-QXLt+WeCjH3pnbs0UVNXmskuWJtBrbNHOV8Of8w3teg=" + "version": "9.0.2", + "hash": "sha256-y2jZfcWx/H6Sx7wklA248r6kPjZmzTTLGxW8ZxrzNLM=" }, { "pname": "Microsoft.Extensions.Options", "version": "9.0.7", "hash": "sha256-nfUnZxx1tKERUddNNyxhGTK7VDTNZIJGYkiOWSHCt/M=" }, + { + "pname": "Microsoft.Extensions.Options", + "version": "9.0.8", + "hash": "sha256-AbwIL8sSZ/qDBKbvabHp1tbExBFr73fYjuXJiV6On1U=" + }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", "version": "8.0.0", @@ -1499,6 +1669,11 @@ "version": "9.0.7", "hash": "sha256-96ycmW7aMb9i0GFXoLVUlb0cc3IIpYXRJ3Pymz/QJi4=" }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "9.0.8", + "hash": "sha256-MwTPdC6kJ6Ff/Tw7BHa9JzRwBeCVdRS1gMz17agSjaY=" + }, { "pname": "Microsoft.Extensions.Primitives", "version": "2.0.0", @@ -1516,64 +1691,54 @@ }, { "pname": "Microsoft.Extensions.Primitives", - "version": "9.0.4", - "hash": "sha256-v/Ygyo1TMTUbnhdQSV2wzD4FOgAEWd1mpESo3kZ557g=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "9.0.6", - "hash": "sha256-hO2BmhEhL5sJUv0cf37jhsjr+gRCAJnQKOj38RKxJvo=" + "version": "9.0.2", + "hash": "sha256-zy/YNMaY47o6yNv2WuYiAJEjtoOF8jlWgsWHqXeSm4s=" }, { "pname": "Microsoft.Extensions.Primitives", "version": "9.0.7", "hash": "sha256-Vv1EuoBSfjCJ7EKzxh10/nA/rpaFU8D8+bdZZQWzw2I=" }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.8", + "hash": "sha256-K3T8krgXZmvQg87AQQrn9kiH2sDyKzRUMDyuB/ItmPc=" + }, { "pname": "Microsoft.Extensions.Resilience", - "version": "9.7.0", - "hash": "sha256-uty6qx0B9huC3hse2Yv5yF4zHlYYVtOXavHl3x/77fo=" + "version": "9.8.0", + "hash": "sha256-SwBaVPldd72h3U2Ym03KfOyrHBbgQz4awi+DnsgHNss=" }, { "pname": "Microsoft.Extensions.Telemetry", - "version": "9.7.0", - "hash": "sha256-2J7ZkaEiJrEwo95VgY3xncLM8Asxw87WisfQXKcLmxY=" + "version": "9.8.0", + "hash": "sha256-X71YGIbaSnJHCxcvKpPiE7fDe1d7bCYrWDOHE7NxJdM=" }, { "pname": "Microsoft.Extensions.Telemetry.Abstractions", - "version": "9.7.0", - "hash": "sha256-b6Gj39kXrD2Uvtc958xOmS5nTQau7jsR+mJTjqhUtO8=" + "version": "9.8.0", + "hash": "sha256-/m0QanS9S/WSFBT5MZFqs+y48tmQvuY1c+pP3vLjwtY=" }, { "pname": "Microsoft.Extensions.TimeProvider.Testing", - "version": "9.7.0", - "hash": "sha256-pP/kan3lcJmF+owvLoT99KdenMwR75I74UeRAJXlZr0=" + "version": "9.8.0", + "hash": "sha256-Fn4c4gdqPn6oficqkIWRH7kri+6r6GEVUY6KP68JCjw=" }, { "pname": "Microsoft.Net.Http.Headers", - "version": "9.0.4", - "hash": "sha256-Anax2K+D109FE9VAxd5I/a5B8piNywbr1KuymobEgNA=" + "version": "9.0.8", + "hash": "sha256-5qKuLaer6hoD269yBw8iFbv9B0541vMA4D4lxzW68Tg=" }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.14.0", - "hash": "sha256-KSZk8lDeSyHDiFC2xG4b9x6XoK+6nDVEFi2dDd4bk+4=" + "version": "17.14.1", + "hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.0.0", - "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.1.2", - "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", @@ -1596,8 +1761,8 @@ }, { "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", - "version": "1.7.1", - "hash": "sha256-zaDOAoEA4CF6/7rXLBO5f5d8PpcqB7hKlwdEWzaFsNk=" + "version": "1.8.3", + "hash": "sha256-4lbrLFfNAqGP4Y1kdC7kxxCOVEL2dczLV0Jj0qt2RBc=" }, { "pname": "Microsoft.Testing.Platform", @@ -1606,8 +1771,8 @@ }, { "pname": "Microsoft.Testing.Platform", - "version": "1.7.1", - "hash": "sha256-YJ41q1VXvFZh/TWo3tutGQnhNCrxv/QbDLTxCS4b/w4=" + "version": "1.8.3", + "hash": "sha256-e/84lOkoTz90bux7D9mq6WSrRBPh4uFLUVuxLgHUddM=" }, { "pname": "Microsoft.Testing.Platform.MSBuild", @@ -1621,13 +1786,13 @@ }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.14.0", - "hash": "sha256-e312v6n+QcNG6boEL1L7W1pzi14NhVnzf1EAH/Pn06s=" + "version": "17.14.1", + "hash": "sha256-QMf6O+w0IT+16Mrzo7wn+N20f3L1/mDhs/qjmEo1rYs=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.14.0", - "hash": "sha256-uSiD1mioF2ROSmw4B1qONNPe5PxlKzu0AYg3kr3AYH0=" + "version": "17.14.1", + "hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs=" }, { "pname": "Microsoft.VisualStudio.Composition", @@ -1640,14 +1805,9 @@ "hash": "sha256-FFemIG+m8RWUPo5W+kCHPh5Yn4fGS+tpjGiQTcT0sAE=" }, { - "pname": "Microsoft.VisualStudio.Threading", - "version": "17.10.48", - "hash": "sha256-WL8c7TjDBHGjsVLMMPf9cin8rirzOdxusEBQlkUfiVU=" - }, - { - "pname": "Microsoft.VisualStudio.Threading.Analyzers", - "version": "17.10.48", - "hash": "sha256-EvZGbyxtrJDvHZwsQbZDXtVfWiy0f58oCdTdSzD34wI=" + "pname": "Microsoft.VisualStudio.Threading.Only", + "version": "17.13.61", + "hash": "sha256-OhXEAuF9PZAkZuHqHwdVODLjA/rIMqmD7nXJfVAQWA8=" }, { "pname": "Microsoft.VisualStudio.Validation", @@ -1664,11 +1824,6 @@ "version": "4.3.0", "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, - { - "pname": "Microsoft.Win32.Registry", - "version": "4.4.0", - "hash": "sha256-ZumsykAAIYKmVtP4QI5kZ0J10n2zcOZZ69PmAK0SEiE=" - }, { "pname": "Microsoft.Win32.Registry", "version": "5.0.0", @@ -1679,6 +1834,26 @@ "version": "6.0.0", "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" }, + { + "pname": "Mutagen.Bethesda.Core", + "version": "0.51.3", + "hash": "sha256-qIAlQ9/pQDFQvyxHSsjg5ojJAk9xAQQK2hr/j4hYTK8=" + }, + { + "pname": "Mutagen.Bethesda.Fallout4", + "version": "0.51.3", + "hash": "sha256-NfKJi/aOTxM7RN0AzniTm9gMYFDFb1L5uJZQHwhvnl4=" + }, + { + "pname": "Mutagen.Bethesda.Kernel", + "version": "0.51.3", + "hash": "sha256-aZa5BYAtMFPGcUKGUCzUOA0+wuWecT3CyvbVHomNq1o=" + }, + { + "pname": "Mutagen.Bethesda.Skyrim", + "version": "0.51.3", + "hash": "sha256-+YYNZGGScAMfGJDYyn6a84SPe5vl0ujanrfB3ju1IGU=" + }, { "pname": "Nerdbank.FullDuplexStream", "version": "1.1.12", @@ -1686,8 +1861,8 @@ }, { "pname": "Nerdbank.Streams", - "version": "2.11.79", - "hash": "sha256-1bzibVcSH8LJMR8Nb6Q0q/7fieTgxRnVY4C1RvRbrrI=" + "version": "2.13.16", + "hash": "sha256-VdiB31IDleh/hDFtxAtL2N0WAHo8PgyyyX3Q6/un93A=" }, { "pname": "NetEscapades.EnumGenerators", @@ -1751,23 +1926,28 @@ }, { "pname": "NexusMods.HyperDuck", - "version": "0.20.0", - "hash": "sha256-VGMQHuEVNgbQtHNkgVwbqKrfgtlS6nc2eWfcr2aDdlg=" + "version": "0.24.0", + "hash": "sha256-DQP/Jq+19282NbTrwiCEOFwtbagbVhc8tmtruBLV470=" }, { "pname": "NexusMods.MnemonicDB", - "version": "0.20.0", - "hash": "sha256-kMav1mmEFAsNSEdAa4OaEwAt0DuozyzVVmMVHCjcyJU=" + "version": "0.24.0", + "hash": "sha256-QIuX3I/tAc37hmmvhrOQZcv5U40Sa6HeR00wTlmgFF0=" }, { "pname": "NexusMods.MnemonicDB.Abstractions", - "version": "0.20.0", - "hash": "sha256-+BCvfhNCMNguq+2NTHyOj8hSF/cC7/krl4BOTIumm0c=" + "version": "0.24.0", + "hash": "sha256-SaVCEfgG1d+4wAtBdq9i5atbZsyBe6OEXt367eMOj1A=" }, { "pname": "NexusMods.MnemonicDB.SourceGenerator", - "version": "0.20.0", - "hash": "sha256-ckWPWMzeekNC977ccGhtqvG9kC6q9yZBx3O8KU/yr4k=" + "version": "0.24.0", + "hash": "sha256-vEALZe2bs1fm2r7TyOG2UJNbeudadc3BtdE5ezppINg=" + }, + { + "pname": "NexusMods.Paths", + "version": "0.10.0", + "hash": "sha256-tzUKPBrGNyZvVgScDAP0qvVF5nV6635v3NlBvzpnz1M=" }, { "pname": "NexusMods.Paths", @@ -1836,23 +2016,23 @@ }, { "pname": "NLog", - "version": "5.2.8", - "hash": "sha256-IrCChiy703DRIebN//M4wwXW7gayuCVD/dHKXCoQcPw=" - }, - { - "pname": "NLog", - "version": "5.3.4", - "hash": "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k=" + "version": "6.0.3", + "hash": "sha256-lrF4+wTsVr7/hD9sJVAMk3+zwH7JMoOEw/pCZm3ki4g=" }, { "pname": "NLog.Extensions.Logging", - "version": "5.3.14", - "hash": "sha256-Ckb3z1Ou5dAncADgylCu7yOGfQ7Vh47Oc48PInAi1lA=" + "version": "6.0.3", + "hash": "sha256-lkM/ZX8qxHTPwP8KT3WQhUrKmBr3IomIPRPq1070+CM=" }, { "pname": "Noggog.CSharpExt", - "version": "2.67.3", - "hash": "sha256-UjONR5k+miASf4OxLPF9fccYLkfRJsVnktmvvEQDzUc=" + "version": "2.73.2", + "hash": "sha256-R+delOGBL2j+ECQUnF1Iy3xC7m3/GXyPnp4x5IEhz+4=" + }, + { + "pname": "Noggog.CSharpExt", + "version": "2.73.3", + "hash": "sha256-aJo/CUv9O98CLsTixmWQ3XlcSbBcswuC3XgLjFl3F70=" }, { "pname": "NSubstitute", @@ -1896,8 +2076,8 @@ }, { "pname": "NuGet.Versioning", - "version": "6.12.1", - "hash": "sha256-f/ejCuzCAwKs4N4Ec6yf2RovrhBT0nj0hRDP+03/Iy4=" + "version": "6.14.0", + "hash": "sha256-DqdOJgsphKxSvqB8b60zNPCaiLfbiu3WnUJ/90feLrY=" }, { "pname": "NuGet.Versioning", @@ -1934,30 +2114,35 @@ "version": "1.0.6", "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU=" }, + { + "pname": "Onigwrap", + "version": "1.0.8", + "hash": "sha256-lH9nH74cPMQnWKO8mwgg+nX4iMUXuh7McfeRL9asQIY=" + }, { "pname": "OpenTelemetry", - "version": "1.10.0", - "hash": "sha256-ucUy3vIabYb0TGDhraqMEzT+LLPmXrO1NgAjEeyVCO8=" + "version": "1.12.0", + "hash": "sha256-WqUAXbwHyoksigzEgYnHNONl2TLd0ZM5MJ6jDsbYxas=" }, { "pname": "OpenTelemetry.Api", - "version": "1.10.0", - "hash": "sha256-ZSpQFnNgkk3dO8Q7yokJ/VSl4wp5PuIv9nduxgC6UxU=" + "version": "1.12.0", + "hash": "sha256-nw7Y84b98RFoL9eHip2Moz5sLHt3cDUDznYZLu3OCXU=" }, { "pname": "OpenTelemetry.Api.ProviderBuilderExtensions", - "version": "1.10.0", - "hash": "sha256-hLw3Sf1fviAlVJYhaMudVJEdG5pjX5JvVrqv9DgYAk8=" + "version": "1.12.0", + "hash": "sha256-HW5lCuHZgkh0SO94cJLcjfX3M0dJDV0xJIRV2pY0jXc=" }, { "pname": "OpenTelemetry.Exporter.OpenTelemetryProtocol", - "version": "1.10.0", - "hash": "sha256-1sKqD/DsEo1nfD4BuuIde/In7W0wAbIEWD3jvvbO8JA=" + "version": "1.12.0", + "hash": "sha256-DapxmIJEc0m43r4CEsGmIOqIeH5U9Xerie1X/VpcmaE=" }, { "pname": "OpenTelemetry.Extensions.Hosting", - "version": "1.10.0", - "hash": "sha256-+O9oaAUYaKUItLAaT7yQUs2nrHVDNkj8YcFuUxiTy6M=" + "version": "1.12.0", + "hash": "sha256-TbZ0XXPWa84m9810x7XQmxccWZmGnE8PM4rwG+88dmg=" }, { "pname": "Pathoschild.Http.FluentClient", @@ -1966,13 +2151,13 @@ }, { "pname": "Perfolizer", - "version": "0.3.17", - "hash": "sha256-EfT9EabewLMOAKrxEwpj7QRzqnHODU0tZ08o1w7aV6Q=" + "version": "0.5.3", + "hash": "sha256-rDhNfnyxl5fpMAQOM4dCxBBlbeh0gjSSk2sfXjHCksQ=" }, { "pname": "Polly", - "version": "8.5.0", - "hash": "sha256-oXIqYMkFXoF/9y704LJSX5Non9mry19OSKA7JFviu5Q=" + "version": "8.6.3", + "hash": "sha256-kioidi6PKWgUe7uj+rT8k5B6E7ro2iIMo60cLraFJL0=" }, { "pname": "Polly.Core", @@ -1981,8 +2166,8 @@ }, { "pname": "Polly.Core", - "version": "8.5.0", - "hash": "sha256-vN/OoQi5F8+oKNO46FwjPcKrgfhGMGjAQ2yCQUlHtOc=" + "version": "8.6.3", + "hash": "sha256-6XKRLrwQ8nYLwUNhw8+/5Z6EvfILhgub2Tn6B6XSxIw=" }, { "pname": "Polly.Extensions", @@ -1996,23 +2181,23 @@ }, { "pname": "Projektanker.Icons.Avalonia", - "version": "9.6.1", - "hash": "sha256-vO6CqlO3EjzGYElIjy6r2d5b8g33P1m4EoqYuew9anM=" + "version": "9.6.2", + "hash": "sha256-BMbZQ2Hj80Yxcx8mNZ8+A4fxyB/Sa0QhFX5gC6jAueA=" }, { "pname": "Projektanker.Icons.Avalonia.MaterialDesign", - "version": "9.6.1", - "hash": "sha256-5e/MUcfACOKbX6Wgc+L/3nuDDbS8ccTXwZ0G5obo7Kw=" + "version": "9.6.2", + "hash": "sha256-CG4VZDafywR278XwZTosm0sYzJyQ6AGHEQiIDB9y81I=" }, { "pname": "protobuf-net", - "version": "3.2.45", - "hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA=" + "version": "3.2.56", + "hash": "sha256-KjwRHyGwflQDjVaudT+NjRnfGhHb4CpCfn9hHVixI+E=" }, { "pname": "protobuf-net.Core", - "version": "3.2.45", - "hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ=" + "version": "3.2.56", + "hash": "sha256-NVvLreCvvvnS/s0syL5/L3mRpXeswP7E71C6WP9f2Dc=" }, { "pname": "QoiSharp", @@ -2296,8 +2481,8 @@ }, { "pname": "SimpleInfoName", - "version": "3.0.1", - "hash": "sha256-9p/BiEqlQczjjUfpUxcFKn71cLAJC7GGvYqRs8fSuuQ=" + "version": "3.1.2", + "hash": "sha256-JpqqJVZ3wBnWVdYoYwlDs6VwxeGLUjoC2O0XpRNqCWw=" }, { "pname": "SkiaSharp", @@ -2371,23 +2556,23 @@ }, { "pname": "SmartFormat", - "version": "3.5.1", - "hash": "sha256-NwvJBCT2BBfJgGa/LMbvan0XqZhRBYzlpMLtC3l5SOM=" + "version": "3.6.0", + "hash": "sha256-hDW5EKH6veS1Pwp+wvjtsUj/qS8EoiA2IP3JDt35ivM=" }, { "pname": "Spectre.Console", - "version": "0.49.1", - "hash": "sha256-tqSVojyuQjuB34lXo759NOcyLgNIw815mKXJPq5JFDo=" + "version": "0.51.1", + "hash": "sha256-FQAK07dEwEsNYVI1T3S488LHv8AXJ+ZeA9N2hPpWBoo=" }, { "pname": "Spectre.Console.Cli", - "version": "0.49.1", - "hash": "sha256-sar9rhft1ivDMj1kU683+4KxUPUZL+Fb++ewMA6RD4Q=" + "version": "0.51.1", + "hash": "sha256-hxSNKzOJH+sFzMS2GnzwVVWUsMxcNOP9SCNqyC2JABM=" }, { "pname": "Spectre.Console.Testing", - "version": "0.49.1", - "hash": "sha256-NFZE0ubRmjeOOnkf8EXCp8lya0XK1tclMmtodxJPt1I=" + "version": "0.51.1", + "hash": "sha256-m68cTpCpQEv6mAoEHOfBRQBmuNPtyzEeBDRml89qXuU=" }, { "pname": "Splat", @@ -2399,45 +2584,45 @@ "version": "15.1.1", "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" }, - { - "pname": "Splat", - "version": "15.4.1", - "hash": "sha256-qmp9aNmSSGQjrt9womxfC786nxeafH66okaBk0LXnhw=" - }, { "pname": "Splat.Microsoft.Extensions.Logging", - "version": "15.4.1", - "hash": "sha256-W5ycBz7V31+XkxROu3G7J8WDw3gfSWUwIuRXvPOkwsU=" + "version": "15.1.1", + "hash": "sha256-kl/+5CsdMAH3uu5mmKC7Eb+ELsYUKOFdWhTg+1PLTAY=" }, { "pname": "SteamKit2", - "version": "3.0.0", - "hash": "sha256-bRRdX8WFo9k+QCZWh0KHb3TULpJxpR4Hg9FDXKBW6d4=" + "version": "3.3.1", + "hash": "sha256-f6kc15RKNxCSIlynlVHU8fBqQ7N8nG1xV3DNbBlRmvo=" }, { "pname": "StrawberryShake.Core", - "version": "15.0.3", - "hash": "sha256-bAqmB6l6r1GAAm6w0BcUdwGlktU/FAeB3vPiENmOaKg=" + "version": "15.1.10", + "hash": "sha256-vYo6Oi2XdHaTyXq9h/PxVDT5Y/ZvNYL1IZ7sLJcswVc=" }, { "pname": "StrawberryShake.Resources", - "version": "15.0.3", - "hash": "sha256-m50HKpBrcQkrJxlRAfg2RNobMbv9yw3jakDz7Hp/sn8=" + "version": "15.1.10", + "hash": "sha256-+K0wX+zyuk8pNHPvdyBGnzu1lz17JIdFo6wvEEootIA=" }, { "pname": "StrawberryShake.Server", - "version": "15.0.3", - "hash": "sha256-Tdl27WUE0pA+SXZetKjPPcQxM6rxzf1Cnjz6Jw/XZaM=" + "version": "15.1.10", + "hash": "sha256-GRSYdGYSLyTFpyt3z5qdGFuKdf//HtvRU+IxSNUUeZo=" }, { "pname": "StrawberryShake.Transport.Http", - "version": "15.0.3", - "hash": "sha256-UmB5tTEwB0JImx/LDb+ihCao4YxsT3XvHJpuUDBMODc=" + "version": "15.1.10", + "hash": "sha256-DrRFXi9Do+wsXKLDpUq0rt/iBsdiQ2ETNwjeh9M7XhY=" }, { "pname": "StrawberryShake.Transport.WebSockets", - "version": "15.0.3", - "hash": "sha256-Nz70BHgzDzxIRzIjKgx6Vx1T+K/UKoPkG6wP/yNKVYs=" + "version": "15.1.10", + "hash": "sha256-dXbu1XyApu7HxpDmdqtaZGUWvcmatwEgdRwtLXCJrNs=" + }, + { + "pname": "StrongInject", + "version": "1.4.4", + "hash": "sha256-vihRojG6QXVt9UK32gc3MwVIuQuX58fLjYSb8HoG9uw=" }, { "pname": "Svg.Custom", @@ -2469,11 +2654,6 @@ "version": "4.5.1", "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" }, - { - "pname": "System.CodeDom", - "version": "5.0.0", - "hash": "sha256-UNqyPrK9eshU5kgJukvPamkaxLAp9BmR/J22OjEX+pM=" - }, { "pname": "System.CodeDom", "version": "8.0.0", @@ -2484,6 +2664,11 @@ "version": "9.0.0", "hash": "sha256-578lcBgswW0eM16r0EnJzfGodPx86RxxFoZHc2PSzsw=" }, + { + "pname": "System.CodeDom", + "version": "9.0.5", + "hash": "sha256-XIZLBpvIDxx6h6tfvG5wz2BJ6O4f1IwCXn1mC4RLXlY=" + }, { "pname": "System.Collections", "version": "4.0.11", @@ -2526,8 +2711,13 @@ }, { "pname": "System.Collections.Immutable", - "version": "9.0.6", - "hash": "sha256-aqQxYZfza+pSNrwazdGldlECSkuUTQLWGhIdEk7/2xw=" + "version": "9.0.0", + "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac=" + }, + { + "pname": "System.Collections.Immutable", + "version": "9.0.7", + "hash": "sha256-OI+/e7BtdXN+0Ef75ueb/NRf3OjFlJy22QXmodeHG60=" }, { "pname": "System.CommandLine", @@ -2669,6 +2859,11 @@ "version": "9.0.7", "hash": "sha256-bc0v/V0Qs3ENMlK/oGOkvUtP6jj3fMQOiF6Jk2NQUwM=" }, + { + "pname": "System.Diagnostics.EventLog", + "version": "9.0.8", + "hash": "sha256-u10dcgug0Pwp83YNagVto8Pu3ieuByflYLNwAdX9Fm0=" + }, { "pname": "System.Diagnostics.Tools", "version": "4.3.0", @@ -2726,8 +2921,8 @@ }, { "pname": "System.IO.Abstractions", - "version": "21.0.29", - "hash": "sha256-91e2/Bd4ZgANw19mKkTdxAy2tv7NutyG0lQTKhMiEpo=" + "version": "22.0.15", + "hash": "sha256-2deBvDALOzd+BAnhdbnR7ZPjChE71HPv7w61/2tfYOg=" }, { "pname": "System.IO.Compression", @@ -2759,6 +2954,11 @@ "version": "9.0.0", "hash": "sha256-k6Pdndm5fTD6CB1QsQfP7G+2h4B30CWIsuvjHuBg3fc=" }, + { + "pname": "System.IO.Hashing", + "version": "9.0.8", + "hash": "sha256-Jj1XwumBjBa5LJqSVTN2naQJ0FM4wwPvZS8NxGd5Hnw=" + }, { "pname": "System.IO.Pipelines", "version": "6.0.3", @@ -2776,13 +2976,8 @@ }, { "pname": "System.IO.Pipelines", - "version": "9.0.0", - "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" - }, - { - "pname": "System.IO.Pipelines", - "version": "9.0.7", - "hash": "sha256-jCnYjyjJeTReO7ySPm1A1VIRNoac5/eMN2q9IGGGEh0=" + "version": "9.0.2", + "hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE=" }, { "pname": "System.Linq", @@ -2796,8 +2991,8 @@ }, { "pname": "System.Linq.Async", - "version": "6.0.1", - "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI=" + "version": "6.0.3", + "hash": "sha256-i+2XnsOJnD7R/vCFtadp+lwrkDNAscANes2Ur0MSTl8=" }, { "pname": "System.Linq.Expressions", @@ -2811,24 +3006,19 @@ }, { "pname": "System.Management", - "version": "5.0.0", - "hash": "sha256-upx2lBRhITuOz9rKth+pBNGvxaLNU3ZOSaS0D+7YHiY=" + "version": "8.0.0", + "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0=" }, { "pname": "System.Management", - "version": "8.0.0", - "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0=" + "version": "9.0.5", + "hash": "sha256-r1BSfaOI0SSl3ScAUXIYDiEjnljqEJ5Ncx3fXjtwTaU=" }, { "pname": "System.Memory", "version": "4.5.3", "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, - { - "pname": "System.Memory", - "version": "4.5.4", - "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" - }, { "pname": "System.Memory", "version": "4.5.5", @@ -2884,6 +3074,11 @@ "version": "6.0.1", "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, + { + "pname": "System.Reactive", + "version": "6.0.2", + "hash": "sha256-4WwkPpfdIpbAjN5K0OSLXW6aelwvvMBgd8syCtf+qeE=" + }, { "pname": "System.Reflection", "version": "4.1.0", @@ -2949,6 +3144,11 @@ "version": "8.0.0", "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" }, + { + "pname": "System.Reflection.Metadata", + "version": "9.0.0", + "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=" + }, { "pname": "System.Reflection.Primitives", "version": "4.0.1", @@ -2969,6 +3169,11 @@ "version": "4.3.0", "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.7.0", + "hash": "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM=" + }, { "pname": "System.Resources.ResourceManager", "version": "4.0.1", @@ -2994,21 +3199,11 @@ "version": "4.4.0", "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.2", - "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.5.3", "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "5.0.0", - "hash": "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", @@ -3044,11 +3239,6 @@ "version": "4.3.0", "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, - { - "pname": "System.Security.AccessControl", - "version": "4.4.0", - "hash": "sha256-J3T2ECVdL0JiBA999CUz77az545CVOYB11/NPA/huEc=" - }, { "pname": "System.Security.AccessControl", "version": "5.0.0", @@ -3139,11 +3329,6 @@ "version": "4.3.0", "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.4.0", - "hash": "sha256-lwNBM33EW45j6o8bM4hKWirEUZCvep0VYFchc50JOYc=" - }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", @@ -3156,13 +3341,13 @@ }, { "pname": "System.Text.Encoding.CodePages", - "version": "4.5.1", - "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" + "version": "7.0.0", + "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" }, { "pname": "System.Text.Encoding.CodePages", - "version": "7.0.0", - "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" + "version": "9.0.7", + "hash": "sha256-cYYl7wcROoiC1mTK9XXF5L099GJtLvmA42hR8kuSomw=" }, { "pname": "System.Text.Encoding.Extensions", @@ -3204,6 +3389,11 @@ "version": "7.0.0", "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=" }, + { + "pname": "System.Threading.Channels", + "version": "9.0.0", + "hash": "sha256-depIorJqzjyWew0+aBRgbGh88KWivbp9RrtWZHFr+pI=" + }, { "pname": "System.Threading.RateLimiting", "version": "8.0.0", @@ -3261,24 +3451,39 @@ }, { "pname": "TestableIO.System.IO.Abstractions", - "version": "21.0.29", - "hash": "sha256-OFpu9RcDRPLYntQyesBevoG1XxyH96ukHOH0uXqO5ls=" + "version": "22.0.15", + "hash": "sha256-6YwnBfAnsxM0lEPB2LOFQcs7d1r7CyqjDEmvUBTz+X0=" }, { "pname": "TestableIO.System.IO.Abstractions.Wrappers", - "version": "21.0.29", - "hash": "sha256-2q1HzbyRPIm6VKYzZzZnkXBJzV8S+HBtT6Lej1pv84Y=" + "version": "22.0.15", + "hash": "sha256-KoGuXGzecpf4rTmEth4/2goVFFR9V2aj+iibfZxpR7U=" + }, + { + "pname": "Testably.Abstractions.FileSystem.Interface", + "version": "9.0.0", + "hash": "sha256-6JW+qDtqQT9StP4oTR7uO0NnmVc2xcjSZ6ds2H71wtg=" }, { "pname": "TextMateSharp", "version": "1.0.65", "hash": "sha256-kZx3CBDzu7qUSnihs9Q4Ck78ih1aJ+0g8cN8Hke+E5w=" }, + { + "pname": "TextMateSharp", + "version": "1.0.70", + "hash": "sha256-fzmSGU8fT/J6W+Yx/qgUqPEiC1Og9ctUyQGDleOggrM=" + }, { "pname": "TextMateSharp.Grammars", "version": "1.0.65", "hash": "sha256-tZx/GKYX3bomQFVFaEgneNYHpB74v+8D90IfkYImlhE=" }, + { + "pname": "TextMateSharp.Grammars", + "version": "1.0.70", + "hash": "sha256-AAH3SXLyIUIfJgdPhwIRPZhdcxdNhis2ODLd9mh1PuE=" + }, { "pname": "Tmds.DBus.Protocol", "version": "0.21.2", @@ -3296,23 +3501,23 @@ }, { "pname": "TUnit", - "version": "0.25.0", - "hash": "sha256-rQaQ9DQF+y2bbtFqIa7oVtXC+dgGi6nYLTyZjrhmN9s=" + "version": "0.57.24", + "hash": "sha256-19XQGB9UbhPqTeubaMo4Vq/MwNfhdEajmsqegQiJib0=" }, { "pname": "TUnit.Assertions", - "version": "0.25.0", - "hash": "sha256-DuurVpcD3mxMl7nh3nmtxsUyBNRyeZi3vy91lzwQYyA=" + "version": "0.57.24", + "hash": "sha256-yRSwh/BMUR4eOiNWVFK7IXZITKq5nYnsgVR6ws4ABfs=" }, { "pname": "TUnit.Core", - "version": "0.25.0", - "hash": "sha256-zaTFjXPtR2muqmyyWt1GxL5ACp5tiArcH6B2h4PscNw=" + "version": "0.57.24", + "hash": "sha256-dpTSlAhcZbMzUil9OOnQNgLWrtJMykUKCSHQclQzNjY=" }, { "pname": "TUnit.Engine", - "version": "0.25.0", - "hash": "sha256-0/5JkVww0Ek48VaTuZ/mkNcVCef43k0F95QU8WS71Nc=" + "version": "0.57.24", + "hash": "sha256-jbtRa1lMhtQW99sYDM33F89e7dCmqaH72vQJBAc1jog=" }, { "pname": "Validation", @@ -3324,6 +3529,11 @@ "version": "2.4.18", "hash": "sha256-ByITVSjsqVglWPIRaZ3i1P3bHh8+OB6BWgDA8f8qTFI=" }, + { + "pname": "ValveKeyValue", + "version": "0.10.0.360", + "hash": "sha256-LPQ6isUsA3cQKiO6ADijrCQ2ucx4TD01+kGzei3jIGY=" + }, { "pname": "ValveKeyValue", "version": "0.13.1.398", @@ -3336,18 +3546,18 @@ }, { "pname": "Verify", - "version": "27.0.0", - "hash": "sha256-eBvZNh7NAUJgyHD/LOdxhd0GnZOADdshhb0HA8Gz8j8=" + "version": "30.11.0", + "hash": "sha256-pAMKqtTNpnFItOw/MCftyKQJ9wNutvUZTs4shSiVhB4=" }, { "pname": "Verify", - "version": "28.2.1", - "hash": "sha256-SF2IgbAseEANZDnFXGd//oQ9uLusWrk0TY/GynyBqTI=" + "version": "30.7.3", + "hash": "sha256-ET3tUBfryHi17VYavmA0n/U0vPWxO7Am1imPs6MYcYk=" }, { "pname": "Verify.ImageMagick", - "version": "3.6.0", - "hash": "sha256-U6i0pR1ceSDy7+iiRN8RQen3okp6X3De0DK8R5IxxfA=" + "version": "3.7.3", + "hash": "sha256-cbKQC4eruazFxlv6UtQodurCoE2h/pNXmNWvWC+xsGI=" }, { "pname": "Verify.SourceGenerators", @@ -3356,8 +3566,8 @@ }, { "pname": "Verify.Xunit", - "version": "28.2.1", - "hash": "sha256-2PeJmxMrO8Q3muNtPdscxLsb9q04cTPZ8jQZIG1mDbM=" + "version": "30.11.0", + "hash": "sha256-de7csNsUlbORteOwFEQFUfTcrCxxJQT6HqDwjpaLo4k=" }, { "pname": "Weave", @@ -3366,8 +3576,8 @@ }, { "pname": "xunit", - "version": "2.9.2", - "hash": "sha256-h5+yTTfCmokCPy4lqdEw8RGzQlrlsQAW3Am0Jh0q7oo=" + "version": "2.9.3", + "hash": "sha256-BPrpSbjlIB7PoH+ocCusqMDrMZgRQZSzeTeJzHK/I9c=" }, { "pname": "xunit.abstractions", @@ -3386,8 +3596,8 @@ }, { "pname": "xunit.analyzers", - "version": "1.16.0", - "hash": "sha256-P5Bvl9hvHvF8KY1YWLg4tKiYxlfRnmHyL14jfSACDaU=" + "version": "1.18.0", + "hash": "sha256-DOgamLnfi9Ua5IDm3JVm9MaOFbSSbmq5l8j2NPO3qd0=" }, { "pname": "xunit.assert", @@ -3396,13 +3606,13 @@ }, { "pname": "xunit.assert", - "version": "2.9.2", - "hash": "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4=" + "version": "2.9.3", + "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA=" }, { "pname": "xunit.core", - "version": "2.9.2", - "hash": "sha256-zhjV1I5xh0RFckgTEK72tIkLxVl4CPmter2UB++oye8=" + "version": "2.9.3", + "hash": "sha256-qkVQ8Jw/LZWmxirkPOwiry7bvZn3IuaRzu/sp2H8anw=" }, { "pname": "Xunit.DependencyInjection", @@ -3441,8 +3651,8 @@ }, { "pname": "xunit.extensibility.core", - "version": "2.9.2", - "hash": "sha256-MQAC/4d67Nssu3R+pHPh6vHitBXQYxEEZkVVMGW720c=" + "version": "2.9.3", + "hash": "sha256-mcpVX+m0R7F0ev9CaBnbai9gtu4GVcqijEuRqe89D0g=" }, { "pname": "xunit.extensibility.execution", @@ -3456,8 +3666,8 @@ }, { "pname": "xunit.extensibility.execution", - "version": "2.9.2", - "hash": "sha256-f+9UfoPyK3JIDhQSW0Yu9c4PGqUqZC96DMINCYi2i80=" + "version": "2.9.3", + "hash": "sha256-2rxMs2Dt4cAcmOFMwP5Yd3RpP0BnmiL8cXlKysXY0jw=" }, { "pname": "xunit.runner.visualstudio", @@ -3476,13 +3686,13 @@ }, { "pname": "ZLinq", - "version": "0.9.6", - "hash": "sha256-MxKNBih6j/t+S+Adw7OgkVN5llUylP+gstF9LSsDShY=" + "version": "1.5.2", + "hash": "sha256-j3gikzndyZ7yXKbfHpTIbvzZmNYpb9RhwW19CQElydQ=" }, { "pname": "ZstdSharp.Port", - "version": "0.8.2", - "hash": "sha256-mwU4YWaBrbbqQeQ+7ohm/0ewWPD6S8Y2pg6Rqxbi4Ts=" + "version": "0.8.6", + "hash": "sha256-rc3YWP80fykqujDsD72SXOA1tBDoy2KrvVETOC8eTx8=" }, { "pname": "ZString", diff --git a/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix b/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix index eee12f0aff09..99d3e349cbda 100644 --- a/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix +++ b/pkgs/by-name/ne/nexusmods-app/game-hashes/default.nix @@ -1,6 +1,6 @@ { fetchurl }: let - release = "v1a75cea1c1f2efc6"; + release = "vD0E6FC9F3A82C2E9"; owner = "Nexus-Mods"; repo = "game-hashes"; repoURL = "https://github.com/${owner}/${repo}"; @@ -8,7 +8,7 @@ let # Define a binding so that `update-source-version` can find it src = fetchurl { url = "${repoURL}/releases/download/${release}/game_hashes_db.zip"; - hash = "sha256-LvVOp4vbLwae0CM0CukFoXeNRn0FKXjIhHgbxYwnGnI="; + hash = "sha256-ACwhWSoxe1CxBWhkgixZeLKpfdXAnavd/30ELInVtZM="; passthru = { inherit src # Also for `update-source-version` support diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index d7f4c960b5e5..fdaacf378941 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -23,12 +23,12 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.16.4"; + version = "0.17.2"; src = fetchgit { url = "https://github.com/Nexus-Mods/NexusMods.App.git"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-9Xy5SWwjVWYlbt33meVGFDF96Cx66DXOyECEF47/kSo="; + hash = "sha256-2B5n1yN42birMJ1YaUU/KjzhHIJTv8nwrupc0ULc8Hc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/games.json b/pkgs/by-name/ne/nexusmods-app/vendored/games.json index 21ac9a0ace18..3995eba3b599 100644 --- a/pkgs/by-name/ne/nexusmods-app/vendored/games.json +++ b/pkgs/by-name/ne/nexusmods-app/vendored/games.json @@ -6,12 +6,12 @@ "forum_url": "https://forums.nexusmods.com/games/19-stardew-valley/", "nexusmods_url": "https://www.nexusmods.com/stardewvalley", "genre": "Simulation", - "file_count": 139050, - "downloads": 600849301, + "file_count": 141253, + "downloads": 614556730, "domain_name": "stardewvalley", "approved_date": 1457432329, - "mods": 25015, - "collections": 2014 + "mods": 25471, + "collections": 2025 }, { "id": 1704, @@ -20,12 +20,12 @@ "forum_url": "https://forums.nexusmods.com/games/6-skyrim/", "nexusmods_url": "https://www.nexusmods.com/skyrimspecialedition", "genre": "RPG", - "file_count": 645252, - "downloads": 8778903191, + "file_count": 653576, + "downloads": 8992667521, "domain_name": "skyrimspecialedition", "approved_date": 1477480498, - "mods": 115650, - "collections": 4780 + "mods": 117157, + "collections": 4847 }, { "id": 3174, @@ -34,12 +34,12 @@ "forum_url": "https://forums.nexusmods.com/games/9-mount-blade-ii-bannerlord/", "nexusmods_url": "https://www.nexusmods.com/mountandblade2bannerlord", "genre": "Strategy", - "file_count": 49470, - "downloads": 112381081, + "file_count": 50070, + "downloads": 114524055, "domain_name": "mountandblade2bannerlord", "approved_date": 1582898627, - "mods": 6180, - "collections": 283 + "mods": 6265, + "collections": 292 }, { "id": 3333, @@ -48,12 +48,12 @@ "forum_url": "https://forums.nexusmods.com/games/1-cyberpunk-2077/", "nexusmods_url": "https://www.nexusmods.com/cyberpunk2077", "genre": "Action", - "file_count": 120069, - "downloads": 850033001, + "file_count": 123015, + "downloads": 894075844, "domain_name": "cyberpunk2077", "approved_date": 1607433331, - "mods": 16998, - "collections": 1559 + "mods": 17664, + "collections": 1584 }, { "id": 3474, @@ -62,11 +62,11 @@ "forum_url": "https://forums.nexusmods.com/games/2-baldurs-gate-3/", "nexusmods_url": "https://www.nexusmods.com/baldursgate3", "genre": "RPG", - "file_count": 101960, - "downloads": 332531245, + "file_count": 103892, + "downloads": 342668709, "domain_name": "baldursgate3", "approved_date": 1602863114, - "mods": 14347, - "collections": 1788 + "mods": 14725, + "collections": 1800 } ] diff --git a/pkgs/by-name/nf/nf-test/package.nix b/pkgs/by-name/nf/nf-test/package.nix index d49cbfc2613e..014465db1d19 100644 --- a/pkgs/by-name/nf/nf-test/package.nix +++ b/pkgs/by-name/nf/nf-test/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "nf-test"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { url = "https://github.com/askimed/nf-test/releases/download/v${version}/nf-test-${version}.tar.gz"; - hash = "sha256-v7LgbfKdTvQbMcs1ajdKmSQr742YQ0uL4wN79rPV1No="; + hash = "sha256-LLylgv34HiMXg+sjBbMdeLVPMV5+h+Z2xEWCiBqbNEY="; }; sourceRoot = "."; diff --git a/pkgs/by-name/nh/nheko/fix-darwin-build.patch b/pkgs/by-name/nh/nheko/fix-darwin-build.patch new file mode 100644 index 000000000000..6fb5c4138807 --- /dev/null +++ b/pkgs/by-name/nh/nheko/fix-darwin-build.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4ff134c53877d5aa2e00e3c344eb5c6783cccb2f..164553d34152639c6a2c5319c2a03d7a25c33ba3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -974,16 +974,11 @@ endif() + + # potential workaround for macdeployqt issues + if(APPLE) ++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") + install(TARGETS nheko + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) +- qt_generate_deploy_qml_app_script( +- TARGET nheko +- OUTPUT_SCRIPT deploy_script +- NO_UNSUPPORTED_PLATFORM_ERROR +- ) +- install(SCRIPT ${deploy_script}) + endif() + + if(UNIX AND NOT APPLE) diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix index d54028a3df54..c48c23697788 100644 --- a/pkgs/by-name/nh/nheko/package.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -5,7 +5,6 @@ cmake, asciidoc, pkg-config, - boost, cmark, coeurl, curl, @@ -23,16 +22,17 @@ libnice, qt6Packages, fetchpatch, + withVoipSupport ? stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nheko"; version = "0.12.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-WlWxe4utRSc9Tt2FsnhBwxzQsoDML2hvm3g5zRnDEiU="; }; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { url = "https://github.com/Nheko-Reborn/nheko/commit/2769642d3c7bd3c0d830b2f18ef6b3bf6a710bf4.patch"; hash = "sha256-y8aiS6h5CSJYBdsAH4jYhAyrFug7aH2H8L6rBfULnQQ="; }) + ./fix-darwin-build.patch ]; nativeBuildInputs = [ @@ -53,7 +54,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost cmark coeurl curl @@ -65,35 +65,39 @@ stdenv.mkDerivation rec { nlohmann_json olm qt6Packages.qtbase + qt6Packages.qtdeclarative qt6Packages.qtimageformats qt6Packages.qtkeychain qt6Packages.qtmultimedia + qt6Packages.qtsvg qt6Packages.qttools - qt6Packages.qtwayland qt6Packages.qt-jdenticon re2 spdlog ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - (gst-plugins-good.override { qt6Support = true; }) - gst-plugins-bad + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qt6Packages.qtwayland + ] + ++ lib.optionals withVoipSupport [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + (gst_all_1.gst-plugins-good.override { qt6Support = true; }) + gst_all_1.gst-plugins-bad libnice - ]); + ]; cmakeFlags = [ - "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 + (lib.cmakeBool "VOIP" withVoipSupport) ]; preFixup = '' - # add gstreamer plugins path to the wrapper # unset QT_STYLE_OVERRIDE to avoid showing a blank window when started # https://github.com/NixOS/nixpkgs/issues/333009 - qtWrapperArgs+=( - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - --unset QT_STYLE_OVERRIDE - ) + qtWrapperArgs+=(--unset QT_STYLE_OVERRIDE) + '' + + lib.optionalString withVoipSupport '' + # add gstreamer plugins path to the wrapper + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; meta = with lib; { @@ -104,11 +108,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ekleog fpletz + rebmit rnhmjoj ]; platforms = platforms.all; - # Should be fixable if a higher clang version is used, see: - # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index 514ee9b68ef2..476baccd55c9 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -13,19 +13,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ni"; - version = "26.0.1"; + version = "26.1.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "ni"; tag = "v${finalAttrs.version}"; - hash = "sha256-R4X6X9Yys7zq8+3vGj0vamVsqLM0i/NO9HLTDlofX54="; + hash = "sha256-vde0NUOWVfdrJUgYBLP4C3I+lFv3YJVtcqUgB7Nx2b0="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-eeZGLwiN8uu0GL8CGCAHsV2JepaZDcfnBipaLLWdXzw="; + hash = "sha256-aNRWBnlZ72OmU619L99aVqL317w4gSaJNtoO25u+s40="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nix-search-tv/package.nix b/pkgs/by-name/ni/nix-search-tv/package.nix index 658f2cd68353..1a2c29b39aec 100644 --- a/pkgs/by-name/ni/nix-search-tv/package.nix +++ b/pkgs/by-name/ni/nix-search-tv/package.nix @@ -20,6 +20,8 @@ buildGoModule (finalAttrs: { subPackages = [ "cmd/nix-search-tv" ]; + env.GOEXPERIMENT = "jsonv2"; + ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/ni/nixos-init/src/activate.rs b/pkgs/by-name/ni/nixos-init/src/activate.rs index c8fe22447899..048b037d9a51 100644 --- a/pkgs/by-name/ni/nixos-init/src/activate.rs +++ b/pkgs/by-name/ni/nixos-init/src/activate.rs @@ -42,16 +42,21 @@ fn setup_modprobe(modprobe_binary: impl AsRef) -> Result<()> { // a procfs in a chroot would. const MODPROBE_PATH: &str = "/proc/sys/kernel/modprobe"; - fs::write( - MODPROBE_PATH, - modprobe_binary.as_ref().as_os_str().as_encoded_bytes(), - ) - .with_context(|| { - format!( - "Failed to populate modprobe path with {}", - modprobe_binary.as_ref().display() + if Path::new(MODPROBE_PATH).exists() { + fs::write( + MODPROBE_PATH, + modprobe_binary.as_ref().as_os_str().as_encoded_bytes(), ) - })?; + .with_context(|| { + format!( + "Failed to populate modprobe path with {}", + modprobe_binary.as_ref().display() + ) + })?; + } else { + log::info!("{MODPROBE_PATH} doesn't exist. Not populating it..."); + } + Ok(()) } @@ -74,6 +79,8 @@ fn setup_firmware_search_path(firmware: impl AsRef) -> Result<()> { firmware.as_ref().display() ) })?; + } else { + log::info!("{FIRMWARE_SERCH_PATH} doesn't exist. Not populating it..."); } Ok(()) diff --git a/pkgs/by-name/no/norouter/package.nix b/pkgs/by-name/no/norouter/package.nix deleted file mode 100644 index 12ad91496a84..000000000000 --- a/pkgs/by-name/no/norouter/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "norouter"; - version = "0.6.5"; - - src = fetchFromGitHub { - owner = "norouter"; - repo = "norouter"; - rev = "v${version}"; - sha256 = "sha256-EY/Yfyaz2DeQKHJ4awpQDbrVkse9crIZlLzfviPy3Tk="; - }; - - vendorHash = "sha256-RxrmYfEm1Maq8byoLXUr5RfXcwgqpCcAq5enMnl9V9E="; - - subPackages = [ "cmd/norouter" ]; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/norouter --version | grep ${version} > /dev/null - - runHook postInstallCheck - ''; - - meta = with lib; { - # Doesn't build with Go >=1.21 - # https://github.com/norouter/norouter/issues/165 - broken = true; - description = "Tool to handle unprivileged networking by using multiple loopback addresses"; - homepage = "https://github.com/norouter/norouter"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - mainProgram = "norouter"; - }; -} diff --git a/pkgs/by-name/np/npingler/package.nix b/pkgs/by-name/np/npingler/package.nix index 443cf4f50b7c..7ba718f3535f 100644 --- a/pkgs/by-name/np/npingler/package.nix +++ b/pkgs/by-name/np/npingler/package.nix @@ -1,22 +1,48 @@ { lib, + stdenv, + buildPackages, rustPlatform, fetchFromGitHub, + installShellFiles, nix-update-script, }: -rustPlatform.buildRustPackage { +let + emulatorAvailable = stdenv.hostPlatform.emulatorAvailable buildPackages; + emulator = stdenv.hostPlatform.emulator buildPackages; +in +rustPlatform.buildRustPackage (finalAttrs: { pname = "npingler"; - version = "unstable-2025-08-24"; + version = "0.4.0"; src = fetchFromGitHub { owner = "9999years"; repo = "npingler"; - rev = "b897098be1df890b669dc734edcb10bf8fc798cb"; - hash = "sha256-mMwfonIP8fnJDNdl9ANhLmYlM8tPLtBCWNIPSRBT/D4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-d34IGZ+Xdzknkmz+JemEEEYde+8zowuGOlGKlm7F3Jk="; }; - cargoHash = "sha256-VhMpgrNy0NauwBSCR+5vjod9H216HPC+rdQUIFVjnRg="; + cargoHash = "sha256-Fs5LPy9dX2hRyMo/YASQesXQoklqYDV78eXnlecet0E="; + + buildFeatures = [ "clap_mangen" ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString emulatorAvailable '' + manpages=$(mktemp -d) + ${emulator} $out/bin/npingler util generate-man-pages "$manpages" + for manpage in "$manpages"/*; do + installManPage "$manpage" + done + + installShellCompletion --cmd npingler \ + --bash <(${emulator} $out/bin/npingler util generate-completions bash) \ + --fish <(${emulator} $out/bin/npingler util generate-completions fish) \ + --zsh <(${emulator} $out/bin/npingler util generate-completions zsh) + ''; meta = { description = "Nix profile manager for use with npins"; @@ -29,4 +55,4 @@ rustPlatform.buildRustPackage { }; passthru.updateScript = nix-update-script { }; -} +}) diff --git a/pkgs/by-name/np/npm-check-updates/package.nix b/pkgs/by-name/np/npm-check-updates/package.nix index 9b634be58bfa..5812df80bae6 100644 --- a/pkgs/by-name/np/npm-check-updates/package.nix +++ b/pkgs/by-name/np/npm-check-updates/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "npm-check-updates"; - version = "18.2.0"; + version = "19.0.0"; src = fetchFromGitHub { owner = "raineorshine"; repo = "npm-check-updates"; rev = "refs/tags/v${version}"; - hash = "sha256-llBQVABBjsb5JZEVAbj4lQzTrrwRisX1DNRlb6mnwuM="; + hash = "sha256-C3W3Yt28MpKEW7a8BXD2e/dzJhR9WHPrqPDo3ohTYpU="; }; - npmDepsHash = "sha256-USNLNMhBVN5LaTeCBdfzFrTgu8R2Z96PyjqICQH6Dqc="; + npmDepsHash = "sha256-dpVPfBbazloSg0WVlgyGfMjOxLhALUyQDOBqM0Z915o="; postPatch = '' sed -i '/"prepare"/d' package.json diff --git a/pkgs/by-name/ns/nsgenbind/package.nix b/pkgs/by-name/ns/nsgenbind/package.nix index 572228dba46a..fd56a343ac63 100644 --- a/pkgs/by-name/ns/nsgenbind/package.nix +++ b/pkgs/by-name/ns/nsgenbind/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "nsgenbind"; - version = "0.8"; + version = "0.9"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM="; + hash = "sha256-Iyzg9my8LD7tYoiuJt4sVnu/u8Adiw9vxsHBZJ1LOF0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index 4c336ac7fce7..4a13cbbd4434 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.17.2"; + version = "1.18.0"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; tag = "r${version}"; - hash = "sha256-YNbRgqJSf22YV/4e2Sr9CwKFOQcBVhS6ScDNon3yJUM="; + hash = "sha256-PpSoqDCjvROkfXSuOlGxqa9ChdBItu/PQztdsXvVC60="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index e7dd3e1986b0..914de43f062b 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.103.0"; + version = "0.103.1"; in stdenv.mkDerivation { pname = "nwjs-ffmpeg-prebuilt"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { src = let hashes = { - "x64" = "sha256-A5jzp9f5C5Zj4r/GMrQEv9gYyZOiKjytH07mIoB79V4="; - "ia32" = "sha256-A5jzp9f5C5Zj4r/GMrQEv9gYyZOiKjytH07mIoB79V4="; + "x64" = "sha256-/PN83C3i2wzxl76YuMXfPK5jsS+D04qMTWTgXoplv+E="; + "ia32" = "sha256-/PN83C3i2wzxl76YuMXfPK5jsS+D04qMTWTgXoplv+E="; }; in fetchurl { diff --git a/pkgs/by-name/oc/octopus/package.nix b/pkgs/by-name/oc/octopus/package.nix index 60eb732a24a7..e5018530f519 100644 --- a/pkgs/by-name/oc/octopus/package.nix +++ b/pkgs/by-name/oc/octopus/package.nix @@ -29,20 +29,21 @@ assert (!blas.isILP64) && (!lapack.isILP64); assert (blas.isILP64 == arpack.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "octopus"; - version = "16.0"; + version = "16.2"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; - rev = version; - hash = "sha256-sByiRTgAntJtSeL4h+49Mi9Rcxw2wK/BvXvsePa77HE="; + tag = finalAttrs.version; + hash = "sha256-L97igB+bdZ19zpbffHi8DVSJXKtUyDqauUB+l5zzFwQ="; }; - patches = [ - # Discover all MPI languages components to avoid scalpack discovery failure - ./scalapack-mpi-alias.patch + outputs = [ + "out" + "dev" + "testsuite" ]; nativeBuildInputs = [ @@ -78,11 +79,11 @@ stdenv.mkDerivation rec { (lib.cmakeBool "OCTOPUS_MPI" enableMpi) (lib.cmakeBool "OCTOPUS_ScaLAPACK" enableMpi) (lib.cmakeBool "OCTOPUS_OpenMP" true) + (lib.cmakeBool "OCTOPUS_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) ]; - nativeCheckInputs = lib.optional.enableMpi mpi; - doCheck = false; - checkTarget = "check-short"; + nativeCheckInputs = lib.optional enableMpi mpi; + doCheck = false; # requires installed data postPatch = '' patchShebangs ./ @@ -92,15 +93,20 @@ stdenv.mkDerivation rec { patchShebangs testsuite/oct-run_testsuite.sh ''; + postInstall = '' + mkdir -p $testsuite + moveToOutput share/octopus/testsuite $testsuite + ''; + enableParallelBuilding = true; passthru = lib.attrsets.optionalAttrs enableMpi { inherit mpi; }; - meta = with lib; { + meta = { description = "Real-space time dependent density-functional theory code"; homepage = "https://octopus-code.org"; - maintainers = with maintainers; [ markuskowa ]; - license = with licenses; [ + maintainers = with lib.maintainers; [ markuskowa ]; + license = with lib.licenses; [ gpl2Only asl20 lgpl3Plus @@ -108,4 +114,4 @@ stdenv.mkDerivation rec { ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch b/pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch deleted file mode 100644 index 8c8253ebf1f3..000000000000 --- a/pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70d89efb5e..47ba750d7a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -131,7 +131,7 @@ set(Octopus_ext_libs) - find_package(GSL) - if (OCTOPUS_MPI) - set(MPI_DETERMINE_LIBRARY_VERSION ON) -- find_package(MPI 3 COMPONENTS Fortran) -+ find_package(MPI 3) - # Further set MKL variables - if (MPI_Fortran_LIBRARY_VERSION_STRING MATCHES Intel) - set(MKL_MPI intelmpi CACHE STRING "Octopus: Overloaded") diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index 28806e3131ea..0a867bf501f3 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -19,14 +19,14 @@ }: stdenv.mkDerivation rec { - version = "2025-09-10"; + version = "2025-09-27"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "9e23925b8581d22033f07f1983587412d3761494"; - sha256 = "sha256-HhU7aP7tZP6x/dOO5fxKnrEqAv2fkwd3YcI/eq5cdC0="; + rev = "242e2faa51675494cbfa78a81f3ff47d81039863"; + sha256 = "sha256-xYwo5/ONf5nRgfVSnEadPUkPDaOsJhk7doqRs4zp39E="; }; strictDeps = true; diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 7590f87bfe14..431db2635b18 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; tag = finalAttrs.version; - hash = "sha256-gzOymFkzz2MStbhLA1viJuHNbsBFDLqbhG0lIaxAC+w="; + hash = "sha256-EL1xWrxI7W2iXb0syb/53BgW22kqOSJCHyzBHGdQOm4="; }; vendorHash = "sha256-wkuCUMzmYAWf8RjM6DkTTHaY7qEIjGNYiT4grtCbYs8="; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 6afc055a3350..63af415a6d6d 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -117,13 +117,13 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-D3b3ddW6s9NqV8mJZboQ/z8IkId8h7a4eTh/MkjPNqg="; + hash = "sha256-ooDGwTklGJ/wzDlAY3uJiqpZUxT1cCsqVNJKU8BAPbQ="; }; vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4="; diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix index 97edb0e25e5e..0e4284c88dac 100644 --- a/pkgs/by-name/ol/olympus-unwrapped/package.nix +++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix @@ -31,9 +31,9 @@ let phome = "$out/lib/olympus"; # The following variables are to be updated by the update script. - version = "25.09.09.02"; - buildId = "5131"; # IMPORTANT: This line is matched with regex in update.sh. - rev = "fa3f1a9aaca5e57bfa6d2e18a0a8688c7608b747"; + version = "25.09.30.01"; + buildId = "5195"; # IMPORTANT: This line is matched with regex in update.sh. + rev = "f377dc2703a08b0871208a56a87b1796bf41b50d"; in buildDotnetModule { pname = "olympus-unwrapped"; @@ -44,7 +44,7 @@ buildDotnetModule { owner = "EverestAPI"; repo = "Olympus"; fetchSubmodules = true; # Required. See upstream's README. - hash = "sha256-MJzrQDMsnbjua76twT+swZ1fMiRqokqlxg0ce1fnvLU="; + hash = "sha256-eE7DU4hUlawza7Q0CD3U7QQrw4T8RnT0todJz6UIZlM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index f4f85728b646..b6e9ce81d4d9 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "omnictl"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-wPatXY9hl1YEzEQyvn+As2MBssCXFJCfNbYlwwdgGR0="; + hash = "sha256-bm2ItsMgjZ/yrvinBPVaEvPSLwrD+uZGCzcnBKdvmK4="; }; - vendorHash = "sha256-9BzR5ZjSoaPYxMhweNaOalFsvX5BM4EVX8HAR17Xzoc="; + vendorHash = "sha256-Vq2XTW36L1Rq9l/ADaJXQUSkAbPWNJcEn+5VXKADdw8="; ldflags = [ "-s" diff --git a/pkgs/by-name/on/oneDNN/package.nix b/pkgs/by-name/on/oneDNN/package.nix index c8e011b94cc1..e196a0acb4f9 100644 --- a/pkgs/by-name/on/oneDNN/package.nix +++ b/pkgs/by-name/on/oneDNN/package.nix @@ -11,13 +11,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.9"; + version = "3.9.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-YSHHdXZaSHb1vVRI8MTW2BFoSSUEzIpb/AhhuAQYJls="; + hash = "sha256-DbLW22LgG8wrBNMsxoUGlacHLcfIBwqyiv+HOmFDtxc="; }; outputs = [ diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix index faac23a3b05e..03ec4393af1c 100644 --- a/pkgs/by-name/op/opa-envoy-plugin/package.nix +++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix @@ -14,13 +14,13 @@ assert buildGoModule rec { pname = "opa-envoy-plugin"; - version = "1.8.0-envoy"; + version = "1.9.0-envoy"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa-envoy-plugin"; tag = "v${version}"; - hash = "sha256-tPPF/zCwPShejBZZO1Kw7+jd4BpTU81DeIUxxz9b0RY="; + hash = "sha256-Arc0aVDcGZqCrrUrAB9yVXSXzdtOlXEFGZ8pJ578oKk="; }; vendorHash = null; diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix index 8cd5040ace23..cede42911834 100644 --- a/pkgs/by-name/op/open-vm-tools/package.nix +++ b/pkgs/by-name/op/open-vm-tools/package.nix @@ -53,13 +53,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open-vm-tools"; - version = "13.0.0"; + version = "13.0.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; tag = "stable-${finalAttrs.version}"; - hash = "sha256-1ZW1edwKW3okKNdWw6rBgfeOt9afESbhe1L1TNp0+Kc="; + hash = "sha256-N0z7OpJP8ubYOeb0KHEQkITlWkKP04rpm79VXRnCe0I="; }; sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 598df36c166f..26f859a4265b 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.6.31"; + version = "0.6.32"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-Pv+2+j5S4jokGYHGSewk33Vmf41XJj8CwyKYLMG2EWA="; + hash = "sha256-+P/IjELE1G2Fm8OwS5l7k78f78s/o1/Dy945aw+lfQw="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-HBmhRzWY7lIl3OScIlwSj/JJUlVcgFvXNHbw4jJRbl8="; + npmDepsHash = "sha256-BcSDzLg2voHyUz4cnXQ0KRNSbLCsCwJ1itEJSbfAQhU="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 4a46904cf50a..fcab7e363bf6 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -22,12 +22,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.12.1"; + version = "0.13.5"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZpxHLZIc9bBzPJyvDHMjuaTEzZsHwafoBihKxe8Pr3U="; + hash = "sha256-GiByJg4NpllA4N4QGSyWsBNqKqKIdxicIjQpc7mHgEs="; }; tui = buildGoModule { diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index d1f4254b7d08..4e25e98dffdd 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "opengist"; - version = "1.10.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; tag = "v${finalAttrs.version}"; - hash = "sha256-cSPKtcD1V+WTSCkgi8eKhGbtW+WdCoetbiSrNvEVRW4="; + hash = "sha256-TlUaen8uCj4Ba2gOWG32Gk4KIDvitXai5qv4PTeizYo="; }; frontend = buildNpmPackage { @@ -43,10 +43,10 @@ buildGoModule (finalAttrs: { cp -R public $out ''; - npmDepsHash = "sha256-Uh+oXd//G/lPAMXRxijjEOpQNmeXK/XCIU7DJN3ujaY="; + npmDepsHash = "sha256-zBao/EoAolkgMvqQPqN0P2VC4tT6gkQPqIk4HyfXC7o="; }; - vendorHash = "sha256-m2f9+PEMjVhlXs7b1neEWO0VY1fQSfe+T1aNEdtML28="; + vendorHash = "sha256-NGRJuNSypmIc8G0wMW7HT+LkP5i5n/p3QH8FyU9pF5w="; tags = [ "fs_embed" ]; diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix index a41ef68ff345..2501a26418ab 100644 --- a/pkgs/by-name/op/openimageio/package.nix +++ b/pkgs/by-name/op/openimageio/package.nix @@ -10,6 +10,7 @@ libtiff, opencolorio, openexr, + openjph, robin-map, unzip, fmt, @@ -17,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openimageio"; - version = "3.0.10.0"; + version = "3.0.10.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenImageIO"; tag = "v${finalAttrs.version}"; - hash = "sha256-WbzAYZEPH81FtG6I9jwKI5NJjnFSxIgkMpo3Gt/OIOQ="; + hash = "sha256-BBrzmukPfQVYR0CdfiYOxvPfIEXCj/45lQFRxl9Loc0="; }; outputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff opencolorio openexr + openjph robin-map ]; diff --git a/pkgs/by-name/op/openjfx/25/deps.json b/pkgs/by-name/op/openjfx/25/deps.json new file mode 100644 index 000000000000..ccf9307c9961 --- /dev/null +++ b/pkgs/by-name/op/openjfx/25/deps.json @@ -0,0 +1,145 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": { + "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs=" + }, + "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355": { + "jar": "sha256-j98ySq5bTxFHbDJKzWMZP+kfUqekWU1jYUJNDyNg9js=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": { + "zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/junit#junit-bom/5.12.2": { + "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=", + "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc=" + }, + "org/junit/jupiter#junit-jupiter-api/5.12.2": { + "jar": "sha256-C5ynKOS82a3FfyneuVVv+e1eCLTohDuHWrpOTj4E8JI=", + "module": "sha256-VFfyRO3hjRFzbwfrnF8wklrrCW5Cw1m2oEqaDgOyKes=", + "pom": "sha256-VmKCFmSJvUCxLDUHuZXkj44CXgmgXn0W3SuY3GQs994=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.12.2": { + "jar": "sha256-9XbAa4rM3pmFBjuLyAUmy5gO7CTe4LciH8jd16zmWAA=", + "module": "sha256-0W0wjmqiWjCz75JNnf5PiJqb/ybqvXLvMO6oH864SBU=", + "pom": "sha256-PHGRdFCb6dsfqBesY7eLIfH2fQaL5HHaPQR4G9RAKqM=" + }, + "org/junit/jupiter#junit-jupiter-params/5.12.2": { + "jar": "sha256-shn/qUm5CnGqO2wrYGRWuCvKCyCJt0Wcj/RhFW/1mw8=", + "module": "sha256-x3KP8z0SJgBzLq09DW+K3XRd4+lEFRmHE5WuiZymFHQ=", + "pom": "sha256-pcfvF8refV90q2IHK7xrxxy9AWgGJGvOQl/LvBEISTw=" + }, + "org/junit/jupiter#junit-jupiter/5.12.2": { + "jar": "sha256-OFSzrUNJBrgn/sR0qg2NqLVunlbV/H8uIPw/EuxL6JQ=", + "module": "sha256-ioIpqKD4Se/BzD/9XPlN4W6sgAYcX5M5eoXAk8nX6nA=", + "pom": "sha256-ka2OSkvzBCMslByQFKyRNnvroTHx21jVv+SZx5DUbxc=" + }, + "org/junit/platform#junit-platform-commons/1.12.2": { + "jar": "sha256-5oOgHoXfq+pSDAVqxgFaYWJ1bmAuxlPA2oXiM/CvvBg=", + "module": "sha256-ZMeQwnpztFz8b4TMtotI92SQNIZ+Fo1iJ1TUlmkrwic=", + "pom": "sha256-TyuKkGXJCcaJLYYi1VO2qwpwMhYkSZ47acEon1nswHc=" + }, + "org/junit/platform#junit-platform-engine/1.12.2": { + "jar": "sha256-zvDvy1vS4F4rgI04urXGVQicDDABUnN250y2BqeRHsg=", + "module": "sha256-+Xsxk2wRnAgtTQOM3resDmVvRR2eXX6Jg9IqJONvoQM=", + "pom": "sha256-lICxinlldp0Ag8LLcRBUI/UwKo8Ea7IEfm2/8J84NJA=" + }, + "org/junit/platform#junit-platform-launcher/1.12.2": { + "jar": "sha256-3M8sH6Cpd8U60JSthZv93dUk2XWUt2MHrXh95xmFdX8=", + "module": "sha256-UKBqBDdOMA57hhWIxdwNAhQh4Z8ToL2ymwYX/y/ehdE=", + "pom": "sha256-YZFFzSFdMiJTcr5iW7ooaD10FC/uGl39scZLUv6cC1E=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/by-name/op/openjfx/25/source.json b/pkgs/by-name/op/openjfx/25/source.json new file mode 100644 index 000000000000..1ba71dbdaa6c --- /dev/null +++ b/pkgs/by-name/op/openjfx/25/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-O8ogDcM/YYYwFmYqglc48m11lcbjqxeYbjsB6crY1bU=", + "owner": "openjdk", + "repo": "jfx25u", + "rev": "refs/tags/25+29" +} diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix index 04c6006d723d..ca4cab8b6cba 100644 --- a/pkgs/by-name/op/openjfx/package.nix +++ b/pkgs/by-name/op/openjfx/package.nix @@ -37,12 +37,14 @@ jdk21_headless, jdk23_headless, jdk24_headless, + jdk25_headless, jdk-bootstrap ? { "17" = jdk17_headless; "21" = jdk21_headless; "23" = jdk23_headless; "24" = jdk24_headless; + "25" = jdk25_headless; } .${featureVersion}, }: diff --git a/pkgs/by-name/op/openonload/openonload.pc.in b/pkgs/by-name/op/openonload/openonload.pc.in new file mode 100644 index 000000000000..61a65e06def4 --- /dev/null +++ b/pkgs/by-name/op/openonload/openonload.pc.in @@ -0,0 +1,10 @@ +prefix=@dev@ +includedir=${prefix}/include +libdir=@lib@/lib + +Name: openonload +Description: OpenOnLoad high performance network stack from Solarflare +URL: http://www.openonload.org/ +Version: @version@ +Cflags: -isystem${includedir} +Libs: -L${libdir} -Wl,-rpath,${libdir} @dash_l@ diff --git a/pkgs/by-name/op/openonload/package.nix b/pkgs/by-name/op/openonload/package.nix new file mode 100644 index 000000000000..bf01d96a6d9c --- /dev/null +++ b/pkgs/by-name/op/openonload/package.nix @@ -0,0 +1,158 @@ +{ + lib, + stdenv, + fetchFromGitHub, + coreutils, + libpcap, + which, + libcap, + makeWrapper, + nix-update-script, + perl, + libmnl, +}: + +stdenv.mkDerivation rec { + pname = "openonload"; + version = "9.0.2"; + + src = fetchFromGitHub { + owner = "Xilinx-CNS"; + repo = "onload"; + rev = "v${version}"; + hash = "sha256-wyvTtOjD6fwuT2OGGhr10F0Q7hXE97mGREhq7Ns14hw="; + }; + + nativeBuildInputs = [ + which + makeWrapper + ]; + + buildInputs = [ + libcap + libpcap + ]; + + configurePhase = '' + runHook preConfigure + export PATH="$PWD/scripts:$PATH" + patchShebangs --build \ + scripts/ \ + src/driver/ + substituteInPlace \ + scripts/mmaketool \ + scripts/onload \ + scripts/onload_build \ + scripts/onload_install \ + scripts/shell-fns/fns \ + scripts/shell-fns/mmake-fns \ + --replace-fail "/bin/pwd" "${coreutils}/bin/pwd" + substituteInPlace \ + scripts/mmaketool \ + scripts/onload_install \ + scripts/sfcaffinity_config \ + --replace-fail "/bin/ls" "${coreutils}/bin/ls" + + # Disable compiler checks that are disabled for Ubuntu: https://github.com/Xilinx-CNS/onload/blob/713eff9c3a105c51fb062527e01e1663c4e61e28/scripts/mmakebuildtree#L337-L344 + substituteInPlace scripts/mmakebuildtree \ + --replace-fail 'W_NO_UNUSED_RESULT= + ' "" + export W_NO_UNUSED_RESULT=1 W_NO_IGNORED_ATTRIBUTES=1 + + # Patch unit tests to be run during check phase + substituteInPlace src/tests/onload/{oof,cplane_unit,cplane_sysunit,onload_remote_monitor/internal_tests}/mmake.mk \ + --replace-fail '/usr/bin/timeout' '${coreutils}/bin/timeout' + + # Honor NIX_BUILD_CORES in onload_build script + substituteInPlace scripts/onload_build --replace-fail 'nproc' 'echo "$NIX_BUILD_CORES"' + runHook postConfigure + ''; + + # This only builds the 64 bit libraries, not the kernel module. + buildPhase = '' + runHook preBuild + ./scripts/onload_build --user64 + runHook postBuild + ''; + + doCheck = true; + nativeCheckInputs = [ + perl + ]; + checkInputs = [ + libmnl + ]; + checkPhase = '' + runHook preCheck + # Build all tests in parallel, the script does it in sequence + make -C "$(mmaketool --toppath)/build/$(mmaketool --userbuild)" -j$NIX_BUILD_CORES + scripts/run_unit_tests.sh + runHook postCheck + ''; + + outputs = [ + "out" + "lib" + "dev" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out + i_prefix=$out scripts/onload_install --nobuild --userfiles --headers \ + --bindir=/bin \ + --sbindir=/bin \ + --usrsbindir=/bin \ + --libexecdir=/libexec \ + --includedir=/include \ + --lib64dir=/lib + + mkdir -p $dev/lib + mv -v $out/include $dev + mv -v $out/lib/*.a $dev/lib + mkdir -p $lib + mv -v $out/lib $lib + + substituteInPlace $out/bin/onload --replace-fail "/usr/libexec" "$out/libexec" + # This tool looks for libonload.so in environment, point default to the actual library + wrapProgram $out/bin/onload \ + --set-default ONLOAD_PRELOAD $out/lib/libonload.so + + # These scripts assume other binaries from this package are in PATH + wrapProgram $out/bin/onload_tcpdump \ + --prefix PATH : $out/bin + wrapProgram $out/bin/orm_webserver \ + --prefix PATH : $out/bin + + cp -v $(find build/gnu_x86_64/tools -type f -executable -print | grep -v '/debug/' | grep -v '.so$') $out/bin + # Capture the test apps for validating performance/host set-up + cp -v $(find build/gnu_x86_64/tests/ef_vi -type f -executable -print) $out/bin + + mkdir -p $dev/lib/pkgconfig/ + export dash_l="-lonload_ext" + substituteAll ${./openonload.pc.in} $dev/lib/pkgconfig/openonload.pc + export dash_l="-l:libonload_ext.a" + substituteAll ${./openonload.pc.in} $dev/lib/pkgconfig/openonload-static.pc + runHook postInstall + ''; + + preFixup = '' + # The test apps have a build directory in RPATH, which patchelf can't + # remove by default because the required library libefcp.so is there. + # By removing the library, patchelf is unblocked from removing the build + # directory from RPATH. This doesn't break the binary because the library + # is also available from other RPATH entries. + rm -v build/gnu_x86_64/lib/cplane/*.so* + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "OpenOnLoad high performance network stack from Solarflare"; + homepage = "https://www.openonload.org"; + license = lib.licenses.gpl2; + maintainers = with maintainers; [ YorikSar ]; + # ARM64 build fails, see https://github.com/Xilinx-CNS/onload/issues/253 + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/op/openspeedrun/package.nix b/pkgs/by-name/op/openspeedrun/package.nix new file mode 100644 index 000000000000..468a3b199b5b --- /dev/null +++ b/pkgs/by-name/op/openspeedrun/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + wayland, + libxkbcommon, + libGL, + autoPatchelfHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "openspeedrun"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "SrWither"; + repo = "OpenSpeedRun"; + tag = "v${finalAttrs.version}"; + hash = "sha256-EZPApXUVhsaOYa6CnpR8IWeEoHEl89KJGGoBOYFqBV0="; + }; + + cargoHash = "sha256-WzsLEfDZpjpUrbyPOr5QUkTMrlAJoC9Rej5BMOKF7OM="; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + runtimeDependencies = [ + wayland + libxkbcommon + libGL + ]; + + autoPatchelfIgnoreMissingDeps = [ + "libgcc_s.so.1" + ]; + + meta = { + changelog = "https://github.com/SrWither/OpenSpeedRun/releases/tag/v${finalAttrs.version}"; + description = "Modern and minimalistic open-source speedrun timer"; + homepage = "https://github.com/SrWither/OpenSpeedRun"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.pyrox0 ]; + mainProgram = "openspeedrun"; + }; +}) diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 8f0fdcaf5b6e..5856d185d9b2 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -23,13 +23,13 @@ buildDotnetModule (finalAttrs: { pname = "OpenTabletDriver"; - version = "0.6.5.1"; + version = "0.6.6.0"; src = fetchFromGitHub { owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; tag = "v${finalAttrs.version}"; - hash = "sha256-PpgqmeQRGZew0+HD4xtbimc25XPEfgW69VfJf+TlYC4="; + hash = "sha256-NS/r4FU3dT7UT+R7NryRnU5RfLEN0E6pSqtNDpKMS7U="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; @@ -83,9 +83,6 @@ buildDotnetModule (finalAttrs: { "OpenTabletDriver.Tests.UpdaterTests.Install_Copies_AppDataFiles" # Depends on processor load "OpenTabletDriver.Tests.TimerTests.TimerAccuracy" - # Can't find Configurations directory, remove after https://github.com/OpenTabletDriver/OpenTabletDriver/pull/3796 - "OpenTabletDriver.Tests.ConfigurationTest.Configurations_Verify_Configs_With_Schema" - "OpenTabletDriver.Tests.ConfigurationTest.Configurations_Are_Linted" ]; preBuild = '' diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index fcb3614180df..e3703d050cca 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "opentelemetry-cpp"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-vprHCexKtXvbiHz7JfuTbVFyLy0VL1s4e/hNyaN3nY0="; + hash = "sha256-4SmKB2368I/2WTKYCqsZAAdkJygA15zCT+I7/RF8Knk="; }; patches = [ diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix index 5900c5d8766d..5d2ee5b936a5 100644 --- a/pkgs/by-name/os/ossia-score/package.nix +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -44,13 +44,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "ossia-score"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "ossia"; repo = "score"; tag = "v${finalAttrs.version}"; - hash = "sha256-r5JoOzUa70nn5pj9pcuAC4okpnRWTafyukz+ij0VQno="; + hash = "sha256-+RUspDEAQPL6M0/f4lb/SuTD1wdmwE9+8GXQKUClgdE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index f5f8b696368c..4f5c2f0635f8 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; tag = "v${version}"; - hash = "sha256-gleQ/Bh+oLYy3iP6FsqtihoLz4jerRnx14dB2cBbf60="; + hash = "sha256-YdtTF1u5uyXERRZXidumBFoWq4yA5L7cwIaoYJ4ktSM="; }; - vendorHash = "sha256-F1QioqSFQvSJd7JByyUakjn9QSpF2hqEkyx10ei/sKk="; + vendorHash = "sha256-/+VtmLnceOzcqWvpBnihtsAf9Q4x/56Zk6UjjejzWHQ="; subPackages = [ "cmd/osv-scanner" diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index 242026223cca..c3dbc70c1983 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -105,6 +105,15 @@ stdenv.mkDerivation (finalAttrs: { "-Dnautilus=false" ]; + # For https://gitlab.gnome.org/GNOME/papers/-/blob/5efed8638dd4a2d5c36f59eb9a22158d69632e0b/shell/src/meson.build#L36 + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + + postPatch = '' + substituteInPlace shell/src/meson.build --replace-fail \ + "meson.current_build_dir() / rust_target / meson.project_name()" \ + "meson.current_build_dir() / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()" + ''; + postInstall = '' substituteInPlace $out/share/thumbnailers/papers.thumbnailer \ --replace-fail '=papers-thumbnailer' "=$out/bin/papers-thumbnailer" diff --git a/pkgs/by-name/pa/parabolic/package.nix b/pkgs/by-name/pa/parabolic/package.nix index 12ae8ffefb93..e1d979b44321 100644 --- a/pkgs/by-name/pa/parabolic/package.nix +++ b/pkgs/by-name/pa/parabolic/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "parabolic"; - version = "2025.8.1"; + version = "2025.9.0"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "Parabolic"; tag = finalAttrs.version; - hash = "sha256-Xft9yqkJzWu4eGPDtRl4tV4594HjJp17Osnv0kG0IMk="; + hash = "sha256-19lsgoAKk9mjTrEcbQ8GjSzGEep0zUxW8unn7euNS6w="; }; # Patches desktop file/dbus service bypassing wrapped executable diff --git a/pkgs/tools/misc/parallel/wrapper.nix b/pkgs/by-name/pa/parallel-full/package.nix similarity index 100% rename from pkgs/tools/misc/parallel/wrapper.nix rename to pkgs/by-name/pa/parallel-full/package.nix diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/by-name/pa/parallel/package.nix similarity index 89% rename from pkgs/tools/misc/parallel/default.nix rename to pkgs/by-name/pa/parallel/package.nix index cc9dacc51e94..b9ff9d0d9e85 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/by-name/pa/parallel/package.nix @@ -10,12 +10,12 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "parallel"; version = "20250822"; src = fetchurl { - url = "mirror://gnu/parallel/parallel-${version}.tar.bz2"; + url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2"; hash = "sha256-AZ0yhyKGfP/pGMRJNkMIwN8EhFbGkpm5FFGj5vrJFno="; }; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { description = "Shell tool for executing jobs in parallel"; longDescription = '' GNU Parallel is a shell tool for executing jobs in parallel. A job @@ -78,12 +78,12 @@ stdenv.mkDerivation rec { programs. ''; homepage = "https://www.gnu.org/software/parallel/"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ pSub tomberek ]; mainProgram = "parallel"; }; -} +}) diff --git a/pkgs/by-name/pc/pcp/package.nix b/pkgs/by-name/pc/pcp/package.nix deleted file mode 100644 index a8d6e1c58ba9..000000000000 --- a/pkgs/by-name/pc/pcp/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "pcp"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "dennis-tra"; - repo = "pcp"; - rev = "v${version}"; - sha256 = "sha256-aZO8VuOiYhOPctFKZ6a2psJB0lKHlPc+NLy2RWDU4JI="; - }; - - vendorHash = "sha256-3bkzBQ950Phg4A9p+IjeUx7Xw7eVmUbeYnQViNjghFk="; - - meta = with lib; { - description = "Command line peer-to-peer data transfer tool based on libp2p"; - homepage = "https://github.com/dennis-tra/pcp"; - license = licenses.asl20; - maintainers = with maintainers; [ matthewcroughan ]; - platforms = platforms.linux; - mainProgram = "pcp"; - }; -} diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index ed989be6f710..8625d6b8eaac 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -26,10 +26,10 @@ # External libraries options withHdf5 ? withCommonDeps, withMetis ? withCommonDeps, - withZlib ? (withP4est || withPtscotch), + withZlib ? (withP4est || withPtScotch), withScalapack ? withCommonDeps && mpiSupport, withParmetis ? withFullDeps, # parmetis is unfree - withPtscotch ? withCommonDeps && mpiSupport, + withPtScotch ? withCommonDeps && mpiSupport, withMumps ? withCommonDeps, withP4est ? withFullDeps, withHypre ? withCommonDeps && mpiSupport, @@ -67,7 +67,7 @@ assert withP4est -> (mpiSupport && withZlib); # Package parmetis depend on metis and mpi support assert withParmetis -> (withMetis && mpiSupport); -assert withPtscotch -> (mpiSupport && withZlib); +assert withPtScotch -> (mpiSupport && withZlib); assert withScalapack -> mpiSupport; assert (withMumps && mpiSupport) -> withScalapack; assert withHypre -> mpiSupport; @@ -83,6 +83,7 @@ let fortranSupport pythonSupport precision + withPtScotch ; enableMpi = self.mpiSupport; @@ -109,11 +110,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "petsc"; - version = "3.23.6"; + version = "3.23.7"; src = fetchzip { url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz"; - hash = "sha256-sKXLYtOw6xom7c7ARpOY4dcsV5zR5KgbYrt1bnHF/Io="; + hash = "sha256-6jP1EEYGMkttmEh0Fvtm0Fgp0NwHQlG21fY7cnLmXTI="; }; strictDeps = true; @@ -139,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withP4est petscPackages.p4est ++ lib.optional withMetis petscPackages.metis ++ lib.optional withParmetis petscPackages.parmetis - ++ lib.optional withPtscotch petscPackages.scotch + ++ lib.optional withPtScotch petscPackages.scotch ++ lib.optional withScalapack petscPackages.scalapack ++ lib.optional withMumps petscPackages.mumps ++ lib.optional withHypre petscPackages.hypre @@ -184,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional pythonSupport "--with-petsc4py=1" ++ lib.optional withMetis "--with-metis=1" ++ lib.optional withParmetis "--with-parmetis=1" - ++ lib.optional withPtscotch "--with-ptscotch=1" + ++ lib.optional withPtScotch "--with-ptscotch=1" ++ lib.optional withScalapack "--with-scalapack=1" ++ lib.optional withMumps "--with-mumps=1" ++ lib.optional (withMumps && !mpiSupport) "--with-mumps-serial=1" @@ -197,11 +198,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withFftw "--with-fftw=1" ++ lib.optional withSuitesparse "--with-suitesparse=1"; - hardeningDisable = lib.optionals debug [ - "fortify" - "fortify3" - ]; - installTargets = [ (if withExamples then "install" else "install-lib") ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/pg/pgmetrics/package.nix b/pkgs/by-name/pg/pgmetrics/package.nix index 5e9ef426b4b0..97dd147447ed 100644 --- a/pkgs/by-name/pg/pgmetrics/package.nix +++ b/pkgs/by-name/pg/pgmetrics/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = "pgmetrics"; rev = "v${version}"; - sha256 = "sha256-SaJc09RRm8MR8OiBIznCRHLhpflQ4Gi8tlXQvYd/j9A="; + sha256 = "sha256-kaoJZdBzx2DGvoA+aIJnfM2ORTM9xMXHaXEuUD/qqe0="; }; - vendorHash = "sha256-/QAdHC2Ge2Bp2zcn9cpgCPpT8TADqeJC4GlJWsGPe8Q="; + vendorHash = "sha256-2p8BZw/GB/w99VL5NFIBpmyadNmasqrWVncpBHTyh6Q="; doCheck = false; diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index d53302b695a1..35821b430ac2 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.45.0"; + version = "2.46.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-6oq9DW2h1vy2G3sjjzO8xgqSsH1wYVSXccMf1i+qmM8="; + sha256 = "sha256-cKCasr2TtNIn6tNPX/QpxWsG/n3fdq9DTqC77ymGmsQ="; }; - vendorHash = "sha256-nrxkELO1gxU3douXLID5HbS+rMjz9dVQ9eMEn32XpNY="; + vendorHash = "sha256-duzotdz+vyjza6mHNCSPlAbqW/RitC3ZDXepNW3PRyc="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/by-name/pi/picoscope/package.nix b/pkgs/by-name/pi/picoscope/package.nix index 4e47d0d9c896..9841f081e969 100644 --- a/pkgs/by-name/pi/picoscope/package.nix +++ b/pkgs/by-name/pi/picoscope/package.nix @@ -1,154 +1,103 @@ { - stdenv, - lib, - fetchurl, + cacert, dpkg, - makeWrapper, - mono, - gtk-sharp-3_0, + fetchurl, + gdk-pixbuf, glib, + glibc, + gtk3, + icu, + lib, + libcap, + librsvg, libusb1, - zlib, - gtk3-x11, - callPackage, + makeWrapper, + openssl, + patchelf, + stdenv, + systemdMinimal, + tbb, writeTextDir, - scopes ? [ - "picocv" - "ps2000" - "ps2000a" - "ps3000" - "ps3000a" - "ps4000" - "ps4000a" - "ps5000" - "ps5000a" - "ps6000" - "ps6000a" - ], }: let - shared_meta = lib: { - homepage = "https://www.picotech.com/downloads/linux"; - maintainers = with lib.maintainers; [ wirew0rm ]; - teams = [ lib.teams.lumiguide ]; - platforms = [ "x86_64-linux" ]; - license = lib.licenses.unfree; - }; - - libpicoipp = callPackage ( - { - stdenv, - lib, - fetchurl, - autoPatchelfHook, - dpkg, - }: - stdenv.mkDerivation { - pname = "libpicoipp"; - inherit (sources.libpicoipp) version; - src = fetchurl { inherit (sources.libpicoipp) url sha256; }; - nativeBuildInputs = [ - dpkg - autoPatchelfHook - ]; - buildInputs = [ (lib.getLib stdenv.cc.cc) ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/lib - cp -d opt/picoscope/lib/* $out/lib - install -Dt $out/usr/share/doc/libpicoipp usr/share/doc/libpicoipp/copyright - runHook postInstall - ''; - meta = shared_meta lib // { - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - description = "Library for picotech oscilloscope software"; - }; - } - ) { }; - - # If we don't have a platform available, put a dummy version here, so at - # least evaluation succeeds. sources = (lib.importJSON ./sources.json).${stdenv.system} or (throw "unsupported system ${stdenv.system}"); - scopePkg = - name: - { - url, - version, - sha256, - }: - stdenv.mkDerivation { - pname = "lib${name}"; - inherit version; - src = fetchurl { inherit url sha256; }; - # picoscope does a signature check, so we can't patchelf these - nativeBuildInputs = [ dpkg ]; - installPhase = '' - runHook preInstall - mkdir -p $out/lib - cp -d opt/picoscope/lib/* $out/lib - runHook postInstall - ''; - meta = - with lib; - shared_meta lib - // { - description = "Library for picotech oscilloscope ${name} series"; - }; - }; + libraryPath = lib.makeLibraryPath libraries; + libraries = [ + gdk-pixbuf + glibc + gtk3 + icu + libcap + librsvg + libusb1 + openssl + stdenv.cc.cc.lib + systemdMinimal + tbb + ]; - scopePkgs = lib.mapAttrs scopePkg sources; + gdkLoadersCache = "${gdk-pixbuf.out}/${gdk-pixbuf.moduleDir}.cache"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "picoscope"; inherit (sources.picoscope) version; - src = fetchurl { inherit (sources.picoscope) url sha256; }; + srcs = lib.mapAttrsToList (_: src: fetchurl { inherit (src) url sha256; }) sources; + + unpackPhase = '' + for src in $srcs; do + dpkg-deb -x "$src" . + done + ''; nativeBuildInputs = [ dpkg makeWrapper ]; - buildInputs = [ - gtk-sharp-3_0 - mono - glib - libusb1 - zlib - ]; - scopeLibs = lib.attrVals (map (x: "lib${x}") scopes) scopePkgs; - MONO_PATH = - "${gtk-sharp-3_0}/lib/mono/gtk-sharp-3.0:" - + (lib.makeLibraryPath ( - [ - glib - gtk3-x11 - gtk-sharp-3_0 - libusb1 - zlib - libpicoipp - ] - ++ scopeLibs - )); + buildInputs = libraries; installPhase = '' runHook preInstall mkdir -p $out/ - cp -dr usr/share $out/share cp -dr opt/picoscope/* $out/ - makeWrapper "$(command -v mono)" $out/bin/picoscope \ - --add-flags $out/lib/PicoScope.GTK.exe \ - --prefix MONO_PATH : "$MONO_PATH" \ - --prefix LD_LIBRARY_PATH : "$MONO_PATH" \ - --set LANG C + chmod +x $out/lib/PicoScope.GTK + + # Patch all ELF files to prefer Pico libs then our curated runtime + # Set dynamic loader to Nix's glibc ld.so + for f in $out/lib/{PicoScope.GTK,CrashReporter} $(find $out/lib -type f -name 'lib*.so*'); do + ${patchelf}/bin/patchelf \ + --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 \ + --set-rpath "$out/lib:${libraryPath}" \ + "$f" || true + done + + # LD_LIBRARY_PATH: not strictly needed for the main exe (rpath already covers it), but required + # for dlopened plugins that ignore rpath or use absolute sonames. + # GDK_PIXBUF_MODULE_FILE: points gdk-pixbuf to Nix’s loader cache so image loaders (gif/svg/png) + # come from our matched version, not the host. This fixes the “g_module_*” symbol errors. + # GIO_MODULE_DIR: restricts GIO to GLib’s core modules only (no dconf/gvfs host bleed-through). + # SSL_CERT_DIR/SSL_CERT_FILE: Gives OpenSSL a known CA bundle so any HTTPS inside the app works + # without querying host paths. + makeWrapper $out/lib/PicoScope.GTK $out/bin/picoscope \ + --set LD_LIBRARY_PATH "$out/lib:${libraryPath}" \ + --set GDK_PIXBUF_MODULE_FILE "${gdkLoadersCache}" \ + --set GIO_MODULE_DIR "${glib.out}/lib/gio/modules" \ + --set SSL_CERT_DIR "${cacert}/etc/ssl/certs" \ + --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" runHook postInstall ''; + # Stripping causes the following error: + # Failure processing application bundle; possible file corruption. + # Arithmetic overflow while reading bundle. + # A fatal error occurred while processing application bundle + dontStrip = true; + # usage: # services.udev.packages = [ pkgs.picoscope.rules ]; # users.groups.pico = {}; @@ -157,22 +106,23 @@ stdenv.mkDerivation rec { SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico" ''; - meta = - with lib; - shared_meta lib - // { - description = "Oscilloscope application that works with all PicoScope models"; - longDescription = '' - PicoScope for Linux is a powerful oscilloscope application that works - with all PicoScope models. The most important features from PicoScope - for Windows are included—scope, spectrum analyzer, advanced triggers, - automated measurements, interactive zoom, persistence modes and signal - generator control. More features are being added all the time. + meta = { + homepage = "https://www.picotech.com/downloads/linux"; + maintainers = with lib.maintainers; [ wirew0rm ] ++ lib.teams.lumiguide.members; + platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + description = "Oscilloscope application that works with all PicoScope models"; + longDescription = '' + PicoScope for Linux is a powerful oscilloscope application that works + with all PicoScope models. The most important features from PicoScope + for Windows are included—scope, spectrum analyzer, advanced triggers, + automated measurements, interactive zoom, persistence modes and signal + generator control. More features are being added all the time. - Waveform captures can be saved for off-line analysis, and shared with - PicoScope for Linux, PicoScope for macOS and PicoScope for Windows - users, or exported in text, CSV and MathWorks MATLAB 4 formats. - ''; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - }; + Waveform captures can be saved for off-line analysis, and shared with + PicoScope for Linux, PicoScope for macOS and PicoScope for Windows + users, or exported in text, CSV and MathWorks MATLAB 4 formats. + ''; + }; } diff --git a/pkgs/by-name/pi/picoscope/sources.json b/pkgs/by-name/pi/picoscope/sources.json index 6b1d81978b9d..19e71d60b1d5 100644 --- a/pkgs/by-name/pi/picoscope/sources.json +++ b/pkgs/by-name/pi/picoscope/sources.json @@ -1,69 +1,104 @@ { "x86_64-linux": { "libpicocv": { - "sha256": "c0c5bec33c2c7fdd0f26b035ed942175f87012e33d6764c3abf1da31b5626037", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.34-beta2r172_amd64.deb", - "version": "1.1.34-beta2r172" + "sha256": "cff2f4b4460ce58d97a8e4dfde55386cd1836b463b551c17928757493089e475", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.43-1r443_amd64.deb", + "version": "1.1.43-1r443" + }, + "libpicohrdl": { + "sha256": "920c529b8f49cfff3d1050f45753fa8bfca3f2d8e87c9712447c8f4fc766d60a", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicohrdl/libpicohrdl_2.0.150-1r6187_amd64.deb", + "version": "2.0.150-1r6187" }, "libpicoipp": { "sha256": "4a84f0af7f4e8cba91fad620eac0cd23c36b2fdda4637904be564286b10ffe1d", "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r161_amd64.deb", "version": "1.4.0-4r161" }, + "libpl1000": { + "sha256": "5f81971fb54dc12ddb3654c95b085cc6d750e932b759cdfaae47d8ad1a1bcaaf", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpl1000/libpl1000_2.0.150-1r6187_amd64.deb", + "version": "2.0.150-1r6187" + }, + "libplcm3": { + "sha256": "82a962c4a1a3049b4c258cf419e8468326f7931bdd3d5288af697271ed39a261", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libplcm3/libplcm3_2.0.150-1r6187_amd64.deb", + "version": "2.0.150-1r6187" + }, "libps2000": { - "sha256": "473b065e79a7414c1e2b8c8468c8d2654333ac28f3a8c33b535626b33c60d2ca", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.127-3r5552_amd64.deb", - "version": "3.0.127-3r5552" + "sha256": "e51a2870450b9921c9b4a2a26d579b9d44047cf015ef0c51d8a19c9f26309983", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.150-3r6187_amd64.deb", + "version": "3.0.150-3r6187" }, "libps2000a": { - "sha256": "8eba0052f9c7ef327710f2fba5aa11bec0c20225b39d77bb7b69cf80055c039c", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.127-5r5552_amd64.deb", - "version": "2.1.127-5r5552" + "sha256": "19be0c046dbd2725e236f3508af45141a6723ec51b0fcf9a2d7bcd818d53a0b1", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.2.154-5r6530_amd64.deb", + "version": "2.2.154-5r6530" }, "libps3000": { - "sha256": "4e786036b8de0dd0f922aed947f30a53d31bed46b2df5132e8c9480c8a5d93e9", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.127-3r5552_amd64.deb", - "version": "4.0.127-3r5552" + "sha256": "41bbabe8abc39245612996cbc10053dfe06275b819ab57f9fbf48ef798c18a1a", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.149-3r6187_amd64.deb", + "version": "4.0.149-3r6187" }, "libps3000a": { - "sha256": "d2bb1e5bb151b0953ed30ca5421bb93d05dab898c33cdc89927e943ea991867a", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.127-6r5552_amd64.deb", - "version": "2.1.127-6r5552" + "sha256": "7a01aedb064c366405e9b5d9af5b1adfc27b6b782bda1d0bd3b3bee3e595a41a", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.2.157-6r7555_amd64.deb", + "version": "2.2.157-6r7555" }, "libps4000": { - "sha256": "4c127e67949835b5ab5c5c8caa55f73c69df354d761aa53d6df99c8f8ac39009", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.127-2r5552_amd64.deb", - "version": "2.1.127-2r5552" + "sha256": "0d1dff842e806e8f193ee319f88203b8fbb0391d53188e77fa9601bbbf8d2ef6", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.151-2r6187_amd64.deb", + "version": "2.1.151-2r6187" }, "libps4000a": { - "sha256": "26df82bc946e5bb30d599c4c365247bdbaa01e830d4d00630b46a6abcc1eef04", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.127-2r5552_amd64.deb", - "version": "2.1.127-2r5552" + "sha256": "1d2ab448ed2b92f305410dbea452268071cb096edb88855e60dd627be7faed45", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.2.206-2r7757_amd64.deb", + "version": "2.2.206-2r7757" }, "libps5000": { - "sha256": "106ef17862e98c3621f95c377f271c843664f481f84ef918d9eadd013561cd1b", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.127-3r5552_amd64.deb", - "version": "2.1.127-3r5552" + "sha256": "e3dbd0534d1acf5c81b5170d276dcb8d0b612c3fd55f5cc212581d51734079cd", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.151-3r6187_amd64.deb", + "version": "2.1.151-3r6187" }, "libps5000a": { - "sha256": "fe9def134ef9df6654485911f14ece7b2ee3d79113aeee7826dd6e36bb5de3b4", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.127-5r5552_amd64.deb", - "version": "2.1.127-5r5552" + "sha256": "f17ab24eb77df24d4957b848f64815a47227d5eb246c31a111d7eadb43d04cf4", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.2.11-5r5086_amd64.deb", + "version": "2.2.11-5r5086" }, "libps6000": { - "sha256": "9b08c5b7fb2d34b0e2e98f2e0452a59105f612cd445a9e45d3cac14d931d18f2", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.127-6r5552_amd64.deb", - "version": "2.1.127-6r5552" + "sha256": "01716b5d24f670ca709ca6e0947f3ca1cebb225d3b1037eee692ef049dc1946c", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.151-6r6187_amd64.deb", + "version": "2.1.151-6r6187" }, "libps6000a": { - "sha256": "2a23ccad72b9be83b87d449b6bb8ded23fd29c85ec9f78a45b6d45b38ccf335b", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.127-0r5552_amd64.deb", - "version": "1.0.127-0r5552" + "sha256": "4ecf9543d388c6b972e78d3b2caa09f9a314e9cb6fd54b24c1e227fcaa3f8f12", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_2.0.156-0r167_amd64.deb", + "version": "2.0.156-0r167" + }, + "libpsospa": { + "sha256": "adaf1f555b8b6f0950731cd642488bd8707a09291e0f1fb7a79ed22867203eb4", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpsospa/libpsospa_1.0.149-0r5787_amd64.deb", + "version": "1.0.149-0r5787" + }, + "libusbdrdaq": { + "sha256": "0906429cd32b34aaaaa41ae9f60f6b47ecbdc0b53e49275a3349141f2e79d806", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libu/libusbdrdaq/libusbdrdaq_2.0.150-1r6187_amd64.deb", + "version": "2.0.150-1r6187" + }, + "libusbpt104": { + "sha256": "a73a175dcced17e59ade58edb760c8e11551300841e5c30c16cbd7c1bfe6c540", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libu/libusbpt104/libusbpt104_2.0.150-1r6187_amd64.deb", + "version": "2.0.150-1r6187" + }, + "libusbtc08": { + "sha256": "551f3f290d7ee672a4e0533ffebeab746ba552c3a4d0c857edaf7c2494a96659", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libu/libusbtc08/libusbtc08_2.0.150-1r6187_amd64.deb", + "version": "2.0.150-1r6187" }, "picoscope": { - "sha256": "d95f269171da7273b596dae95452789e889f12ef0f15c3baea26dd1b3a8117fc", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.1.17-1r17318_amd64.deb", - "version": "7.1.17-1r17318" + "sha256": "ab4a0db634b93bd5dcf7cb7fca52591c03130d57451d3ddb3942a0e663c4ffd7", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.2.6.7136_amd64.deb", + "version": "7.2.6.7136" } } } diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index 08496a4ef5f4..7f6b5efb2604 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pik"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = version; - hash = "sha256-uvfCMXCbU0SGia1lLz9jkPnZ9Nmohd3sTgxHUbW6/Y8="; + hash = "sha256-qpSQ920nAWqta3aPxl9dVHFRBtgETtUye+D2yU33ZFw="; }; - cargoHash = "sha256-IQX3lS8Fl6zNKTYlvoPXPzBx+J8bbyH9ZYMzyu2mF9o="; + cargoHash = "sha256-5/ympn4z1R7dYG4jR+0zEgvaYr0AbcIbUIrMac5Tj7A="; passthru.tests.version = testers.testVersion { package = pik; }; diff --git a/pkgs/by-name/pi/pike/package.nix b/pkgs/by-name/pi/pike/package.nix index 0016b9891b22..6953aef913f6 100644 --- a/pkgs/by-name/pi/pike/package.nix +++ b/pkgs/by-name/pi/pike/package.nix @@ -120,13 +120,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pike"; - version = "8.0.2024"; + version = "8.0.2026"; src = fetchFromGitHub { owner = "pikelang"; repo = "Pike"; tag = "v${finalAttrs.version}"; - hash = "sha256-a5egJww2O0pGzoAy/M5VXEQ70f74cto4X/HyD7et9MU="; + hash = "sha256-ttEEY1l2Bfz8Qfi6x3CDeJOxEajzookd8WfnFbN/vro="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/pinyin-tool/package.nix b/pkgs/by-name/pi/pinyin-tool/package.nix index 1fcd8b6945b0..6bff727ac50f 100644 --- a/pkgs/by-name/pi/pinyin-tool/package.nix +++ b/pkgs/by-name/pi/pinyin-tool/package.nix @@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec { mainProgram = "pinyin-tool"; homepage = "https://github.com/briankung/pinyin-tool"; license = licenses.mit; - maintainers = with maintainers; [ neonfuz ]; }; } diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix index a342709b910e..45b2256e15f2 100644 --- a/pkgs/by-name/pk/pkarr/package.nix +++ b/pkgs/by-name/pk/pkarr/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "pkarr"; - version = "2.0.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "pubky"; repo = "pkarr"; rev = "v${version}"; - hash = "sha256-zJe/hCdGVqs2TTwxnceGVXt0ZFRheSRYzjSRHytYXks="; + hash = "sha256-9sTF5h2+vWcz5ohAoo95vldTJGQyz/ICkVpIgaxilwA="; }; - cargoHash = "sha256-y20vVO714WPcB2aYzo0LBuJhy224bsHA7O9Dj00ViWE="; + cargoHash = "sha256-26OlV/Xnl1+VFOaCWUjb8LxuJWrCsfY7QTlPZ7VMBCs="; meta = { description = "Public Key Addressable Resource Records (sovereign TLDs) "; diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix index bdda3c057760..54dc10aa07bb 100644 --- a/pkgs/by-name/pl/planify/package.nix +++ b/pkgs/by-name/pl/planify/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.14.0"; + version = "4.14.1"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-QvCESTpHyT6Lu4z7b9DhjFu27PhQwgAo9FY7TMsKy18="; + hash = "sha256-4N+2DWOriuxQJX5hfDmGy066ypSn1HkkildBIJjOXhc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index f3be5276cbed..0285d45612d5 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "25.2.8"; + version = "25.2.9"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-jJzERpVCAQtTxuC2J7F9SHq9NuyihLzQjLzIcSfXziE="; + hash = "sha256-Ey1APUOGw2zAVdn5C96bIwe5+PHXzMtXVI5f1xHISFU="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/pl/platformsh/versions.json b/pkgs/by-name/pl/platformsh/versions.json index 1c568061e52e..f2ef24a2f407 100644 --- a/pkgs/by-name/pl/platformsh/versions.json +++ b/pkgs/by-name/pl/platformsh/versions.json @@ -1,19 +1,19 @@ { - "version": "5.3.0", + "version": "5.5.0", "darwin-amd64": { - "hash": "sha256-9ntTHPC58qq9aasbXHqcfoK5X7dpDWoGhQEQpKmIcGw=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/platform_5.3.0_darwin_all.tar.gz" + "hash": "sha256-cuLDYW0kr6D2qMhVW+avwbnqq6KI4zRyNBbNSNOpY2o=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/platform_5.5.0_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-9ntTHPC58qq9aasbXHqcfoK5X7dpDWoGhQEQpKmIcGw=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/platform_5.3.0_darwin_all.tar.gz" + "hash": "sha256-cuLDYW0kr6D2qMhVW+avwbnqq6KI4zRyNBbNSNOpY2o=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/platform_5.5.0_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-puQ+Wpzmfqs9hM+UDAuicRjbNODbGDbMGiXPe4hrKzU=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/platform_5.3.0_linux_amd64.tar.gz" + "hash": "sha256-7WUjkF8u8AvCFT1MtNjYQI3jlmoABmmEUyg4pctCrGo=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/platform_5.5.0_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-V509gDeX0jpMwWLVbNpe3HP17hy1xlY7Kk6ZTOTyCMI=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/platform_5.3.0_linux_arm64.tar.gz" + "hash": "sha256-WTATvnvCF1GDObO14wHWN290/qz24f3gOKgnjNW0xF8=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/platform_5.5.0_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix index 2cb63dabe04a..0d54ee676202 100644 --- a/pkgs/by-name/po/pocket-casts/package.nix +++ b/pkgs/by-name/po/pocket-casts/package.nix @@ -5,9 +5,11 @@ makeDesktopItem, copyDesktopItems, makeWrapper, - electron, + electron_36, }: - +let + electron = electron_36; +in buildNpmPackage rec { pname = "pocket-casts"; version = "0.10.4"; diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 2f05e92a7722..8fe7204c1a75 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -11,18 +11,18 @@ buildGo125Module (finalAttrs: { pname = "pocket-id"; - version = "1.10.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-YAQT7ORRg27ORh57NTE8F89iNfw+3gd1xPM8f4zHKm4="; + hash = "sha256-thKPYbHx9w75hUgWkLS5fX4R3QLLqFtAJqcvfTxAFiY="; }; sourceRoot = "${finalAttrs.src.name}/backend"; - vendorHash = "sha256-eNUhk76YLHtXCFaxiavM6d8CMeE+YQ+vOecDUCiTh5k="; + vendorHash = "sha256-+HF1zAWA6Ak7uJqWCcTXrttTy1sPA8bN+/No95eqFTU="; env.CGO_ENABLED = 0; ldflags = [ @@ -49,7 +49,7 @@ buildGo125Module (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-Gjj2iFQ15Tso0gXihFH96nW49GJleOU323shBE7VgJ4="; + hash = "sha256-IVrp5qWYMgud9ryLidrUowWWBHZ2lMrJp0cfPPHpXls="; }; env.BUILD_OUTPUT_PATH = "dist"; diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 978736798756..19ec18e3dbab 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -76,13 +76,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.6.1"; + version = "5.6.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-i1AXjLg28VV5vHMdywlCHB9kIALXToVx/4ujaNe9Dc0="; + hash = "sha256-VVPwnzcGOm3UDHtoLbP1I+9NIluMU/wHuerM+ePiKhg="; }; patches = [ diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index b58b658595cf..2c768099c79a 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "polarity"; - version = "latest-unstable-2025-09-17"; + version = "latest-unstable-2025-09-25"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "20a0394d99752947f78e152854efd19852616968"; - hash = "sha256-Gu9PwRqMjFzubFkyRRbxcfG6mmID8HIJclkW7sDDWYo="; + rev = "e582716daae20d534f7c7ecc58569bfd28d679f2"; + hash = "sha256-L9eBD8rA8cBdd2FFeyFKSl8/lse1OlgogEOTkVYkxHo="; }; cargoHash = "sha256-EB6DlhD+0oneAGhLHi3bWnnFUIfNdKeW52umWHZEP7c="; diff --git a/pkgs/by-name/po/polymake/package.nix b/pkgs/by-name/po/polymake/package.nix index bd92eb900c14..8c674f3e76cc 100644 --- a/pkgs/by-name/po/polymake/package.nix +++ b/pkgs/by-name/po/polymake/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "polymake"; - version = "4.14"; + version = "4.15"; src = fetchurl { # "The minimal version is a packager friendly version which omits # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; - sha256 = "sha256-4nZncZpZECwbJ/X5j6g807QUf2MpKUBZLyFxUd79v40="; + sha256 = "sha256-MOCo+JATz3qaRO2Q2y9pxJvxgQUGZMfmvbhhxhCxvbk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 410fa276bb5d..ca2c05c9e186 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -34,11 +34,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.80.0"; + version = "0.80.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-2Qpyc4SXjQQtvDxYxrZrFt91BptlzFNC7Psl9MxII6I="; + hash = "sha256-v6XtXClqihubYSr8trX4w9sNpRqaBsTFf0mI7a1m7Jc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/posting/package.nix b/pkgs/by-name/po/posting/package.nix index 0c46b8704924..37c874d33ae4 100644 --- a/pkgs/by-name/po/posting/package.nix +++ b/pkgs/by-name/po/posting/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication rec { pname = "posting"; - version = "2.7.1"; + version = "2.9.0"; pyproject = true; src = fetchFromGitHub { owner = "darrenburns"; repo = "posting"; tag = version; - hash = "sha256-2mRLkZ4rr5awc8X3thllUlB/XpFGs6uaPsYreSPB/nw="; + hash = "sha256-JkYcLh3S+vLfSCgIpiRu9tKPMjjDSdHtO8faeMlgbe8="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index 44743ec64c90..ee3467f2fc46 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "prek"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "j178"; repo = "prek"; tag = "v${finalAttrs.version}"; - hash = "sha256-hiGfbrE/I0Gmp5G8BOlTnWc8+XeuDc7yyBaw2AfeW40="; + hash = "sha256-52NTG+cZLOxCJZvDSZ9vqsyH+J8U38aGlQdWQ2dFOWE="; }; - cargoHash = "sha256-8fg80Rluea3MgzHZYhik26UxzpoNcsT8PZp+NqTmhcY="; + cargoHash = "sha256-SYJ+ABvIoOW0O+28ofM8YXJwIlFkR84yDZaaehhx0Ks="; preBuild = '' version312_str=$(${python312}/bin/python -c 'import sys; print(sys.version_info[:3])') diff --git a/pkgs/by-name/pr/prisma-language-server/package.nix b/pkgs/by-name/pr/prisma-language-server/package.nix index e49d7d159315..4c0834ba2060 100644 --- a/pkgs/by-name/pr/prisma-language-server/package.nix +++ b/pkgs/by-name/pr/prisma-language-server/package.nix @@ -6,17 +6,17 @@ buildNpmPackage (finalAttrs: { pname = "prisma-language-server"; - version = "6.16.2"; + version = "6.16.3"; src = fetchFromGitHub { owner = "prisma"; repo = "language-tools"; tag = "${finalAttrs.version}"; - hash = "sha256-UZP0pLcbMeaYI0ytOJ68l/ZEC9dBhohJZyTU99p+1QM="; + hash = "sha256-89/XErfqdMYTbATa8SmSTBMwY8Hlb364jNAuQgql5zo="; }; sourceRoot = "${finalAttrs.src.name}/packages/language-server"; - npmDepsHash = "sha256-UAGz/qCYf+jsgCWqvR52mW6Ze3WWP9EHuE4k9wCbnH0="; + npmDepsHash = "sha256-RCwHl8UNQfGOmq4QY6ECY+/Beo2enaOlWsS7RiMlyLc="; meta = { description = "Language server for Prisma"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/by-name/pr/prometheus-mysqld-exporter/package.nix similarity index 75% rename from pkgs/servers/monitoring/prometheus/mysqld-exporter.nix rename to pkgs/by-name/pr/prometheus-mysqld-exporter/package.nix index ff8e33b3ad41..9c89d8ac0842 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/by-name/pr/prometheus-mysqld-exporter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mysqld_exporter"; - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "mysqld_exporter"; - rev = "v${version}"; - sha256 = "sha256-vkbjOWVV79fDBdCa6/ueY9QhPDkFCApR/EZn20SYHYU="; + tag = "v${version}"; + hash = "sha256-uHr9hVjnQx1DIr7ByaqgmR4YOvCYo49+b+Ikh+Vlh+o="; }; - vendorHash = "sha256-pdxIW800vnKK0l84bDVkl2JHBb0e9zkQnn3O8ls04R0="; + vendorHash = "sha256-fM3CqyOEKYJOFkEwBE7/yIQEKUUIbBIbmHQp12/psas="; ldflags = let @@ -37,6 +37,7 @@ buildGoModule rec { ]; meta = with lib; { + changelog = "https://github.com/prometheus/mysqld_exporter/blob/${src.tag}/CHANGELOG.md"; description = "Prometheus exporter for MySQL server metrics"; mainProgram = "mysqld_exporter"; homepage = "https://github.com/prometheus/mysqld_exporter"; diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix deleted file mode 100644 index f45ddae59769..000000000000 --- a/pkgs/by-name/pr/proton-caller/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "proton-caller"; - version = "3.1.2"; - - src = fetchFromGitHub { - owner = "caverym"; - repo = "proton-caller"; - rev = version; - sha256 = "sha256-srzahBMihkEP9/+7oRij5POHkCcH6QBh4kGz42Pz0nM="; - }; - - cargoHash = "sha256-AZp6Mbm9Fg+EVr31oJe6/Z8LIwapYhos8JpZzPMiwz0="; - - meta = { - description = "Run Windows programs with Proton"; - changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}"; - homepage = "https://github.com/caverym/proton-caller"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; - mainProgram = "proton-call"; - }; -} diff --git a/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch b/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch index 4ff0cb5b1085..e83e4e5c84c1 100644 --- a/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch +++ b/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch @@ -1,5 +1,5 @@ diff --git a/src-tauri/src/qf_client/modules/analytics.rs b/src-tauri/src/qf_client/modules/analytics.rs -index 3b31cfa..562e0b4 100644 +index f68e185..355723e 100644 --- a/src-tauri/src/qf_client/modules/analytics.rs +++ b/src-tauri/src/qf_client/modules/analytics.rs @@ -37,7 +37,7 @@ impl AnalyticsModule { @@ -11,26 +11,32 @@ index 3b31cfa..562e0b4 100644 last_user_activity: Arc::new(Mutex::new(Instant::now())), metricAndLabelPairsScheduledToSend: vec![], } -@@ -96,69 +96,6 @@ impl AnalyticsModule { - // Create Timer for sending metrics - let mut last_metric_time = Instant::now(); - +@@ -77,90 +77,7 @@ impl AnalyticsModule { + } + pub fn init(&mut self) -> Result<(), AppError> { + let app = states::app_state()?; +- if self.is_init { +- return Ok(()); +- } +- self.is_init = true; +- self.update_state(); +- +- let is_first_install = app.is_first_install.clone(); +- tauri::async_runtime::spawn({ +- async move { +- // Create a new instance of the QFClient and store it in the app state +- let qf = states::qf_client().expect("Failed to get qf client"); +- +- // Create Timer for sending metrics +- let mut last_metric_time = Instant::now(); +- - if is_first_install { -- logger::info( -- &&qf.analytics().get_component("init"), -- "Detected first install", -- LoggerOptions::default(), -- ); -- match qf -- .analytics() -- .try_send_analytics("install", 3, json!({})) -- .await -- { -- Ok(_) => {} -- Err(e) => { -- error::create_log_file("analytics.log", &e); -- } -- }; +- qf.analytics() +- .metricAndLabelPairsScheduledToSend +- .push(HashMap::from([( +- "First_Install".to_string(), +- "true".to_string(), +- )])); - } - loop { - let send_metrics = qf.analytics().send_metrics; @@ -38,50 +44,66 @@ index 3b31cfa..562e0b4 100644 - tokio::time::sleep(std::time::Duration::from_secs(60)).await; - continue; - } -- if last_metric_time.elapsed() > Duration::from_secs(15) -- || qf.analytics().is_user_active() -- { -- if last_metric_time.elapsed() > Duration::from_secs(60) -- && qf.analytics().is_user_active() -- { -- continue; -- } - -- last_metric_time = Instant::now(); -- // logger::info_con( -- // &qf.analytics().get_component("TrySendAnalytics"), -- // "Sending user activity", -- // ); -- match qf -- .analytics() -- .try_send_analytics( -- "metrics/periodic", -- 3, -- json!(qf.analytics().metricAndLabelPairsScheduledToSend), -- ) -- .await -- { -- Ok(_) => { -- qf.analytics().clear_metrics(); -- } -- Err(e) => { -- if e.cause().contains("Unauthorized") -- || e.cause().contains("Banned") -- || e.cause().contains("WFMBanned") -- { -- error::create_log_file("analytics.log", &e); -- break; -- } -- error::create_log_file("analytics.log", &e); -- } -- }; +- if last_metric_time.elapsed() < Duration::from_secs(15) +- || !qf.analytics().is_user_active() +- { +- tokio::time::sleep(std::time::Duration::from_secs(5)).await; +- continue; - } -- tokio::time::sleep(std::time::Duration::from_secs(5)).await; +- +- if last_metric_time.elapsed() < Duration::from_secs(60) +- && !qf.analytics().is_user_active() +- { +- tokio::time::sleep(std::time::Duration::from_secs(5)).await; +- continue; +- } +- +- last_metric_time = Instant::now(); +- // logger::info_con( +- // &qf.analytics().get_component("TrySendAnalytics"), +- // "Sending user activity", +- // ); +- match qf +- .analytics() +- .try_send_analytics( +- "users/metrics/periodic", +- 3, +- json!(qf.analytics().metricAndLabelPairsScheduledToSend), +- ) +- .await +- { +- Ok(_) => { +- qf.analytics().clear_metrics(); +- } +- Err(e) => { +- if e.cause().contains("Unauthorized") +- || e.cause().contains("Banned") +- || e.cause().contains("WFMBanned") +- { +- error::create_log_file("analytics.log", &e); +- break; +- } else if e.cause().contains("429") { +- logger::info( +- &qf.analytics().get_component("TrySendAnalytics"), +- "Rate limit reached, waiting for 60 seconds", +- LoggerOptions::default(), +- ); +- tokio::time::sleep(std::time::Duration::from_secs(60)).await; +- continue; +- } +- error::create_log_file("analytics.log", &e); +- } +- }; - } - qf.analytics().is_init = false; - } - }); -@@ -174,45 +111,6 @@ impl AnalyticsModule { +- qf.analytics().is_init = false; +- } +- }); ++ self.is_init = false; + Ok(()) + } + pub fn set_send_metrics(&mut self, send_metrics: bool) { +@@ -173,45 +90,6 @@ impl AnalyticsModule { mut retry_count: i64, data: Value, ) -> Result<(), AppError> { @@ -94,7 +116,7 @@ index 3b31cfa..562e0b4 100644 - let err = match self - .client - .post::( -- format!("analytics/{}?{}", url, parameters.join("&")).as_str(), +- format!("{}?{}", url, parameters.join("&")).as_str(), - data.clone(), - ) - .await @@ -124,12 +146,11 @@ index 3b31cfa..562e0b4 100644 - ); - tokio::time::sleep(std::time::Duration::from_secs(5)).await; - } -- Ok(()) -+ return Ok(()) + Ok(()) } } diff --git a/src/contexts/app.context.tsx b/src/contexts/app.context.tsx -index 8b3ced9..5da811f 100644 +index 7897db9..1945ab9 100644 --- a/src/contexts/app.context.tsx +++ b/src/contexts/app.context.tsx @@ -160,7 +160,7 @@ export function AppContextProvider({ children }: AppContextProviderProps) { diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix index 440851cff716..b30f8a02ec6b 100644 --- a/pkgs/by-name/qu/quantframe/package.nix +++ b/pkgs/by-name/qu/quantframe/package.nix @@ -15,16 +15,15 @@ gtk3, nix-update-script, }: - rustPlatform.buildRustPackage (finalAttrs: { pname = "quantframe"; - version = "1.4.3"; + version = "1.5.3"; src = fetchFromGitHub { owner = "Kenya-DK"; repo = "quantframe-react"; tag = "v${finalAttrs.version}"; - hash = "sha256-ls6c9xLmjjx0kSh1s+HkdClrcTOvsAemjzqNwMeOd9c="; + hash = "sha256-afTiQzHat6k+BF8EhYhd0o0FzYjq7GpnOnjRhjXASG8="; }; postPatch = '' @@ -35,17 +34,15 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' ''; - patches = [ - ./0001-disable-telemetry.patch - ]; + patches = [ ./0001-disable-telemetry.patch ]; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE="; + hash = "sha256-ncoxliXnLxWEXL1Z7ixOULI/uYkxmfLiDWu1tDSRsrM="; }; - cargoHash = "sha256-UyfSmlr+5mWmlisNtjF6jZKx92kdQziG26mgeZtkySY="; + cargoHash = "sha256-0IgQK0jMVN6u5i4lBKK8njbMyRQCLguTdDcSBnFnyso="; nativeBuildInputs = [ cargo-tauri.hook @@ -75,6 +72,9 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://quantframe.app/"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ nyukuru ]; + maintainers = with lib.maintainers; [ + nyukuru + enkarterisi + ]; }; }) diff --git a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix index bacef122db89..2349d765b3cd 100644 --- a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix +++ b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix @@ -40,15 +40,15 @@ let ) deviceIds; componentHashes = { - "arria_lite" = "sha256-PNoc15Y5h+2bxhYFIxkg1qVAsXIX3IMfEQSdPLVNUp4="; - "cyclone" = "sha256-2huDuTkXt6jszwih0wzusoxRvECi6+tupvRcUvn6eIA="; - "cyclone10lp" = "sha256-i8VJKqlIfQmK2GWhm0W0FujHcup4RjeXughL2VG5gkY="; - "cyclonev" = "sha256-HoNJkcD96rPQEZtjbtmiRpoKh8oni7gOLVi80c1a3TM="; - "max" = "sha256-qh920mvu0H+fUuSJBH7fDPywzll6sGdmEtfx32ApCSA="; - "max10" = "sha256-XOyreAG3lYEV7Mnyh/UnFTuOwPQsd/t23Q8/P2p6U+0="; + "arria_lite" = "sha256-ASvi9YX15b4XXabGjkuR5wl9wDwCijl8s750XTR/4XU="; + "cyclone" = "sha256-iNA4S5mssffgn29NUhibJk6iKnmJ+vG9LYY3W+nnqcI="; + "cyclone10lp" = "sha256-247yR2fm5A3LWRjePJU99z1NBYziV8WkPL05wHJ4Z1Q="; + "cyclonev" = "sha256-Fa1PQ3pp9iTPYQljeKGyxHIXHaSolJZR8vXVb3gEN7g="; + "max" = "sha256-lAA1CgSfAjfilLDhRzfU2OkzGAChk7TMFckeboMB4mI="; + "max10" = "sha256-edycBj0P3qwLN2YS//QpCHQeGOW8WM0RqTIWdGAkEv8="; }; - version = "23.1std.1.993"; + version = "24.1std.0.1077"; download = { name, sha256 }: @@ -62,12 +62,12 @@ let [ { name = "QuartusLiteSetup-${version}-linux.run"; - sha256 = "sha256-OCp2hZrfrfp1nASuVNWgg8/ODRrl67SJ+c6IWq5eWvY="; + sha256 = "sha256-NFWT1VWcb3gun7GhpPbHzR3SIYBMpK40jESXS/vC5II="; } ] ++ lib.optional withQuesta { name = "QuestaSetup-${version}-linux.run"; - sha256 = "sha256-Dne4MLFSGXUVLMd+JgiS/d5RX9t5gs6PEvexTssLdF4="; + sha256 = "sha256-4+Y34UiJwenlIp/XKzMs+2aYZt/Y6XmNmiYyXVmOQkc="; } ); components = map ( @@ -133,6 +133,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ bjornfor kwohlfahrt + zainkergaye ]; }; } diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix index 4e7d1bdb7bbd..3c087d4a58a7 100644 --- a/pkgs/by-name/qw/qwen-code/package.nix +++ b/pkgs/by-name/qw/qwen-code/package.nix @@ -10,13 +10,13 @@ buildNpmPackage (finalAttrs: { pname = "qwen-code"; - version = "0.0.13"; + version = "0.0.14"; src = fetchFromGitHub { owner = "QwenLM"; repo = "qwen-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-h7CtdZap+D+qRzEvkXJq1Ui4SFg4ldWjqdna/7Ggokk="; + hash = "sha256-Rld6k0MPfOOncK240zOJbcvheV4UKU2yF7luBrTrnFs="; }; patches = [ @@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: { ./add-missing-resolved-integrity-fields.patch ]; - npmDepsHash = "sha256-ClLXCjcFahbMerkyz3AZ12kiJU8CzUEvd9tYpK6BRUE="; + npmDepsHash = "sha256-43s13HncNKv4uOKVwNvqIF+Ih3rJBWrpVJnE3hCKD2w="; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix index 29d8ba679c05..6baaa04ef960 100644 --- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix +++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "rabbitmqadmin-ng"; - version = "2.10.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "rabbitmq"; repo = "rabbitmqadmin-ng"; tag = "v${version}"; - hash = "sha256-edKvJKKBkZ5kkvbE4IMlo3i7uQrHlzFXzL3cn3/wa3k="; + hash = "sha256-zbxe+pu5db0D32UpPF4Np0rtha1lmavwafcvyWBli9k="; }; - cargoHash = "sha256-rkp/TMcEC5IDyMsCNBfUfK/H0By1DFR9aKOXAxkNHq8="; + cargoHash = "sha256-Qzj9hhVNnlrRA355nYRep2YEUD/CXqXo2XTOXGE/bEo="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 83afa3b0755f..ee91336d5ada 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -21,13 +21,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-node"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromRadicle { seed = "seed.radicle.xyz"; repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5"; tag = "releases/${finalAttrs.version}"; - hash = "sha256-e5Zelu3g8m9u5NtyABkIV4wOed9cq58xSaxginoDb2Q="; + hash = "sha256-/dWeG2jKCnfg7fwPP+BbRmEvM7rCppGYh2aeftcg3SY="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git_head @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-64SDz0wHKcp/tPGDDOlCRFr3Z1q6cWOafhP0howSFhA="; + cargoHash = "sha256-4URBtN5lyzFPaLJUf/HPAL2ugRUa6sZhpDeiFR0W7cc="; env.RADICLE_VERSION = finalAttrs.version; diff --git a/pkgs/by-name/ra/rasdaemon/package.nix b/pkgs/by-name/ra/rasdaemon/package.nix index 37a55db266c5..238114c6a628 100644 --- a/pkgs/by-name/ra/rasdaemon/package.nix +++ b/pkgs/by-name/ra/rasdaemon/package.nix @@ -1,6 +1,7 @@ { autoreconfHook, fetchFromGitHub, + fetchpatch, lib, libtraceevent, nix-update-script, @@ -16,15 +17,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "rasdaemon"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "mchehab"; repo = "rasdaemon"; tag = "v${finalAttrs.version}"; - hash = "sha256-veaqAbSJvoUzkn1OLYY3t3y9Bh8dzuenpLGO2yz/yaM="; + hash = "sha256-SpMNkeJkjaWteWsIScRnzNILf+PtVu1sX9e6ctwm3G0="; }; + patches = [ + # https://github.com/mchehab/rasdaemon/pull/212 + (fetchpatch { + name = "fix_buffer_overflow_in_add_event_handler_read.patch"; + url = "https://github.com/mchehab/rasdaemon/commit/46bed1b6845bcb560d760b4cacea7df67cd6d1fd.patch"; + hash = "sha256-5T5U2i0i/7MpHzqpPq6mn2ghSUj9O6BzY11VcySgCMo="; + }) + ]; + strictDeps = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix index 89c5701e3880..536fa62d66a4 100644 --- a/pkgs/by-name/rd/rdkafka/package.nix +++ b/pkgs/by-name/rd/rdkafka/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdkafka"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-37lCQ+CFeTRQwL6FCl79RSGw+nRKr0DeuXob9CjiVnk="; + sha256 = "sha256-Hg0l44wFQSk8x14V4CxJN80aGrhaj3CIFOYBfNUbG3E="; }; outputs = [ diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix index e5dea94261e9..7813baddc5c4 100644 --- a/pkgs/by-name/re/readsb/package.nix +++ b/pkgs/by-name/re/readsb/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "readsb"; - version = "3.16.2"; + version = "3.16.3"; src = fetchFromGitHub { owner = "wiedehopf"; repo = "readsb"; tag = "v${finalAttrs.version}"; - hash = "sha256-SjfVnWE5q3uaisRdR4ynVKC9U2mS9LmfLXbA2ecil7M="; + hash = "sha256-IjARj2qC1/kwoVvc5SXkJmoDN2m1fjPWj7jVgHG8cWI="; }; strictDeps = true; diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix index 7a887487a706..de29f20ec721 100644 --- a/pkgs/by-name/re/rectangle/package.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rectangle"; - version = "0.90"; + version = "0.91"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg"; - hash = "sha256-SC479DxtFkonvWqYSB47b4Mjb7VSnWoNTHcfThYNxt4="; + hash = "sha256-MOpg8N2mMNB81dmtgQc7KRax+g4d1Xedh9dkC/zYhLw="; }; sourceRoot = "."; diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index 8871982a91a5..abc1811cc8ee 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -94,10 +94,15 @@ stdenv.mkDerivation (finalAttrs: { -e '/^proc wait_for_ofs_sync/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \ tests/support/util.tcl + CLIENTS="$NIX_BUILD_CORES" + if (( $CLIENTS > 4)); then + CLIENTS=4 + fi + ./runtest \ --no-latency \ --timeout 2000 \ - --clients $NIX_BUILD_CORES \ + --clients "$CLIENTS" \ --tags -leaks \ --skipunit integration/aof-multi-part \ --skipunit integration/failover \ diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index ed7763f7915a..f6c88abdc755 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2025.09.15.00"; + version = "2025.09.29.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-fWfN+x3QuXHX/+0UQ1FW6I1bLIZ1s+McXUEesBtc6wQ="; + hash = "sha256-vZ4yKyvGvQOiUDV+i6c1pWURYoXBSjGZqTjAB0yDFDw="; }; - cargoHash = "sha256-VcB2WxEjn/XbjnZdQE6D6xKuoGMH1SCITU+C4tVnZHw="; + cargoHash = "sha256-kNLspdJiJGcl4epqJzemqjP44aXfkzJs1EX9cZwAhE8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix index ee9e5cd08ef9..4a6d2780b48b 100644 --- a/pkgs/by-name/re/remarshal_0_17/package.nix +++ b/pkgs/by-name/re/remarshal_0_17/package.nix @@ -7,26 +7,27 @@ }: let - python = python3Packages.python.override { - self = python3Packages.python; - packageOverrides = self: super: { - tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec { - version = "0.12.5"; - src = fetchPypi { - pname = "tomlkit"; - inherit version; - hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw="; - }; - patches = [ - (fetchpatch { - url = "https://github.com/python-poetry/tomlkit/commit/05d9be1c2b2a95a4eb3a53d999f1483dd7abae5a.patch"; - hash = "sha256-9pLGxcGHs+XoKrqlh7Q0dyc07XrK7J6u2T7Kvfd0ICc="; - excludes = [ ".github/workflows/tests.yml" ]; - }) - ]; - }); - }; + packageOverrides = self: super: { + tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec { + version = "0.12.5"; + src = fetchPypi { + pname = "tomlkit"; + inherit version; + hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw="; + }; + patches = [ + (fetchpatch { + url = "https://github.com/python-poetry/tomlkit/commit/05d9be1c2b2a95a4eb3a53d999f1483dd7abae5a.patch"; + hash = "sha256-9pLGxcGHs+XoKrqlh7Q0dyc07XrK7J6u2T7Kvfd0ICc="; + excludes = [ ".github/workflows/tests.yml" ]; + }) + ]; + }); }; + python = python3Packages.python.override (oa: { + self = python3Packages.python; + packageOverrides = lib.composeExtensions (oa.packageOverrides or (_: _: { })) packageOverrides; + }); pythonPackages = python.pkgs; in pythonPackages.buildPythonApplication rec { diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 4922fc0a9dbe..1f4bec2c18f6 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 = "41.81.0"; + version = "41.132.4"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-iFcq8TbUXcEf0q/ifAC4dXJkG7pYvTM78FHPZucky8g="; + hash = "sha256-Sgs2WL/rZ4zLYWqw7wXTpHQz2j5NhDMUpzFNte+3h/E="; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-HQEN+gBvI9s5WEXrH/3WTMSCg0ERykeKit8z8BBUe6w="; + hash = "sha256-r2/BTBsBvks1M0oPn4mYjdUYkYRvZDmlZgSxUd7WbEM="; }; env.COREPACK_ENABLE_STRICT = 0; diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index c9be8dd7ac4b..01c090029ea1 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-fAno9fGmr+iEFDWRxDgX+QICxvQxiPv9o15+lH4I50Y="; + hash = "sha256-177G2IhGZ1pQwxtJ2gozG0vEGEkcBmtOR6AbYxs4N+M="; }; - npmDepsHash = "sha256-qF4GvgyEAZSrgCYVhX1FbD2UG1M/tXG/R0bQrOiECU8="; + npmDepsHash = "sha256-KzOjpWRpvQ9P2vajhHdAVlKdoYAvw0vncmVyh24v0g0="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/re/restic/package.nix b/pkgs/by-name/re/restic/package.nix index 47d67bfbd56c..a8fff4d80bde 100644 --- a/pkgs/by-name/re/restic/package.nix +++ b/pkgs/by-name/re/restic/package.nix @@ -4,8 +4,10 @@ buildGoModule, fetchFromGitHub, installShellFiles, - makeWrapper, + makeBinaryWrapper, + versionCheckHook, nixosTests, + openssh, rclone, python3, }: @@ -32,11 +34,15 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles - makeWrapper + makeBinaryWrapper ]; nativeCheckInputs = [ python3 ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { restic = nixosTests.restic; }; @@ -46,7 +52,13 @@ buildGoModule rec { ''; postInstall = '' - wrapProgram $out/bin/restic --prefix PATH : '${rclone}/bin' + wrapProgram $out/bin/restic \ + --prefix PATH : "${ + lib.makeBinPath [ + openssh + rclone + ] + }" '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' $out/bin/restic generate \ @@ -58,13 +70,13 @@ buildGoModule rec { installManPage *.1 ''; - meta = with lib; { + meta = { homepage = "https://restic.net"; changelog = "https://github.com/restic/restic/blob/${src.rev}/CHANGELOG.md"; description = "Backup program that is fast, efficient and secure"; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.bsd2; - maintainers = with maintainers; [ + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ mbrgm dotlambda ryan4yin diff --git a/pkgs/by-name/re/rewaita/package.nix b/pkgs/by-name/re/rewaita/package.nix index f3089ef6b39d..e90782854d23 100644 --- a/pkgs/by-name/re/rewaita/package.nix +++ b/pkgs/by-name/re/rewaita/package.nix @@ -16,7 +16,7 @@ nix-update-script, }: let - version = "1.0.5"; + version = "1.0.8"; in python3Packages.buildPythonApplication { pname = "rewaita"; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication { owner = "SwordPuffin"; repo = "Rewaita"; tag = "v${version}"; - hash = "sha256-Q4HUly78liI0OfmD9llR+00qUKE+mioeNE0TIypCB9k="; + hash = "sha256-T1MrSg3DO6U/ztX4LYB1Uhpne+7xAfr8+INV5CyS0eE="; }; postPatch = '' diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix index d478ce982312..546a58753349 100644 --- a/pkgs/by-name/ri/rime-wanxiang/package.nix +++ b/pkgs/by-name/ri/rime-wanxiang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-wanxiang"; - version = "12.4.1"; + version = "12.6.13"; src = fetchFromGitHub { owner = "amzxyz"; repo = "rime_wanxiang"; tag = "v" + finalAttrs.version; - hash = "sha256-Z4rHSWN784+djARztQK7b24pLk42kUwCm9mct3ojPM4="; + hash = "sha256-wOCfJG/k30fyO7jxRpjQBTN6Xc/gusuwerjYykDl2JQ="; }; installPhase = '' diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix index fa5e65064a5d..9e2bd1b17046 100644 --- a/pkgs/by-name/ro/rocketchat-desktop/package.nix +++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "4.9.0"; + version = "4.9.1"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-M5ikgyg7ZTnWhsbLISy3WC80krmDX0C01fb+b+i24K4="; + hash = "sha256-71B5EqsMVGsTvrdl4gLW3O+7/xy2DNv/zROg2CfXl1E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix index c86f168f2e38..7622cb01527b 100644 --- a/pkgs/by-name/ro/roon-server/package.nix +++ b/pkgs/by-name/ro/roon-server/package.nix @@ -16,7 +16,7 @@ stdenv, }: let - version = "2.54.1554"; + version = "2.55.1559"; urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version; in stdenv.mkDerivation { @@ -25,7 +25,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-tE+WhsXJn1fVkD8wCuu5ZVaBDwsm9hss2KA0nocME+E="; + hash = "sha256-eeQ6Gci63GRdN5HOtT5+RFgWcnpTeCG6hBk1bNKXYoE="; }; dontConfigure = true; diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 5d9b5b60ab1b..e0c9abfbc793 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -154,7 +154,6 @@ stdenv.mkDerivation (finalAttrs: { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; maintainers = with maintainers; [ - neonfuz ilian ]; license = licenses.gpl2Only; diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index 4bb0d362e348..522f9014b4d9 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-/iudk0PB+6DYD2lh1gvksTxlkdhll5J9dV6dQWCx/i4="; + hash = "sha256-o4Cd6ZiFzUZLY7Oj11YIO29ejA9bPCoD4XvFdsPLNLg="; }; - cargoHash = "sha256-NlFGyCDSPouUX/VQ/Oe+Tp0/7RuLkBVSrrwJks+P0/A="; + cargoHash = "sha256-CgCN3yD/CFmhr0apU/8Dt8VbNwkm5DMREt/BnNHHH9s="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 553c4afb5461..577086952b83 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.5-unstable-2025-09-18"; + version = "11.5-unstable-2025-09-27"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "b1a393a89850ba54423a2360247703b2f51a8dc0"; - hash = "sha256-+nNryibKZhNQPdExDOAjsJngMdsVauBUzDSB1JcWVlo="; + rev = "5e05a6ac2c21e19629018edd6e4c434db7ccefa7"; + hash = "sha256-rMqWQeqBbHAytybX8w9yBAnlzjUJOSKtnpCVF6Nblrg="; }; buildInputs = diff --git a/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch index 77c49e2eb011..4010c6e6fcb7 100644 --- a/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch @@ -1,40 +1,8 @@ diff --git a/src/sage_docbuild/builders.py b/src/sage_docbuild/builders.py -index ab39d93c280..e6501c083d5 100644 +index 91035a01f1c..24f3d0c7c12 100644 --- a/src/sage_docbuild/builders.py +++ b/src/sage_docbuild/builders.py -@@ -106,31 +106,6 @@ def builder_helper(type): - """ - Return a function which builds the documentation for - output type ``type``. -- -- TESTS: -- -- Check that :issue:`25161` has been resolved:: -- -- sage: from sage_docbuild.builders import DocBuilder -- sage: from sage_docbuild.__main__ import setup_parser -- sage: DocBuilder._options = setup_parser().parse_args([]) # builder_helper needs _options to be set -- -- sage: import sage_docbuild.sphinxbuild -- sage: def raiseBaseException(): -- ....: raise BaseException("abort pool operation") -- sage: original_runsphinx, sage_docbuild.sphinxbuild.runsphinx = sage_docbuild.sphinxbuild.runsphinx, raiseBaseException -- -- sage: from sage.misc.temporary_file import tmp_dir -- sage: os.environ['SAGE_DOC'] = tmp_dir() -- sage: sage.env.var('SAGE_DOC') # random -- sage: from sage_docbuild.builders import builder_helper, build_ref_doc -- sage: from sage_docbuild.builders import _build_many as build_many -- sage: helper = builder_helper("html") -- sage: try: # optional - sagemath_doc_html -- ....: build_many(build_ref_doc, [("docname", "en", "html", {})]) -- ....: except Exception as E: -- ....: "Non-exception during docbuild: abort pool operation" in str(E) -- True - """ - def f(self, *args, **kwds): - output_dir = self._output_dir(type) -@@ -157,10 +132,9 @@ def builder_helper(type): +@@ -130,10 +130,9 @@ def builder_helper(type): logger.debug(build_command) # Run Sphinx with Sage's special logger diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index ad3fb2438cd5..706e178e6300 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, fetchpatch2, fetchurl, }: @@ -13,14 +12,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "10.6"; + version = "10.7"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - hash = "sha256-ZDYFq2lJXjnADFdX6y7sskaF0rkT5EIcdN8/bs00TlQ="; + hash = "sha256-nYlBmKQ9TD5EAVvNwo8YzqAd5IUCpTU3kBTqUH21IxQ="; }; # contains essential files (e.g., setup.cfg) generated by the bootstrap script. @@ -28,8 +27,8 @@ stdenv.mkDerivation rec { configure-src = fetchurl { # the hash below is the tagged commit's _parent_. it can also be found by looking for # the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version} - url = "mirror://sageupstream/configure/configure-10741006a4794b7db82942db55b97033d5905431.tar.gz"; - hash = "sha256-7LqY+vwBlyukDfcRtuR99vpC3hcBo8WRUuJjiFFq9xk="; + url = "mirror://sageupstream/configure/configure-858268b40010e5ed6da13488ad0f52cda4d1f70e.tar.gz"; + hash = "sha256-TsVX+wUWr+keCXmGQp1OHGXgNc7luajyGxfTwduSEtc="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -60,6 +59,13 @@ stdenv.mkDerivation rec { # compile libs/gap/element.pyx with -O1 # a more conservative version of https://github.com/sagemath/sage/pull/37951 ./patches/gap-element-crash.patch + + # https://github.com/sagemath/sage/pull/40895, positively reviewed + (fetchpatch2 { + name = "doctest-absolute-path.patch"; + url = "https://github.com/sagemath/sage/commit/3de32dccd2e32e5452ca3adf5bd63cbacb64ba9d.patch?full_index=1"; + hash = "sha256-rp+9d8Y6kifWzufE07GWU68txPn//w7uMn4LcpITaBs="; + }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -69,33 +75,6 @@ stdenv.mkDerivation rec { # should come from or be proposed to upstream. This list will probably never # be empty since dependencies update all the time. packageUpgradePatches = [ - # https://github.com/sagemath/sage/pull/39737, positively reviewed - (fetchpatch { - name = "sphinx-8.2-update.patch"; - url = "https://github.com/sagemath/sage/pull/39737/commits/4e485497fb5e20a056ffd2178360b88f482447d8.patch"; - hash = "sha256-oIcFeol0SW5dE/iE6mbYyas3kXIjOwsG1k+h99R94x8="; - }) - - # https://github.com/sagemath/sage/pull/40285, landed in 10.7.beta7 - (fetchpatch2 { - name = "scipy-1.16-update.patch"; - url = "https://github.com/sagemath/sage/commit/d0cbe9d353722580f98a327694f1a361c9b83ccd.patch?full_index=1"; - hash = "sha256-uV2nttxCKDsNqMf1O+lUmuoiDrx7/CfiS00JBb9kiM8="; - }) - - # https://github.com/sagemath/sage/pull/40156, landed in 10.7.beta5 - (fetchpatch2 { - name = "cython-3.1-update.patch"; - url = "https://github.com/sagemath/sage/commit/5ea8db28977ec113aec3c4c4b208d1783e3937a7.patch?full_index=1"; - hash = "sha256-5DPPxMuidPpVHrjK8j0UVZzuwiVy9vQzFd6hBYwNAok="; - }) - - # https://github.com/sagemath/sage/pull/40175, landed in 10.7.beta8 - (fetchpatch2 { - name = "rpy2-3.6-update.patch"; - url = "https://github.com/sagemath/sage/commit/db2d8db99d9a7dfa1972d534ecd89e3d2ba5c55b.patch?full_index=1"; - hash = "sha256-6Bk0uGlKFsiDsgv+ljMC1YnmAT+g+he6aFNkpvw2on0="; - }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/by-name/sa/sage/sagedoc.nix b/pkgs/by-name/sa/sage/sagedoc.nix index 7db4d6b4e07e..83fa1807b95e 100644 --- a/pkgs/by-name/sa/sage/sagedoc.nix +++ b/pkgs/by-name/sa/sage/sagedoc.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { chmod -R 755 "$SAGE_DOC_SRC_OVERRIDE" ''; - buildPhase = '' - export SAGE_NUM_THREADS="$NIX_BUILD_CORES" + preBuild = '' + export SAGE_ROOT="${sage-with-env.env.lib.src}" + export PATH="${sage-with-env}/bin:$PATH" export HOME="$TMPDIR/sage_home" mkdir -p "$HOME" @@ -31,12 +32,14 @@ stdenv.mkDerivation rec { # jupyter-sphinx calls the sagemath jupyter kernel during docbuild export JUPYTER_PATH=${jupyter-kernel-specs} - ${sage-with-env}/bin/sage --docbuild \ - --mathjax \ - --no-pdf-links \ - all html + # the Makefile tries to guess SAGE_DOC, but in a buggy way (changed in 10.8) + export SAGE_DOC="$SAGE_DOC_OVERRIDE" + + cd docsrc ''; + enableParallelBuilding = true; + installPhase = '' cd "$SAGE_DOC_OVERRIDE" diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix index 22404827edeb..dbc4f9c13963 100644 --- a/pkgs/by-name/sa/salt/package.nix +++ b/pkgs/by-name/sa/salt/package.nix @@ -12,12 +12,12 @@ python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3007.7"; + version = "3007.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WGEC38rCegqcCCb/gGve6YjkAooEzyqzFiq6nwsEAss="; + hash = "sha256-WfK1pIf9gyOeMaeNsAgrElCDOTEx2uENO5Cjs0h2meI="; }; patches = [ diff --git a/pkgs/by-name/sc/scip-go/package.nix b/pkgs/by-name/sc/scip-go/package.nix index 7b4615fd8768..22e07287513b 100644 --- a/pkgs/by-name/sc/scip-go/package.nix +++ b/pkgs/by-name/sc/scip-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "scip-go"; - version = "0.1.25"; + version = "0.1.26"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip-go"; rev = "v${version}"; - hash = "sha256-qzLDqHnZpJtdBZa/YOLZCiS+V52a1Lxc0TLsfSeRCG8="; + hash = "sha256-4Xm/o4hl94vCAEpFbaKDMDhv6ZyANCg2HDC6EIwyzsI="; }; vendorHash = "sha256-J/97J/VXmQAYHu1qr9KiTUrB6/SVFcahihRatCKgaD8="; diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix index 6f1b7c147bcd..4ddd8ddc9fe6 100644 --- a/pkgs/by-name/sc/scopehal-apps/package.nix +++ b/pkgs/by-name/sc/scopehal-apps/package.nix @@ -13,7 +13,9 @@ libsigcxx, glew, zstd, - wrapGAppsHook4, + wrapGAppsHook3, + makeBinaryWrapper, + writeDarwinBundle, shaderc, vulkan-headers, vulkan-loader, @@ -23,17 +25,22 @@ ffts, moltenvk, llvmPackages, + hidapi, }: -stdenv.mkDerivation { +let pname = "scopehal-apps"; - version = "0-unstable-2024-09-16"; + version = "0.1"; +in +stdenv.mkDerivation { + pname = "${pname}"; + version = "${version}"; src = fetchFromGitHub { owner = "ngscopeclient"; - repo = "scopehal-apps"; - rev = "d2a1a2f17e9398a3f60c99483dd2f6dbc2e62efc"; - hash = "sha256-FQoaTuL6mEqnH8oNXwHpDcOEAPGExqj6lhrUhZ9VAQ4="; + repo = "${pname}"; + tag = "v${version}"; + hash = "sha256-AfO6JaWA9ECMI6FkMg/LaAG4QMeZmG9VxHiw0dSJYNM="; fetchSubmodules = true; }; @@ -46,7 +53,11 @@ stdenv.mkDerivation { spirv-tools ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - wrapGAppsHook4 + wrapGAppsHook3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeBinaryWrapper + writeDarwinBundle ]; buildInputs = [ @@ -61,6 +72,7 @@ stdenv.mkDerivation { vulkan-tools yaml-cpp zstd + hidapi ] ++ lib.optionals stdenv.hostPlatform.isLinux [ ffts @@ -72,15 +84,30 @@ stdenv.mkDerivation { moltenvk ]; - # Targets InitializeSearchPaths - postPatch = '' - substituteInPlace lib/scopehal/scopehal.cpp \ - --replace-fail '"/share/' '"/../share/' + cmakeFlags = [ + "-DNGSCOPECLIENT_VERSION=${version}" + ]; + + patches = [ + ./remove-git-derived-version.patch + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ./remove-brew-molten-vk-lookup.patch + ]; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + mv -v $out/bin/ngscopeclient $out/bin/.ngscopeclient-unwrapped + makeWrapper $out/bin/.ngscopeclient-unwrapped $out/bin/ngscopeclient \ + --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath ([ vulkan-loader ])}" ''; - cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - "-DCMAKE_INSTALL_RPATH=${lib.strings.makeLibraryPath [ vulkan-loader ]}" - ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications/ngscopeclient.app/Contents/{MacOS,Resources} + + install -m644 {../src/ngscopeclient/icons/macos,$out/Applications/ngscopeclient.app/Contents/Resources}/ngscopeclient.icns + + write-darwin-bundle $out ngscopeclient ngscopeclient ngscopeclient + ''; meta = { description = "Advanced test & measurement remote control and analysis suite"; diff --git a/pkgs/by-name/sc/scopehal-apps/remove-brew-molten-vk-lookup.patch b/pkgs/by-name/sc/scopehal-apps/remove-brew-molten-vk-lookup.patch new file mode 100644 index 000000000000..015ebe8ed294 --- /dev/null +++ b/pkgs/by-name/sc/scopehal-apps/remove-brew-molten-vk-lookup.patch @@ -0,0 +1,36 @@ +diff --git a/src/ngscopeclient/CMakeLists.txt b/src/ngscopeclient/CMakeLists.txt +index fb6d19fa..25611981 100644 +--- a/src/ngscopeclient/CMakeLists.txt ++++ b/src/ngscopeclient/CMakeLists.txt +@@ -249,31 +249,6 @@ if(LINUX) + DESTINATION share/mime/packages) + endif() + +-if(APPLE) +- set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/ngscopeclient") +- set(DIRS "\${CMAKE_INSTALL_PREFIX}/lib") +- set(FRAMEWORKS "\${CMAKE_INSTALL_PREFIX}/Frameworks") +- execute_process( +- COMMAND brew --prefix molten-vk +- RESULT_VARIABLE MOLTEN_VK_RESULT +- OUTPUT_VARIABLE MOLTEN_VK_OUTPUT +- ERROR_QUIET +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- if(NOT MOLTEN_VK_RESULT EQUAL 0) +- message(FATAL_ERROR "failed to find Homebrew prefix for molten-vk") +- endif() +- # https://vulkan.lunarg.com/doc/view/1.3.275.0/mac/getting_started.html#application-bundle-structure-on-macos +- install(FILES "${CMAKE_SOURCE_DIR}/src/ngscopeclient/macos/MoltenVK_icd.json" +- DESTINATION bin/vulkan/icd.d/) +- install(FILES "${MOLTEN_VK_OUTPUT}/lib/libMoltenVK.dylib" DESTINATION lib) +- install(CODE " +- include(BundleUtilities) +- fixup_bundle(\"${APPS}\" \"lib/libMoltenVK.dylib\" \"${DIRS}\") +- include(\"${CMAKE_SOURCE_DIR}/src/ngscopeclient/macos/signing.cmake\") +- ") +-endif() +- + # ngscopeclient Windows portable zip/MSI installer build + if(WIXPATH AND WIN32) + # Run the command to get /mingw64/bin full path using where gcc diff --git a/pkgs/by-name/sc/scopehal-apps/remove-git-derived-version.patch b/pkgs/by-name/sc/scopehal-apps/remove-git-derived-version.patch new file mode 100644 index 000000000000..9facccfe0be9 --- /dev/null +++ b/pkgs/by-name/sc/scopehal-apps/remove-git-derived-version.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d362165d..7e3dfd09 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,45 +23,6 @@ if(DEFINED ENV{VULKAN_SDK}) + endif() + endif() + +-# Git is used for git-describe based version generation if we have it +-find_package(Git) +- +-#Set up versioning (with a dummy string for now if Git isn't present) +-if(Git_FOUND) +- execute_process( +- COMMAND ${GIT_EXECUTABLE} describe --always --tags +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_VARIABLE NGSCOPECLIENT_VERSION +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- message("Git reports scopehal-apps version ${NGSCOPECLIENT_VERSION}") +- +- +- execute_process( +- COMMAND ${GIT_EXECUTABLE} describe --always --tags --long +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_VARIABLE NGSCOPECLIENT_VERSION_LONG +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- +- # TODO: if/when we have a point release, make MSI version 10x+9 +- # ex: 0.1.2-rc2 is 0.1.22 +- # ex: 0.1.2 is 0.1.29 +- +- # Ugly string parsing to make windows build happy +- # First path: release candidate tags +- if(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-rc([0-9])-([0-9]*)") +- set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}.${CMAKE_MATCH_4}") +- +- # Release tags +- elseif(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-([0-9]*)") +- set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.9.${CMAKE_MATCH_3}") +- endif() +- +-else() +- set(NGSCOPECLIENT_VERSION "unknown") +- set(MSI_VERSION "0.1") +- message("Git not detected, scopehal-apps version unknown") +-endif() +- + set(PROJECT_VERSION "${NGSCOPECLIENT_VERSION}") + + include(CTest) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index b15a1a66f0a5..9fafe1d1da77 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -1,15 +1,17 @@ { - bison, - bzip2, - cmake, - fetchFromGitLab, - flex, - gfortran, lib, - mpi, stdenv, - zlib, + fetchFromGitLab, + cmake, + gfortran, + bison, + flex, + bzip2, xz, + zlib, + mpi, + withPtScotch ? false, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -30,22 +32,49 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "BUILD_PTSCOTCH" withPtScotch) + # Prefix Scotch version of MeTiS routines + (lib.cmakeBool "SCOTCH_METIS_PREFIX" true) + # building tests is broken with SCOTCH_METIS_PREFIX enabled in 7.0.9 + (lib.cmakeBool "ENABLE_TESTS" false) + ]; nativeBuildInputs = [ cmake gfortran + bison + flex ]; buildInputs = [ - bison bzip2 - mpi - flex xz zlib ]; + propagatedBuildInputs = lib.optionals withPtScotch [ + mpi + ]; + + passthru = { + tests = { + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "SCOTCH" ]; + package = finalAttrs.finalPackage; + }; + }; + }; + + # SCOTCH provide compatibility with Metis/Parmetis interface. + # We install the metis compatible headers to subdirectory to + # avoid conflict with metis/parmetis. + postFixup = '' + mkdir -p $dev/include/scotch + mv $dev/include/{*metis,metisf}.h $dev/include/scotch + ''; + meta = { description = "Graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering"; longDescription = '' @@ -54,6 +83,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "http://www.labri.fr/perso/pelegrin/scotch"; license = lib.licenses.cecill-c; - maintainers = [ lib.maintainers.bzizou ]; + maintainers = with lib.maintainers; [ + bzizou + qbisi + ]; }; }) diff --git a/pkgs/by-name/sc/scsh/package.nix b/pkgs/by-name/sc/scsh/package.nix index 7199980aa06a..6d4c81da43be 100644 --- a/pkgs/by-name/sc/scsh/package.nix +++ b/pkgs/by-name/sc/scsh/package.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ scheme48 ]; configureFlags = [ "--with-scheme48=${scheme48}" ]; + makeFlags = [ + "SCHEME48VERSION=${scheme48.version}" + ]; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 6e09e6fb2799..08538523beb2 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.22.8"; + version = "7.22.9"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; tag = "v${finalAttrs.version}"; - hash = "sha256-Uj6BzMUhhi/0Jz8jKe/MCiXinoKcyXy4DqC/USdkcpA="; + hash = "sha256-VYSM9ldzx/8tWKQb++qGROSXdeEXIDhGqnnHUmkW4+k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index 1e3ced96b2a8..657e512b5a20 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -1,23 +1,28 @@ { lib, - fetchFromGitHub, + stdenv, buildGoModule, + fetchFromGitHub, + libredirect, + iana-etc, testers, seaweedfs, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "seaweedfs"; - version = "3.94"; + version = "3.97"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; - rev = version; - hash = "sha256-d8N9py3khwjg/tRyKUfImLy1CwtjoDvWzQB6F+tM5kQ="; + tag = finalAttrs.version; + hash = "sha256-h8pyjC/hbKfvt4hEKuq0v5osLMWNU+6mYqFGqsZFqXs="; }; - vendorHash = "sha256-WURNRNjUylLsf3+AMfb48VHbqfiPIT0lPmLfNjWphSU="; + vendorHash = "sha256-KRO0aDGOVx1neXcGsYYqcpD0tAqtR3GSBDhFz5TbQBs="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ]; subPackages = [ "weed" ]; @@ -42,25 +47,31 @@ buildGoModule rec { preCheck = '' # Test all targets. unset subPackages - - # Remove unmaintained tests ahd those that require additional services. - rm -rf unmaintained test/s3 + # Remove unmaintained tests and those that require additional services. + rm -rf unmaintained test/s3 test/fuse_integration + # TestECEncodingVolumeLocationTimingBug, TestECEncodingMasterTimingRaceCondition: weed binary not found + export PATH=$PATH:$NIX_BUILD_TOP/go/bin + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services ''; + __darwinAllowLocalNetworking = true; + passthru.tests.version = testers.testVersion { package = seaweedfs; command = "weed version"; }; - meta = with lib; { + meta = { description = "Simple and highly scalable distributed file system"; homepage = "https://github.com/chrislusf/seaweedfs"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ azahi cmacrae wozeparrot ]; mainProgram = "weed"; - license = licenses.asl20; + license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix index 317df1c58213..236c3873795d 100644 --- a/pkgs/by-name/se/sentry-cli/package.nix +++ b/pkgs/by-name/se/sentry-cli/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.54.0"; + version = "2.55.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - hash = "sha256-D6ep1N8IZO1jps1ihmiAiEJXSTW2PNDW3cnYrrM3Svg="; + hash = "sha256-QOYk/WT/4rOjNMU4h22+Lbl9X6Ezw1oBE5yVZZwLNo4="; }; doCheck = false; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - cargoHash = "sha256-uvaxGVVxbp1TnAarItgNSLzguqgt7LfTalDVS6TFpoY="; + cargoHash = "sha256-8OIBIMlR0XAhJrYNd0gtBhApuZF6r2+7iHrATQdMfr0="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index d1f03e908c9e..1d73caa79429 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = version; - hash = "sha256-PEm6Vu5MTT+T28jNnsRkHQo2k3o1ZbHQV8hOo7VKNbQ="; + hash = "sha256-1BZtlGeSnop0ti/XhrmDxzZOFwzS6bagcZ4+7tM5zEk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix index 663827bb5d1c..a4de0fa084eb 100644 --- a/pkgs/by-name/se/sesh/package.nix +++ b/pkgs/by-name/se/sesh/package.nix @@ -7,7 +7,7 @@ }: buildGoModule rec { pname = "sesh"; - version = "2.17.1"; + version = "2.18.1"; nativeBuildInputs = [ go-mockery @@ -16,7 +16,7 @@ buildGoModule rec { owner = "joshmedeski"; repo = "sesh"; rev = "v${version}"; - hash = "sha256-olt61AR/Tq8lLh65V0/+GDrWjCi9hrkNbHR9LOX7kY0="; + hash = "sha256-f63C2QFU5G/xoy6mLUSzgQv7VOJ4lv06OnGoyZy54rg="; }; preBuild = '' diff --git a/pkgs/by-name/sf/sftool/package.nix b/pkgs/by-name/sf/sftool/package.nix index b120150aa26c..58676d2fa6a2 100644 --- a/pkgs/by-name/sf/sftool/package.nix +++ b/pkgs/by-name/sf/sftool/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sftool"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "OpenSiFli"; repo = "sftool"; tag = finalAttrs.version; - hash = "sha256-/5RVBWHrZpPK2R4khnvZAnFyMfSZStCnQO5g7Ao9Ck4="; + hash = "sha256-xheGgtE9hZVNa4ceqQCrfiYJwlIuXm00J//0VeZ/afE="; }; - cargoHash = "sha256-fteBYld3JzsTn/KMy5w/6Ts7x1PsYmi8zhBvgYVw5os="; + cargoHash = "sha256-pimr4OL709EWIoLk/Wq+QAiveLyR/V70nPuzYfZSH/o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sh/sharkey/package.nix b/pkgs/by-name/sh/sharkey/package.nix index f2aed7b9541d..fad377864486 100644 --- a/pkgs/by-name/sh/sharkey/package.nix +++ b/pkgs/by-name/sh/sharkey/package.nix @@ -165,7 +165,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = with lib.platforms; linux ++ darwin; mainProgram = "sharkey"; maintainers = with lib.maintainers; [ - srxl tmarkus ]; }; diff --git a/pkgs/by-name/sh/shh/fix_run_checks.patch b/pkgs/by-name/sh/shh/fix_run_checks.patch index 3b29a4f1b5eb..c555badd5e90 100644 --- a/pkgs/by-name/sh/shh/fix_run_checks.patch +++ b/pkgs/by-name/sh/shh/fix_run_checks.patch @@ -1,14 +1,16 @@ -commit 58bdfa7ef92ba07dc41a07aeef6d790ecd8f888c -Author: kuflierl <41301536+kuflierl@users.noreply.github.com> -Date: Sat May 3 21:02:26 2025 +0200 +commit 3052c2c8be6a44aab2d4c5fa0d560a8109c5ed5e +Author: 06kellyjac +Date: Mon Sep 22 13:17:14 2025 +0100 fix(tests): add support for nix-build-system for tests + Co-authored-by: kuflierl <41301536+kuflierl@users.noreply.github.com> + diff --git a/src/systemd/resolver.rs b/src/systemd/resolver.rs -index e2abbb7..1151592 100644 +index 989f378..0629fb5 100644 --- a/src/systemd/resolver.rs +++ b/src/systemd/resolver.rs -@@ -637,17 +637,14 @@ mod tests { +@@ -650,17 +650,14 @@ mod tests { let OptionValue::List(opt_list) = &candidates[0].value else { panic!(); }; @@ -32,7 +34,7 @@ index e2abbb7..1151592 100644 let actions = vec![ProgramAction::Read("/var/data".into())]; let candidates = resolve(&opts, &actions, &hardening_opts); diff --git a/tests/options.rs b/tests/options.rs -index 835ee14..a9c9973 100644 +index cf20ea0..ab9f389 100644 --- a/tests/options.rs +++ b/tests/options.rs @@ -24,7 +24,7 @@ fn run_true() { @@ -50,7 +52,7 @@ index 835ee14..a9c9973 100644 .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) - .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) - .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); } @@ -97,7 +97,7 @@ fn run_ls_dev() { @@ -92,7 +94,7 @@ index 835ee14..a9c9973 100644 .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) - .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) - .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); } @@ -201,7 +201,7 @@ fn run_read_kallsyms() { @@ -110,11 +112,11 @@ index 835ee14..a9c9973 100644 .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) - .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) - .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); } @@ -344,6 +344,7 @@ fn run_systemctl() { - .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); } +// patched due to nix build isolation @@ -145,6 +147,6 @@ index 835ee14..a9c9973 100644 .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) - .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) - .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); } diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix index df19b76f8fe6..b8940661b542 100644 --- a/pkgs/by-name/sh/shh/package.nix +++ b/pkgs/by-name/sh/shh/package.nix @@ -16,18 +16,18 @@ let isNativeDocgen = (stdenv.buildPlatform.canExecute stdenv.hostPlatform) && enableDocumentationFeature; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "shh"; - version = "2025.7.13"; + version = "2025.9.22"; src = fetchFromGitHub { owner = "desbma"; repo = "shh"; - tag = "v${version}"; - hash = "sha256-mTBA+NPkeGF1sSnXpOz9xBsKDAihRe+TVcBAlvbBQPc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Esb6IR49YtGWvLmGLtviAyMLjoWZLQka2igC6yKJ3A0="; }; - cargoHash = "sha256-JrtXDercjkPA5WVaq+LyhFmGqMAxQ/sVZQlmtJUTrms="; + cargoHash = "sha256-CB0jhVDR40lZaYqNq43V/af1v3Ph+6Z9swSrrsNgA8k="; patches = [ ./fix_run_checks.patch @@ -85,9 +85,9 @@ rustPlatform.buildRustPackage rec { installManPage target/mangen/* - installShellCompletion --cmd ${pname} \ - target/shellcomplete/${pname}.{bash,fish} \ - --zsh target/shellcomplete/_${pname} + installShellCompletion --cmd ${finalAttrs.pname} \ + target/shellcomplete/${finalAttrs.pname}.{bash,fish} \ + --zsh target/shellcomplete/_${finalAttrs.pname} ''; # RUST_BACKTRACE = 1; @@ -99,11 +99,12 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/desbma/shh"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - changelog = "https://github.com/desbma/shh/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/desbma/shh/blob/v${finalAttrs.version}/CHANGELOG.md"; mainProgram = "shh"; maintainers = with lib.maintainers; [ erdnaxe kuflierl + jk ]; }; -} +}) diff --git a/pkgs/by-name/si/sidequest/package.nix b/pkgs/by-name/si/sidequest/package.nix index fe78c9ff3188..9bc2341ac105 100644 --- a/pkgs/by-name/si/sidequest/package.nix +++ b/pkgs/by-name/si/sidequest/package.nix @@ -1,8 +1,9 @@ { - stdenv, lib, + stdenv, fetchurl, buildFHSEnv, + copyDesktopItems, makeDesktopItem, makeWrapper, alsa-lib, @@ -15,6 +16,7 @@ glib, gtk3, libgbm, + libGL, nss, nspr, libdrm, @@ -26,100 +28,93 @@ icu, openssl, zlib, + bintools, }: let pname = "sidequest"; - version = "0.10.33"; - - desktopItem = makeDesktopItem rec { - name = "SideQuest"; - exec = "SideQuest"; - desktopName = name; - genericName = "VR App Store"; - categories = [ - "Settings" - "PackageManager" - ]; - }; + version = "0.10.42"; sidequest = stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "8ac3d97400a8e3ce86902b5bea7b8d042a092acd888d20e5139490a38507f995"; + hash = "sha256-YZp7OAjUOXepVv5dPhh9Q2HicUKjSOGfhrWyMKy2gME="; }; - dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + desktopItems = [ + (makeDesktopItem { + name = "sidequest"; + exec = "sidequest"; + icon = "sidequest"; + desktopName = "SideQuest"; + genericName = "VR App Store"; + categories = [ + "Settings" + "PackageManager" + ]; + }) + ]; installPhase = '' - mkdir -p "$out/lib/SideQuest" "$out/bin" - tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 + runHook preInstall - ln -s "$out/lib/SideQuest/sidequest" "$out/bin" + mkdir -p "$out/libexec" "$out/bin" + cp --recursive . "$out/libexec/sidequest" + ln -s "$out/libexec/sidequest/sidequest" "$out/bin/sidequest" + for size in 16 24 32 48 64 128 256 512 1024; do + install -D --mode=0644 resources/app.asar.unpacked/build/icons/''${size}x''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/sidequest.png + done + + runHook postInstall ''; - postFixup = - let - libPath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libgbm - nss - nspr - libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence - libxkbcommon - xorg.libxkbfile - pango - (lib.getLib stdenv.cc.cc) - systemd - ]; - in - '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/lib/SideQuest" \ - "$out/lib/SideQuest/sidequest" - ''; + postFixup = '' + patchelf \ + --set-interpreter "${bintools.dynamicLinker}" \ + --set-rpath "${ + lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libgbm + libGL + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxshmfence + libxkbcommon + xorg.libxkbfile + pango + (lib.getLib stdenv.cc.cc) + systemd + ] + }:$out/libexec/sidequest" \ + --add-needed libGL.so.1 \ + "$out/libexec/sidequest/sidequest" + ''; }; in buildFHSEnv { - pname = "SideQuest"; - inherit version; - - passthru = { - inherit pname version; - - meta = with lib; { - description = "Open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; - homepage = "https://github.com/SideQuestVR/SideQuest"; - downloadPage = "https://github.com/SideQuestVR/SideQuest/releases"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - maintainers = with maintainers; [ - joepie91 - rvolosatovs - ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "SideQuest"; - }; - }; + inherit pname version; targetPkgs = pkgs: [ sidequest @@ -132,9 +127,22 @@ buildFHSEnv { ]; extraInstallCommands = '' - mkdir -p "$out/share/applications" - ln -s ${desktopItem}/share/applications/* "$out/share/applications" + ln -s ${sidequest}/share "$out/share" ''; runScript = "sidequest"; + + meta = { + description = "Open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; + homepage = "https://github.com/SideQuestVR/SideQuest"; + downloadPage = "https://github.com/SideQuestVR/SideQuest/releases"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + joepie91 + rvolosatovs + ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "SideQuest"; + }; } diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix index bb9ca470d6d6..f03e1139e6e0 100644 --- a/pkgs/by-name/si/signal-cli/package.nix +++ b/pkgs/by-name/si/signal-cli/package.nix @@ -12,12 +12,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "signal-cli"; - version = "0.13.19"; + version = "0.13.20"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${finalAttrs.version}/signal-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-+vO/6bn5416HdqM9x2tJQ6v4KP9hcxX1G31icBOcB58="; + hash = "sha256-MFgR2c+XhzgxO6jv7e30rTf7bRVa5gxnzVOLnemXYY8="; }; buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index b3b13c42c954..cb5190abb930 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -24,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.78.3"; + version = "0.81.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-BRNgNE7BR4mlCKS4sydxx7rrfy+s4bTpQkX9GbEfhTg="; + hash = "sha256-SOQyps+iGVQ3RWPLmQHzXwmMwmR1PrGIbViCmNg60P4="; }; - cargoHash = "sha256-T8kSQFTvwAYZad9rQRK6vY8vEiilEKv1+fd/1EBlxjI="; + cargoHash = "sha256-O4v9GgNrs4+HpfgoHh6YLy4dNF1LrF1ZS50RaEHh1iM="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-e/WyQlea46qTx7x45QuYdlaShezHV5vuB3ptB2DRCVE="; + hash = "sha256-KvMEQ9nJunqF2CDjiP3s3CMoeF+nbUpZDzSIMsImbPg="; }; nativeBuildInputs = [ @@ -62,15 +62,8 @@ rustPlatform.buildRustPackage (finalAttrs: { ./dont-strip-absolute-paths.patch ]; postPatch = '' - substituteInPlace node/binding.gyp \ - --replace-fail "'--out-dir', '<(PRODUCT_DIR)/'," \ - "'--out-dir', '$out/lib/<(NODE_OS_NAME)-<(target_arch)/'," \ - --replace-fail "'target_name': 'libsignal_client_<(NODE_OS_NAME)_<(target_arch).node'," \ - "'target_name': '@signalapp+libsignal-client'," - substituteInPlace node/build_node_bridge.py \ - --replace-fail "dst_base = 'libsignal_client_%s_%s' % (node_os_name, node_arch)" \ - "dst_base = '@signalapp+libsignal-client'" \ + --replace-fail "'prebuilds'" "'$out/lib'" \ --replace-fail "objcopy = shutil.which('%s-linux-gnu-objcopy' % cargo_target.split('-')[0]) or 'objcopy'" \ "objcopy = os.getenv('OBJCOPY', 'objcopy')" ''; @@ -79,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: { runHook preBuild pushd node - npx node-gyp rebuild + npm run build -- --copy-to-prebuilds popd runHook postBuild diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 01bf8349b79d..e369ffaf2c6b 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -3,7 +3,7 @@ lib, nodejs_22, pnpm_10, - electron_37, + electron_38, python3, makeWrapper, callPackage, @@ -23,7 +23,7 @@ let nodejs = nodejs_22; pnpm = pnpm_10.override { inherit nodejs; }; - electron = electron_37; + electron = electron_38; libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; }; signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; }; @@ -52,13 +52,13 @@ let ''; }); - version = "7.70.0"; + version = "7.72.1"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-y9i9YQPsLt3SLqROyEZsyIkVy/os3hy+1UMUSFMZJTY="; + hash = "sha256-X+ENbHnlr9VL+flaZAHsOjRSBnXHa32qLNEXntxnRLA="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-uVVUHvYhBCplKPyuS2+PKCxox8uWU2E/2EXLCG1ot54=" + "sha256-7VDIUyQBhFNrAmpfemKcNgjJEuvQ355uU6oZdWM1Hk8=" else - "sha256-tbfk/tIgqpjDtDiULbTVUOJf5i9eLX9xY7vUPrrjmu0="; + "sha256-gpK4WZjD//jZkxLvhAzXVAKmLjya8D1MVCPD4KKJJdA="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1757542492; + SOURCE_DATE_EPOCH = 1758811882; }; preBuild = '' @@ -218,10 +218,12 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 $icon $out/share/icons/hicolor/`basename ''${icon%.png}`/apps/signal-desktop.png done + # TODO: Remove --ozone-platform=wayland after next electron update, + # see https://github.com/electron/electron/pull/48309 makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \ --add-flags "$out/share/signal-desktop/app.asar" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ - --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=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index 0f5f892ecc77..7a2ddc5c7c09 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.57.0"; + version = "2.57.1"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-m73SXjTES1sHGbQRtn9CjurFd/Xby5Yyn6uLVLigfiU="; + hash = "sha256-U3sfNjJInT7QBqLLNK1j/0xzmwi/pfZZGOtL/JZ5gZM="; }; - cargoHash = "sha256-LRCgK/w+GcYBCWUKjytErQCxDtS15EnsVOr5Uq6F8ww="; + cargoHash = "sha256-DcaZmOPVO/eAMZ9NsqmwnI2d7Vdz/aVmvI4COivvDBM="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index b5af92437126..aba5dcbd06de 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 = "20250916"; + version = "20250925"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = version; - hash = "sha256-iUX1d/bWR6JKn1CESCnp0QoEnTYA+yEXRWhB4WUowSs="; + hash = "sha256-xukBIxndZPkg54u5MIJgLzQcJFwy2iwaLQRLB6EML2M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index 23fd9b524789..a52d60dc6c4c 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "2.0.0-unstable-2025-09-09"; + version = "2.0.0-unstable-2025-09-23"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "b19e390fcfc5cd468a4af3abf94b046bdadfa348"; - hash = "sha256-IM62oDUe09UnokitxHvIL3kUUXBOekIG+eKuYKu2dsg="; + rev = "c835e6be266168807fd82fb13129c4728c9a0cab"; + hash = "sha256-IB9lVQnFVDkluCpuzrZJ/9xZjF8Q/FIM3NpVi+ZQ2e0="; }; buildInputs = [ diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 9c4ad615e723..a06996d3ea64 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-haZwGJKRRAguCbY7C+kBIOq5Cr0lymGbRH90oarYUpE="; + hash = "sha256-J3IWPWa4L16kaapMifViFOVRP8OrWIN1F+v4CfPm3y8="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-joLfVa6xi03JmQBIj08dTyDMPn0q2LqwJtfUJRYW+4c="; + vendorHash = "sha256-/mB0aQtTOTmaTEEkOIgwIcDDi4quxe5/ttvJJr3cnlQ="; patches = [ (replaceVars ./set-pandoc-path.patch { diff --git a/pkgs/by-name/sk/skippy-xd/package.nix b/pkgs/by-name/sk/skippy-xd/package.nix index 8f5fa8f1e789..09b6c5a4d129 100644 --- a/pkgs/by-name/sk/skippy-xd/package.nix +++ b/pkgs/by-name/sk/skippy-xd/package.nix @@ -13,16 +13,20 @@ giflib, pkg-config, }: -stdenv.mkDerivation { + +stdenv.mkDerivation (finalAttrs: { pname = "skippy-xd"; - version = "0.8.0"; + version = "2025.09.07"; + src = fetchFromGitHub { owner = "felixfung"; repo = "skippy-xd"; - rev = "30da57cb59ccf77f766718f7d533ddbe533ba241"; - hash = "sha256-YBUDbI1SHsBI/fA3f3W1sPu3wXSodMbTGvAMqOz7RCM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-PxVU0atl5OLINFTM1n3REVA/M9iozkHOW9kPgTU/+qI="; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 @@ -34,15 +38,18 @@ stdenv.mkDerivation { libjpeg giflib ]; + makeFlags = [ "PREFIX=$(out)" ]; + preInstall = '' sed -e "s@/etc/xdg@$out&@" -i Makefile ''; - meta = with lib; { + + meta = { description = "Expose-style compositing-based standalone window switcher"; homepage = "https://github.com/felixfung/skippy-xd"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix index c3f8535e8300..3b40757dbddd 100644 --- a/pkgs/by-name/sl/slade-unstable/package.nix +++ b/pkgs/by-name/sl/slade-unstable/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "slade"; - version = "3.2.7-unstable-2025-09-03"; + version = "3.2.7-unstable-2025-09-30"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "00dc589de708595013cefd42397f7a890b269e68"; - hash = "sha256-w+ZBchsGNUCFXnkcNstNrhe7Bu0vNRrzVYEK/NSfIts="; + rev = "8ad6609784de6fef6b35f1508b6d5d8a3084aa17"; + hash = "sha256-XYg0k5ZOZ/M/4X0+6pjJEMK0sIVqu/1LtmJaeq6iOvM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/sloth-app/package.nix b/pkgs/by-name/sl/sloth-app/package.nix index 1b9a2bbb8934..b494bf0c8443 100644 --- a/pkgs/by-name/sl/sloth-app/package.nix +++ b/pkgs/by-name/sl/sloth-app/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sloth-app"; - version = "3.3"; + version = "3.4"; src = fetchurl { url = "https://github.com/sveinbjornt/Sloth/releases/download/${finalAttrs.version}/sloth-${finalAttrs.version}.zip"; - hash = "sha256-LGaL7+NqoPqXZdYWq9x+yNEZFlZZmsZw+qcELC4rdjY="; + hash = "sha256-K8DweBFAILEQyqri6NO+p5qRam+BHjIk1tl43gcseNs="; }; dontUnpack = true; @@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sveinbjorn.org/sloth"; license = lib.licenses.bsd3; mainProgram = "Sloth"; - maintainers = with lib.maintainers; [ emilytrau ]; + maintainers = with lib.maintainers; [ + emilytrau + iedame + ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/sm/smartsynchronize/package.nix b/pkgs/by-name/sm/smartsynchronize/package.nix index 9cdf139c0b23..0b6fa30fc3a5 100644 --- a/pkgs/by-name/sm/smartsynchronize/package.nix +++ b/pkgs/by-name/sm/smartsynchronize/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "smartsynchronize"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartsynchronize/smartsynchronize-linux-${ builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }.tar.gz"; - hash = "sha256-78CidB6d7FJH17rRT3N9tCCHNZyeyOy7DOepxVDLPUM="; + hash = "sha256-F+Yrr029nPnnCvFEhIxgeXloyt2JRKSw8uOmVySWKzo="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; diff --git a/pkgs/by-name/sm/smfh/package.nix b/pkgs/by-name/sm/smfh/package.nix index d59d42a9221c..b7dae3aa956d 100644 --- a/pkgs/by-name/sm/smfh/package.nix +++ b/pkgs/by-name/sm/smfh/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "smfh"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "feel-co"; repo = "smfh"; tag = finalAttrs.version; - hash = "sha256-/9Ww10kYopxfCNNnNDwENTubs7Wzqlw+O6PJAHNOYQw="; + hash = "sha256-LxLu578DRp1l3ekybZ+g6zNbvt27rOx7wORP9ch5O2c="; }; - cargoHash = "sha256-MpqbmhjNsE1krs7g3zWSXGxzb4G/A+cz/zxD2Jk2HC8="; + cargoHash = "sha256-DOE0Bs09TRP7fUqzB0mdylFc1vYsRjcz9chrQG79ajg="; meta = { description = "Sleek Manifest File Handler"; diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix index d2e6ebe89ba0..56b5bdcede9c 100644 --- a/pkgs/by-name/sm/smtp4dev/package.nix +++ b/pkgs/by-name/sm/smtp4dev/package.nix @@ -11,13 +11,13 @@ buildDotnetModule (finalAttrs: { pname = "smtp4dev"; - version = "3.10.2"; + version = "3.10.3"; src = fetchFromGitHub { owner = "rnwood"; repo = "smtp4dev"; tag = finalAttrs.version; - hash = "sha256-0j5r5YO1wHg3N/OX81UE2YCqhqIaQuSGZa2uh2y+zqs="; + hash = "sha256-bbo4kke0deZQoD08dbUKsLUhjg/z7TaIr5qmU4SETNg="; }; patches = [ ./smtp4dev-npm-packages.patch ]; diff --git a/pkgs/by-name/sn/snagboot/package.nix b/pkgs/by-name/sn/snagboot/package.nix index d13ad71332a8..58bff0f669e3 100644 --- a/pkgs/by-name/sn/snagboot/package.nix +++ b/pkgs/by-name/sn/snagboot/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication rec { pname = "snagboot"; - version = "2.2"; + version = "2.4"; pyproject = true; src = fetchFromGitHub { owner = "bootlin"; repo = "snagboot"; tag = "v${version}"; - hash = "sha256-JXhh+Ed/ZwytNrMwvGw7jaDBvwDQiUKe+gBDezOCHO4="; + hash = "sha256-ZjN4k5prOoEdAT4z37XiHdnUgLsz3zeR3+0zxY+2420="; }; build-system = with python3Packages; [ @@ -42,8 +42,11 @@ python3Packages.buildPythonApplication rec { libfdt # swig packaging + xmodem ]; + pythonRelaxDeps = [ "pylibfdt" ]; + optional-dependencies = with python3Packages; { gui = [ kivy ]; }; diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix index 44735da75e42..9aa688267d78 100644 --- a/pkgs/by-name/sn/snakefmt/package.nix +++ b/pkgs/by-name/sn/snakefmt/package.nix @@ -8,26 +8,27 @@ python3.pkgs.buildPythonApplication rec { pname = "snakefmt"; - version = "0.11.0"; + version = "0.11.2"; pyproject = true; disabled = python3.pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-r8O5LhA8/agP/35381f2zB2rdCJy7nY0K6NC8w5yHzA="; + hash = "sha256-6a03WEAeApH3pFNgB1xXODhrWKGxYNOIJ7QGMNn3NeE="; }; - build-system = [ python3.pkgs.poetry-core ]; + build-system = with python3.pkgs; [ hatchling ]; dependencies = with python3.pkgs; [ black click - importlib-metadata - toml ]; - pythonRelaxDeps = [ "black" ]; + pythonRelaxDeps = [ + "black" + "click" + ]; pythonImportsCheck = [ "snakefmt" ]; diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix index 0bd79455bc32..edb440b1cab7 100644 --- a/pkgs/by-name/sn/snapshot/package.nix +++ b/pkgs/by-name/sn/snapshot/package.nix @@ -11,6 +11,7 @@ ninja, pkg-config, rustc, + rustPlatform, wrapGAppsHook4, glib, gst_all_1, @@ -36,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: { glycin-loaders.passthru.glycinPathsPatch ]; + cargoVendorDir = "vendor"; + nativeBuildInputs = [ cargo desktop-file-utils @@ -45,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config rustc + rustPlatform.cargoSetupHook wrapGAppsHook4 ]; @@ -69,6 +73,10 @@ stdenv.mkDerivation (finalAttrs: { '.files."src/sandbox.rs" = $hash' \ vendor/glycin/.cargo-checksum.json \ | sponge vendor/glycin/.cargo-checksum.json + + substituteInPlace src/meson.build --replace-fail \ + "'src' / rust_target / meson.project_name()" \ + "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()" ''; preFixup = '' @@ -80,6 +88,9 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + # For https://gitlab.gnome.org/GNOME/snapshot/-/blob/34236a6dded23b66fdc4e4ed613e5b09eec3872c/src/meson.build#L57 + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + passthru.updateScript = gnome.updateScript { packageName = "snapshot"; }; diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix index f171d45dc089..fb624bffbd3e 100644 --- a/pkgs/by-name/so/solanum/package.nix +++ b/pkgs/by-name/so/solanum/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "solanum"; - version = "0-unstable-2025-09-11"; + version = "0-unstable-2025-09-20"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = "solanum"; - rev = "994e753fed3916b159b4bc4945b7de700643b0ad"; - hash = "sha256-hJOM7ZiJDAgkQ2/tqeHF6Qiw7M+cuBgUAIMiuwX7DYk="; + rev = "380dca67c2f270f1b60634b6ed9a90c80884684d"; + hash = "sha256-R+TXRFzTVWxWVRSmPgmFjYplEonDKszsBckPWUS+gOU="; }; patches = [ diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index 89492fbdf345..5b9f8c8977a1 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -12,16 +12,16 @@ buildGoModule (final: { pname = "sops"; - version = "3.10.2"; + version = "3.11.0"; src = fetchFromGitHub { owner = "getsops"; repo = final.pname; tag = "v${final.version}"; - hash = "sha256-IdQnxVBMAQpSAYB2S3D3lSULelFMBpjiBGOxeTgC10I="; + hash = "sha256-AAnrZvNkBgliHdk1lAoFrJdISNWteFdBUorRycKsptU="; }; - vendorHash = "sha256-7aHUIERVSxv3YGAMteGbqkAZQXXDVziV0rhUhjwch3U="; + vendorHash = "sha256-9bB3MbE03KEaxUp0VvCnNVKUY4zSUoam8h2cDlAz7RY="; subPackages = [ "cmd/sops" ]; diff --git a/pkgs/by-name/so/soqt/package.nix b/pkgs/by-name/so/soqt/package.nix new file mode 100644 index 000000000000..6f9ff22fb1b9 --- /dev/null +++ b/pkgs/by-name/so/soqt/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + coin3d, + qt6, + testers, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "soqt"; + version = "1.6.4"; + + src = fetchFromGitHub { + owner = "coin3d"; + repo = "soqt"; + tag = "v${finalAttrs.version}"; + hash = "sha256-H904mFfrELjB6ZVhypaKJd+pu5y+aVV4foryrsN7IqE="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + coin3d + qt6.qtbase + ]; + + dontWrapQtApps = true; + + passthru = { + tests = { + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "soqt" ]; + package = finalAttrs.finalPackage; + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + }; + }; + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://github.com/coin3d/soqt"; + license = lib.licenses.bsd3; + description = "Glue between Coin high-level 3D visualization library and Qt"; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index e0effd47c5ad..3ec81eb43f3a 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "spacectl"; - version = "1.15.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${version}"; - hash = "sha256-RC2ReS8XI0WHIXP1XhnBcsOxHQ3NhpQf4wByk8mfm8g="; + hash = "sha256-ZtM3A09cQ7BqIYcEJTggunxRidXiu/xlsp9F8qIwSv0="; }; - vendorHash = "sha256-t81t+Fx9cMfOSSzuCaqnyXvGOJ07JYk9mqPbR4HaHUk="; + vendorHash = "sha256-g5Y6NuG8z2Pnh3Ng690FcwOrEU2EOhftZbM8oUFj4B4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sp/speedify/package.nix b/pkgs/by-name/sp/speedify/package.nix index ad592e7b6417..9d83ca8c86fd 100755 --- a/pkgs/by-name/sp/speedify/package.nix +++ b/pkgs/by-name/sp/speedify/package.nix @@ -7,13 +7,13 @@ net-tools, autoPatchelfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "speedify"; - version = "15.6.4-12495"; + version = "15.8.2-12611"; src = fetchurl { - url = "https://apt.connectify.me/pool/main/s/speedify/speedify_${version}_amd64.deb"; - hash = "sha256-b8J7JqVxuRREC16DeKD7hOBX4IZMbJPLArLmPtnDUB4="; + url = "https://apt.connectify.me/pool/main/s/speedify/speedify_${finalAttrs.version}_amd64.deb"; + hash = "sha256-61GQZkXBe3EQpOUODpL60SCHJO0FGqvpL9xFn+q+kPs="; }; nativeBuildInputs = [ @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ zahrun ]; }; -} +}) diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index 0ead497b42d5..a93cd5a902ae 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "spider"; - version = "2.37.136"; + version = "2.37.159"; src = fetchFromGitHub { owner = "spider-rs"; repo = "spider"; tag = "v${finalAttrs.version}"; - hash = "sha256-QWOqxIQfRGpxgw/R2yPDdHNDXG8RQb+JV/1gEtWJNVo="; + hash = "sha256-5e6PK+PQnIEm7qpJGW8kmO6GugQMU3phWIsqFSGIj48="; }; - cargoHash = "sha256-bd3pHEwLPwICv61kg3stYJAOjffPYlxoxhupmJ+BC4s="; + cargoHash = "sha256-ffT8SQh6CjIqxMSGahGSiUha1e8wwUbbC3eTEUMx14s="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index dbe6b7f7de9d..55f166610f0a 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://squawkhq.com"; changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md"; license = with lib.licenses; [ gpl3Only ]; - maintainers = with lib.maintainers; [ andrewsmith ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index b147be39f8d8..f1d9a2a723f7 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise"); - version = "0.13.2"; + version = "0.13.4"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "stalwart"; tag = "v${finalAttrs.version}"; - hash = "sha256-VdeHb1HVGXA5RPenhhK4r/kkQiLG8/4qhdxoJ3xIqR4="; + hash = "sha256-1WKmSgDZ3c6+fFKH9+kgrxFYthKQqE1455bFHlVCGhU="; }; - cargoHash = "sha256-Wu6skjs3Stux5nCX++yoQPeA33Qln67GoKcob++Ldng="; + cargoHash = "sha256-i6AvyX4RObB9aa+TYvsOW8i9WTcYx8ddP/Jmyr8PWMY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 75657e93be4e..b396f1f9ee75 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.51"; + version = "2.11.55"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-oFRS60LPIscqBPMUfK1WvWi7eDv3VpAUaaAKyrpzN2s="; + hash = "sha256-akjQxThXcfEfY2EvSPMmLO8ZAHeG4iS83iu7LNBHguE="; }; sourceRoot = "."; @@ -37,6 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ FlameFlag emilytrau + iedame ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix index d7a60c7b828d..dee6c7a61e17 100644 --- a/pkgs/by-name/st/steel/package.nix +++ b/pkgs/by-name/st/steel/package.nix @@ -19,16 +19,16 @@ }: rustPlatform.buildRustPackage { pname = "steel"; - version = "0-unstable-2025-09-17"; + version = "0-unstable-2025-09-25"; src = fetchFromGitHub { owner = "mattwparas"; repo = "steel"; - rev = "e387a1f2b69edfd213451a6541ece49365da96f0"; - hash = "sha256-vwz7MfSo2b5beWvB8x333wgDGUB0ZEL3UK+DIfL2idQ="; + rev = "27532d855c71a4080f46f69fb9bae0eccfdaea7f"; + hash = "sha256-GxmpBsL/ktR/Sd4q3/5FXQBV0tpdfsnBfbQcUzPIXHw="; }; - cargoHash = "sha256-MTSVnCXXDVox3CfFEATTYffbKxG8ETp3p1Hp1+Nguiw="; + cargoHash = "sha256-CrmQhOfh7SQ5GvBywmYkfU6wMlgZq2x61+T+mIeQ7z4="; nativeBuildInputs = [ curl diff --git a/pkgs/by-name/st/stirling-pdf/deps.json b/pkgs/by-name/st/stirling-pdf/deps.json index 27e920fae6c1..1378f5d9cf1c 100644 --- a/pkgs/by-name/st/stirling-pdf/deps.json +++ b/pkgs/by-name/st/stirling-pdf/deps.json @@ -230,13 +230,13 @@ "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=", "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY=" }, - "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.7": { - "pom": "sha256-l1WeY50P1RQXexwWk5/r+SekKRl4WV++ghVJt9qW4vo=" + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/4.0.0": { + "pom": "sha256-TtWqaTreNMWne6IY1Jf4Lrf0ADl1surG71/v/W1pgYE=" }, - "edu/sc/seis/launch4j#launch4j/3.0.7": { - "jar": "sha256-FindaUYEC647rBn3bALPm+6K6Gs03MS0tSRZvQC9bMU=", - "module": "sha256-6KP/ycQQZv0fQECCq44nOLWTd5zEWgs167+oNQR/1PQ=", - "pom": "sha256-m/5KiCQa7IpuWr2Yi8xThXbLKt+oZR+JCfjP9mK+6eE=" + "edu/sc/seis/launch4j#launch4j/4.0.0": { + "jar": "sha256-NP36amMCquvKuhIcQXhyTImZynP1GcId4xuTHVWy3tc=", + "module": "sha256-TCKDiOnYqBc4dp15SaMyPj6kjstNGqQ1FYBUdeiykHY=", + "pom": "sha256-wNuHvSCkUBtAtvHAQhQ72tGD01E4tQjNjKH0DMGf3Y8=" }, "io/github/hakky54#sslcontext-kickstart-bom/8.3.6": { "pom": "sha256-vRw5cU+BlPtQbphtvneTcWRGaHhs4pdUPcLkj64hJA4=" @@ -471,13 +471,13 @@ "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" }, - "org/panteleyev#jpackage-gradle-plugin/1.7.3": { - "jar": "sha256-gO8iGFeCnaWETVvesmLncZIXdbAdTHUrrR71McAM8Ks=", - "module": "sha256-qR0MQwRfaEUUK3g7aWCGC6zaZo7xqwxWUSbaawH5LUE=", - "pom": "sha256-PWIfK3VFsjxZr5WmQJOb0UL1b0+NjAxEdKi+/WFnf80=" + "org/panteleyev#jpackage-gradle-plugin/1.7.5": { + "jar": "sha256-evjp9GGY3Z9ZlIWYg2kPTur5NUdDNcHYZII9ISc7zBw=", + "module": "sha256-NDELD0lwgFpjrdOhnEFGhdAJOoHTO+oQ3uqs/uoGGOo=", + "pom": "sha256-JH+7IsCYxixUJ9N4vNH9h1fQ7Y5yfFxNbZuNqwSIhrI=" }, - "org/panteleyev/jpackageplugin#org.panteleyev.jpackageplugin.gradle.plugin/1.7.3": { - "pom": "sha256-wTfNg1M3fc8EbS0uN0yQEgu40ERumiauTRCqN4iLjRU=" + "org/panteleyev/jpackageplugin#org.panteleyev.jpackageplugin.gradle.plugin/1.7.5": { + "pom": "sha256-Gc7VJbA647rikt6xAdbLkhGicEeKI6w+G9/LXeG8rdM=" }, "org/slf4j#slf4j-api/1.7.36": { "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" @@ -495,16 +495,16 @@ "org/slf4j#slf4j-parent/2.0.13": { "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo=" }, - "org/sonarqube#org.sonarqube.gradle.plugin/6.2.0.5505": { - "pom": "sha256-rRX6asDkCqfgmJL045PDyIR67586wRdnC3CBNitu7wI=" + "org/sonarqube#org.sonarqube.gradle.plugin/6.3.1.5724": { + "pom": "sha256-Fxgf38G49fZ2BFG9Hyyt3Gdwf0HzOGn0bdHCNGmsjQg=" }, "org/sonarsource/parent#parent/83.0.0.2369": { "pom": "sha256-01GmWHGSs8N+88VSW4MZ/vE4M7YwCZCBwCfiHWMzfv0=" }, - "org/sonarsource/scanner/gradle#sonarqube-gradle-plugin/6.2.0.5505": { - "jar": "sha256-AASeHrIg9xk201Rd0miPz/fcOGHrrA/xUXzb/Adfzsw=", - "module": "sha256-aleCEUMj0+oH72M1erpslMqtXufC0aXpEyZVlC0qOe0=", - "pom": "sha256-JjZuG1SxZHGRM3542RDMTfJZ5e/95pBmfZgxuGXWgPM=" + "org/sonarsource/scanner/gradle#sonarqube-gradle-plugin/6.3.1.5724": { + "jar": "sha256-uxCZqUgDxueuZ1b1JJMemfx1hvDd1Bb8+mtZ3fCE2D4=", + "module": "sha256-DPumZdFZd0aHNlTKtGAea2UUrgl5pQCLkBj2Yg+fnOg=", + "pom": "sha256-zFFAPmpC0SHLgjcLKOpAJNEwEgud1o4ETa2kog9N0+M=" }, "org/sonarsource/scanner/lib#sonar-scanner-java-library-batch-interface/3.3.1.450": { "jar": "sha256-rb/vIFOVek6WOdtpcwuoOgkKX4+hzDQkoSLCxmYyl9k=", @@ -534,33 +534,33 @@ "org/springdoc/openapi-gradle-plugin#org.springdoc.openapi-gradle-plugin.gradle.plugin/1.9.0": { "pom": "sha256-tl5WbBE1MB1a3ZBIt2+eSkYygpKKJ27CMFDL64QIWd0=" }, - "org/springframework#spring-core/6.2.9": { - "jar": "sha256-n6BiK69zjJtG9ITN3jXEqXoqZbHaRCba0NcH0KiqPZA=", - "module": "sha256-+5lrq7iG52t+OMFnjX56l1zPFhEqNSOH4j/DUSEF9Ts=", - "pom": "sha256-ICqzW5xlBtoYDyhv5ekO89+5YaOeJ+zXh9czWjhcOEo=" + "org/springframework#spring-core/6.2.10": { + "jar": "sha256-KBItbkpI64tqDk4IelXpbkb7TV59XSx03IBRQB2BAdo=", + "module": "sha256-MmC8Tf0xYWQt2mU62/Em9cHvm874d73jQvgnLuKLzcA=", + "pom": "sha256-4v/tn6SWogTfN+OZtOyHMek0EddkDeLRJMufPK80eTM=" }, - "org/springframework#spring-jcl/6.2.9": { - "jar": "sha256-iMWPc0UZ3z19ngdzO5HYOcQ9RZVRkj2T9LfJJli0FJg=", - "module": "sha256-KLyW4h4ir9Su1X/zMyrHHeNyx+6cL9KMF83P7O9aBww=", - "pom": "sha256-S+vO9ZVoqiHLAECvC5OjpXhwRe+cp+yHVguBo32mA/8=" + "org/springframework#spring-jcl/6.2.10": { + "jar": "sha256-cVhuCM3GLaosbwbcYGocwDHjJHeYaiFsJy0aFycLKt4=", + "module": "sha256-Njez/NAN6jtZWccyipfmYOgh6Q8uS5kmV3QWFiC+e1Q=", + "pom": "sha256-wO64UdvnE6rsQbMAVNAECv5GLY/OyWSL8wqPJJ6VLMc=" }, - "org/springframework/boot#org.springframework.boot.gradle.plugin/3.5.4": { - "pom": "sha256-MiUJLNwqsFHTQLFT/eIT4s9Qb6mkNhawOLi3kZHrA/8=" + "org/springframework/boot#org.springframework.boot.gradle.plugin/3.5.5": { + "pom": "sha256-siIS+HdJdKxJAPdmCHy3ka1WG2UgSy8oESSz5cwsk/c=" }, - "org/springframework/boot#spring-boot-buildpack-platform/3.5.4": { - "jar": "sha256-bupy3Tv1oplEfocIZOvNfOH5Z1M3+Kro8kx6NVksVr4=", - "module": "sha256-iY4X66lUosCBI1K5qumZXtGGcnQ+dfsbnES7U4Sy6r0=", - "pom": "sha256-hLv3ntINSlskjp52jLTx1LeX6tE8IkEDeFVv9aHIuR0=" + "org/springframework/boot#spring-boot-buildpack-platform/3.5.5": { + "jar": "sha256-FnqJxfvqUYrhgc8opcqhGSb/tWX5M1pqfHyeAsTdnNw=", + "module": "sha256-kNZmXGGKhQ2CAgdeWuUNcCNfY/79FSkiikQMcZIDPoY=", + "pom": "sha256-zHjruodVnZDtpuP9Ql+vBdXpLdu+dWxoYAfu+Y5gdG4=" }, - "org/springframework/boot#spring-boot-gradle-plugin/3.5.4": { - "jar": "sha256-yoB5TEAF+kw5UOZkjlvgA3oGFzOa4QCIe0+7+5O+Jr8=", - "module": "sha256-WO+gcv0oA1PG8KC4pvuKg+zXH8czzQjYZlzl2wohL+4=", - "pom": "sha256-wzSyfBKXbo+vWx8fA5YOCHg8dHZxnBW9poYXuHTAgFs=" + "org/springframework/boot#spring-boot-gradle-plugin/3.5.5": { + "jar": "sha256-SByclAa1HlOmdVfJlKDQWVqnDCJHGEXQPCpjIQPHtIE=", + "module": "sha256-xtChfOm0iN0kTBLC1A2dC4JwLrBnh6EAe90xfscZhAg=", + "pom": "sha256-9SKtYYcWjI9H9ObNisuel8jkdNE/PPb0MS/PdMTed8g=" }, - "org/springframework/boot#spring-boot-loader-tools/3.5.4": { - "jar": "sha256-d0oBV3fXAMkG8eqopg6DyPY3XeT4H+thhSmOTtw3mOs=", - "module": "sha256-7XSRc5qRqywvmrjh7m/N6L7Dy7xirmYrkrHOSFPXvqY=", - "pom": "sha256-U5dq5pyE17y5Geg8CKVPnUKR+LyMYWn+rhzinPapGG0=" + "org/springframework/boot#spring-boot-loader-tools/3.5.5": { + "jar": "sha256-SebVQqdDUQdHf9w8/owDBPm0qbC261KO1X0pghM1hLY=", + "module": "sha256-Zd6KuwbHDwF/9PNkXh3uX8Ym3ANKfz9MGuKzs9BQADY=", + "pom": "sha256-xelv0vi9C0PyAmuG7hwubrE5d0ZQpJGTGHlTPGYsi6o=" }, "org/tomlj#tomlj/1.0.0": { "jar": "sha256-Mml8dWeykhxHNnioILE/xkcAqoe7FFdu60jQ7VhHz9Q=", @@ -591,9 +591,9 @@ "jar": "sha256-j3AzxXm5n6DZ1t3LlEiHW15LV3w1AAInjORpl9Z4tzc=", "pom": "sha256-cZEYGCECwlM+kqL2fANRAmTmFgVxpzishj51cSQXMj0=" }, - "com/bucket4j#bucket4j_jdk17-core/8.14.0": { - "jar": "sha256-bNVTaEKXO+mR8nzFrcvK87+UqNVCpKfSiqgu9unXkk4=", - "pom": "sha256-C7h/rINT5MsC6PZ4aqZTXyIq4ivbajuODKazSgZuT3g=" + "com/bucket4j#bucket4j_jdk17-core/8.15.0": { + "jar": "sha256-MkeEbF9GVXQqREK7gYi8OfFkA2p2J+5d5xajrHEFivc=", + "pom": "sha256-AamKlD7w22ppgKVZItM6x/lHYvL9O6bxGXbzsdOBV18=" }, "com/coveo#saml-client/5.0.0": { "jar": "sha256-cgI4UPOCtJ2FbfvKbBKym87l6gmJQEQleG4UbkuUXIo=", @@ -724,6 +724,11 @@ "com/fathzer#parent-pom/1.0.8": { "pom": "sha256-zRQ6tSZOnHOx0gQmT1GKVaAZpmgdV/J5C+s9s90sPCA=" }, + "com/github/ben-manes/caffeine#caffeine/3.2.2": { + "jar": "sha256-x0psciId+3brkvK7QBCOpWGn2i8xXcOx5kr6jwd/IQw=", + "module": "sha256-oD7s/Xs/XQSmZSw4yT1xFDCnSfx/+OwKpN7janRJwDE=", + "pom": "sha256-OQTfB3fF2aYILhfKOiaSseoGGtTpOjomkAIRbrGsq2I=" + }, "com/github/jai-imageio#jai-imageio-core/1.4.0": { "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw=" @@ -747,20 +752,19 @@ "jar": "sha256-lIVZQtSZLxEpRtPeHDNOcJI3uBJtgTC/B4B8AYpKISA=", "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo=" }, - "com/google/errorprone#error_prone_annotations/2.11.0": { - "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=", - "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" - }, "com/google/errorprone#error_prone_annotations/2.38.0": { - "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=", "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc=" }, - "com/google/errorprone#error_prone_parent/2.11.0": { - "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" + "com/google/errorprone#error_prone_annotations/2.40.0": { + "jar": "sha256-v6d+SSJum9KsesG8SjxwQwB48ubNMMjgYV1sJdiugY0=", + "pom": "sha256-GI+AyOrAS0CvdrRdA90dCjk5IOP6DEglL05u8YcojK4=" }, "com/google/errorprone#error_prone_parent/2.38.0": { "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" }, + "com/google/errorprone#error_prone_parent/2.40.0": { + "pom": "sha256-HGt0MRxgFPj9aMjdHl9h3bVEz/LHQ8JyTbf4LXLd5Is=" + }, "com/google/guava#failureaccess/1.0.1": { "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" @@ -1051,9 +1055,9 @@ "jar": "sha256-MTOHjRCPDhlk19Qn83mnQz4bcaRfnzwfq37QrAMB07A=", "pom": "sha256-wwO7cco5tSiAann47wLaSpTxklt11Bh3ojRNsbwiWpI=" }, - "com/zaxxer#HikariCP/6.3.1": { - "jar": "sha256-D5KKM3drMX6ySNeV7l7/JgWQaWqfhJMKJcqVy06vSS4=", - "pom": "sha256-FmMuPVHzp8DHIwIxPeuzKN9Okrpsotmhl2s5+vblS0Y=" + "com/zaxxer#HikariCP/6.3.2": { + "jar": "sha256-bTwbjcFX9qhSWTXLOjxW+LIzSm1cOUVSpQUzyjuSNr8=", + "pom": "sha256-5jQKhf34SuSHkzOYy9bIv2WPEhlETWtyscgAWMlXLMY=" }, "commons-beanutils#commons-beanutils/1.11.0": { "jar": "sha256-nkS6aOyaPyEob6Kou7ADtzXA9pEBu0MUS3n0+KqnRwk=", @@ -1103,43 +1107,49 @@ "module": "sha256-Wn2aCi8TDN4Syxl3ycS81+TbGcQlk5MQnMDRAo4K0X8=", "pom": "sha256-HeEZTgkZRy/Eja4Cui/V5C79AUVLnQsoZaoBczdwPfo=" }, - "io/micrometer#micrometer-bom/1.15.0": { - "pom": "sha256-H+qJzHE6YZj3tiIgvwnpgU5On5PkH+0+HFjs1L3BwYk=" + "io/jsonwebtoken#jjwt-api/0.13.0": { + "jar": "sha256-WvipccchWstsNwh5SjkSxW63Bmyjse5z+HmIyeDWwGc=", + "pom": "sha256-jNjB+Jd1BTkW5GObMviwqup/HV2mf5d8kSjLDZV+Uqg=" }, - "io/micrometer#micrometer-bom/1.15.2": { - "pom": "sha256-twLsZrQLHux0/j62hRyAEeBiXaz8GJGvMILc3lN/0Ik=" + "io/jsonwebtoken#jjwt-impl/0.13.0": { + "jar": "sha256-s1G6qjAoiaQW6DaD8RCUgBfO5nEwMmJSLUukd2iMqJ8=", + "pom": "sha256-x/fLIrSkvfRXMA0c9pVNW4F97CV3ihdNAIiEqV92wSk=" }, - "io/micrometer#micrometer-commons/1.15.2": { - "jar": "sha256-wg6wKbPnT+JheVRntCDyCyBioCXazQPXYRVrnqbUogU=", - "pom": "sha256-Wy48iWx3MdeBRnZX5e8A+KuaaIkAS/rD0pySKRn7hLQ=" + "io/jsonwebtoken#jjwt-jackson/0.13.0": { + "jar": "sha256-5cpDtJ3soa2BiyVy8K9NkCNwIFCJvc0V1du2CV0XQWs=", + "pom": "sha256-t9IgJyYBGrimA9YLtNfcYU1/0vxDSgmdmqoyweeTkY4=" }, - "io/micrometer#micrometer-core/1.15.2": { - "jar": "sha256-dURQO0Zj3B38IRts4j9RQQRL2vXjSIKjJj6EGBKQ1bo=", - "pom": "sha256-KAgTD0KOAKYJG4/RHNcVtp1Yo3v+QJzBxEE8ZAWlOEg=" + "io/jsonwebtoken#jjwt-root/0.13.0": { + "pom": "sha256-1RQ/LH01XhRXBmg0cgHHGj4f7m0dqRFfhr0RfdfWSWo=" }, - "io/micrometer#micrometer-jakarta9/1.15.2": { - "jar": "sha256-7QEZL2+WsWHUDxoxwK4uueKExM/JAFazBOp2ztCMKAg=", - "pom": "sha256-XOoYxJdRAjtXK0qarJ5HIPmGvDTBGhOM4O0wI39OLXs=" + "io/micrometer#micrometer-bom/1.15.3": { + "pom": "sha256-nKOxjc3L4T5dZjipTfI7WenVWUflND/gA6sXRtSB7t4=" }, - "io/micrometer#micrometer-observation/1.15.2": { - "jar": "sha256-+OhHoQ5ZdLLJ/9cWnpZ/QUGMX9/q8wqXk3tdgqXSfqY=", - "pom": "sha256-nFgJTExUxv30KB01Y+pSOlP99kN6et+mYjIcNW51FdY=" + "io/micrometer#micrometer-commons/1.15.3": { + "jar": "sha256-DcZ8oVXudkcMDDZhLoA8gfiXsq+Aih9ANTZY1ENPeRQ=", + "pom": "sha256-ZxGT7XYuJMLGmNe1q2Qu9V6Oqvw+j5nWvZhNqdRwRVk=" }, - "io/micrometer#micrometer-registry-prometheus/1.15.2": { - "jar": "sha256-6f0KbTZnCVnmZ7NZNcg68HwhI8h/7aNn5wo4MaeONo4=", - "pom": "sha256-TLrR5Psk9sjkBSE59YefoK447TgmCxSaJblF5rWxnx4=" + "io/micrometer#micrometer-core/1.15.3": { + "jar": "sha256-x4BXQEEqBTzX3KO/Gs091MV2XjJk5Mm2jjc/nf+4eoo=", + "pom": "sha256-CR3m2ToDXDI6YJB7H8CcpL/yCTTmgv1mNJHtEmgciDs=" }, - "io/micrometer#micrometer-tracing-bom/1.5.0": { - "pom": "sha256-k+Ys3TNXFWIy0k5eup6d98cPByuDzlWQ309wzDMTxRY=" + "io/micrometer#micrometer-jakarta9/1.15.3": { + "jar": "sha256-T3/dTVRtlSJpxN0IKMwxp6m0lAjCQMyLVfD7LKwJf3k=", + "pom": "sha256-bBljpLWOeT4N2RBvKoF01RejCCxYymlmNVPM9SnyqD0=" }, - "io/micrometer#micrometer-tracing-bom/1.5.2": { - "pom": "sha256-tSr7aZ4uHapJr7B1RaXmP3tk3FchGZoxmkf/bY0+DQU=" + "io/micrometer#micrometer-observation/1.15.3": { + "jar": "sha256-UsywVu8m+ofdcabtq7+9ArSkggts03NEcg4U+dtu4M4=", + "pom": "sha256-gjMo+yvu5PQkM3PaObtswTV1o5SEAVxDWgZ5mHNDykM=" }, - "io/netty#netty-bom/4.1.121.Final": { - "pom": "sha256-E24RjGngF0Wbor28weVaD9w2dD1X8oqOoWKpjR/LtjM=" + "io/micrometer#micrometer-registry-prometheus/1.15.3": { + "jar": "sha256-Ze84eO/x2zprnLbjGwQsXSoiatn8wETIB6c/yov8NmI=", + "pom": "sha256-4G+8OIkOoBLqUzSMIM7i5hsMMbHn5Zu5uz5YeH4TVKg=" }, - "io/netty#netty-bom/4.1.123.Final": { - "pom": "sha256-QSOrLmgHrP4/8MR2qSDvNJpRfW44Zw/ghMB4Q88CmoI=" + "io/micrometer#micrometer-tracing-bom/1.5.3": { + "pom": "sha256-6O2PDqLXvn4l8jhc2qDIOxQjF2wajS+CPt1IDiDavcc=" + }, + "io/netty#netty-bom/4.1.124.Final": { + "pom": "sha256-JjYm03b6G+14HpVMgeDbM9+quHZZ07WhMnoSfL8qYac=" }, "io/netty#netty-bom/4.2.0.Final": { "pom": "sha256-+q0GIXkS4qfLmTtFIAp5y9JRyXsEMzuLm5njcK8Vfbk=" @@ -1168,20 +1178,13 @@ "module": "sha256-q9+I0toctizFQ+OgBJvN0/40JvOfqIH6/38OEifY1S8=", "pom": "sha256-sPfCTHH0Hlqqku03Pm1SI6HTXuKRMDgNhehmSnhPpRY=" }, - "io/projectreactor#reactor-bom/2024.0.6": { - "module": "sha256-SmzH3USA/8rbi6nJJvpzDUSiStIfXO335N3GsVGFK+o=", - "pom": "sha256-mXj/ik3ahXpRQu5TzNFcfKRcthBPDxk2hW7PDbKVTIY=" - }, - "io/projectreactor#reactor-bom/2024.0.8": { - "module": "sha256-onmpIDKNPIy17RaQjC2qUnSW7mXaps/KU/EgH5mT3W0=", - "pom": "sha256-iiHv9l7zUUGqBNnTZJQHsLl0rAga0ef//Uc7ua0vYYM=" + "io/projectreactor#reactor-bom/2024.0.9": { + "module": "sha256-wLZbyjpHhdixpuFh8NsJKhPJIslCX8EKKJCPYcPSv/I=", + "pom": "sha256-ibksIU8SbVUQTFujkXRS4nWJQ2+3/Fir0vKVPSiMojQ=" }, "io/prometheus#client_java/1.3.10": { "pom": "sha256-YFsiNUvY7QBXYpb2c3+NWRbeGgpW1PeXKjZhVNL2vL4=" }, - "io/prometheus#client_java/1.3.6": { - "pom": "sha256-n/AOSQfYUE9Rt6u2o9wns7fLZQmOWb7Nt14TjjPHR0I=" - }, "io/prometheus#client_java_parent/1.3.10": { "pom": "sha256-4RZbobMV4GzPRpIvqwgXbQjlLh71KFDosQ73bWUmcxY=" }, @@ -1191,9 +1194,6 @@ "io/prometheus#prometheus-metrics-bom/1.3.10": { "pom": "sha256-fxdFY/rwQL6XbdH8XdyOIHdmFJ3F7FwdDxBqhKvKA1A=" }, - "io/prometheus#prometheus-metrics-bom/1.3.6": { - "pom": "sha256-7F7SHKoBR1WFBiSTeY7gQUX7wUmkUNXFMWnASxUCg2A=" - }, "io/prometheus#prometheus-metrics-config/1.3.10": { "jar": "sha256-0g6nOfGvEw1n1qjmeg/QAWnNTmLcp/opxfKuZWt1h/k=", "pom": "sha256-VO/sLQcCS2Xb6En74H9qVE7qbNtoGfCxuEGrA3cUYXM=" @@ -1224,11 +1224,8 @@ "io/prometheus#simpleclient_bom/0.16.0": { "pom": "sha256-r0QdMpXeEacONf6+s9kZui7RdVJ1MWMyW5VNU1lNVcM=" }, - "io/rest-assured#rest-assured-bom/5.5.2": { - "pom": "sha256-bm0NGP1jc+UmWrqkI03npZMmKQvJdBQuh3rcDtWRr1k=" - }, - "io/rest-assured#rest-assured-bom/5.5.5": { - "pom": "sha256-fhmZS0OoTtf/gNgc9hpHeqAmKEft6XN7hYJnjNT97IY=" + "io/rest-assured#rest-assured-bom/5.5.6": { + "pom": "sha256-jTaiYMw6+QA4LIMm+0gANc2unZYAmaP7JcNm5P4cvJY=" }, "io/rsocket#rsocket-bom/1.1.5": { "pom": "sha256-Ck4TdcyMFOz+MSIZQGgXmO+Ke4r26JaONj8VwO1HjD8=" @@ -1243,42 +1240,24 @@ "io/smallrye#smallrye-build-parent/42": { "pom": "sha256-FBJFawNFSQ+NC00L5SnQSh1Y0Z1a2FvzHDdAwT+Q1t4=" }, - "io/swagger/core/v3#swagger-annotations-jakarta/2.2.30": { - "jar": "sha256-Kj8W8gxlZ+Pl6aFGrO+Naqccq2i66mIVVqwtN5eOBuI=", - "pom": "sha256-zkarwk7RoI41icv+ZIoG6siRdcUSKr2KMAN1xMFGwqI=" + "io/swagger/core/v3#swagger-annotations-jakarta/2.2.36": { + "jar": "sha256-jdd1/Sflazsmub71rSqyJahy6XgEe+d9yA/g/mCaZBk=", + "pom": "sha256-cyZE7PPYjQWlP9NZuM+J4CCAHJ5LV0o6tzTVtlVIyFo=" }, - "io/swagger/core/v3#swagger-annotations-jakarta/2.2.35": { - "jar": "sha256-bsUqoDuFykUiLyAcONYef67a1f8B8hlG2a3o8pLpEgM=", - "pom": "sha256-LtGQ3ongUea3/FM87okuzvKvC+WEMMJ5A5tVSMfWF5o=" + "io/swagger/core/v3#swagger-core-jakarta/2.2.36": { + "jar": "sha256-SwVjPS3HDjmy8HWj8bGrIiDF4OiOjrrRJO8J++Oj7ZU=", + "pom": "sha256-2HOfvfoHBi+pTTWKXdQRAmleTznSTM1X+eai1IMpqYw=" }, - "io/swagger/core/v3#swagger-core-jakarta/2.2.30": { - "jar": "sha256-r25tXOLOhloCK6ucyGUr37yy3EV5Y4e8sfPFwq0/oS0=", - "pom": "sha256-N2XJGY3xaAAipHZkBV/UhMJeEBj+lBhm9tlpdk36ri8=" + "io/swagger/core/v3#swagger-models-jakarta/2.2.36": { + "jar": "sha256-vPmtxshskIKuxXOYe57QniJUOSpchOW0ly3Vf1ymaZc=", + "pom": "sha256-LwKuEM6/PQ3j6q+ws66zAROs4Q8lTeGHHyhUgPw8Lko=" }, - "io/swagger/core/v3#swagger-core-jakarta/2.2.35": { - "jar": "sha256-Sgdrsb5nPwJaTo1o7uWNeGnDrqZDiPAgnulV8VQclnA=", - "pom": "sha256-V+BWLzItPbYKBg5kmJ/s66MsOQDDpjzGhD2W/RWL3e8=" - }, - "io/swagger/core/v3#swagger-models-jakarta/2.2.30": { - "jar": "sha256-6W0DFIPL2iLe6qUVe8c9bUa/zKLS6VWrVqGYsq5VaT4=", - "pom": "sha256-r1mbT8wHHfALCtSzZox964H8eq7Q9x4UtMC8eUo2uuI=" - }, - "io/swagger/core/v3#swagger-models-jakarta/2.2.35": { - "jar": "sha256-NLI/JH+RIfYs0Vc57ph9wHXP0tAPZVEXqA/JY+3r7zo=", - "pom": "sha256-xsHLz+yBYjXqpU8XMtx5Wo0SLtcERzfiXA6siyMjvAg=" - }, - "io/swagger/core/v3#swagger-project-jakarta/2.2.30": { - "pom": "sha256-kOQyeN56U2nxatUzv+fF9NK/tLUShQdsgZIlBWFN0eE=" - }, - "io/swagger/core/v3#swagger-project-jakarta/2.2.35": { - "pom": "sha256-U88sJYzWA/GxODbHCnq4s6kUrqTiQx4Fh8x/kzUPZIA=" + "io/swagger/core/v3#swagger-project-jakarta/2.2.36": { + "pom": "sha256-BdmEubWsZiK4YkFR0NHznA1e4M3c3hBK/kfBdVlbOec=" }, "io/zipkin/brave#brave-bom/6.1.0": { "pom": "sha256-iUcmZppvAAqtW1/P97rsP42c9wAag9D0gFSxLxbhbpM=" }, - "io/zipkin/reporter2#zipkin-reporter-bom/3.5.0": { - "pom": "sha256-5CPgGIZk2gwj+H6AkAgE7GikowDyhMY1kg7iC28wIHQ=" - }, "io/zipkin/reporter2#zipkin-reporter-bom/3.5.1": { "pom": "sha256-j5/3aCMobH1es/BhsFO+pf2CnSVc3dqEm4MfQRZqfZA=" }, @@ -1313,6 +1292,10 @@ "jar": "sha256-gFG1jXX5gvmluWOzdlQm6CSypkhl7wrxcgXkVbmNsFw=", "pom": "sha256-/r52PsEKgXMh7LFdqGyx+8mVx+NS4cET8P01fku1eYA=" }, + "jakarta/mail#jakarta.mail-api/2.1.4": { + "jar": "sha256-/La3QNkiLRewejIzrGLJriAOImMGG8YU8KgF6AzoVf0=", + "pom": "sha256-7DEC3AKrkrICGbnJ6qmQl4rud7Q1Gt+OYcd2jQVxWEY=" + }, "jakarta/persistence#jakarta.persistence-api/3.1.0": { "jar": "sha256-R1OJRG01xvRsVlcot1bcUIwoRkTqJpBkTg2OfjOdQv0=", "pom": "sha256-+Hb8jYhnM1QPWYFat3sbmYvuxwgAMt+xUmyt5GzuzL0=" @@ -1377,16 +1360,16 @@ "jar": "sha256-gZ5InHXMoqwyjBwEuTvt5QyzJxY6ipqbToexd80zmLI=", "pom": "sha256-Lp2imccXNFIkVvsUOO+t3OoOabyOwX+mqPfwa3dSEh8=" }, - "net/bytebuddy#byte-buddy-agent/1.17.6": { - "jar": "sha256-ioCVlGW7CYSM1BqJMBSQxVudlA3G7DDYq6wPY7Of1dA=", - "pom": "sha256-Zw0Cz7w5b05+ZhTd3PSghC+vF/l5k3PX4Mt7aq3Njm8=" + "net/bytebuddy#byte-buddy-agent/1.17.7": { + "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=", + "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w=" }, - "net/bytebuddy#byte-buddy-parent/1.17.6": { - "pom": "sha256-3RX5X9VgUmPwZdncuOzuzEjr5NZmw3KY/0RgAUlCQL0=" + "net/bytebuddy#byte-buddy-parent/1.17.7": { + "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw=" }, - "net/bytebuddy#byte-buddy/1.17.6": { - "jar": "sha256-0mOCqDnLJtXGKgsPBHFbzvVaUx+WrGzkDeRSocBTnnA=", - "pom": "sha256-UExH3b8VsOc8ymO52woBwSp83n+LM6DF2dW1BtGUaz4=" + "net/bytebuddy#byte-buddy/1.17.7": { + "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=", + "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M=" }, "net/minidev#accessors-smart/2.5.2": { "jar": "sha256-m4p7xDhh1hVsAhFm2UH7fd2+RGPi+l7ogHfksBRSqDY=", @@ -1442,9 +1425,6 @@ "org/apache#apache/35": { "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" }, - "org/apache/activemq#activemq-bom/6.1.6": { - "pom": "sha256-FcLWnzVyE9bjsHEq+H31cfDY21mE0RSwoiD/LnSdxUQ=" - }, "org/apache/activemq#activemq-bom/6.1.7": { "pom": "sha256-YnqWon/U8rqaU6ffSHhifVbP9At4mygzVBgMS40quWY=" }, @@ -1519,10 +1499,6 @@ "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" }, - "org/apache/groovy#groovy-bom/4.0.26": { - "module": "sha256-b3I9IpHN+uqPpoZ/frp77Klvt4SQXfvikjG0eW7I6RE=", - "pom": "sha256-uJshtYixe2Q/ou7HxAbgoah541ctzuy9VU9aB+IfV4Y=" - }, "org/apache/groovy#groovy-bom/4.0.28": { "module": "sha256-gw04aMOee7MP9lNeilum3ufZuBujtEuq8Q8VBqcgdFo=", "pom": "sha256-8wUszlm1mdU2nk/B2fsun6OVqo53K+3C3NeQfNGKPQY=" @@ -1564,12 +1540,6 @@ "org/apache/logging/log4j#log4j/2.24.3": { "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E=" }, - "org/apache/maven#maven-parent/33": { - "pom": "sha256-OFbj/NFpUC1fEv4kUmBOv2x8Al8VZWv6VY6pntKdc+o=" - }, - "org/apache/maven#maven/3.6.3": { - "pom": "sha256-0thiRepmFJvBTS3XK7uWH5ZN1li4CaBXMlLAZTHu7BY=" - }, "org/apache/pdfbox#fontbox/3.0.5": { "jar": "sha256-6KYr4t8noNRBkbZmnAsY327+UnEjLbjcuHRdXZd0dVs=", "pom": "sha256-I/bas9ldDvUDM8n3ZZp0ChCwYZ3eEXbqYtyLSTU4jr4=" @@ -1597,11 +1567,8 @@ "jar": "sha256-AXiZsvtcKvcU0wxSzKks3o8SmZq/MUDU8NXxEzT2L90=", "pom": "sha256-E6MTEo+lkzyjcj8gwYKO5oJUHRRqX7BK5JtXoqYFC4s=" }, - "org/apache/pulsar#pulsar-bom/4.0.4": { - "pom": "sha256-6P+5UWzgUCu+C0fWUusnjoBfL7RoJffPL3uHPF0qLcM=" - }, - "org/apache/pulsar#pulsar-bom/4.0.5": { - "pom": "sha256-r7Cgmkbg67DW2bbS4v4fJLxMef7OVZ4bMLAShGBLjwA=" + "org/apache/pulsar#pulsar-bom/4.0.6": { + "pom": "sha256-emqGOP+IF8nMt9k6xMRG8Z3g8ivHV0xht/BJbB9xmjo=" }, "org/apache/pulsar#pulsar-client-reactive-bom/0.6.0": { "module": "sha256-PZSBOoS8//FI814RaYfo8w/MUAITTrMvVDDpa03AX/k=", @@ -1611,15 +1578,15 @@ "jar": "sha256-VRPnQX7cHrcYitxN4DEukxVr18ptbB5gctPgAG3v/yM=", "pom": "sha256-Ez/s/gIYho799ZY03YaS9/Ke5uLeQynWdwDJF6OE7kA=" }, - "org/apache/tomcat/embed#tomcat-embed-core/10.1.43": { - "pom": "sha256-FfWbk/bSl/DHA4VQhcodJDJU9tqAzu6EYCrfT/R7Z/Q=" + "org/apache/tomcat/embed#tomcat-embed-core/10.1.44": { + "pom": "sha256-34z2k8TkeP9iUoXi5wCpz/pNSp37YnS+eTjxaNdLkrI=" }, - "org/apache/tomcat/embed#tomcat-embed-el/10.1.43": { - "jar": "sha256-FQxy/BJtju8x4K7JmU7tKFAabk11v5dVSpfBZ1MJPJw=", - "pom": "sha256-hoDLJ0+2jPqI46UP+911FyKzwKasXB9tiF75aXXm4Ko=" + "org/apache/tomcat/embed#tomcat-embed-el/10.1.44": { + "jar": "sha256-jwKTDUktNbbrmH88iixjKF7uc5QTEx+0iGaN6MYqSYY=", + "pom": "sha256-f8mVKleDMcgxy2p9gqvSHOUhhFqnhM6oD/jTfsfJgZo=" }, - "org/apache/tomcat/embed#tomcat-embed-websocket/10.1.43": { - "pom": "sha256-lzSN+vxO8QZ93dVX1Nybd9e5HwptEGgSMfRru6cIMrk=" + "org/apache/tomcat/embed#tomcat-embed-websocket/10.1.44": { + "pom": "sha256-ZwPWaYpatbvk0xDKOngKROz/jIFzo7ZRkVIGa+Xc/oY=" }, "org/apache/velocity#velocity-engine-core/2.3": { "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=", @@ -1651,12 +1618,12 @@ "jar": "sha256-deQif7fcX5fD1Gic0cJDn02wvRjOovokLEZWzZPFmao=", "pom": "sha256-JExiUSK8NBpYUYRPIvhY0Kl1WYrk3M47h/H9VIF5BkU=" }, - "org/assertj#assertj-bom/3.27.3": { - "pom": "sha256-QI+eOBZmGBexR5veOy/J3ZUWFWLM+nl3iSDmK38kUb4=" + "org/assertj#assertj-bom/3.27.4": { + "pom": "sha256-AfwfeOavD6DmNLTbD8bNdYQr+5g+mo3SaiTeGvILOcg=" }, - "org/assertj#assertj-core/3.27.3": { - "jar": "sha256-W4omIF9tXqYK2c5lzkpAoq/kxIq+7GG9B0CgiMJOifU=", - "pom": "sha256-jrN+QWt4B+e/833QN8QMBrlWk6dgWcX7m+uFSaTO19w=" + "org/assertj#assertj-core/3.27.4": { + "jar": "sha256-zGmqhPeTVstjXD+f8/ht/w+djufve2hKLJqZgE/0UAg=", + "pom": "sha256-nLMcgATISEPShMQCqBRTvupFCb+neP9CKmcvfny/Ygw=" }, "org/attoparser#attoparser/2.0.7.RELEASE": { "jar": "sha256-dd0cBFSSv/jhljqrsov+kDwgZOEeJ/4vDwr/GtPYRHY=", @@ -1683,10 +1650,6 @@ "jar": "sha256-s4xgSHHzaQEJo8AJgtkUVjQSXeM2WoF7oW65DYjiQsk=", "pom": "sha256-gmKXCFw2VHLz1Fyx4sxzyl04h4vIQQjwVFl6+/WQPuI=" }, - "org/bouncycastle#bcprov-jdk18on/1.72": { - "jar": "sha256-OSh/IginU9tBn1ylKdbIDwlGFKp015AzESazyca4X9o=", - "pom": "sha256-47ttnhNGz8Iw4JAPF35goSttviEqkuHNLPseSNTASDk=" - }, "org/bouncycastle#bcprov-jdk18on/1.81": { "jar": "sha256-JJ85ZBKwwM5n8lyBl9p1eyQbi+PsQZk4bABwSiRXRZs=", "pom": "sha256-IDmQEivg/dNL8S0LeIwGVRYThqjoWLpD8G43CcLMdMw=" @@ -1705,8 +1668,8 @@ "org/bouncycastle/bcutil-jdk18on/maven-metadata": { "xml": { "groupId": "org.bouncycastle", - "lastUpdated": "20250604080934", - "release": "1.81" + "lastUpdated": "20250917070135", + "release": "1.82" } }, "org/checkerframework#checker-qual/3.12.0": { @@ -1734,9 +1697,6 @@ "jar": "sha256-xgDRrmG1sP8TkeAOtvs5AgHkYSw6ry3BuUBQyHhIQL4=", "pom": "sha256-RnLsWVmf6Yu0Gr0VJtn1KJcmr/sj/XCeNru8umM056E=" }, - "org/eclipse/angus#all/2.0.3": { - "pom": "sha256-EoyjtvoISnQ8pRwgKxqfxHCjdzm5PI9OcoVM4m+gBnI=" - }, "org/eclipse/angus#all/2.0.4": { "pom": "sha256-/M1yMQnFQB6VNOZYBCnxNj/1yEa0sWkThqbx9zdcoQw=" }, @@ -1747,17 +1707,13 @@ "jar": "sha256-bdO8/8IrzoOwc3ag4uCU5JZKMZXUEY+0PjgO81Q2zB4=", "pom": "sha256-deViGn3IWMmW7nDGtNiE2QHRh4Ns5sZxIMr5VH5vxXE=" }, - "org/eclipse/angus#angus-mail/2.0.3": { - "jar": "sha256-a1tvwrpjPFNzPYKcVsrlHTQ/sere4+F7juoBpJ7cctM=", - "pom": "sha256-2/OjHKYSJaapGygy1cExoYegN+wHYa2xngg2LjanrYs=" - }, "org/eclipse/angus#angus-mail/2.0.4": { "jar": "sha256-hzAYZVhLrZFwZis+7vA1Cqr+pFIkg+OOVK6H3D3z6Vg=", "pom": "sha256-hQ9aU/bgvIyFxRwmuDzkvVGEsbmC3zTRMfYIRO2T6zg=" }, - "org/eclipse/angus#jakarta.mail/2.0.3": { - "jar": "sha256-77lGQkkzgGvG+BNnUtIv2zuoh+oFJ/+EnEdOUfezcV4=", - "pom": "sha256-Z5luZL2/8GcHrUq6eDp5do1iFRs2jFpbITnFuZE0vSg=" + "org/eclipse/angus#jakarta.mail/2.0.4": { + "jar": "sha256-CO0mFHVJG7thXsuFJ6jorm99UHtuuhhwYaXGMMU7ARQ=", + "pom": "sha256-QvSqsW1XyK0CBhj83SZPpysbwYmLxWxzcmbCvObKssE=" }, "org/eclipse/ee4j#project/1.0.6": { "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" @@ -1771,139 +1727,133 @@ "org/eclipse/ee4j#project/1.0.9": { "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" }, - "org/eclipse/jetty#jetty-alpn-client/12.0.23": { - "jar": "sha256-eF/8AvRCn+yu3IkKAmHMIOeny/EVEYalpuKvaWddIJI=", - "pom": "sha256-G7g1IuvGOEGH0DeJ3L1UZg7okmJ+KQlIbPQjsDQxARY=" + "org/eclipse/jetty#jetty-alpn-client/12.0.25": { + "jar": "sha256-E4sHDJVuULXhL50+IuDmTcBfwxSl8kG1P6R932gqFrk=", + "pom": "sha256-zPlcYg0Uc/xPiLlhMC7GSvHjjQa75RMS84B5AZ3abBw=" }, - "org/eclipse/jetty#jetty-alpn/12.0.23": { - "pom": "sha256-XpkWD81aEa7LuT/FZXfuqH77DSoyXTpZxo2Z/fG4UhM=" + "org/eclipse/jetty#jetty-alpn/12.0.25": { + "pom": "sha256-gjDzAW5BSgw898levq9IhcYEYlNbRx5Jyc4o6crXteM=" }, - "org/eclipse/jetty#jetty-bom/12.0.21": { - "pom": "sha256-PxB+Po77Hkr504PmvAZn/jbPVSYAEMIoNDaOga6E0yk=" + "org/eclipse/jetty#jetty-bom/12.0.25": { + "pom": "sha256-9qh6HNgykiWtLLlspl8xsavzbGXNlDV/FiNvIHyhL8M=" }, - "org/eclipse/jetty#jetty-bom/12.0.23": { - "pom": "sha256-cNid7nnxRJpAXiqTHdcxhW+vZV0EnIHYa9wnfrrMoew=" + "org/eclipse/jetty#jetty-client/12.0.25": { + "jar": "sha256-TGFD50QoEl2IGSTSHdFh90dWGA77kW30aeaUDYDe2bo=", + "pom": "sha256-aRzeTTCKr6STdQ59TxmoGsoWULwnY4gsipiBcserCQQ=" }, - "org/eclipse/jetty#jetty-client/12.0.23": { - "jar": "sha256-nhvOmR2E8eB9L8pK11c44wYZKM/rjHqc0zaSB0DRcW0=", - "pom": "sha256-34Spk0glkelPw26doHZvO2ShVtg7xcaZb6ABJjNjngE=" + "org/eclipse/jetty#jetty-core/12.0.25": { + "pom": "sha256-vLdH49pPegTwZBp+zntIG2+TvucWutn2X4gLpqTdWmw=" }, - "org/eclipse/jetty#jetty-core/12.0.23": { - "pom": "sha256-v+5KNlBlSFA0KgAsoDCVdvirINXGH68mBRDKhHa0w+s=" + "org/eclipse/jetty#jetty-ee/12.0.25": { + "jar": "sha256-P8Ls3i8T/ndr8gsOWdVwmOoTAdirTmiXuX/olg7HKI4=", + "pom": "sha256-13sKAJDHTzh+9+ur81dwlMqNuIlk+VN6pSMGP8E7bWY=" }, - "org/eclipse/jetty#jetty-ee/12.0.23": { - "jar": "sha256-qZmRl3UxXcCZ39kA5FYv2N42A08870GE3bCxa+PDZZ4=", - "pom": "sha256-IEHJ56NYFGHnXAV8ANooGhv4fjq6aPp+m0QoLV1f8gU=" + "org/eclipse/jetty#jetty-http/12.0.25": { + "jar": "sha256-2bFwQRSYWRBczgxk9hPBBanbqCn9OZRnfmaYE0peCLs=", + "pom": "sha256-omSKww3NtLodDVzY3QoLolxBRvgiWh93hgcpzXbHs1E=" }, - "org/eclipse/jetty#jetty-http/12.0.23": { - "jar": "sha256-KryqzmYg/DOuGFgAkHm6qAFwKZDuxmS4hHciIGlFWJ0=", - "pom": "sha256-Wq8ecP10ior3/9mS/6+zBoP5yiJUFV7F63qInzOl1xE=" + "org/eclipse/jetty#jetty-io/12.0.25": { + "jar": "sha256-hSX54g7cPQjfxF1nOQgfKd+ffmRC4kZ7d/eOuo5CgUM=", + "pom": "sha256-0/Uxy0jpBcvEnDEsTl4yVjwug0GlId/Jw2tthVz7IOk=" }, - "org/eclipse/jetty#jetty-io/12.0.23": { - "jar": "sha256-aXTY6b5p05ssAwjURpnO8NlhMru2Nqvw4SJhhLZrG14=", - "pom": "sha256-44jZea3xmUcOCgWsXgCnwxkCnTUi26NB59KujrAlYt4=" + "org/eclipse/jetty#jetty-plus/12.0.25": { + "jar": "sha256-y52Z645ekm200W9w4AxI9Em9aMNmIxHJQxlN+OeLOME=", + "pom": "sha256-eBgZIEGaCx6Hn1d4We5GjXy2lYUvdaZgXneMAztKkqg=" }, - "org/eclipse/jetty#jetty-plus/12.0.23": { - "jar": "sha256-O7AKWaJeCeRA6+ONkuyxMcznK5wb4A/BgyIp7PfCE0Y=", - "pom": "sha256-4KNqxs5zrc85D4AqT5jVaiqJXNDJ8H+TuFe7wxiGKVs=" + "org/eclipse/jetty#jetty-project/12.0.25": { + "pom": "sha256-cBLMFruT8cVXWFc0bgdsjozg0Y3fL1Aaf5ACYGPqHys=" }, - "org/eclipse/jetty#jetty-project/12.0.23": { - "pom": "sha256-+hlR3IA1V20dnyaYBqhyzNZhrPpe7mGr3C92tVb9bHc=" + "org/eclipse/jetty#jetty-security/12.0.25": { + "jar": "sha256-VAXcWLXn22dYya7gFdnFNPedRXd76zXNCqAh9KiLe5o=", + "pom": "sha256-4xxznIuKaO2HA1+jsLYYHzqvOAP5hwx5JD6lDFlL/p4=" }, - "org/eclipse/jetty#jetty-security/12.0.23": { - "jar": "sha256-tOTBT4wb/QpJOa2toz6nRJGZslI9ANIRSI/4F5m7PAw=", - "pom": "sha256-t7NUuEhbXEuzKUIC+JKO6TRUkJgN/ofnCob++iPZDiU=" + "org/eclipse/jetty#jetty-server/12.0.25": { + "jar": "sha256-6SOg7Dj7OK/o1XFWfL4BcP0ZvO80Fv5Yq/Xg/D9B4tA=", + "pom": "sha256-lX3fyUtulF3DnsvF1wfZD2Ie/C6Dl9PLhj3ocr5wyc0=" }, - "org/eclipse/jetty#jetty-server/12.0.23": { - "jar": "sha256-w/AkFJahxxxwULzZ3gUx5m7AkIf/7Nm6lR/jPyRWz0I=", - "pom": "sha256-KIJq1c10aB1klrb33gBi0kJ16Henno+E/XWyMGtt0xw=" + "org/eclipse/jetty#jetty-session/12.0.25": { + "jar": "sha256-Z3GTf8xpFDvQQI2JmU/FmSfjVKaGkUsS0XbxeSHuD8A=", + "pom": "sha256-SgnVWqDlK3lqTe48AmzFr6kQ5dlZM12suos+3OtDkig=" }, - "org/eclipse/jetty#jetty-session/12.0.23": { - "jar": "sha256-qzc2KTVhG4+FXIvN3ql81vzX5PRqqgW0JaU5JlA8XiA=", - "pom": "sha256-FVCZKihkpJ6edA0BUzRE7wPR+RsWw4qu/gUjTrepqIY=" + "org/eclipse/jetty#jetty-util/12.0.25": { + "jar": "sha256-JnPzwLStzxxa+i6zxU/UMZt+dMr4PTA7AwZn9bAzdq4=", + "pom": "sha256-/NJHm6vfrx6QGiCwxFeow9z1lFHS905nWG/sz8DbMEM=" }, - "org/eclipse/jetty#jetty-util/12.0.23": { - "jar": "sha256-dCUYy3znFR+itsVIGem2UgTA+doRk4EiYfpWVWGOLJc=", - "pom": "sha256-a+LvvbIwkprpf70F4vlCkcc4mHuq+uN+K4wQ0EeQu+s=" + "org/eclipse/jetty#jetty-xml/12.0.25": { + "jar": "sha256-AUGtD1gLpEhffgi79zcCkrYrSoADwjlbwwCa6YTCyTg=", + "pom": "sha256-9zBeYlvVedmzLFD9lnH+IG96anBoJsVo2sWOlsvcV0Q=" }, - "org/eclipse/jetty#jetty-xml/12.0.23": { - "jar": "sha256-3kMBzOJ4eoq8vi2hxgADVA4sgNNhtVuEPphJvr5yD18=", - "pom": "sha256-Fu4uPjegqndVDQ5Yw1TWqBUnjYyPCIDG5/1lGbAHYt0=" + "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.25": { + "jar": "sha256-0wByRxiIy9N7FVdRkLnd7KAhn7VqR7oLNTzNQQkWSuE=", + "pom": "sha256-ZOVPJOt2TayHHvyKPoJ6B13HTBjzobIF14THgD24uDM=" }, - "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.23": { - "jar": "sha256-7oPA3rN/1DsJkPe0qOHp4POUiYYYVZnZld+WafQ0dbU=", - "pom": "sha256-6zr58NV+sZjIpEy2S37UGGjGM182UvBNX56ElRY08PA=" + "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.25": { + "pom": "sha256-na76ox1J2KzxmzUsnpXQcmPHJj6AD2pKvrGqZE4w+Gg=" }, - "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.21": { - "pom": "sha256-OxLpvear+nRdW7LYj4qtHESaciWKGCCiNyXC6tAfYKk=" + "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.25": { + "jar": "sha256-q0cJT+VRINdEx5Q7bs3zArYXxI2RoXWq/ehe4gf2h5g=", + "pom": "sha256-SKZ25Tpa6GgKJAQTF3mywzz1R4BZORmu9D9/ZH1kqgI=" }, - "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.23": { - "pom": "sha256-cravtVFrM4JJjIEvxVTwzHmCWEQnl+caTuw/QB52Zig=" + "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.25": { + "jar": "sha256-GYVtF59aPdNC0WvsMmSeWMQm4SRrVWfMkZGm32SVY3U=", + "pom": "sha256-wNGcbPQaNtJQTT4rGwEg0OHKH5gpw78cl2CH0MRWx14=" }, - "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.23": { - "jar": "sha256-amR0NqOFtj8eGtvaalevcTDnv8POJgdJxc4jkPsPDN0=", - "pom": "sha256-f+asmRWtVUdZrMsWunmwensnRgC0dQUjpsdZP0JBZxw=" + "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.25": { + "jar": "sha256-902Yhk+t41nVueVtieZjfke22uCVT2v4wKqti3nE2oM=", + "pom": "sha256-Xzw/FllRXsy3w/SduvqMJf9xfqgnFAPfzYdfM/xTglM=" }, - "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.23": { - "jar": "sha256-SWl+ZZxytURjjn4iIMhc4AYEXaV2VTdSI7kjm8sXDx8=", - "pom": "sha256-dneAS9AUNwYILS3xc5f6/CofvUA96csG5/A9hHzHGKQ=" + "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.25": { + "jar": "sha256-Mr5AYD/TgjFhbvA0Q7zn55TLSd2rb49Ht5MXngttfDk=", + "pom": "sha256-5z1osr+bldTJS7T1NC4xfhXZeA41iTVYa0yzKViIhms=" }, - "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.23": { - "jar": "sha256-gn+JBDspduXjN5vKTHpEZUlxzywVZled5I2uNnl2+5k=", - "pom": "sha256-0Z3byOk9+xAKSHppdFDJoGhYijrVQxU/B8kiHqMQuiQ=" + "org/eclipse/jetty/ee10#jetty-ee10/12.0.25": { + "pom": "sha256-vSQdg2u75+/YVjJ3gAorOcPm7q2Sgyte9zIl3rxuJys=" }, - "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.23": { - "jar": "sha256-0ZL7JY40chGeC3nG04tE0xWPAUvbm1zIhfcXqKRIyAw=", - "pom": "sha256-2/sgNLMEJt4n397EtVFBoOFyIyqdeqpansB/mRXMYMM=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.25": { + "jar": "sha256-HjAariEgeRyBHWk7CXlaaNMjI/xsGWZCd/VC+gvsq0w=", + "pom": "sha256-zDzxWUggMerkUpKdsBR8ft1NU92xri/YjYIBhHDSXOA=" }, - "org/eclipse/jetty/ee10#jetty-ee10/12.0.23": { - "pom": "sha256-/aeV3R5bPHTmiSmndQMQj7Gqgxf8J/yYCO0/J8yDvYA=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.25": { + "jar": "sha256-rNuiJr4gJQl0QSOgweET/tSE7pmYKGKFNmjrSEsbW+8=", + "pom": "sha256-o3odtZGgxbT+2ymStwCzdr1Ch9xcqa3XM7DBSq/sZhs=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.23": { - "jar": "sha256-vlmL6AQtpGqrS0kgY5zUmCLscVsnqYR1H+DiWwB3x8s=", - "pom": "sha256-27ZzjC4uqQjbeI4LGXa1gsN147omD3xrkQ72t6x4DCg=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.25": { + "jar": "sha256-LY89adEKEIt+s9XbAYfxjuvVc3aaMN3R+3qGl8fAID8=", + "pom": "sha256-3zprfN21xppje2LcTUyDRCkz4Xi0Nf8cIGLODX50UWw=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.23": { - "jar": "sha256-L+axasCUSSAWf15P7RoJECq6taVwFPc6KXyrokmbCv4=", - "pom": "sha256-1QsnvoyIbs3VaKmSE4abEgDjy14QPupa0wTL1w5g50M=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.25": { + "jar": "sha256-zGT7GeCcLx9AEPnLZGYjSQX+KLKY90zy2h1GQ1JNqY8=", + "pom": "sha256-SicF8wkGjJPjJHKsvgK9rg5/JWJ2lceF0enli5CGJ1w=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.23": { - "jar": "sha256-YmTU8eOk0nw5w9pGWvUFp+MLQGo8KYYjyr4NLB+R8Dc=", - "pom": "sha256-sbgQXoqrRKEYMxtCfUBJySz0I96yS94yazqyiqgcmIk=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.25": { + "jar": "sha256-0LyoE4DFykWm/e+6rWsx05ixitbFsV82TZ9ezYPGs18=", + "pom": "sha256-Mg905Jt94uoPt/OZYA0uDP5p2zpUYaZ2v/yNqwqSfLk=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.23": { - "jar": "sha256-7X3x3/GTCjqBaq0p7iwdIDcfjVGOh0eIurMVnhKqXgI=", - "pom": "sha256-Zu2yvrp3jyB5qGN2MNfZ2Kwvueyn/erRutUjO/xzwOQ=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.25": { + "pom": "sha256-iyQPp2yoVGxQPvP0c0OGGSEDAeka5KsVKuD9mk6WkIY=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.23": { - "jar": "sha256-IA1F7sadIOkeyv+xaxzxi22xqNHqKe9ryEsbL1+ThSM=", - "pom": "sha256-+xSF2jFyI8NGm1I0T5tpg3cVgRQ5p4cDavPZJCHm+xs=" + "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.25": { + "jar": "sha256-yOjuqTHJQjGS4+rAuUfWRf2aCO+0K8bZcNZEZa8K1j4=", + "pom": "sha256-NV7U5qKXyvqa7DxdmhEy83eZn6/1/Q5DkTkAwE7ACV4=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.23": { - "pom": "sha256-mRAXbSvxeuVr5FM8dR2ixBqfdBApow+zxdMuK1A/6/I=" + "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.25": { + "jar": "sha256-DeP7T8+apU3Kx2yG0rWJc64R/7jn837l+Ibh+nht64g=", + "pom": "sha256-rOYFDyybj8dxzuN/6yfWFA6pHOSMPiM7Xp6LJn6yf3E=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.23": { - "jar": "sha256-rz8U8r2a0gQJDWUbjoYXLzZRtBjXMWjwOZkKza+sZa4=", - "pom": "sha256-wcRP+o0PQcwuznjxf5+3GmYhSK4jwHYnvu+56PK4Cus=" + "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.25": { + "jar": "sha256-2uAlBSOMoa9ujhLG4wT3Kz+hmgfzSGIjHC3+ZHyCkts=", + "pom": "sha256-iA1lo8oblSZCRrZiHj17m5GAsr3qeGsTlP3utWSmV0k=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.23": { - "jar": "sha256-6ChhIRAcMemYa54F3LwE4mly1K9PVlDaqTCuueYauZ4=", - "pom": "sha256-yNZcB86kFd6zBH+qyojOPCOMKX42535QlK3UsT/RK/s=" + "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.25": { + "jar": "sha256-VggCl1ELUa7lfAaGjYvt4Q5LFjtbLrwgaieHr/lfjAQ=", + "pom": "sha256-X19EI+XUaKA6vQmzF1NpX2fHH1KxvPztCuSz9Jzcae4=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.23": { - "jar": "sha256-ivkeP9Q8O4TRm8Ljbbz8IrMjN45TWCg+R7jN9tPiXIc=", - "pom": "sha256-0WMuA1SygPIRXZ7+UUmMmkfGd5ySH603iy/g3TNnUts=" + "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.25": { + "jar": "sha256-TNXW55FTyjyA8iBTnkcCVwR/TZBeDdf5SF884R/iLkk=", + "pom": "sha256-lE5J6VdtM+Erym6lKP3Ktfairwzcp3vdHfYW8wcdhBg=" }, - "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.23": { - "jar": "sha256-JTdmbrmJrF/Y0+V3kfsGePSrVHicTCnd2UxsFRQOALk=", - "pom": "sha256-tqQBJYBIkmgkBPajKGTJ04t8l+Bzz7IZMpnrOblhrbI=" - }, - "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.23": { - "jar": "sha256-Xi1d5V7CMly5LFlupkBshupISnqGw1PHdytZBG2uYxg=", - "pom": "sha256-yysP5QR6EY/NRAseGm7i6RoS7aaBl4noNTaIlBgG0Ws=" - }, - "org/eclipse/jetty/websocket#jetty-websocket/12.0.23": { - "pom": "sha256-H891exkZB5ouzOQS+LT27lJ7J2qXul7QXJisK0WpjNQ=" + "org/eclipse/jetty/websocket#jetty-websocket/12.0.25": { + "pom": "sha256-C0oXxdF01WIxlSraz+jeRxSULNCR5BylF78D3NmGTNA=" }, "org/glassfish/jaxb#jaxb-bom/4.0.5": { "pom": "sha256-7JfsQtk308iVGXl+RCRvgN4IUIGax6euZ1xEl7cHXDk=" @@ -1920,8 +1870,8 @@ "jar": "sha256-kXNVvEUUgfMNBDsk0SMRBReWavNDg5AXc4goENykgOU=", "pom": "sha256-a2gzdWAy4YOaQBRoFaWY7IsFg6Lv+9Rd311UMB9Ky6s=" }, - "org/glassfish/jersey#jersey-bom/3.1.10": { - "pom": "sha256-KYl09Itfm23mIvJFApLexNuZs5vjJF9WVqbJpEtd67Q=" + "org/glassfish/jersey#jersey-bom/3.1.11": { + "pom": "sha256-3DdcE5WY+5VgZlWat70vwxGHlvVcMMT19LW8O0dEIrQ=" }, "org/hamcrest#hamcrest-core/3.0": { "jar": "sha256-t4o6gWkvQhzAH8F97ZpF6ftvOUnHEvjsTQHaa4wGvG4=", @@ -1942,28 +1892,25 @@ "module": "sha256-sapyAvw/Z9IgZpA9Ph63BS7hD0cyKhy5JfovRJ8lruM=", "pom": "sha256-ZvbmB7MHQOORmJglpa4HamyHepm3jrBUqBRmUKr/cus=" }, - "org/hibernate/orm#hibernate-core/6.6.22.Final": { - "jar": "sha256-azIEXFmg9EVfbjnZ8rSPea1CvPWVoq/H0Y/8+dyUI0E=", - "pom": "sha256-fagA2F/BHnAI+Zd+hdc+womSh3JN2Ja8aKUYk6G1atU=" + "org/hibernate/orm#hibernate-core/6.6.26.Final": { + "jar": "sha256-t1rg3Y29Bw9uh/tt0U5Aw2dNBL81mID3xvgko389EFc=", + "pom": "sha256-Dva4GxJXb84kgRM+srnAAGzwjYOmgR2PSDIph+eApG4=" }, - "org/hibernate/search#hibernate-search-bom/7.2.3.Final": { - "pom": "sha256-WghCh8hrp8qS7rMrFFO6cyuYFe7UcoTYXAE+4VX3SW8=" + "org/hibernate/search#hibernate-search-bom/7.2.4.Final": { + "pom": "sha256-FeQ040Zi1w3XLUNQwSGZTHISigSVOyfFOU91y0lV1II=" }, - "org/hibernate/validator#hibernate-validator-parent/8.0.2.Final": { - "pom": "sha256-4IrtGYZCWE/kJxF/EYP1MEBxrMyRzJFjH/atokeNKoY=" + "org/hibernate/validator#hibernate-validator/8.0.3.Final": { + "jar": "sha256-KtJGcP0I4h0/Q9MQXVMmvV72sB6BnFzRA4I4ZrlUUX4=", + "pom": "sha256-uPb9AfPIYdY6VanLcmyxd2kXqjfFj+33rKLtaS9Pc50=" }, - "org/hibernate/validator#hibernate-validator/8.0.2.Final": { - "jar": "sha256-LyIkpaGb3PpzVA6f9clxtsQlrYBBWHbzBSWf6HOhWy8=", - "pom": "sha256-Gorr9UkAgnTLf81gjEiSLyk/LhK5qQF8J+342CHMOro=" - }, - "org/infinispan#infinispan-bom/15.2.1.Final": { - "pom": "sha256-FJF84qZzrk7Qe/504e6VCFOhwVQ3BHVjBmI2Pg4zW5E=" + "org/infinispan#infinispan-bom/15.2.4.Final": { + "pom": "sha256-44lgdyrM1Qk6h4Pqs1UbaXZ5C3ohFW4ioNpZbVYLptI=" }, "org/infinispan#infinispan-bom/15.2.5.Final": { "pom": "sha256-pYWE4Uusd4EG4YI0XIZlGsRbLRqQFxTRwaztgc7crKA=" }, - "org/infinispan#infinispan-build-configuration-parent/15.2.1.Final": { - "pom": "sha256-m2u5xpNKfbt0YA2t8Yy6eqHBs0SaKqUHSEY/JpItiuE=" + "org/infinispan#infinispan-build-configuration-parent/15.2.4.Final": { + "pom": "sha256-6ev57jNm+l4N4HD7x4iMjHvukRbdPZ7niUgfXTL3lFM=" }, "org/infinispan#infinispan-build-configuration-parent/15.2.5.Final": { "pom": "sha256-qCfDuEIoLhZAiXFWulWmDwrDOz+Z0FkNLFpCx64Tn88=" @@ -1990,9 +1937,6 @@ "org/jboss#jboss-parent/42": { "pom": "sha256-5BJ27+NQkFTLpBl7PWNgxR3Ve8ZA3eSM832vqkWgnDs=" }, - "org/jboss/arquillian#arquillian-bom/1.7.0.Alpha10": { - "pom": "sha256-C/LOORlX466CMFpMzc3sBHzDEnr5Tq6Acwc72BnsHh0=" - }, "org/jboss/logging#jboss-logging/3.6.1.Final": { "jar": "sha256-XgiksJLchbM38JEKdAVx2HIM+lZfq9iAqMr5SmV8pBY=", "pom": "sha256-J82Iq45ZRrinqpJkTrNzLjW+KBQ5qwevcfiYRT7nVA0=" @@ -2000,15 +1944,6 @@ "org/jboss/logging#logging-parent/1.0.3.Final": { "pom": "sha256-mXLIlHSc2jVXZiF9Q97XAJse6ybgMBwwkUotslPdaFs=" }, - "org/jboss/shrinkwrap#shrinkwrap-bom/1.2.6": { - "pom": "sha256-HArIAaoxJb3l6IFrqHijJDJZw5bS845nbihSqcxVADY=" - }, - "org/jboss/shrinkwrap/descriptors#shrinkwrap-descriptors-bom/2.0.0": { - "pom": "sha256-h46wca0fSwyBVoU2sqOk996FqBSvxbGW2ambXjwKZYM=" - }, - "org/jboss/shrinkwrap/resolver#shrinkwrap-resolver-bom/3.1.4": { - "pom": "sha256-U9Rd91c4i2k6N0k7dODXqTjFc0wV+CYp1Aop3qnOt08=" - }, "org/jetbrains#annotations/13.0": { "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, @@ -2153,9 +2088,6 @@ "jar": "sha256-XFRC+KqqjwPfA+SGKg1pIF0bQfXtv31ap6JIamHeSbc=", "pom": "sha256-AaXP6bnbkv1GSZ3oA2e7JtreMj/DH4cMyT8ArLwWRs0=" }, - "org/mongodb#mongodb-driver-bom/5.4.0": { - "pom": "sha256-S2/nLFJXIlPUAFuNqiFZsu0zWWjvhjb0ZM7sANDHPtI=" - }, "org/mongodb#mongodb-driver-bom/5.5.1": { "pom": "sha256-Lmi0Md1roLUrB4MvkVQFmDgavpziuHlScg4b9IpwNhw=" }, @@ -2251,55 +2183,55 @@ "org/sonatype/oss#oss-parent/9": { "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" }, - "org/springdoc#springdoc-openapi-starter-common/2.8.9": { - "jar": "sha256-abqPtV+sAUTdRsIPNcUFzxIhjL5/B05zN61DwHiHqB0=", - "pom": "sha256-NwaESX+f1j2nzucby+ucwMRNNcQ110LSqo0M/j+L4cY=" + "org/springdoc#springdoc-openapi-starter-common/2.8.12": { + "jar": "sha256-E6zC1Y/khjaMYCGRF0lb24fjmTluesmqKzjKPCSxwnc=", + "pom": "sha256-zfVs+KltVzGlKZRCCFGoiHkAOf5SVexQmV7vDBzFH3g=" }, - "org/springdoc#springdoc-openapi-starter-webmvc-api/2.8.9": { - "jar": "sha256-9B7/LU/6a+BLJjPhOW1OxPi4MpNKBqOXkzSZLY2P4EM=", - "pom": "sha256-NqCk/5SPsALn6ZSrRGYlm+gnXCzuiy+wCVaSivIthXQ=" + "org/springdoc#springdoc-openapi-starter-webmvc-api/2.8.12": { + "jar": "sha256-BAycronB4rrXyojNLTqk/5b93WewBXxnduuMrEUT6Z0=", + "pom": "sha256-dYfjLA+XauYyxVC5S3Cv5VrFNRk/L8lYWfvsbqZ3ooI=" }, - "org/springdoc#springdoc-openapi-starter-webmvc-ui/2.8.9": { - "jar": "sha256-iETGzwsnhxK2Q7iZzPGRuEDH6i1OwUXu9c5n5V25LpE=", - "pom": "sha256-qdBmq7SSlvlSq5uogCKJN4jgd5pQov/R/Wv60WjAbCc=" + "org/springdoc#springdoc-openapi-starter-webmvc-ui/2.8.12": { + "jar": "sha256-c2UxY8TeNGWadJCrAshijUKVPs6brNKBBnSuyTIzFEw=", + "pom": "sha256-wL83mV3vrjSEZwfT5++k2h+UPwoFL6V566UytizT6mU=" }, - "org/springdoc#springdoc-openapi/2.8.9": { - "pom": "sha256-pSJjR4H3B4yYji65V314jzD3CTGpmxQQyuwLx1C8T04=" + "org/springdoc#springdoc-openapi/2.8.12": { + "pom": "sha256-PQpRDx7fdLjcPTdGrlvoFpANnonSUZku6xsi6hWC2yU=" }, - "org/springframework#spring-aop/6.2.9": { - "jar": "sha256-2ViCSv7p9s1Ir6gijqHEZMJMafAQQccO+JQK9fbN4WQ=", - "module": "sha256-tyE33sXLI4znpax8fwUzwA2+i9mMazLAtnQ80eEI6+4=", - "pom": "sha256-1alvtHpA6j84uWCDuqe8TQz6Mxc1qKq/sbR9hzNr9Uo=" + "org/springframework#spring-aop/6.2.10": { + "jar": "sha256-nd6ixdrL6Bl1SMPTITVaDtc1jdZOuxkWN+Wdgn3xBII=", + "module": "sha256-o8v7RxeVW56XJgewqiyYo/5EzpZ2tbVvDYhKlM6E17o=", + "pom": "sha256-LMoNeWG+dn77NGE08mpRn8kzWbLSH+4qibpjaq3auhE=" }, - "org/springframework#spring-aspects/6.2.9": { - "jar": "sha256-TsWt7J2A07w90yRF+nipTZN38/RHzdpc06QY+FPM7KQ=", - "module": "sha256-eKyEP0m3VoUL32NfmdsE2iG6nx0+fs+V6E+MOcq2b8o=", - "pom": "sha256-YRDo8DexmIEEK+wGUZhOtiYxKbwSrZy7aafnAncVFw4=" + "org/springframework#spring-aspects/6.2.10": { + "jar": "sha256-fdH151B3l89jvI/bH3BnIV286jUVs7yMIqpT4vZK6lM=", + "module": "sha256-gghCNUBdAGRQesgJZgZSwLe7FAMZk5O+OS1KEAgekaI=", + "pom": "sha256-fPpzJhmSPhWvlg7zruU7RiZty+kpuC1Keht7dCpfWgw=" }, - "org/springframework#spring-beans/6.2.9": { - "jar": "sha256-aT/fvXTtDK3c4uemRPF1VXq0uXoECohCUrwjxVBkhds=", - "module": "sha256-60RDj7t6JV8yKIqACj+fLWbgwEHv01oxNr28qrUVJjU=", - "pom": "sha256-ZG7/rty882A3zwJ5P+LxihbskUPRalJVu8pssD+iJPU=" + "org/springframework#spring-beans/6.2.10": { + "jar": "sha256-14YCemk2h9hMa6nuGy9kD0wGi9nBBGmQ5nbGg8MJIPw=", + "module": "sha256-QsH0yP62uUQ2SYr7luEbAFSc4lsubb59rZXrrwP4EGA=", + "pom": "sha256-l3nGeQDqaRIopW2jqxCeINeLVlBOPgXOy9KyCZ2pmRQ=" }, - "org/springframework#spring-context-support/6.2.9": { - "jar": "sha256-lcTG9sCYpRZxAzDPKOrnYpHyvLM5AwvtYv6iFE7GpOs=", - "module": "sha256-jkxDiocvfzubUP9Jz3mTeAOMMOj+J6wWd9dj777fLks=", - "pom": "sha256-Fu14yVMJl3EZ0SJtPVHH0+j3z1BRKKrWVPjKgjsF6FY=" + "org/springframework#spring-context-support/6.2.10": { + "jar": "sha256-mcIn+VDrM2kC0XGrVCkAzWu6pSD0T4MuH09cduqhCXw=", + "module": "sha256-Kgw2qf4YGZXbP6J0nV/oO1cgAwMZbR2RoKtQQnWsm0k=", + "pom": "sha256-nKSBz/v8UxjqJbdtDW6bCZb2wInsI+MvDpfmze31+C8=" }, - "org/springframework#spring-context/6.2.9": { - "jar": "sha256-XnOhFxCE2BQXpeHKFTTBUlYR9zJMtW47zqxjVkMUuFM=", - "module": "sha256-v6ck7Cj6i7gjowCJ6ZLRekv46Jofx7NjbN7VWY+/VBQ=", - "pom": "sha256-reiIAcweRjxoJ60VT6+Rz1W7F9iwzn9G+vTeYGnDEC8=" + "org/springframework#spring-context/6.2.10": { + "jar": "sha256-tG4v8ncIovhdrf2lzxxByezVKzJlsnIhHOCFUWwCivk=", + "module": "sha256-N942GEcvmm9zbmarTD4Quy3WwsLfbTEk9s18ID8JFTs=", + "pom": "sha256-Y1dsxaQ8WcBXtwZ0cntb5AsQ+bsqED8QUF0SOooZPwI=" }, - "org/springframework#spring-core/6.2.9": { - "jar": "sha256-n6BiK69zjJtG9ITN3jXEqXoqZbHaRCba0NcH0KiqPZA=", - "module": "sha256-+5lrq7iG52t+OMFnjX56l1zPFhEqNSOH4j/DUSEF9Ts=", - "pom": "sha256-ICqzW5xlBtoYDyhv5ekO89+5YaOeJ+zXh9czWjhcOEo=" + "org/springframework#spring-core/6.2.10": { + "jar": "sha256-KBItbkpI64tqDk4IelXpbkb7TV59XSx03IBRQB2BAdo=", + "module": "sha256-MmC8Tf0xYWQt2mU62/Em9cHvm874d73jQvgnLuKLzcA=", + "pom": "sha256-4v/tn6SWogTfN+OZtOyHMek0EddkDeLRJMufPK80eTM=" }, - "org/springframework#spring-expression/6.2.9": { - "jar": "sha256-GGb/B0B/ohMSCBPQDqruchPQPu/ypQ59B1ragHtoWD8=", - "module": "sha256-EHxw3PRcGgq8G66EfkHJdYsaU+3AU9gfhZ1c5Yz3UBg=", - "pom": "sha256-6cNMYbbItzWw0s31lkcmQqsaYT+63pAjH6OV0BO3Yvk=" + "org/springframework#spring-expression/6.2.10": { + "jar": "sha256-T7B8WSSc+zQSCKJ8NxiGwRC1XNoskz5ZRO1+Auq/GCg=", + "module": "sha256-jHR210n0nuzoQ2rmtShdZAUT2jDPCjtIL4PRbcA3JBo=", + "pom": "sha256-eVRpFH6iA7In/jodmCEzNpbHr4b3TZ2VR5o1vk6AsMA=" }, "org/springframework#spring-framework-bom/5.3.25": { "module": "sha256-bPPIDzsrxVO0LptyC/9x/bBxUmy4kMVwkz2deAd2JQ4=", @@ -2317,52 +2249,44 @@ "module": "sha256-8KnavGjttkVgoh3q0GDDB1D8qckDYQYgonMZs4oewCA=", "pom": "sha256-c9YvN2lzSpSUY+hXhSoVS6qroJ0Mdm40QQZs/q46fsQ=" }, - "org/springframework#spring-framework-bom/6.2.7": { - "module": "sha256-8l9z4afwMkS1cSAM9hDq/QCHC2jpQtMUhFjcILhFCMA=", - "pom": "sha256-WZpLV4sXjr3aSxBdUz5L3PGHRF1uL/AhnfqB+rMx+A8=" + "org/springframework#spring-framework-bom/6.2.10": { + "module": "sha256-c1FObtnw4rZ83ukm8QT93yc0vPtI5eZEPo1qwbs3UFc=", + "pom": "sha256-NUCFKBQ8D99ynzuC00PuBaAReU3+E4oMrer86pOsh08=" }, - "org/springframework#spring-framework-bom/6.2.9": { - "module": "sha256-pEYSsQZk/M/SDqBhKfCzJn0Dvmd5bROdyUinqQ3VQPQ=", - "pom": "sha256-+bp8pGVIW/zt757/yLVExoSg2xM/g8Yi9Tix5Crbu8M=" + "org/springframework#spring-jcl/6.2.10": { + "jar": "sha256-cVhuCM3GLaosbwbcYGocwDHjJHeYaiFsJy0aFycLKt4=", + "module": "sha256-Njez/NAN6jtZWccyipfmYOgh6Q8uS5kmV3QWFiC+e1Q=", + "pom": "sha256-wO64UdvnE6rsQbMAVNAECv5GLY/OyWSL8wqPJJ6VLMc=" }, - "org/springframework#spring-jcl/6.2.9": { - "jar": "sha256-iMWPc0UZ3z19ngdzO5HYOcQ9RZVRkj2T9LfJJli0FJg=", - "module": "sha256-KLyW4h4ir9Su1X/zMyrHHeNyx+6cL9KMF83P7O9aBww=", - "pom": "sha256-S+vO9ZVoqiHLAECvC5OjpXhwRe+cp+yHVguBo32mA/8=" + "org/springframework#spring-jdbc/6.2.10": { + "jar": "sha256-QhgRs4+fMCQ8ZyCQnv0RDO7BHBPFIyM/oSJueonYQR0=", + "module": "sha256-RYpxSF6ZghqRQpERdIYeHSmxy13da0lDC4LAqeFZY3s=", + "pom": "sha256-UPn+aql6YloJq/mCV1jRdPOeP9BZGJIHyq4pOqHJETQ=" }, - "org/springframework#spring-jdbc/6.2.9": { - "jar": "sha256-PCicR5/Rnkge+6JWCxTFu+nK7PbdfnmvXTaQ86DvoyY=", - "module": "sha256-0Uh7I52+JTxSBTLgDVl/eU/oxQ7/saTR4fLy6OKQcRQ=", - "pom": "sha256-/3BGksKegtTDD70YMliIK6SOgr2WUj1t+xuknul93OM=" + "org/springframework#spring-orm/6.2.10": { + "jar": "sha256-99gSZZNIgl2NgjXfXZdPeO4YsifiH1E8DbG9ZKwNRHA=", + "module": "sha256-SC34rjFHYOfzpe7hs/e833m1D98S0QzFB3weB2oxN5o=", + "pom": "sha256-DDwdgJ3XUTazYyVn065N2s5kyEgQ35rhMOSBzH/IpxM=" }, - "org/springframework#spring-orm/6.2.9": { - "jar": "sha256-7+7GUTMIYwcLwFAqJ/Mu9mGem1R5dSr+efCxOeFbFxw=", - "module": "sha256-+t4dI1B0HbjEw6mhhWsIZkJWHugnU4tmIRw9uHK+Pzs=", - "pom": "sha256-m5b0uWNi3V7Vww63rYmp4ijYrKE93p8n2dFuoOc9QzE=" + "org/springframework#spring-test/6.2.10": { + "jar": "sha256-tJQ5Syk2uVxm1ywoXL5rYTwgQVH+lNybuZRCPslHLJM=", + "module": "sha256-Zz4cV8urN85SxSFb9obxM3EcMa59UnkRJZpd1Gg4zsk=", + "pom": "sha256-hdygmXQXXW/16BNWoEWCnPQcEEZnuPkoobITWOn/UEc=" }, - "org/springframework#spring-test/6.2.9": { - "jar": "sha256-uGgiV+DdJB89qkb/ZUeKScFct5pffa6dWVxxY4LOFbA=", - "module": "sha256-Tfxn3xvdMgqZDoLSb8VaLiQgBvLTTnzpgdnSvoUZipk=", - "pom": "sha256-js+kxdegZpbay0aupHxvnxIFxA6Z881RP+9yCd6VYes=" + "org/springframework#spring-tx/6.2.10": { + "jar": "sha256-Y3qEddK+d0O7/ePP/DiKkBMwHtqnCKvX7aRy5hhV994=", + "module": "sha256-ryqit3lLbpSV0Lm+BLNdbpBwjcic8h6JXLXQAL2hlIc=", + "pom": "sha256-3e92u0SprwdUO1SHW0SS4fPsVWpnLMc85EXajtIQMIA=" }, - "org/springframework#spring-tx/6.2.9": { - "jar": "sha256-JdiOyjRaqiCELr88ShPK9vWD2pI1+GOdKZ1u4g3ZQOA=", - "module": "sha256-xEfhQMoygU8Z+bV+BVy7jw8JevmBAGJNTa+ef6tHFBw=", - "pom": "sha256-H/Z73Ru33gWydMsHeljq9dmw/Vzg6X0yucKDtSSkRZo=" + "org/springframework#spring-web/6.2.10": { + "jar": "sha256-ebaMUlJ3Xi+2fpReqPY9SHLcDXs8o17CV23Ij3vbiV4=", + "module": "sha256-HITCzYo+Rp3Gkj3DhK+8DWOV9zvnzmUpth8VFpHL+Ns=", + "pom": "sha256-9iyDUxaQpjPzbsdLW1Y9EsUoQGdgv0a2qYhIxZ053mU=" }, - "org/springframework#spring-web/6.2.9": { - "jar": "sha256-ASGiYj93QP0NIINCz28SB/JQGxkVZlo0SiwWG/Xy72s=", - "module": "sha256-HQn5Ole9Botlt+V0bfQG7vfBq8hJYLlLxl5CqyVQaYY=", - "pom": "sha256-A1ZLiyItYlolkupgeWw9oTWRMbsjUSX1Xk2FHaaWLFA=" - }, - "org/springframework#spring-webmvc/6.2.9": { - "jar": "sha256-ik9bIUCS65KfNuBoaaQ2+fFqVfq0cN9qfzjEYWsb8Mw=", - "module": "sha256-n9/QCI5LwLM7mLTPn2pm7m9DGBlzAchPVZqNw9VXYPo=", - "pom": "sha256-BNWOkPl3LcTXVSuyW83gSN4e03tCrzwX5HDbIF4keck=" - }, - "org/springframework/amqp#spring-amqp-bom/3.2.5": { - "module": "sha256-L+YuO5sm66R7/4yjIwTfwCf15Gtnn3mrXgu5HhnY8Yg=", - "pom": "sha256-BGTRVbnvEgFUAEEC2/tuYXPfdf0md8db8NESNUU+Nqk=" + "org/springframework#spring-webmvc/6.2.10": { + "jar": "sha256-zdK9teU5bVJxVZwSDC24EWL0IPz/8rCQB7kWi4Y1F10=", + "module": "sha256-okumzTllmEQ1iN6jlRRCCgcbP1doO4+CLNjqeakBnhE=", + "pom": "sha256-kS/0o0Vs8fKgR8HRtqs88hJC1KTQvH3n1YYN2AFwnCs=" }, "org/springframework/amqp#spring-amqp-bom/3.2.6": { "module": "sha256-xGWJNtXHpd3wIdfoIkUwP4P4Fwze5QLrVIfwpb5VW8A=", @@ -2371,128 +2295,130 @@ "org/springframework/batch#spring-batch-bom/5.2.2": { "pom": "sha256-SJs2UNjohLCPgk5pY7T9M/GIrgTewdAIIP4Ap939nsE=" }, - "org/springframework/boot#spring-boot-actuator-autoconfigure/3.5.4": { - "jar": "sha256-6HxzkRXXtSXvhNttlU60s7hsbpKpB3VNqHmWS1lY0+M=", - "module": "sha256-hdX3X8iWGFPRYHQC3dK0fw/ztLu5JgI0bKi4jg0wZuc=", - "pom": "sha256-CkQKj7oRu7Kvdcd3mvt7M9i/N7tRZY7ByNiisJEqmH4=" + "org/springframework/boot#spring-boot-actuator-autoconfigure/3.5.5": { + "jar": "sha256-2xb2cu3Ow+iQwtIXUTzobLy3YnYgRGAFBkO8kVYCp9E=", + "module": "sha256-qxwwCHbhpM5OZJnltC3T6gLnu89LOueCl78AcQNCSPU=", + "pom": "sha256-puMYxv3Cdlxa0wUwYo4pHft+t3zuzGi43Na3ntmrb2k=" }, - "org/springframework/boot#spring-boot-actuator/3.5.4": { - "jar": "sha256-kJPq2bSjicobErJrsV4km9MaKhP52LTwl+HbMEjvAC4=", - "module": "sha256-gtXcPQ44SFpHIaGKPokrpL8Xy0m9OjmgfF2e51OH2cc=", - "pom": "sha256-nvaIb+a8FtCLP8zZsmG4Gd38sethxmWFU5ULF07rZtE=" + "org/springframework/boot#spring-boot-actuator/3.5.5": { + "jar": "sha256-WcLEpOc73mvdwl3jgLh0K+TEMC8ov8EsVHelOTIvgKk=", + "module": "sha256-MebnpOoYKONP8w4ksYuWLWptxEpvqMNRpnWn1JWD/NM=", + "pom": "sha256-SmxjEOXUj5qMChPUgOBzgpHLlm1pla6Dc+dWNEnASsc=" }, - "org/springframework/boot#spring-boot-autoconfigure/3.5.4": { - "jar": "sha256-jATZR7j+OiN7fgQsbzecSZE4Ei0NrE6FWroRKMI0r3I=", - "module": "sha256-0udwhyKzhXxBFvyUMa/4ddXXA35Kfkv/AyoCWoGYKpY=", - "pom": "sha256-aUPqFbqw6rJv78InkrEfEWAMLp1uIDxKquRefWLZYpE=" + "org/springframework/boot#spring-boot-autoconfigure/3.5.5": { + "jar": "sha256-sSmF5icAFGlzdAIXqOAQUjsqCIeZkJCbQ72CS9gQeU0=", + "module": "sha256-on6VgQf4efSoe335JJMXxjlW2KazI9FUSBTjrQYkCHg=", + "pom": "sha256-1ZXHhIrLxf1tt96e9EWwYkhEtPd133bXE6o0qHzMRYk=" }, - "org/springframework/boot#spring-boot-dependencies/3.5.0": { - "pom": "sha256-c/dS3mB6DhCr1NxTerNiUciKRBJTB+LYhvb/ujoI8FY=" + "org/springframework/boot#spring-boot-dependencies/3.5.5": { + "pom": "sha256-JW/xEsc3m2TpHI3usCT1DICSEuXCGTSK7ERkffOGxZo=" }, - "org/springframework/boot#spring-boot-dependencies/3.5.4": { - "pom": "sha256-/fSK1HdaTge/hTCplTOMz0Wh49fb3BMY4+vl7Iwdr5A=" + "org/springframework/boot#spring-boot-devtools/3.5.5": { + "jar": "sha256-/AbLdC4nFf1KGACUqSt/gNolkr+aqV7ARlSFeJDIc+I=", + "module": "sha256-NipceeJGSwsKg5LJo9UGKTR5+W79QFJTbr7my3zjdg4=", + "pom": "sha256-IpBOsoLA3jscb88ibn5tFVRS5bQOsUTnkQTPeBiFHhg=" }, - "org/springframework/boot#spring-boot-devtools/3.5.4": { - "jar": "sha256-f3s44PWh8DcX2VW3nMeLTG+TMidog0aAaE1zgW82AQk=", - "module": "sha256-1ZGcnwlTXx6OGzk7bpjkhBD+rqVNhvmVvdHmtfUe9iY=", - "pom": "sha256-/2Hm4WnxFNJI7HfNokKSygMhmnDmRLRB7nUS43AKMaY=" + "org/springframework/boot#spring-boot-starter-actuator/3.5.5": { + "jar": "sha256-Wf0K/8PKz56hruP3T/7AJO0N0U2Uq5IqYoM2mIOFjDo=", + "module": "sha256-eJQmNzhY/dDd6vhOCnnxprSPD7Zy1y2EHsKZ3wvQ7Eg=", + "pom": "sha256-kVrb1G6hmmgaR1pdXu5gFLH6yiwdEK0uqYnVHpqdoRY=" }, - "org/springframework/boot#spring-boot-starter-actuator/3.5.4": { - "jar": "sha256-/ZmzFkWK1j7ElTRmhdpR3s+N2rK53HLzYj55fqO91Vo=", - "module": "sha256-16HUvGIde6ZgprTya/ufij4AWr1zD75pWoLNREXiZg4=", - "pom": "sha256-na/t9dMP0uFmErpJX5fpfjdXMdRHPywsU+loMwvtuhQ=" + "org/springframework/boot#spring-boot-starter-aop/3.5.5": { + "jar": "sha256-BvUBJzpHQsIs/NLfY8GJPeX017YbiemioC+09i4aNa4=", + "module": "sha256-kFtfNJZQlvIzRXbJj7KPhmvBN2T6hVzmxZqBiQGssTc=", + "pom": "sha256-XXcumls+nov+qkhMehvQAOpfS89EP68/0TwhVe99Tnw=" }, - "org/springframework/boot#spring-boot-starter-aop/3.5.4": { - "jar": "sha256-DrYTH1eiqTH4bTRH613gemzDIHxc1wu7+r9SN3tQaPE=", - "module": "sha256-XpR1OoK/Fm6kwz/nHatCeoD2592kjbr8RuMRb37zN8k=", - "pom": "sha256-3ir8DmOu8UAxA1sXieJZpSKQp7nBEebJ/rBg6E7IZaw=" + "org/springframework/boot#spring-boot-starter-cache/3.5.5": { + "jar": "sha256-x/AT6TtN364Frr0Z/F2K6U5xMkNYvmpkdUA5S32CB7I=", + "module": "sha256-z9cLZsMwPifLiJ7GQcwBclVfm872We4mYm0vq1SeRPE=", + "pom": "sha256-O/m7nwVJ6ADSlhWXKPIUvlWvgN2jyS11FzSOSMJmAjw=" }, - "org/springframework/boot#spring-boot-starter-data-jpa/3.5.4": { - "jar": "sha256-O6kaRaZ6vjVXo7ITBXuNb6RhB/Fin2Y4Ras6FGqCNP8=", - "module": "sha256-flXQpstxNa11H+KZZoj6/gE+ygoQbIlnW2N7ZElvk7g=", - "pom": "sha256-3hIi0+e2d6gV636CmMSKnEgfNWeBNjk5zqa1C6KlEYo=" + "org/springframework/boot#spring-boot-starter-data-jpa/3.5.5": { + "jar": "sha256-sWIjExRATaUdbZ37j15yadLAAyc/03fsIxx22aNuMYo=", + "module": "sha256-NQeKZT4EpcDoNGhafUuvzJaS1nT5aMQCaZYxI8/m624=", + "pom": "sha256-cEc8BK/3SqEBF6JXwt4nGKBI6ern5vfyRSJeQIzPtME=" }, - "org/springframework/boot#spring-boot-starter-jdbc/3.5.4": { - "jar": "sha256-x+dy/6cnVKaSQgfTAlAGQTN1gVgkU9rsI01PKjUBq6U=", - "module": "sha256-6j5ajS8lAYk95jvol1y1vk9TF205heSAa9W5sBSxuMM=", - "pom": "sha256-KhQlPb+H854pQHLpsUQT13wiXUIb95QdEtqspmqhYQk=" + "org/springframework/boot#spring-boot-starter-jdbc/3.5.5": { + "jar": "sha256-NBwM+LDI93Ed7db9y4TIOsVKx6p+Q0DovDPdHa2fb14=", + "module": "sha256-4SFunOGykJ89Z1XMuk3HLe9roA+FXIne9XjAqoXRFx4=", + "pom": "sha256-dlMu2chO04Yd6MdrkBXeVc6lfSeRA4uijPYfaoVEGYQ=" }, - "org/springframework/boot#spring-boot-starter-jetty/3.5.4": { - "jar": "sha256-5jFnbkvTT3ETWUbXplB5Sy2hvKANV2qvbEeErJTR+Q4=", - "module": "sha256-hjnjJ277ZokEp7wZR8lp49qeT7uIApTDzjTLeRRkRHM=", - "pom": "sha256-qar8jf493GGC+Xptd/qw1qh/21KjBg8eqQDbzN5Vi5M=" + "org/springframework/boot#spring-boot-starter-jetty/3.5.5": { + "jar": "sha256-WEZoCFe3VEvgCeN5hiMhU9UDHUzYrVhPjUzabRK540E=", + "module": "sha256-XCMGSVi+5EyRrV0HgXcjQvgVLglURFwunH2pfe96w9w=", + "pom": "sha256-cqei4laiJFsDk0qPQ9TRqWf5QBhWT3woYBfs7YR/LLE=" }, - "org/springframework/boot#spring-boot-starter-json/3.5.4": { - "jar": "sha256-onJgSypgIqdH67T6pG0enwob16QzXQ33YuRrBdiehys=", - "module": "sha256-NKsoD+hoaG/yxcJGLeFoMk+/vqELaQucaZzlK/yPJO8=", - "pom": "sha256-y7XXTdlJmKax/sHBPAEV8pqlHgVwGAXjdtJc6YJi40M=" + "org/springframework/boot#spring-boot-starter-json/3.5.5": { + "jar": "sha256-O2qKFSUULVgot2hUK9l1UCMWunp69iIvaFAHDYwdXpM=", + "module": "sha256-QMj8rVJfJl9SCkwFF0rSevqPqq6kIYHiZF58OgF3UJk=", + "pom": "sha256-8acNOjpZkf/YjCTt/sFw6XZZOx+2EVPnm6QnvsnefB4=" }, - "org/springframework/boot#spring-boot-starter-logging/3.5.4": { - "jar": "sha256-JkbvwZdtxlsqhlxZ+nPquzjnxbc0f1jh9ybpHylXEdc=", - "module": "sha256-BWBrZ7c3pks2PqZ8AGRe0EZNlAEdcIQ4MLw/itV2f8U=", - "pom": "sha256-n5xPBe0HNerdD05MUFc8kDYEj+tgpXu5Mp6pVtOQ8Ek=" + "org/springframework/boot#spring-boot-starter-logging/3.5.5": { + "jar": "sha256-mc2f7/8l40aKoyBjxYvfnjz1T1j4a0GXjFqbRIS8TdE=", + "module": "sha256-TKO9mFXkVIE2LFXJT5rT5tvK0pznYQKU9jXMR6dEMG8=", + "pom": "sha256-v9VjGYVrARtAfdhHxZ1JwZ9SccVJ8OOrvMZJSmNx848=" }, - "org/springframework/boot#spring-boot-starter-mail/3.5.4": { - "jar": "sha256-euZCkCitvB+tWQuNDMlGgbSrPuNkMGLGeurEhHFwCdY=", - "module": "sha256-TmwRc3VBflvwSpnCtVL6rZKQZ0jr3SKW+OEEn1DLgpA=", - "pom": "sha256-L2PQJWgGV/4OZqsMXb+HDZKL0+psBFmHFzw2jcMa2JU=" + "org/springframework/boot#spring-boot-starter-mail/3.5.5": { + "jar": "sha256-fDAc8TOUM9dSNMmVSe73s7Tq6CmVc7T7JjelBxlNq5c=", + "module": "sha256-KhAYlmPtlvw3JeLKiOydDFDCXeUq3TggCSEJ71p5Gw4=", + "pom": "sha256-gwaTKc+xQoGGkqUZHVilDyb+u5leU2edhyz+sSlmgp4=" }, - "org/springframework/boot#spring-boot-starter-oauth2-client/3.5.4": { - "jar": "sha256-24OkNrBqo6HIt1WALG+S4lwFzCcp7tHbUQIDuuGuHlU=", - "module": "sha256-XM4u3JDs+Ip7nA7LwV/+dIqLKdsAP334EU4JpDqkxxc=", - "pom": "sha256-YKxBqjn3PD9skK71Cuibt8Y1uc4mAvF3gNNw6Uybk9s=" + "org/springframework/boot#spring-boot-starter-oauth2-client/3.5.5": { + "jar": "sha256-/ENbZn1+agUNnvRGrKe842hSVPPl0VZ+tZuQY9j/SkY=", + "module": "sha256-Hg8ncpGlHD1WRRFWquHmpeRob2WzfQlDOB9gQg60JGQ=", + "pom": "sha256-2ghFR7+WR4ogVUsBBEgUsdeM08zxzxNnESxVeCD1Pkw=" }, - "org/springframework/boot#spring-boot-starter-parent/3.5.0": { - "pom": "sha256-PeuCPpzS+D3rayA1Lgh46JcJt6O0Gcwozbilrz0YyRA=" + "org/springframework/boot#spring-boot-starter-parent/3.5.5": { + "pom": "sha256-BPkIZ96YOw5Nf+wFxAHTQabhYOEXtgnmTC58qJEQ9Qc=" }, - "org/springframework/boot#spring-boot-starter-security/3.5.4": { - "jar": "sha256-fINQqKds3ySP4IPELevQu9y5kfMPbAtuPXzcYJ8ZNYo=", - "module": "sha256-Cpw4y0vCGajiPAnCztvf0BSyBj0A9Bn2FSiw1ighysY=", - "pom": "sha256-ZGdGjadsbk+SGrm2Su0E7T8E0jGZVVuZ3d0ztIIEYts=" + "org/springframework/boot#spring-boot-starter-security/3.5.5": { + "jar": "sha256-pX2Ux4BL6e834KHy6Nv72I9RZlivDBuRgCe2ZzC9eY8=", + "module": "sha256-Q5nXjXtS2Wb4P6D44laGbOJUhOLL1BhEMgELWQHddCk=", + "pom": "sha256-/upOWRk3qcTpO5ovuWWO26m/wHjQ8nIXQbNT44UXslc=" }, - "org/springframework/boot#spring-boot-starter-test/3.5.4": { - "jar": "sha256-4yqQuXiIXzFtxMINsOvK5tW8KDZ4PH4rf0uzpmr9AIw=", - "module": "sha256-GX0LXO32uOC2EViDBJawp49MEhUJ7gqdIhtEg5LHfVw=", - "pom": "sha256-z1RzsP7ygz4/e5BYTDZhj9OWn64ccaya01BPI+KUCG0=" + "org/springframework/boot#spring-boot-starter-test/3.5.5": { + "jar": "sha256-WE07yrN3IcL/gO70IOEVntr0Ek3CWx5p2JVG45aZByo=", + "module": "sha256-T4wGj5pvomkMS7MivIMqRdrrBkIYhBasgcD2lc5bvmI=", + "pom": "sha256-rAGrzXXoECrObZoPjm9EaIlpxwet3ELz/ckR9YUW/7o=" }, - "org/springframework/boot#spring-boot-starter-thymeleaf/3.5.4": { - "jar": "sha256-UQy5/X6FMYpzR1MReQTaa5h4xRc9a1UhY+jPwJ8H9zI=", - "module": "sha256-L9rgYMRyilmpFgOh3/Nt9YrWH0zJLITNl+bOQDBpi90=", - "pom": "sha256-nN7quVtJ3mKNLBmQtbokhclHEBTHKrx31NI8anaFnvE=" + "org/springframework/boot#spring-boot-starter-thymeleaf/3.5.5": { + "jar": "sha256-d+e2M6t4Yjdbe7RPkw9tvTWiT0go0D+I0wi5eoWckYc=", + "module": "sha256-xUveW+wSBmBlVSxVkQViNTlh7lAScbpSpIqL4hS6Lpw=", + "pom": "sha256-IztrcQHkwQPyPV1J2vCXeH4OVhjfMEbv/v05SLh1kww=" }, - "org/springframework/boot#spring-boot-starter-tomcat/3.5.4": { - "module": "sha256-S42KvgS2NqsvXyAwRuD+7RJwcPCohR9yTCbjYl39IhA=", - "pom": "sha256-2exedRSXmPCqLz7xYEOY8+7Qby9WYpRv7264CcUzfVI=" + "org/springframework/boot#spring-boot-starter-tomcat/3.5.5": { + "module": "sha256-2+V1WHMJn9f3V4SENlXWqgpCiBctiABMogumjIqsz1I=", + "pom": "sha256-7XFgHmhc15VkcuBMiyWW9LOvild2KaBNpo+SaujATLg=" }, - "org/springframework/boot#spring-boot-starter-validation/3.5.4": { - "jar": "sha256-ElLu3LPEPlq4FLxeCMhR5+LDLIkif/+/yuQBIPZC1H0=", - "module": "sha256-bav1B1GvM8fimEu0y+lhr5xPm+cMM0VUjgYpGnFWcrs=", - "pom": "sha256-dUYHXbZ8PrDEcgBGoljOKhEtV90/Dj/og9Q5CJbOPFQ=" + "org/springframework/boot#spring-boot-starter-validation/3.5.5": { + "jar": "sha256-goiSZE404vyIsEo/AlSb2NE7MlVPMVixM9N80C2Fo24=", + "module": "sha256-tC8kiSBFW6hmze4Aw6Ar0dPnG9if6dw7wubfh1lJjrE=", + "pom": "sha256-H7ZVqOaaxB5Rz+SMB5OpxV7P47sEeGpqET07RbY80tw=" }, - "org/springframework/boot#spring-boot-starter-web/3.5.4": { - "jar": "sha256-KxJKvsJtrzllTAnUBqW5EH1MUK8wg8D3hAXidgHoH7U=", - "module": "sha256-NgCWyJODQSkALJ2uVNvUGb71XrUi13BEuuecF+DEDaQ=", - "pom": "sha256-SXJxNzCSI+NhdkG83aXv3sYgKIUZpX/EqGMCi/cILBQ=" + "org/springframework/boot#spring-boot-starter-web/3.5.5": { + "jar": "sha256-Yjrp/k0L4P4a6f0TUQtI/9MexHAipbffpUYZqbQyXvo=", + "module": "sha256-cXvh7Wcz4VKYBN1eptw1t6a8+VNO4VVWyoEh4VNZfh0=", + "pom": "sha256-b8pD9BVZnJtGyXCF/xiuzDF2m/xc2Bm7iWOWJKHk0fU=" }, - "org/springframework/boot#spring-boot-starter/3.5.4": { - "jar": "sha256-xUz1wxzFtgy+WWGpaJ2WTPklkSUErDMF8BdGruJLW3M=", - "module": "sha256-+jnO1/htbmCR/2sNyZCXj7SVnMpmPr1w1pbHWQSG9m0=", - "pom": "sha256-2meNIoJT90IFETIwUvvqOXmDx3JvQIqWB8iiV0Bz/mA=" + "org/springframework/boot#spring-boot-starter/3.5.5": { + "jar": "sha256-PtZK3lADkeaRfnssnonf3uwL6kDbKeJiRrPncUj7ef4=", + "module": "sha256-3VZ9BYYEb7c1Sqg6Ds+SW+3EpLuEc72YWYJrnpfhFuE=", + "pom": "sha256-FXr1F7mZSCccv8z0aN7rma8nIza3/IwhnkUIBRVdarQ=" }, - "org/springframework/boot#spring-boot-test-autoconfigure/3.5.4": { - "jar": "sha256-Fh0NSjZoGDES6BJDm3xCOo9zmjk5J7eqV4iJxfCknhA=", - "module": "sha256-ICA1FskNGD+QuKctCKWEGqERumeyRQSTauwRR4AXebQ=", - "pom": "sha256-owG/iyfAGTtQxu81AFklcy1hHcfqhfP3rBLNCuALjcQ=" + "org/springframework/boot#spring-boot-test-autoconfigure/3.5.5": { + "jar": "sha256-UPKm+aoXwRxbPunaAIjGf6rcT9jhIzalpkluXhOulWo=", + "module": "sha256-Dhm2QRwUjE+Zo8jGFsCT+bekMBj/3MReOW4QXXO7nxE=", + "pom": "sha256-xGX287Ss0KxTgbxOvJqy7iFv/XjZ9wumEcDXat2/TLY=" }, - "org/springframework/boot#spring-boot-test/3.5.4": { - "jar": "sha256-yKzIQr8p/k78jpld/I3Ud8OvWDNJ3iJJpjRB1sVIiS8=", - "module": "sha256-nHjYp/y65mnTgp2f7KhUHPinHWpWW0fIFo/Hm6pLOiw=", - "pom": "sha256-/gGXCrUokkNEAa2fMZZFZJ9aqkH35rAH2QE8601SB9U=" + "org/springframework/boot#spring-boot-test/3.5.5": { + "jar": "sha256-Z3LY4xFlhl1x/eT4sIqoSDMmiDnMkC+ZPzfsFZYnfUc=", + "module": "sha256-RnR6JR4HiW2SyX72GVyGxfdjkJl/MFRWfFOV7sjAbos=", + "pom": "sha256-6g/Km3tBiSp0KV3wJSpSrjvQVGOl5yb1gYNjqMLGt1w=" }, - "org/springframework/boot#spring-boot/3.5.4": { - "jar": "sha256-MwVepV+Pk3r/Gr/+F5hrmmujoDYcvKj7BCDBQV1xOtQ=", - "module": "sha256-ChRhKLH/PeGYeNIFprnpY6Uqv0nRu+5gAYYT2ixs/0Y=", - "pom": "sha256-kZPTrlYObkVJQ44IEn0SqroubT4R8Xl48QHXr3OE9CY=" + "org/springframework/boot#spring-boot/3.5.5": { + "jar": "sha256-ttV3sZcchKK5NBa28BTk0B36xy3NYrl9XcHIMisw6+c=", + "module": "sha256-NsEY353WZFwDbyk4LeLQ92JxB0P1TJYhSjLzu8izvAo=", + "pom": "sha256-J1b6Y3l46biZWCicq0cjOUQXiIVJFdFgSlePVZ9PyOI=" }, "org/springframework/cloud#spring-cloud-dependencies-parent/4.2.1": { "pom": "sha256-ktuXOlcqL1nZIAYhy4EPPShvPfaG4nGCHzgAQgApjk0=" @@ -2500,118 +2426,93 @@ "org/springframework/cloud#spring-cloud-function-dependencies/4.2.2": { "pom": "sha256-JdZFU6d/QWigqkVELGYwQ5V50WBK79Ba66F37gdhE3g=" }, - "org/springframework/data#spring-data-bom/2025.0.0": { - "pom": "sha256-HSgkDD0c0PeFjBUGIMBBPuryeAZIFoSPAm3weNWrzuA=" + "org/springframework/data#spring-data-bom/2025.0.3": { + "pom": "sha256-I88YZ5nTos9fIe7ie1DPv2G0rvCYI8HLjIIb60Ua4jk=" }, - "org/springframework/data#spring-data-bom/2025.0.2": { - "pom": "sha256-bMmwqaXV+P5/v3NcIBB2vRXFBmoeHe3gU0qKgIppu8w=" + "org/springframework/data#spring-data-commons/3.5.3": { + "jar": "sha256-7c+XRV7DlvUnqlBwQyeeuPhb920gwhFFjo+7fFFMqaA=", + "pom": "sha256-Yu1gKcpDXo2QlYbAKOahZheT7f4AG9GqQIi4vDKnuOg=" }, - "org/springframework/data#spring-data-commons/3.5.2": { - "jar": "sha256-md3y8hnP9yR7HAdMbr0i3GhkCwXpE1M1idSIEWxMs20=", - "pom": "sha256-MNHjUTK8OSk3E27gpk9kk79VnUbxnzV/vqCp08QrkNg=" + "org/springframework/data#spring-data-jpa-parent/3.5.3": { + "pom": "sha256-e1W5kill86coeFfCUEnmbCV9y/sf9eXwaE1nzuVPAgY=" }, - "org/springframework/data#spring-data-jpa-parent/3.5.2": { - "pom": "sha256-RmPgbOjn3wW/1JIUov/dYcj+UqOz7Y3C7oVoSkPFsH0=" + "org/springframework/data#spring-data-jpa/3.5.3": { + "jar": "sha256-UcZ4fWlnUQkU7V5zVlzNbEvsg7TnGOLmnoanlbKN7T0=", + "pom": "sha256-zagmZP9OXyRpNL0axlrlpz6skreshUxjml/F+dxQuUQ=" }, - "org/springframework/data#spring-data-jpa/3.5.2": { - "jar": "sha256-LmFg6PvFItol3ZBlDWsrgJfKQfN+K7UlU918L+cHdTg=", - "pom": "sha256-OzDPXcO1M15cFuGMXllCsbJ5rCVVlwtFf2XosXZ0wf0=" + "org/springframework/data/build#spring-data-build/3.5.3": { + "pom": "sha256-OVw0dj17wt6p3v1cd/CZI8UXI5lt/xENYyvk+SeoToQ=" }, - "org/springframework/data/build#spring-data-build/3.5.2": { - "pom": "sha256-AOrjCqPNZMws0w952ctAat5motDE8v0vDl+hHm2fnes=" - }, - "org/springframework/data/build#spring-data-parent/3.5.2": { - "pom": "sha256-7NMJDhBwYrLRikltAlqsuYTJFcVEQHlUHbPCkSeTHfU=" - }, - "org/springframework/integration#spring-integration-bom/6.5.0": { - "module": "sha256-sIDKqdzcYleLvBXAOKcGP3RHM9cYE0uL5eojrMTGhgo=", - "pom": "sha256-n1tKuDG86ov66hik7KQXT/gTNBlQ8Fn1KEw2gvh4pNk=" + "org/springframework/data/build#spring-data-parent/3.5.3": { + "pom": "sha256-klFZfAkjK1TJEhDeVNOg59K9p/r9h61RqhqaS+RmyC8=" }, "org/springframework/integration#spring-integration-bom/6.5.1": { "module": "sha256-XnyXPE08Y1fe4/EGXsw0NcH3jtpwHjb9KWElACxY3tk=", "pom": "sha256-t1WmIh+KFElhjMs6Bhf/N0GDsHbpt+vjv08CX/rA590=" }, - "org/springframework/pulsar#spring-pulsar-bom/1.2.6": { - "module": "sha256-AnY3pVoBecCTP3+fUvL5Ylnat5/YswkKGGIvACXMaUc=", - "pom": "sha256-DmYnehfMhHBv2Gudke9AOwSwS2o95rbfASBD9efUtt0=" + "org/springframework/pulsar#spring-pulsar-bom/1.2.9": { + "module": "sha256-mhxkfqHgQx4PsCAH6eeIRQDu4BYULLV9wr4yAm77vNo=", + "pom": "sha256-m2hxWVLSJeM8AWcKqNm6h6DV/XhNR2JhmA6Xlon4Ttg=" }, - "org/springframework/pulsar#spring-pulsar-bom/1.2.8": { - "module": "sha256-J2aS+86v8odYB9XyPBCyqckWikUlBonVOcZ6yAvQISQ=", - "pom": "sha256-piTc91oQy3pQ2t5siEosDk5myuC6uhlgT3vYZl5A3sU=" - }, - "org/springframework/restdocs#spring-restdocs-bom/3.0.3": { - "pom": "sha256-BqUY6ZcWnX7d821cOtwAQOKThnvfofFo3al4QL0Pb3Y=" - }, - "org/springframework/restdocs#spring-restdocs-bom/3.0.4": { - "pom": "sha256-t5NTgpIOu6C5fhasVL4HSVTV8sJ5loTASP3jJbplH+U=" + "org/springframework/restdocs#spring-restdocs-bom/3.0.5": { + "pom": "sha256-y4kMwy7q5YyVFx9BkVjDG3nN2CCNOnYCgYEK+zFc+4E=" }, "org/springframework/security#spring-security-bom/5.8.16": { "module": "sha256-eRpwg4XuOGguCJQeRFffivCdxuZWxUVhF91pH9DvNW4=", "pom": "sha256-kcopmCCxmXYQcGDwwsagsPRftd8MuZOvC31Opd4x6hY=" }, - "org/springframework/security#spring-security-bom/6.5.0": { - "module": "sha256-a+5Aq/4syR3iHxOIJQHXhIIc9bnCR8rhKxy7orSVHi8=", - "pom": "sha256-A3IGHIckh4W7kSq7yQIVgxxaAIvlRPpn3zpLFjaYHLQ=" + "org/springframework/security#spring-security-bom/6.5.3": { + "module": "sha256-CZe8Clr1QovAY0cC5oByRQmlG98dSWNvMXdHeUHkLbQ=", + "pom": "sha256-YA1yx9qOb3aR5AmxJ4Z6FlEOe0iQFF2EnGrVIgKLTd4=" }, - "org/springframework/security#spring-security-bom/6.5.2": { - "module": "sha256-cKCvr00aITH09ykZ+YEbz4ACSK52KHNoK14Y/Pmd5Us=", - "pom": "sha256-CjXf+jk6+OPsh8WuT8yBGjgNp5rTDKm7y/nVAl+9k6Q=" + "org/springframework/security#spring-security-config/6.5.3": { + "jar": "sha256-3v3W4pOLYYOzJ4JRqlCmivsRMRZg7ysB3kQse99vXtM=", + "module": "sha256-M3AOB5OeO9W5unhDaVNXwVCef0Q/1GDyamilV2veV9k=", + "pom": "sha256-uCOUwRuDIhlm540PW1u3anjT+T2sGW4IgJPnafSNloA=" }, - "org/springframework/security#spring-security-config/6.5.2": { - "jar": "sha256-R/9EJXeEOf28fwpv/G26QglzbOPylIlbQSalf+gUGzE=", - "module": "sha256-OIbAU2Rq4jOfXFfj5f9saTh2bUoGUaSkcZxX/yCcqsI=", - "pom": "sha256-gYj0ixEtRhNOguPzeRTXOKfNsIeYOZz0olJHlIrgS94=" + "org/springframework/security#spring-security-core/6.5.3": { + "jar": "sha256-7r03/zcCifUayEsIIpdjnJBb3fRZMbQJCYAiAd2tvjI=", + "module": "sha256-+wtz9+XduJU/RRn1VCOxv3Ty6AynA2/SjkMoORECG0U=", + "pom": "sha256-o/8WjtjUrdzx0MfQCTWwtvv0fyT5IyGRYnIFFVAXDwM=" }, - "org/springframework/security#spring-security-core/6.5.2": { - "jar": "sha256-DWqQzXNzece/IPgSU3AyTuaBIEQr2FKTdI7oyJflcr8=", - "module": "sha256-V6lPW2hEkPemgpDz+zmFx+tgPBYXinbok3agzjQzlmw=", - "pom": "sha256-2kSuSWaZ8kdsr3uM+YAyN20rV9xCzdtezRTkbyhAiBQ=" + "org/springframework/security#spring-security-crypto/6.5.3": { + "jar": "sha256-Y1rL4V6pII+AT4JOifgDwXD4SGegifiTJuOBFh8uEdA=", + "module": "sha256-EmGk61HoCzmM68z4pD5lXAfMarcfFQh/AA5VlerxKqo=", + "pom": "sha256-5Ng8QJCx5xLE3cTPrtJgb/pBDBaGtil8JhAwBUxYcew=" }, - "org/springframework/security#spring-security-crypto/6.5.2": { - "jar": "sha256-d6dAH38N/BbanDEISQsuhINXMy0+72D/BCYNZd69axs=", - "module": "sha256-F2zpUe6qPttgNEGQoqmv2ypfI7H2WZ9xkzaMLgrcKsQ=", - "pom": "sha256-wHBBew19Ou4NO+pFDoNZtbuQk+JtCqudwUN0sIomsqs=" + "org/springframework/security#spring-security-oauth2-client/6.5.3": { + "jar": "sha256-jGQ53kmj/j84t9D7kp17T0XpzBSDIekYNXxZyyanB0E=", + "module": "sha256-1bLgcL5Hw5EcoIFO+DptwZUEaMXAc9QhkoLFHQ5VqR4=", + "pom": "sha256-C6V3kI+80225VcpLItMH18UjNpU1Byn4THThfiiJ/IY=" }, - "org/springframework/security#spring-security-oauth2-client/6.5.2": { - "jar": "sha256-0PQt09mo2rtUS5xo9Zc8h4omZFOVXBaS6aQyv2Cmqn0=", - "module": "sha256-VE/yh3FJV9aZvTwzWB4pN4ggAqFd4NH5ovCQlL4sb88=", - "pom": "sha256-tJHCslydvaOFsGD2Br5QR6z257do+EBUlcET0qg8trw=" + "org/springframework/security#spring-security-oauth2-core/6.5.3": { + "jar": "sha256-6d8zQ1Mh+U2ayZN2NVXRfIoVAbw/xW3XihGDyzlEKt0=", + "module": "sha256-IFzSXt9GmrWtoep79i5sOccDv3zU2DGPEbd0L767pAg=", + "pom": "sha256-Qvv56vHHANhcLGkqvG2M2cGVVUDJB9gBod9FUYE9P7U=" }, - "org/springframework/security#spring-security-oauth2-core/6.5.2": { - "jar": "sha256-FY6rVElMNuzXjzMcgTmcbwVxZF+9153puVa911bxDLk=", - "module": "sha256-/V5bBeStjQUuBpX0P2/RN9LDRRqj5XxG7EITAGBtcMU=", - "pom": "sha256-s1+PI1OeddaMPrbGaUQvmH8NJvfUf0Nrmdn+2of7bwI=" + "org/springframework/security#spring-security-oauth2-jose/6.5.3": { + "jar": "sha256-DVUSDDY3JoMbiEwYyqWq+pj32dZ1XYDIbKsURGuD60Q=", + "module": "sha256-Pe8mFJfzl3I5kUk2jTTc2kQW+cNVCbyJd16bMleyAzQ=", + "pom": "sha256-PYPSazmG/tiqIatMlCqBZ2ej+QbopghSgRUvZDsvoDk=" }, - "org/springframework/security#spring-security-oauth2-jose/6.5.2": { - "jar": "sha256-iiIRFAycntGGH8LJ/2/4vKbjueauuPVjpo9EcVbI6nU=", - "module": "sha256-gXSlaz964spDAJnGLU6n7sVJc6XcLoSTLsDelOEc5NE=", - "pom": "sha256-avyaI3tOLwFSF/5CsbrJmqQA0PonZp1K4taV1fpmdmk=" + "org/springframework/security#spring-security-saml2-service-provider/6.5.3": { + "jar": "sha256-/+qRxS0PCn7wdix4AXLF+2/VJJ75P1HM3N4zHUiGNJA=", + "module": "sha256-RPUKQCUZKE6cBvINs3+VbLCQBPXdxNOSE1Tw8zb+6Og=", + "pom": "sha256-Bvr/JRxthlyQjVCcWcnUi0wcaBJYJ9cjMsLCBvamnFo=" }, - "org/springframework/security#spring-security-saml2-service-provider/6.5.2": { - "jar": "sha256-dtXcPiU+sFN3Z6OTcmhuQaIJTbNuo0OE24683bqR6tc=", - "module": "sha256-zwJi/q45s6+8lnALkdxVdMdfmvdHxW4fM5lgZfmjByY=", - "pom": "sha256-fS0jRqpGhZCPtXh350ADj57pN5+x6NhNSAy5XZH1/5s=" + "org/springframework/security#spring-security-web/6.5.3": { + "jar": "sha256-zKIdkWlkqU3BKp1Up48ajgs9i2ESTFUBrZYca8f/Udg=", + "module": "sha256-Hnx4R1a7DPGBUdSx8htnNN7Pwfpla0M0FtiRPuN2gGI=", + "pom": "sha256-+fbyi3oxQLrz8+pRBAMzOYtxJqKaapEz9YLABSeeIPI=" }, - "org/springframework/security#spring-security-web/6.5.2": { - "jar": "sha256-7tCBktfDENkSICjka+eoqSVHGdLQ+d23qb1slHbtj7Y=", - "module": "sha256-Ha9W0ol3fnErBw/ji/YOuOG92rD/N6xh8OG5E90QoKQ=", - "pom": "sha256-NLg8+B91S2/RE8LODWhx8znjU4HdU0QdJzXhMHWbDcE=" + "org/springframework/session#spring-session-bom/3.5.2": { + "module": "sha256-1CEGGhka+Ep0ns15LKgc0nV2ttH6jLM/ROp1j9tMaXE=", + "pom": "sha256-bPR+0WNiCf/y+V5FySopPNZ0AbKT0lapgNT4nNnODfY=" }, - "org/springframework/session#spring-session-bom/3.5.0": { - "module": "sha256-VEadBt68sGF5F4l5n5+W2JYFqN0x677k7cVF4gTVCHE=", - "pom": "sha256-jGnSDUYtm1B5rLR5+FICz9VrP2F13B+oZjKK87M8D6c=" - }, - "org/springframework/session#spring-session-bom/3.5.1": { - "module": "sha256-rpzpR7UTDYQDqzF3i5ys0N9xDgMy86L5d+X7/UwHbq0=", - "pom": "sha256-UL01mQxFmZag0xA8QZyDenzga3UDUAMjPOfxYZqddWE=" - }, - "org/springframework/session#spring-session-core/3.5.1": { - "jar": "sha256-OlEnn6mRQS82PtIpGvVNgxvHdl8WtBXcWPO1fK9NTWY=", - "module": "sha256-cF+8fsPuWZX+7IQMUbDMtbfx+ha1BfjFjIDUE3/9x9U=", - "pom": "sha256-E32S1Hdb4l6ExGvq0FMsJisvFla5BI6caM2LVrq2dz8=" - }, - "org/springframework/ws#spring-ws-bom/4.1.0": { - "pom": "sha256-Ir4IB3DtzBIQBD/twTqykGbts6Zl98w4IgPFtLBFfVo=" + "org/springframework/session#spring-session-core/3.5.2": { + "jar": "sha256-y3u+193DB9UMCUdX4vF3aYLNWVqm05DO8ty2V7wqACo=", + "module": "sha256-tOgvDuoIa5qpLD02b7a8TOHdp5TG7GoDnQk9XYHpJiQ=", + "pom": "sha256-kYryRIBpKdozEvI9admzYEaFY5y9RLfFma+K+n95eck=" }, "org/springframework/ws#spring-ws-bom/4.1.1": { "pom": "sha256-G7arwxEWNdrzesmXSEKCwxFyp/3qfZCCSWzIZn4sEWo=" @@ -2619,9 +2520,6 @@ "org/testcontainers#testcontainers-bom/1.20.6": { "pom": "sha256-OKLdmRxz50sJmGQoOqiJ2MNk1pUcrgB4l6vLe+t0APE=" }, - "org/testcontainers#testcontainers-bom/1.21.0": { - "pom": "sha256-2NxVh3JJlq0p/HMtHIc/oSWXkNeTerxQna2zAyeuPeg=" - }, "org/testcontainers#testcontainers-bom/1.21.3": { "pom": "sha256-LOcXIm0dZ7Wx35cH7ZgCKjZqyJLZ5JbF8Bc/GreKCWU=" }, @@ -2651,9 +2549,9 @@ "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=", "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E=" }, - "org/webjars#swagger-ui/5.21.0": { - "jar": "sha256-/yhIgGQBi5iAkvyQB2+cHvFbHthcz9qD7XrJHV3INa4=", - "pom": "sha256-SzvAAKRPzOtAwwVa1WaRatRBBF2IBEADltUkcLgOOEw=" + "org/webjars#swagger-ui/5.28.0": { + "jar": "sha256-6VEYmw9g5DfExnCYThYfL7R2zXhFRunUdrzazEnS1bE=", + "pom": "sha256-EgZGZvt7IyKHdeCgpGcBX5afBSuiFHAdygpENt1omLA=" }, "org/webjars#webjars-locator-lite/1.1.0": { "jar": "sha256-/Tbi0U/AgPeNFOHsaCDzskaY+IoGLMH1ksnrWbE5P80=", diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix index 7d2ed2dce625..509fbc49dad5 100644 --- a/pkgs/by-name/st/stirling-pdf/package.nix +++ b/pkgs/by-name/st/stirling-pdf/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, gradle_8, makeWrapper, jre, @@ -12,18 +13,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; - version = "1.2.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Stirling-Tools"; repo = "Stirling-PDF"; rev = "v${finalAttrs.version}"; - hash = "sha256-g5ugvnnFUXBfYFN1Z5+m9HTVSZ5KS9HGkIte3lKi/sA="; + hash = "sha256-H1nYRUIUVRUGGK+Vonr2v7oM6SfhYEsFk+JJp/4DI4M="; }; patches = [ # remove timestamp from the header of a generated .properties file ./remove-props-file-timestamp.patch + # Apply fix for building on macOS. Remove when updating the package next time. + (fetchpatch2 { + name = "normalize-path-in-ApplicationPropertiesLogicTest.patch"; + url = "https://github.com/Stirling-Tools/Stirling-PDF/commit/93fb62047a6ab85db63305c23dde5e5118e1ae2e.patch"; + hash = "sha256-kQNYyRtJ0smuhaoII31k87b7QRBJosK6xlFiQUwobsg="; + }) ]; mitmCache = gradle.fetchDeps { diff --git a/pkgs/by-name/st/stirling-pdf/remove-props-file-timestamp.patch b/pkgs/by-name/st/stirling-pdf/remove-props-file-timestamp.patch index 4db2e5b2a196..a87b2942ee29 100644 --- a/pkgs/by-name/st/stirling-pdf/remove-props-file-timestamp.patch +++ b/pkgs/by-name/st/stirling-pdf/remove-props-file-timestamp.patch @@ -1,11 +1,11 @@ diff --git a/build.gradle b/build.gradle -index 2c151d1..4c03638 100644 +index af8962dc9..43d70bc66 100644 --- a/build.gradle +++ b/build.gradle -@@ -69,7 +69,6 @@ allprojects { +@@ -76,7 +76,6 @@ allprojects { tasks.register('writeVersion', WriteProperties) { - outputFile = layout.projectDirectory.file('app/common/src/main/resources/version.properties') - println "Writing version.properties to ${outputFile.path}" + destinationFile = layout.projectDirectory.file('app/common/src/main/resources/version.properties') + println "Writing version.properties to ${destinationFile.get().asFile.path}" - comment = "${new Date()}" property 'version', project.provider { project.version.toString() } } diff --git a/pkgs/by-name/st/stretchly/package.nix b/pkgs/by-name/st/stretchly/package.nix index 6c983dfef6c6..9d18760f2bcb 100644 --- a/pkgs/by-name/st/stretchly/package.nix +++ b/pkgs/by-name/st/stretchly/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "stretchly"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${finalAttrs.version}/stretchly-${finalAttrs.version}.tar.xz"; - hash = "sha256-xmGiGzA4Ol3bteYKrdbmRzh+pwpOOeKmGC70fV1f9Yw="; + hash = "sha256-eHhOxocAQAiuvfJsD4ifFw09B7bry4DWIOA9S6pP+jw="; }; icon = fetchurl { diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix index 56b39c91b1dd..c0da19f43ca3 100644 --- a/pkgs/by-name/st/stylua/package.nix +++ b/pkgs/by-name/st/stylua/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = "stylua"; rev = "v${version}"; - sha256 = "sha256-PBe3X4YUFUV2xQdYYOdPNgJCnCOzrzogP/2sECef4ck="; + sha256 = "sha256-iyZ30Gc32TQsQyMLwArfIRtM0NkbXkqmca46nI0526M="; }; - cargoHash = "sha256-C9g6kA+xc0nixiPAijc5MIF9xHbbeXBHtmdM4QRdf/Q="; + cargoHash = "sha256-H50/e/XyFvXHhwrKUbKZFZwSHfwAkAtddEvFiOr5220="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 8fa9a70a8c62..e57e1a5d7232 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.45.2"; + version = "2.47.2"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Vrb3EFDko5ih9IFtGuKkN2V0MrXMUNiMSNAhYrRuimY="; + hash = "sha256-o9UtQuBPQeq9coc+0cl3HKyA2SRkqlptVwdLwsvRutw="; }; - vendorHash = "sha256-BrR7I+wMME2a5xSwz+3/u/wfeNtxy6YbtYoPOgRvJ40="; + vendorHash = "sha256-n8u4roDibDTRFeqbsO/H1NqFSGaJrVPewdt4nQPmoRE="; ldflags = [ "-s" diff --git a/pkgs/by-name/su/superhtml/deps.nix b/pkgs/by-name/su/superhtml/deps.nix index c85582239480..bedd979a1e8a 100644 --- a/pkgs/by-name/su/superhtml/deps.nix +++ b/pkgs/by-name/su/superhtml/deps.nix @@ -1,61 +1,65 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + { linkFarm, fetchzip, fetchgit, }: + linkFarm "zig-packages" [ { - name = "1220b9ce6dc0e1fbcd9e7b406ab164344f81774351495f860a90729187c3c058ef4f"; - path = fetchgit { - url = "https://github.com/kristoff-it/zig-lsp-kit"; - rev = "b4bf61d7fbf9cf7cfdb6f01b211947d2de3e42fd"; - hash = "sha256-6mlnPTLBXZQwWXstV+h1PAKtMq8RGcJM2dRJ8NqqqtU="; - }; - } - { - name = "1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d"; - path = fetchzip { - url = "https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz"; - hash = "sha256-5/3W0Xt9RjsvCb8Q4cdaM8dkJP7CdFro14JJLCuqASo="; - }; - } - { - name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147"; - path = fetchgit { - url = "https://github.com/ziglibs/known-folders.git"; - rev = "0ad514dcfb7525e32ae349b9acc0a53976f3a9fa"; - hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g="; - }; - } - { - name = "122014e78d7c69d93595993b3231f3141368e22634b332b0b91a2fb73a8570f147a5"; - path = fetchgit { - url = "https://github.com/kristoff-it/scripty"; - rev = "df8c11380f9e9bec34809f2242fb116d27cf39d6"; - hash = "sha256-qVm8pIfT1mHL1zanqYdFm/6AVH8poXKqLtz4+2j+F/A="; - }; - } - { - name = "1220f2d8402bb7bbc4786b9c0aad73910929ea209cbd3b063842371d68abfed33c1e"; - path = fetchgit { - url = "https://github.com/kristoff-it/zig-afl-kit"; - rev = "f003bfe714f2964c90939fdc940d5993190a66ec"; - hash = "sha256-tJ6Ln1SY4WjFZXUWQmgggsUfkd59QgmIpgdInMuv4PI="; - }; - } - { - name = "1220010a1edd8631b2644476517024992f8e57f453bdb68668720bb590d168faf7c8"; + name = "AFLplusplus-4.21.0-aA1y4UtxAABpnSIF7ARSYDMRyqNcI-2Rwa5UeSsuw70v"; path = fetchgit { url = "https://github.com/allyourcodebase/AFLplusplus"; - rev = "032984eabf5a35af386a3d0e542df7686da339c1"; - hash = "sha256-KB3QnKAQQ+5CKvJVrhMveMGpF3NTrlwpIyLHVIB96hs="; + rev = "a52f1376e2d49720c39e4abf4aa4944afbf82191"; + hash = "sha256-AlkULC20/RTGMTPk2xWcdXCQlWn3sY3VrD0NRRoTZqY="; }; } { - name = "12200966011c3dd6979d6aa88fe23061fdc6da1f584a6fb1f7682053a0b01e409dbc"; + name = "N-V-__8AAKE4uAAJZgEcPdaXnWqoj-IwYf3G2h9YSm-x92gg"; path = fetchzip { url = "https://github.com/AFLplusplus/AFLplusplus/archive/v4.21c.tar.gz"; hash = "sha256-DKwPRxSO+JEJYWLldnfrAYqzwqukNzrbo4R5FzJqzzg="; }; } + { + name = "afl_kit-0.1.0-NdJ3cvscAACLEvjZTB017IAks_Uq5ux1qpA-klDe384Y"; + path = fetchgit { + url = "https://github.com/kristoff-it/zig-afl-kit"; + rev = "8ef04d1db48650345dca68da1e1b8f2615125c40"; + hash = "sha256-J0xbmsokjlhOav9KLlH2y4qiSgBit4nS+x6Q10L2OSA="; + }; + } + { + name = "known_folders-0.0.0-Fy-PJtTTAADUOhGKM0sxzG4eMkNQxRvx9e5dfHVyaeA3"; + path = fetchgit { + url = "https://github.com/ziglibs/known-folders"; + rev = "ab5cf5feb936fa3b72c95d3ad0c0c67791937ba1"; + hash = "sha256-Pdn/nUclhHBB1COTzNNR5ysE13h6uLOFJjuFrasv/2I="; + }; + } + { + name = "lsp_kit-0.1.0-bi_PLzAyCgClDh8_M0U9Q50ysdsQBuRuBTZfwg6rZPd6"; + path = fetchgit { + url = "https://github.com/zigtools/lsp-kit"; + rev = "fe98e895ca3bd1b39965ab30f0f252f7b7e83ee6"; + hash = "sha256-1HW8kWhfpbBihzE6PiXXxGN03qIW20KCsBoyfSSWgNU="; + }; + } + { + name = "scripty-0.1.0-LKK5O7v4AADWWXuFcTJky_5sY12tmw3kRi3k2wkpfxAX"; + path = fetchgit { + url = "https://github.com/kristoff-it/scripty"; + rev = "50dbab8945440089384f26ec165d870c29555247"; + hash = "sha256-r3L4iLpJUH93S0tH6d6w3pHcLzAaKZPSFBAgpnTMdeI="; + }; + } + { + name = "tracy-0.0.0-4Xw-1pwwAABTfMgoDP1unCbZDZhJEfict7XCBGF6IdIn"; + path = fetchgit { + url = "https://github.com/kristoff-it/tracy"; + rev = "67d2d89e351048c76fc6d161e0ac09d8a831dc60"; + hash = "sha256-BKo1bhua/u+f5Z//ailur5aSHZWp3GiC0iwmVLrGZkE="; + }; + } ] diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix index eff91d54a5a1..02034775ffa7 100644 --- a/pkgs/by-name/su/superhtml/package.nix +++ b/pkgs/by-name/su/superhtml/package.nix @@ -3,33 +3,36 @@ callPackage, fetchFromGitHub, stdenv, - zig_0_13, + zig_0_15, }: -stdenv.mkDerivation rec { +let + zig = zig_0_15; +in +stdenv.mkDerivation (finalAttrs: { pname = "superhtml"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - tag = "v${version}"; - hash = "sha256-rO7HS07nSqwOq6345q/SOL2imoD0cKV16QJcVVr6mHw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-EWxnozmYTvkX7mn+pVel083Cte1uzvHaes1c7iXPMUg="; }; nativeBuildInputs = [ - zig_0_13.hook + zig.hook ]; postPatch = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; - meta = with lib; { + meta = { description = "HTML Language Server and Templating Language Library"; homepage = "https://github.com/kristoff-it/superhtml"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "superhtml"; - maintainers = with maintainers; [ petertriho ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ petertriho ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs index bc07ec47a661..41fed3086e69 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs @@ -18,10 +18,6 @@ fn main() { let out_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap()); - let fdo_dbus_code = code_for_dbus_xml("org.freedesktop.DBus.xml"); - let mut file = std::fs::File::create(out_path.join("fdo_dbus.rs")).unwrap(); - file.write_all(fdo_dbus_code.as_bytes()).unwrap(); - let systemd_manager_code = code_for_dbus_xml(systemd_dbus_interface_dir.join("org.freedesktop.systemd1.Manager.xml")); let mut file = std::fs::File::create(out_path.join("systemd_manager.rs")).unwrap(); diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/org.freedesktop.DBus.xml b/pkgs/by-name/sw/switch-to-configuration-ng/src/org.freedesktop.DBus.xml deleted file mode 100644 index 6ab33de9dc40..000000000000 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/org.freedesktop.DBus.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs index 4e84e8d1ae09..705b9284f6a1 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs @@ -17,8 +17,6 @@ use std::{ use anyhow::{anyhow, bail, Context, Result}; use dbus::{ blocking::{stdintf::org_freedesktop_dbus::Properties, LocalConnection, Proxy}, - channel::Sender, - strings::{BusName, Interface, Member}, Message, }; use glob::glob; @@ -34,15 +32,6 @@ use nix::{ use regex::Regex; use syslog::Facility; -mod fdo_dbus { - #![allow(non_upper_case_globals)] - #![allow(non_camel_case_types)] - #![allow(non_snake_case)] - #![allow(unused)] - #![allow(clippy::all)] - include!(concat!(env!("OUT_DIR"), "/fdo_dbus.rs")); -} - mod systemd_manager { #![allow(non_upper_case_globals)] #![allow(non_camel_case_types)] @@ -61,9 +50,7 @@ mod logind_manager { include!(concat!(env!("OUT_DIR"), "/logind_manager.rs")); } -use crate::{ - fdo_dbus::OrgFreedesktopDBusNameOwnerChanged, systemd_manager::OrgFreedesktopSystemd1Manager, -}; +use crate::systemd_manager::OrgFreedesktopSystemd1Manager; use crate::{ logind_manager::OrgFreedesktopLogin1Manager, systemd_manager::{ @@ -907,14 +894,6 @@ impl std::fmt::Display for Job { } } -fn fdo_dbus_proxy(conn: &LocalConnection) -> Proxy<'_, &LocalConnection> { - conn.with_proxy( - "org.freedesktop.DBus", - "/org/freedesktop/DBus", - Duration::from_millis(500), - ) -} - fn systemd1_proxy(conn: &LocalConnection) -> Proxy<'_, &LocalConnection> { conn.with_proxy( "org.freedesktop.systemd1", @@ -951,54 +930,6 @@ fn remove_file_if_exists(p: impl AsRef) -> std::io::Result<()> { } } -fn reexecute_systemd_manager( - dbus_conn: &LocalConnection, - fdo_dbus: &Proxy<'_, &LocalConnection>, -) -> anyhow::Result<()> { - let reexecute_done = Rc::new(RefCell::new(false)); - let _reexecute_done = reexecute_done.clone(); - let owner_changed_token = fdo_dbus - .match_signal( - move |signal: OrgFreedesktopDBusNameOwnerChanged, _: &LocalConnection, _: &Message| { - if signal.name.as_str() == "org.freedesktop.systemd1" { - *_reexecute_done.borrow_mut() = true; - } - - true - }, - ) - .context("Failed to add signal match for DBus name owner changes")?; - - let bus_name = BusName::from("org.freedesktop.systemd1"); - let object_path = dbus::Path::from("/org/freedesktop/systemd1"); - let interface = Interface::new("org.freedesktop.systemd1.Manager") - .expect("the org.freedesktop.systemd1.Manager interface name should be valid"); - let method_name = Member::new("Reexecute").expect("the Reexecute method name should be valid"); - - // Systemd does not reply to the Reexecute method. - let _serial = dbus_conn - .send(Message::method_call( - &bus_name, - &object_path, - &interface, - &method_name, - )) - .map_err(|_err| anyhow!("Failed to send org.freedesktop.systemd1.Manager.Reexecute"))?; - - log::debug!("waiting for systemd to finish reexecuting"); - while !*reexecute_done.borrow() { - _ = dbus_conn - .process(Duration::from_secs(500)) - .context("Failed to process dbus messages")?; - } - - dbus_conn - .remove_match(owner_changed_token) - .context("Failed to remove jobs token")?; - - Ok(()) -} - /// Performs switch-to-configuration functionality for a single non-root user fn do_user_switch(parent_exe: String) -> anyhow::Result<()> { if Path::new(&parent_exe) @@ -1014,11 +945,8 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> { } let dbus_conn = LocalConnection::new_session().context("Failed to open dbus connection")?; - let fdo_dbus = fdo_dbus_proxy(&dbus_conn); let systemd = systemd1_proxy(&dbus_conn); - reexecute_systemd_manager(&dbus_conn, &fdo_dbus)?; - let nixos_activation_done = Rc::new(RefCell::new(false)); let _nixos_activation_done = nixos_activation_done.clone(); let jobs_token = systemd @@ -1035,6 +963,10 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> { ) .context("Failed to add signal match for systemd removed jobs")?; + // The systemd user session seems to not send a Reloaded signal, so we don't have anything to + // wait on here. + _ = systemd.reexecute(); + systemd .restart_unit("nixos-activation.service", "replace") .context("Failed to restart nixos-activation.service")?; @@ -1207,7 +1139,6 @@ won't take effect until you reboot the system. let mut units_to_reload = map_from_list_file(RELOAD_LIST_FILE); let dbus_conn = LocalConnection::new_system().context("Failed to open dbus connection")?; - let fdo_dbus = fdo_dbus_proxy(&dbus_conn); let systemd = systemd1_proxy(&dbus_conn); let logind = login1_proxy(&dbus_conn); @@ -1733,7 +1664,7 @@ won't take effect until you reboot the system. // just in case the new one has trouble communicating with the running pid 1. if restart_systemd { eprintln!("restarting systemd..."); - reexecute_systemd_manager(&dbus_conn, &fdo_dbus)?; + _ = systemd.reexecute(); // we don't get a dbus reply here log::debug!("waiting for systemd restart to finish"); while !*systemd_reload_status.borrow() { diff --git a/pkgs/by-name/sw/swww/package.nix b/pkgs/by-name/sw/swww/package.nix index 497e9ebf13e6..80c85a72073f 100644 --- a/pkgs/by-name/sw/swww/package.nix +++ b/pkgs/by-name/sw/swww/package.nix @@ -6,6 +6,8 @@ lz4, libxkbcommon, installShellFiles, + makeWrapper, + procps, scdoc, wayland-protocols, wayland-scanner, @@ -13,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "swww"; - version = "0.10.3"; + version = "0.11.2"; src = fetchFromGitHub { owner = "LGFae"; repo = "swww"; tag = "v${finalAttrs.version}"; - hash = "sha256-GXqXZn29r7ktL01KBzlPZ+9b1fdnAPF8qhsQxhiqAsQ="; + hash = "sha256-X2ptpXRo6ps5RxDe5RS7qfTaHWqBbBNw/aSdC2tzUG8="; }; - cargoHash = "sha256-jCjeHeHML8gHtvFcnHbiGL5fZ3LhABhXrcUTQriUDc0="; + cargoHash = "sha256-5KZWsdo37NbFFkK8XFc0XI9iwBkpV8KsOaOc0y287Io="; buildInputs = [ lz4 @@ -36,6 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config installShellFiles + makeWrapper scdoc ]; @@ -52,6 +55,13 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh completions/_swww ''; + postFixup = '' + for program in $out/bin/*; do + wrapProgram $program \ + --prefix PATH : "${lib.makeBinPath [ procps ]}" + done + ''; + meta = { description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; homepage = "https://github.com/LGFae/swww"; diff --git a/pkgs/by-name/sy/symphony/package.nix b/pkgs/by-name/sy/symphony/package.nix index e7a840ba1e06..8dbe496aa554 100644 --- a/pkgs/by-name/sy/symphony/package.nix +++ b/pkgs/by-name/sy/symphony/package.nix @@ -4,42 +4,45 @@ fetchFromGitHub, coin-utils, coinmp, - gfortran, - libtool, glpk, osi, + gfortran, + libtool, pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "symphony"; - version = "5.7.2"; + version = "5.7.3"; outputs = [ "out" ]; src = fetchFromGitHub { owner = "coin-or"; repo = "SYMPHONY"; - rev = "releases/${version}"; - hash = "sha256-OdTUMG3iVhjhw5uKtUnsLCZ4DfMjYHm8+/ozfmw7J6c="; + tag = "releases/${finalAttrs.version}"; + hash = "sha256-f97LICRykxhiZiSsSBE9IJBLL/ApWV+utvlHuUhx1PI="; }; nativeBuildInputs = [ + gfortran libtool pkg-config - glpk - gfortran - coinmp - osi + ]; + + buildInputs = [ coin-utils + coinmp + glpk + osi ]; meta = { description = "Open-source solver, callable library, and development framework for mixed-integer linear programs (MILPs)"; homepage = "https://www.coin-or.org/SYMPHONY/index.htm"; - changelog = "https://github.com/coin-or/SYMPHONY/blob/${version}/CHANGELOG.md"; - platforms = [ "x86_64-linux" ]; + changelog = "https://github.com/coin-or/SYMPHONY/blob/${finalAttrs.version}/CHANGELOG.md"; + platforms = lib.platforms.linux; license = lib.licenses.epl20; maintainers = with lib.maintainers; [ b-rodrigues ]; }; -} +}) diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index 356da6d8d8fa..2aebd67b86a0 100644 --- a/pkgs/by-name/ta/tabby-agent/package.nix +++ b/pkgs/by-name/ta/tabby-agent/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tabby-agent"; - version = "0.31.1"; + version = "0.31.2"; src = fetchFromGitHub { owner = "TabbyML"; repo = "tabby"; tag = "v${finalAttrs.version}"; - hash = "sha256-RbTX8QKiyzERDVS57Looj9xjS9didNKLdiTkDcyQ/uw="; + hash = "sha256-dVQ/OLJnXgkzWfX3p6Cplw9hti2jXoMKCvKhm6YNzAI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/talhelper/package.nix b/pkgs/by-name/ta/talhelper/package.nix index 2aa8e10a1319..c266ebf62267 100644 --- a/pkgs/by-name/ta/talhelper/package.nix +++ b/pkgs/by-name/ta/talhelper/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "talhelper"; - version = "3.0.35"; + version = "3.0.36"; src = fetchFromGitHub { owner = "budimanjojo"; repo = "talhelper"; tag = "v${finalAttrs.version}"; - hash = "sha256-vgNq8XUuDIqJgGxKMFFtVWfVXggRiaVpYwuwtgTc4Ps="; + hash = "sha256-qs7hFsCsiPRvLXYV4QvSl0gkASK9Fl4E8BnUKyK4Doo="; }; vendorHash = "sha256-f3odaPTeoXKQKlJFOX+csWHL2nIPZEtr6wMqccJUjys="; diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix index e13e9fb5f564..f43b941547e4 100644 --- a/pkgs/by-name/ta/talosctl/package.nix +++ b/pkgs/by-name/ta/talosctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; tag = "v${version}"; - hash = "sha256-G+su1Udkp/IqsU9/TWcEQO4MY8iGC+QM39eMeBUSaDs="; + hash = "sha256-r78O/FdsfD29wM6fcbuwYea/b7J60iAdtrw4CEBM/mo="; }; - vendorHash = "sha256-x9In+TaEuYMB0swuMzyXQRRnWgP1Krg7vKQH4lqDf+c="; + vendorHash = "sha256-T8lJjJfCLpQIsmCW/FQk/CJstyH6u/gNZ6R+COH909M="; ldflags = [ "-s" diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 558cd3df919a..85757c2ee00a 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -62,7 +62,7 @@ let stdenv.cc.cc stdenv.cc.libc ]; - version = "1.0.44"; + version = "1.0.46"; in stdenv.mkDerivation { pname = "tana"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; - hash = "sha256-HtubHH0ENiC+8s8VlpiaNekmzRUtnfmd+CZl5UjJo1U="; + hash = "sha256-WBPTJ2eca5XuccblC31DZ5mCdFm46cXjP4GHyakSalY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tangara-companion/package.nix b/pkgs/by-name/ta/tangara-companion/package.nix index 8ab84283a3d7..0d4c150c8fc3 100644 --- a/pkgs/by-name/ta/tangara-companion/package.nix +++ b/pkgs/by-name/ta/tangara-companion/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "tangara-companion"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "haileys"; repo = "tangara-companion"; tag = "v${version}"; - hash = "sha256-7uTcTAQy5ozIeXfSZ2SbeepFnZJtWBsWIfnezTnUgtM="; + hash = "sha256-x/xB+itr1GVcaTEre3u6Lchg9VcSzWiNyWVGv5Aczgw="; }; - cargoHash = "sha256-lvd9M81j69qFWWD8BZyAU7pisnw8EnU3pTvugoRAqnY="; + cargoHash = "sha256-PVTfAG2AOioW1zVXtXB5SBJX2sJoWVRQO3NafUOAleo="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ta/tart/package.nix b/pkgs/by-name/ta/tart/package.nix index f8e4fa92ab32..357a77a53d82 100644 --- a/pkgs/by-name/ta/tart/package.nix +++ b/pkgs/by-name/ta/tart/package.nix @@ -9,14 +9,16 @@ # See https://github.com/cirruslabs/softnet#installing enableSoftnet ? false, softnet, + nix-update-script, + versionCheckHook, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.28.1"; + version = "2.28.6"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz"; - hash = "sha256-rV5hAJk46e9PAdEo8Qc6/17WqZ9aihj5+A1nLp3fJro="; + hash = "sha256-F6bYWVHtzXo6TH4CAvdF6qx7OCVvKACsh2KdRYFsxOw="; }; sourceRoot = "."; @@ -37,8 +39,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = with lib; { - description = "macOS VMs on Apple Silicon to use in CI and other automations"; + description = "macOS and Linux VMs on Apple Silicon to use in CI and other automations"; homepage = "https://tart.run"; license = licenses.fairsource09; maintainers = with maintainers; [ @@ -46,10 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { aduh95 ]; mainProgram = "tart"; - platforms = [ - "aarch64-darwin" - "x86_64-darwin" - ]; + platforms = platforms.darwin; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/pkgs/by-name/tc/tcpdirect/package.nix b/pkgs/by-name/tc/tcpdirect/package.nix new file mode 100644 index 000000000000..ca476ac23bb9 --- /dev/null +++ b/pkgs/by-name/tc/tcpdirect/package.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libpcap, + which, + libcap, + makeWrapper, + nix-update-script, + openonload, +}: + +stdenv.mkDerivation rec { + pname = "tcpdirect"; + version = "9.0.2.45"; + + src = fetchFromGitHub { + owner = "Xilinx-CNS"; + repo = "tcpdirect"; + rev = "tcpdirect-${version}"; + hash = "sha256-7VQwep078hXdXE4pqGUe2CLqnPdDuWupcyuC+NCM5Ms="; + }; + + nativeBuildInputs = [ + which + makeWrapper + ]; + + buildInputs = [ + libcap + libpcap + openonload + ]; + + enableParallelBuilding = true; + makeFlags = [ + "CITOOLS_LIB=${lib.getDev openonload}/lib/libcitools1.a" + "CIUL_LIB=${lib.getDev openonload}/lib/libciul1.a" + ]; + + outputs = [ + "out" + "lib" + "dev" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $lib/lib $dev/lib $dev/include + + cp -dv \ + build/bin/zf_internal/shared/* \ + build/bin/zf_apps/shared/* \ + build/bin/zf_stackdump \ + build/bin/trade_sim/shared/* \ + $out/bin + + cp -dv build/lib/libonload_zf.so* $lib/lib + cp -dv build/lib/libonload_zf_static.a $dev/lib + cp -rdv src/include/zf $dev/include + + mkdir -p $dev/lib/pkgconfig + export dash_l="-lonload_zf" + substituteAll ${./tcpdirect.pc.in} $dev/lib/pkgconfig/tcpdirect.pc + export dash_l="-l:libonload_zf_static.a" + substituteAll ${./tcpdirect.pc.in} $dev/lib/pkgconfig/tcpdirect-static.pc + runHook postInstall + ''; + + postFixup = '' + # zf_init from libonload_zf dynamically loads libefcp.so from openonload + patchelf --add-rpath ${openonload.lib}/lib $lib/lib/libonload_zf.so + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Ultra low latency kernel bypass TCP and UDP implementation for AMD Solarflare network adapters"; + homepage = "https://www.openonload.org"; + license = lib.licenses.mit; + maintainers = with maintainers; [ YorikSar ]; + # ARM64 build fails, see https://github.com/Xilinx-CNS/onload/issues/253 + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/tc/tcpdirect/tcpdirect.pc.in b/pkgs/by-name/tc/tcpdirect/tcpdirect.pc.in new file mode 100644 index 000000000000..061b624cf472 --- /dev/null +++ b/pkgs/by-name/tc/tcpdirect/tcpdirect.pc.in @@ -0,0 +1,10 @@ +prefix=@dev@ +includedir=${prefix}/include +libdir=@lib@/lib + +Name: tcpdirect +Description: Low latency, zero-copy TCP and UDP stack for SolarFlare NICs +URL: http://www.xilinx.com +Version: @version@ +Cflags: -isystem${includedir} +Libs: -L${libdir} -Wl,-rpath,${libdir} @dash_l@ diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix index 7d45195b42e9..c8134d45c859 100644 --- a/pkgs/by-name/td/tdb/package.nix +++ b/pkgs/by-name/td/tdb/package.nix @@ -28,11 +28,11 @@ in stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.13"; + version = "1.4.14"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-XuJ252RNcT4Z5LatwAtECvtYUf8h5lgh/67YnhWl4Wc="; + hash = "sha256-FE9AfULteg7BRwpA7xetQRM/6RC86GXdn+CE1JyQdSY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index a1f44825f2cd..11672f311e36 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "2.5.8"; + version = "2.5.9"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-yBIIKkB488PW7sqj+xkfR/I9JqFeWb12o8pLFW21Og0="; + hash = "sha256-gbkTQFj2PJw381ISrdxm0BwzO+Zzkh4qDIU31KbWM1Q="; }; - npmDepsHash = "sha256-iX84hsb1N4bELFgspBu9wMmc5xMdRnHJcTzSzRNnrOk="; + npmDepsHash = "sha256-8YzWf62VAzZggbBSMUp2NlUVHN8SAzWVUEeVNPctvik="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/te/tektoncd-cli-pac/package.nix b/pkgs/by-name/te/tektoncd-cli-pac/package.nix index d205e517dcc8..718643366ae2 100644 --- a/pkgs/by-name/te/tektoncd-cli-pac/package.nix +++ b/pkgs/by-name/te/tektoncd-cli-pac/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "tektoncd-cli-pac"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "openshift-pipelines"; repo = "pipelines-as-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-ti8IDslgSPTITrzjVRio1zsV92u505ySr16GfRKxtp8="; + hash = "sha256-ti2IVI6ECXOhSxeeW7ufD1XjsOtr1R2J5Beq/ADRHaA="; }; vendorHash = null; diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index f81328763f31..6dbb853a213f 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.36.1"; + version = "1.36.2"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-WuxQP0ogbCYuwuIUA8U8UD8usGXuPM2iTCms+yPU8vM="; + hash = "sha256-nIYAGsGYZUK5o1KqcH4bI3wPRRXCynN6N5T6f2oy2bo="; }; - vendorHash = "sha256-wIf8Mo4IkR3CC6PnoGL+Jj5XGDpom3RnXmVLobs6DoM="; + vendorHash = "sha256-k4hI/qIQgV1qChOWDCqWcMboaVoDe3k/DP/wNa0Aqg4="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index e06d140d7c0c..956cfb531afd 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ }: buildGo125Module (finalAttrs: { pname = "terragrunt"; - version = "0.86.3"; + version = "0.88.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-sa0Jp9Lb6ECboYDySJcFx6eQDtpChnrIxcCo0UYdhuY="; + hash = "sha256-+AGxB13XgyClWu8xsVTCnRknPleiijoRRRdgedL88IQ="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ buildGo125Module (finalAttrs: { make generate-mocks ''; - vendorHash = "sha256-X6lF18eIn5PtBH48rgxuSJfj5QiML1Bi1330PUDEsOs="; + vendorHash = "sha256-+4mDmC1B4YmExOJqS/vlTxBiI5/rKcn3Vyw53BfvAxA="; doCheck = false; diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index fc1b1813e204..fecd0217f94b 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.13.26"; + version = "0.13.28"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-beGi4vyp/+FFTBCbKibqIn+d/4NTrj5gEPhXjKLwdtw="; + hash = "sha256-Z2FAlFjFHCzFhlLILcXseynoSdMhRQ30fWC7rW946N4="; }; - cargoHash = "sha256-mtqQFiGE240nUpUspjwfR/EW88Ls0fUyqNvw/ltdGFI="; + cargoHash = "sha256-7p+TNZO+uFqXhhMzmHj0r1X2WgDdg8aonMc0jgsrEnk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix index 2ada4ad71cb6..d4d509098bc9 100644 --- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix +++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix @@ -38,6 +38,7 @@ buildGoModule rec { homepage = "https://tillitis.se/app/tkey-ssh-agent/"; license = licenses.gpl2; maintainers = with maintainers; [ bbigras ]; + mainProgram = "tkey-ssh-agent"; platforms = platforms.all; }; } diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index cc204df4afc5..feedfe12411f 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "tlrc"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tlrc"; rev = "v${version}"; - hash = "sha256-SPYLQ7o3sbrjy3MmBAB0YoVJI1rSmePbrZY0yb2SnFE="; + hash = "sha256-Q0vRrCNpbG6LihCi9+uI25PnpFuPfoY2MZmyB/IN/SQ="; }; - cargoHash = "sha256-i2nSwsQnwhiMhG8QJb0z0zPuNxTLwuO1dgJxI4e4FqY="; + cargoHash = "sha256-IrRhj3Tv8rLTJki+Wd4Xfmf74OnYInUytMnYuvre7mw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/to/tomb/package.nix b/pkgs/by-name/to/tomb/package.nix index 171751e5f84f..1ebfad7df23d 100644 --- a/pkgs/by-name/to/tomb/package.nix +++ b/pkgs/by-name/to/tomb/package.nix @@ -13,12 +13,12 @@ lib, libargon2, lsof, - makeWrapper, + makeBinaryWrapper, nix-update-script, pinentry, stdenvNoCC, - testers, - util-linux, + util-linuxMinimal, + versionCheckHook, zsh, }: @@ -37,7 +37,7 @@ let libargon2 lsof pinentry - util-linux + util-linuxMinimal ]; in @@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-z7LkCes0wg+1bZrNXXy4Lh5VwMotCULJQy5DmCisu+Q="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; buildInputs = [ pinentry @@ -69,18 +69,22 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; installPhase = '' - install -Dm755 tomb $out/bin/tomb - install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 + runHook preInstall + + install -D -m755 -t $out/bin tomb + install -D -m644 -t $out/share/man/man1/ doc/tomb.1 wrapProgram $out/bin/tomb \ --prefix PATH : $out/bin:${lib.makeBinPath runtimeDependencies} + + runHook postInstall ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-v"; + passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "tomb -v"; - }; updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix index d4744e58d762..39dedf7a4503 100644 --- a/pkgs/by-name/to/topicctl/package.nix +++ b/pkgs/by-name/to/topicctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-+Khy7WL57oHCb1a4HIJPq9UdMuYXlkf8/GikoRvUT1Y="; + sha256 = "sha256-+PkqIO3xsShSTyi5yBa9a3zLU8BIwERlBv84nuk8rHI="; }; - vendorHash = "sha256-M/lNhGD9zNmwkzTAjp0lbAeliNpLOCVJbOG16N76QL4="; + vendorHash = "sha256-JGVieAp5pg+Vhqx/Ge6xkR3sm/e+qYjMYrkYcPZjpiA="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/by-name/tr/trelby/package.nix b/pkgs/by-name/tr/trelby/package.nix index 597f40fb7899..bce17334a878 100644 --- a/pkgs/by-name/tr/trelby/package.nix +++ b/pkgs/by-name/tr/trelby/package.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Free, multiplatform, feature-rich screenwriting program"; - homepage = "www.trelby.org"; + homepage = "https://www.trelby.org"; downloadPage = "https://github.com/trelby/trelby"; mainProgram = "trelby"; license = lib.licenses.gpl2Only; diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix index 8404a5c6ae70..700dd21822a5 100644 --- a/pkgs/by-name/tr/trilium-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-desktop/package.nix @@ -15,7 +15,7 @@ let pname = "trilium-desktop"; - version = "0.98.1"; + version = "0.99.0"; triliumSource = os: arch: hash: { url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip"; @@ -26,10 +26,10 @@ let darwinSource = triliumSource "macos"; # exposed like this for update.sh - x86_64-linux.hash = "sha256-e8duXDIODrU3eYuZvUcOoT8pAquRIOQ1aUtceY49s+s="; - aarch64-linux.hash = "sha256-HtNzzlnqApwt04R9W6cby8J/0xuYdUX2kMN4vBNKeiQ="; - x86_64-darwin.hash = "sha256-guM1FmDD+J0oBEH+hCzXBkrF0bzvyp5yvCeIO7mGcJg="; - aarch64-darwin.hash = "sha256-fHgPbJS4ZraqowkjPdDg0BbPiI+4dk9JpMSDKASl8wE="; + x86_64-linux.hash = "sha256-ywZBKjUf0h7D3uRf3POJnaC9DtSJ3b8ucdxarHOzIg8="; + aarch64-linux.hash = "sha256-/fXACEZqz0Z8XPPwhQgaUN/23sbBcXmGFA9R1+/Md3E="; + x86_64-darwin.hash = "sha256-39Hwwg9l/HNfCAMwPYp/i/i6LbEoByKb5C+51jifz8U="; + aarch64-darwin.hash = "sha256-J+1NDd1ZL6/w2ObDDLcIp/MDX6lVAHxJOaOC3BIOoqM="; sources = { x86_64-linux = linuxSource "x64" x86_64-linux.hash; diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix index 60bf63bfa01b..c2e55a540071 100644 --- a/pkgs/by-name/tr/trilium-server/package.nix +++ b/pkgs/by-name/tr/trilium-server/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.98.1"; + version = "0.99.0"; serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz"; - serverSource_x64.hash = "sha256-Ipl9mEDj6Wgzl31WonH4nouCoYs1lLgdxRAJr6I8l9c="; + serverSource_x64.hash = "sha256-o3c8j6oi5+Oxo6dUdP6a7Czroc5JpKvdexMEE7BaPC4="; serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz"; - serverSource_arm64.hash = "sha256-XssGT2F1Idv7ICuTjJTAUYyors8ml50EXiOTHeA8KOw="; + serverSource_arm64.hash = "sha256-QFK5XYdPon3J2lp3k23KNf1dbi213JRILrqq8WT359A="; serverSource = if stdenv.hostPlatform.isx86_64 then diff --git a/pkgs/by-name/tt/tt-metal/sfpi.nix b/pkgs/by-name/tt/tt-metal/sfpi.nix index c85b4e282777..d00f3c0c9179 100644 --- a/pkgs/by-name/tt/tt-metal/sfpi.nix +++ b/pkgs/by-name/tt/tt-metal/sfpi.nix @@ -33,11 +33,11 @@ runCommand "sfpi-${version}" { aarch64-linux = fetchurl { url = "https://github.com/tenstorrent/sfpi/releases/download/v${version}/sfpi_${version}_aarch64.txz"; - hash = "sha256-3DQrQewrKnbWNCBw3r7lkwylpKZnouLRG/QXcB6OhDU="; + hash = "sha256-MzI159hiitk1iyeGfQaDOQZhqGjfafpCMz6zmM3HrYs="; }; x86_64-linux = fetchurl { url = "https://github.com/tenstorrent/sfpi/releases/download/v${version}/sfpi_${version}_x86_64.txz"; - hash = "sha256-eRGNHeKM2T4ZylN4tTghR0vN9F3BY1tfam2puvwVmuM="; + hash = "sha256-rQfFveg1ht+jLfk3ZOJadX26+ODE3WW5E0/18eIl7RQ="; }; } ."${stdenv.hostPlatform.system}" or (throw "SFPI does not support ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix index 16f89adc7660..4741fbf7eee3 100644 --- a/pkgs/by-name/tu/tuckr/package.nix +++ b/pkgs/by-name/tu/tuckr/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tuckr"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "RaphGL"; repo = "Tuckr"; rev = version; - hash = "sha256-EGoxM/dAKlIE/oYRH17VcGJNNaPJPDUW4tB6CG+eyFQ="; + hash = "sha256-X2/pOzGUGc5FI0fyn6PB+9duMBdoggjvGxssDXKppWU="; }; - cargoHash = "sha256-ltlJhlvDP1cJqPG7US9h7qx+KA/5gudZUqULsxTVJbU="; + cargoHash = "sha256-NXIrjX73lg7706VAJqr/xv7N46ZdscAtXwzJywuAwro="; doCheck = false; # test result: FAILED. 5 passed; 3 failed; diff --git a/pkgs/by-name/tu/tuist/package.nix b/pkgs/by-name/tu/tuist/package.nix index 44a9edf5f70c..7b7cb6d22bb1 100644 --- a/pkgs/by-name/tu/tuist/package.nix +++ b/pkgs/by-name/tu/tuist/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tuist"; - version = "4.53.4"; + version = "4.79.7"; src = fetchurl { url = "https://github.com/tuist/tuist/releases/download/${finalAttrs.version}/tuist.zip"; - hash = "sha256-4YQY94/uWh/H4cCzhdQ3KxIh19D8mmUCCDKMF8ZwA4E="; + hash = "sha256-afZToryR7SXLlS/MKFuQFoBv2JQAaF4bHvEk5tO6xiw="; }; dontUnpack = true; @@ -35,14 +35,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^([0-9.]+)$" ]; }; meta = { description = "Command line tool that helps you generate, maintain and interact with Xcode projects"; homepage = "https://tuist.dev"; - changelog = "https://github.com/tuist/tuist/blob/${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/tuist/tuist/blob/${finalAttrs.version}/cli/CHANGELOG.md"; license = lib.licenses.mit; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = [ lib.maintainers.DimitarNestorov ]; diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix index 242fe9db9d56..69db955f6b81 100644 --- a/pkgs/by-name/ui/uiua/stable.nix +++ b/pkgs/by-name/ui/uiua/stable.nix @@ -1,7 +1,7 @@ rec { - version = "0.17.0"; + version = "0.17.1"; tag = version; - hash = "sha256-mLtWU7eJxDAyUuwsiwLqa9LgJXnTtYHwcnXQOBsmugw="; - cargoHash = "sha256-h8HmBfxRKrtARFQ0vll09uEMcYUhW4+8M/Q90EVw3Io="; + hash = "sha256-bRazhDhqXnY+nDDWg/unqVuOg9ib3AND0HivFL68Iko="; + cargoHash = "sha256-llg/BoiGiD9AT8UTDyTpzrSvEinXbLdT1rQECH2ftdE="; updateScript = ./update-stable.sh; } diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index 9b25d9b205fe..5d1daf2287e2 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -1,7 +1,7 @@ rec { - version = "0.17.0"; + version = "0.17.1"; tag = version; - hash = "sha256-mLtWU7eJxDAyUuwsiwLqa9LgJXnTtYHwcnXQOBsmugw="; - cargoHash = "sha256-h8HmBfxRKrtARFQ0vll09uEMcYUhW4+8M/Q90EVw3Io="; + hash = "sha256-bRazhDhqXnY+nDDWg/unqVuOg9ib3AND0HivFL68Iko="; + cargoHash = "sha256-llg/BoiGiD9AT8UTDyTpzrSvEinXbLdT1rQECH2ftdE="; updateScript = ./update-unstable.sh; } diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix index d7c653248e85..4d97de94dacb 100644 --- a/pkgs/by-name/un/unison-ucm/package.nix +++ b/pkgs/by-name/un/unison-ucm/package.nix @@ -14,25 +14,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.48"; + version = "0.5.49"; src = { aarch64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz"; - hash = "sha256-HtgVPgxwOYvsv6Z+qG0GMnRyqzm/AlLDdIrypjzCBHo="; + hash = "sha256-ydrSqSaHJcL5DX2voAcUfHn3Y0QRo8CyvYHNZrTMmhI="; }; x86_64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz"; - hash = "sha256-xtn8ozF2UdoSSYYCoYPh4AgbrYm+3vtmIRSXD8OWams="; + hash = "sha256-qd+cDB9FnfOija0xeF0GMBIZu2JAjlax/nPtfORzhlM="; }; aarch64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-arm64.tar.gz"; - hash = "sha256-xiEEkzdCS/HSEPLzuuDLh4iITsF2fuR51ACYQoQnzKQ="; + hash = "sha256-5QPG6JkciD3iI7WVPB6p3NEO/ZNEBgpRe30XT1op4K8="; }; x86_64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz"; - hash = "sha256-CMiheW4z27awGIpAk/DQN+JAAU7ZvIyFAEAI+ZaQhpY="; + hash = "sha256-LiW1Ugaaz1LzVDmfpSkiwtRYMhuv7XeNGEnFc9HndWg="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json index 55d7ad670b3d..164467be61cc 100644 --- a/pkgs/by-name/up/upsun/versions.json +++ b/pkgs/by-name/up/upsun/versions.json @@ -1,19 +1,19 @@ { - "version": "5.3.0", + "version": "5.5.0", "darwin-amd64": { - "hash": "sha256-R+UjM8jmet+qf9Q5JZsUs7UfXf7IWpaqmulEWSKsaLY=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_darwin_all.tar.gz" + "hash": "sha256-aLBaRBahtAcf9KArjrfuhPHNnUTko+kxhoaY5QeKB5E=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-R+UjM8jmet+qf9Q5JZsUs7UfXf7IWpaqmulEWSKsaLY=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_darwin_all.tar.gz" + "hash": "sha256-aLBaRBahtAcf9KArjrfuhPHNnUTko+kxhoaY5QeKB5E=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-52hfP1pgZkpLvVLelKJtELUOUug3gOw3juCdRRMSt/w=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_linux_amd64.tar.gz" + "hash": "sha256-RJuOddfXtT3yyphDSJ8sN8ibX30ALL9kRohGaw9jaeg=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-4rFYjh6lgbtD9h3yUtcJGpTvy/F+BW/7q1fvZWtRc/c=", - "url": "https://github.com/platformsh/cli/releases/download/5.3.0/upsun_5.3.0_linux_arm64.tar.gz" + "hash": "sha256-GbfYckZ91ki1D8e50fF3HRJ6NtTXgqkZe2PrbODAfcw=", + "url": "https://github.com/platformsh/cli/releases/download/5.5.0/upsun_5.5.0_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 5d4a725e2ccb..f92681741d26 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2025-09-07"; + version = "1.0-unstable-2025-09-27"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "f2e858273890abcffe7451b0566669e610036f49"; - hash = "sha256-wFc8D16R9HR9riaC67SpaLxWyqiMfj7i/neL2JCnINI="; + rev = "87465a40baf315e32213fbd100fee20d7d97c371"; + hash = "sha256-iZjzC+LwVZcB4WKd6JYU0oUswQuxby1NPfIa62uLsdg="; }; outputs = [ diff --git a/pkgs/by-name/va/vagrant/package.nix b/pkgs/by-name/va/vagrant/package.nix index 6c3c4344ebce..b7c3fb89c1ef 100644 --- a/pkgs/by-name/va/vagrant/package.nix +++ b/pkgs/by-name/va/vagrant/package.nix @@ -21,7 +21,7 @@ let owner = "hashicorp"; repo = "vagrant"; rev = "v${version}"; - hash = "sha256-xlL0YLY5yG9Q2L93Ag1pO/F8LOp+JdcgrvWyw+bZP/I="; + hash = "sha256-8csEIkXI5LPf5aZUuKYKALgwtG/skXFvMBimbCerEPY="; }; ruby = ruby_3_4; @@ -32,6 +32,7 @@ let inherit version; inherit ruby; + gemdir = src; gemfile = writeText "Gemfile" ""; lockfile = writeText "Gemfile.lock" ""; gemset = lib.recursiveUpdate (import ./gemset.nix) ( diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix index ef657ead72a5..2ea13942aee8 100644 --- a/pkgs/by-name/ve/verilator/package.nix +++ b/pkgs/by-name/ve/verilator/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, perl, flex, bison, @@ -32,6 +33,14 @@ stdenv.mkDerivation rec { hash = "sha256-S+cDnKOTPjLw+sNmWL3+Ay6+UM8poMadkyPSGd3hgnc="; }; + patches = [ + (fetchpatch { + name = "clang-V3hash-overload-fix.patch"; + url = "https://github.com/verilator/verilator/commit/2aa260a03b67d3fe86bc64b8a59183f8dc21e117.patch"; + hash = "sha256-waUsctWiAMG3lCpQi+VUUZ7qMw/kJGu/wNXPHZGuAoU="; + }) + ]; + enableParallelBuilding = true; buildInputs = [ perl diff --git a/pkgs/by-name/ve/vexctl/package.nix b/pkgs/by-name/ve/vexctl/package.nix index e841f72bd0e9..cf38811910cf 100644 --- a/pkgs/by-name/ve/vexctl/package.nix +++ b/pkgs/by-name/ve/vexctl/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "vexctl"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "openvex"; repo = "vexctl"; tag = "v${version}"; - hash = "sha256-rJK9OTaEF0PU12m7voMUHPHI2/Je7wh6w2Zr1Ug8+1w="; + hash = "sha256-LAl56aB7bFXrXK8wSAmQleWTy8q9Gx1+fxpmSTMp2Cg="; # 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; @@ -28,7 +28,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-YVMg9tjwJmrqxB2GmVuLkzsGXGlpp5gmZZTmv+PGWPc="; + vendorHash = "sha256-G0w5auYmSED6ktTDayfOSu/9QQLTuFCkjW/f9ekn/Hw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index bdb6ce7bc597..6cfe8d5b4990 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaLogs"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaLogs"; tag = "v${finalAttrs.version}"; - hash = "sha256-NUfFXssgNtlb8p9B32aMVSzRJxafMrsuxsR38oHAm2M="; + hash = "sha256-9g23rtLi/tHIXpfZSHgaIHIGHwQ0eYW5kLtMHqrIlMk="; }; vendorHash = null; @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { postPatch = '' # Allow older go versions substituteInPlace go.mod \ - --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}" + --replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}" substituteInPlace vendor/modules.txt \ --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}" diff --git a/pkgs/by-name/vi/video-compare/package.nix b/pkgs/by-name/vi/video-compare/package.nix index e9741a049d99..a1c2563ea447 100644 --- a/pkgs/by-name/vi/video-compare/package.nix +++ b/pkgs/by-name/vi/video-compare/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "video-compare"; - version = "20250825"; + version = "20250928"; src = fetchFromGitHub { owner = "pixop"; repo = "video-compare"; tag = version; - hash = "sha256-4sfRTb/FkGL3WdJMW6P9H/EHW5oTw+GTQZhKrWS+ptM="; + hash = "sha256-md+h39tMbd07pHZzQ1eae5QCkqYErMoD6oEYov9lLBU="; }; postPatch = '' diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index 74f277e6a71d..5e502efc2162 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; - version = "2.35"; + version = "2.37"; pyproject = true; src = fetchFromGitHub { owner = "abbbi"; repo = "virtnbdbackup"; tag = "v${version}"; - hash = "sha256-wWRtOXCagpxcpwbTXhqVVRxbOSdELv2ZgnidSXdt7Ao="; + hash = "sha256-G3nDaAIWxSA6EsqiVpdouBRWprSbogcMTTroquK8Big="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/vo/vokoscreen-ng/package.nix b/pkgs/by-name/vo/vokoscreen-ng/package.nix index e53a0342fbfa..f8fea38b93f4 100644 --- a/pkgs/by-name/vo/vokoscreen-ng/package.nix +++ b/pkgs/by-name/vo/vokoscreen-ng/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "vokoscreen-ng"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; tag = version; - hash = "sha256-avn7ywYJNZdUe1aTLmT2t1BB6Lvn5eUiQBMZCQnNFKs="; + hash = "sha256-GMiiO+uKaf87X3dLmkEbFd2GdfHf5wFAyhe9wd8NQeI="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; diff --git a/pkgs/by-name/vo/voxinput/package.nix b/pkgs/by-name/vo/voxinput/package.nix index 604ceb5dabea..ec769c62ecdd 100644 --- a/pkgs/by-name/vo/voxinput/package.nix +++ b/pkgs/by-name/vo/voxinput/package.nix @@ -17,16 +17,16 @@ buildGoModule (finalAttrs: { pname = "voxinput"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "richiejp"; repo = "VoxInput"; tag = "v${finalAttrs.version}"; - hash = "sha256-fNlvCyjg4aOTRypKf/6nQeDyNYN+ojo1WekVPLhdyJQ="; + hash = "sha256-aFsAAT3hNbTSSkeMH65+jnhpjJRxVvfRUiiXdKIvZqM="; }; - vendorHash = "sha256-HOXjD4mwvK3jcFmpZyvKB7WOfpCIDlUWJTJSTN7wFXM="; + vendorHash = "sha256-jopDuqIuc45zT36B7D7WCtYtdZUn4hvE45s/FLBGrms="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/vs/vsftpd/package.nix b/pkgs/by-name/vs/vsftpd/package.nix index aed7cb231734..1e9b8c79d155 100644 --- a/pkgs/by-name/vs/vsftpd/package.nix +++ b/pkgs/by-name/vs/vsftpd/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, libcap, libseccomp, openssl, @@ -10,13 +11,13 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vsftpd"; version = "3.0.5"; src = fetchurl { - url = "https://security.appspot.com/downloads/vsftpd-${version}.tar.gz"; - sha256 = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM="; + url = "https://security.appspot.com/downloads/vsftpd-${finalAttrs.version}.tar.gz"; + hash = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM="; }; buildInputs = [ @@ -27,7 +28,16 @@ stdenv.mkDerivation rec { libxcrypt ]; - patches = [ ./CVE-2015-1419.patch ]; + patches = [ + ./CVE-2015-1419.patch + + # Fix build with gcc15 + (fetchpatch { + name = "vsftpd-correct-the-definition-of-setup_bio_callbacks-in-ssl.patch"; + url = "https://src.fedoraproject.org/rpms/vsftpd/raw/c31087744900967ff4d572706a296bf6c8c4a68e/f/0076-Correct-the-definition-of-setup_bio_callbacks-in-ssl.patch"; + hash = "sha256-eYiY2eKQ+qS3CiRZYGuRHcnAe32zLDdb/GwF6NyHch4="; + }) + ]; postPatch = '' sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h @@ -54,11 +64,11 @@ stdenv.mkDerivation rec { tests = { inherit (nixosTests) vsftpd; }; }; - meta = with lib; { + meta = { description = "Very secure FTP daemon"; mainProgram = "vsftpd"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 2bd4318e40d3..59b45da99668 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -37,6 +37,12 @@ stdenv.mkDerivation (finalAttrs: { ''; preInstall = '' + # the mv commands are workaround for https://github.com/pnpm/pnpm/issues/8307 + mv packages packages.dontpruneme + CI=true pnpm prune --prod + find packages.dontpruneme/**/node_modules -xtype l -delete + mv packages.dontpruneme packages + find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + # https://github.com/pnpm/pnpm/issues/3645 diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 38afc7d517e0..ca9fbc62b2f2 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-EPtPjDsSTGsJFRVDM8HtpmcLaPFzbQsph7pyNdXllAU=", - "version": "0.2025.09.17.08.11.stable_02" + "hash": "sha256-5lSv9/RLHVu9rusUO2MEGDKCEjteNNOiOfhk9f35a78=", + "version": "0.2025.09.24.08.11.stable_01" }, "linux_x86_64": { - "hash": "sha256-5av17Bcg8ri7+y4H8ZJeUuOkpcNbag+VH6OYVF0JrCQ=", - "version": "0.2025.09.17.08.11.stable_02" + "hash": "sha256-Ho8xOs9hke5jiM0y4QVsaE9pUfbEc6rjbipxtGRp6Ec=", + "version": "0.2025.09.24.08.11.stable_01" }, "linux_aarch64": { - "hash": "sha256-QM5abg5hbwvOBioLOdYN1IGCP1y5manRGsnmj+23EmQ=", - "version": "0.2025.09.17.08.11.stable_02" + "hash": "sha256-rdCKoIf6CFltrkaCfGu1X644mhtPC9Z2u+w4msj6Jr4=", + "version": "0.2025.09.24.08.11.stable_01" } } diff --git a/pkgs/by-name/wa/wasm-language-tools/package.nix b/pkgs/by-name/wa/wasm-language-tools/package.nix index 84dbf9796b63..80214a312bd3 100644 --- a/pkgs/by-name/wa/wasm-language-tools/package.nix +++ b/pkgs/by-name/wa/wasm-language-tools/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "wasm-language-tools"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "g-plane"; repo = "wasm-language-tools"; tag = "v${version}"; - hash = "sha256-FjBRz2vAc5qmOeuDiqn8WkMqJmkeyrZDcJ2FoOaR2PY="; + hash = "sha256-lZWrrxMqtAPeSMLUS0HSgv9wwNaQYlrWj0E34zRtkhw="; }; - cargoHash = "sha256-a3bLXdKCXWH7bSmU6G5X9vHOPaBkn/EUG894BB8/dHs="; + cargoHash = "sha256-d94k0hBKEFjCcQFwy3eeP5nPlaMUXYLgYltqHzCj6X8="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/wat_server"; diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix index 1849187a4b0c..945a202f9c78 100644 --- a/pkgs/by-name/we/wechat/package.nix +++ b/pkgs/by-name/we/wechat/package.nix @@ -45,17 +45,17 @@ let aarch64-darwin = any-darwin; x86_64-darwin = any-darwin; aarch64-linux = { - version = "4.0.1.11"; + version = "4.1.0.10"; src = fetchurl { - url = "https://web.archive.org/web/20250512112413if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage"; - hash = "sha256-Rg+FWNgOPC02ILUskQqQmlz1qNb9AMdvLcRWv7NQhGk="; + url = "https://web.archive.org/web/20250930121708/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage"; + hash = "sha256-qkNLA8nILsIi2ciIzr9pb3PejhbEvZ5fe4GlmjyjrEI="; }; }; x86_64-linux = { - version = "4.0.1.11"; + version = "4.1.0.10"; src = fetchurl { - url = "https://web.archive.org/web/20250512110825if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage"; - hash = "sha256-gBWcNQ1o1AZfNsmu1Vi1Kilqv3YbR+wqOod4XYAeVKo="; + url = "https://web.archive.org/web/20250930121506/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage"; + hash = "sha256-d/zdb69gmIcgAFCbWLKGfmD8ZFfuDlYdOy7vUJ7SiXc="; }; }; }; diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix index 53f9dcc3522b..6fbf70d6335d 100644 --- a/pkgs/by-name/we/wemeet/package.nix +++ b/pkgs/by-name/we/wemeet/package.nix @@ -189,6 +189,7 @@ stdenv.mkDerivation { mkdir -p $out/app cp -r opt/wemeet $out/app/wemeet cp -r usr/share $out/share + # bundled libcurl depends on openssl 1.1 which is not available in nixpkgs rm -f $out/app/wemeet/lib/libcurl.so substituteInPlace $out/share/applications/wemeetapp.desktop \ --replace-fail "/opt/wemeet/wemeetapp.sh" "wemeet" \ @@ -200,8 +201,7 @@ stdenv.mkDerivation { ln -s $out/app/wemeet/bin/raw/xcast.conf $out/app/wemeet/bin/xcast.conf ln -s $out/app/wemeet/plugins $out/app/wemeet/lib/plugins ln -s $out/app/wemeet/resources $out/app/wemeet/lib/resources - mkdir -p $out/app/wemeet/lib/translations - ln -s $out/app/wemeet/translations/qtwebengine_locales $out/app/wemeet/lib/translations/qtwebengine_locales + ln -s $out/app/wemeet/translations $out/app/wemeet/lib/translations runHook postInstall ''; @@ -217,9 +217,9 @@ stdenv.mkDerivation { "--set QT_STYLE_OVERRIDE fusion" "--set IBUS_USE_PORTAL 1" "--set XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" - "--prefix LD_LIBRARY_PATH : $out/lib:$out/translations:${xorg.libXext}/lib:${xorg.libXdamage}/lib:${opencv4WithoutCuda}/lib:${xorg.libXrandr}/lib" - "--prefix PATH : $out/bin" - "--prefix QT_PLUGIN_PATH : $out/plugins" + "--prefix LD_LIBRARY_PATH : $out/app/wemeet/lib:$out/translations:${xorg.libXext}/lib:${xorg.libXdamage}/lib:${opencv4WithoutCuda}/lib:${xorg.libXrandr}/lib" + "--prefix PATH : $out/app/wemeet/bin" + "--prefix QT_PLUGIN_PATH : $out/app/wemeet/plugins" ]; commonWrapperArgs = baseWrapperArgs ++ [ "--prefix LD_PRELOAD : ${libwemeetwrap}/lib/libwemeetwrap.so" diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/by-name/we/wesnoth/package.nix similarity index 92% rename from pkgs/games/wesnoth/default.nix rename to pkgs/by-name/we/wesnoth/package.nix index 1db4ae430e28..16663c625477 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/by-name/we/wesnoth/package.nix @@ -12,7 +12,7 @@ SDL2_ttf, pango, gettext, - boost, + boost186, libvorbis, fribidi, dbus, @@ -20,11 +20,21 @@ pcre, openssl, icu, - lua, + lua5_4, curl, nix-update-script, }: +let + boost = boost186; + # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234 + lua = lua5_4.override { + postConfigure = '' + makeFlagsArray+=("CC=$CXX") + ''; + }; +in + stdenv.mkDerivation (finalAttrs: { pname = "wesnoth"; version = "1.18.5"; @@ -118,6 +128,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ niklaskorz + iedame ]; platforms = lib.platforms.unix; mainProgram = "wesnoth"; diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 852ca8a043ef..6b5a470845cb 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.12.11", + "version": "1.12.12", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/869df67af2a3134ce6fe3d8395ac0ae23726fd02/Windsurf-darwin-arm64-1.12.11.zip", - "sha256": "1303ed86901099beac3ea6a8ac8ca532f238130b032153546252b852d8224d95" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/146732d0c28fe6d8f982f1ebf7ab4101ece88c63/Windsurf-darwin-arm64-1.12.12.zip", + "sha256": "dae2809d0d551b1ad4acd03effba65c655d6040b3903e046934b1940e4be063f" }, "x86_64-darwin": { - "version": "1.12.11", + "version": "1.12.12", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/869df67af2a3134ce6fe3d8395ac0ae23726fd02/Windsurf-darwin-x64-1.12.11.zip", - "sha256": "6a0898186f68125c9f1310f8c2e6867f3e54ab6a72e1295799da1bd607af4825" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/146732d0c28fe6d8f982f1ebf7ab4101ece88c63/Windsurf-darwin-x64-1.12.12.zip", + "sha256": "8696e119dbabf962d465ea6d2395f165a849b0d8abdd1f62d0ea1d49528e92e1" }, "x86_64-linux": { - "version": "1.12.11", + "version": "1.12.12", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/869df67af2a3134ce6fe3d8395ac0ae23726fd02/Windsurf-linux-x64-1.12.11.tar.gz", - "sha256": "421a27f73c84a6f52bba3cfdc9edd9ea055013ba9c85bdd0777b072ab382637c" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/146732d0c28fe6d8f982f1ebf7ab4101ece88c63/Windsurf-linux-x64-1.12.12.tar.gz", + "sha256": "9f832381f3ea79f3662d728817b05ef33756708e845052d40d1253b7e1a055dc" } } diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix index 4c24da977500..594591c7cf8c 100644 --- a/pkgs/by-name/wo/workshop-runner/package.nix +++ b/pkgs/by-name/wo/workshop-runner/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "workshop-runner"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "mainmatter"; repo = "rust-workshop-runner"; rev = "v${version}"; - hash = "sha256-PfQPRbOPK1Y/j8Xtg78oDzBFUx8eiM3ZwRul/ao0SgI="; + hash = "sha256-vaCMnytN3GidEzn3r0zDyD2uBTLaLSnaho/j1Ti3yHE="; }; - cargoHash = "sha256-opV2IrqMIwdgrXY6V0jxFtrdP8NVmdlUdsLdfFNimt0="; + cargoHash = "sha256-/Oj4B2W+fprOML1KdiU8fHkeGj1JXq8o0GlKxa46/64="; meta = { description = "CLI tool to drive test-driven Rust workshops"; diff --git a/pkgs/by-name/wo/worldpainter/package.nix b/pkgs/by-name/wo/worldpainter/package.nix index 36ca74e99b48..5a3c2c990035 100644 --- a/pkgs/by-name/wo/worldpainter/package.nix +++ b/pkgs/by-name/wo/worldpainter/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "worldpainter"; - version = "2.26.0"; + version = "2.26.1"; src = fetchurl { url = "https://www.worldpainter.net/files/${pname}_${version}.tar.gz"; - hash = "sha256-/ppESrYoNbtxSWaCaKgwvtrW8IGLwigYgQuHF5F/26A="; + hash = "sha256-YlFiGim9IeurDZ4H1XzxRDn7GM/U/zL9SqTUT4gJdno="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xm/xmenu/package.nix b/pkgs/by-name/xm/xmenu/package.nix index f18d19f31021..301742c35acb 100644 --- a/pkgs/by-name/xm/xmenu/package.nix +++ b/pkgs/by-name/xm/xmenu/package.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Menu utility for X"; homepage = "https://github.com/phillbush/xmenu"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ neonfuz ]; platforms = lib.platforms.all; mainProgram = "xmenu"; }; diff --git a/pkgs/by-name/xm/xmlformat/package.nix b/pkgs/by-name/xm/xmlformat/package.nix index c42d0c60b7f6..52fd2d20623a 100644 --- a/pkgs/by-name/xm/xmlformat/package.nix +++ b/pkgs/by-name/xm/xmlformat/package.nix @@ -1,34 +1,39 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, perl, + unstableGitUpdater, }: -stdenv.mkDerivation rec { - pname = "xmlformat"; - version = "1.04"; - src = fetchurl { - url = "http://www.kitebird.com/software/xmlformat/xmlformat-${version}.tar.gz"; - sha256 = "1vwgzn4ha0az7dx0cyc6dx5nywwrx9gxhyh08mvdcq27wjbh79vi"; +stdenv.mkDerivation { + pname = "xmlformat"; + version = "1.9-unstable-2021-09-15"; + + src = fetchFromGitHub { + owner = "someth2say"; + repo = "xmlformat"; + rev = "15a22213b341ab2800806f052a32d29898fecaad"; + hash = "sha256-XCjvGeMerSqyMaVEu6EvLuwgsOxZ/v6ahgFCbzRqC7w="; }; buildInputs = [ perl ]; - buildPhase = '' - patchShebangs ./xmlformat.pl - ''; installPhase = '' mkdir -p $out/bin - cp ./xmlformat.pl $out/bin/xmlformat - cp ./LICENSE $out/ + cp bin/xmlformat.pl $out/bin/xmlformat ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Configurable formatter (or 'pretty-printer') for XML documents"; + homepage = "https://github.com/someth2say/xmlformat"; + license = lib.licenses.gpl3Only; mainProgram = "xmlformat"; - homepage = "http://www.kitebird.com/software/xmlformat/"; - license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + gepbird + ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/xo/xo/package.nix b/pkgs/by-name/xo/xo/package.nix deleted file mode 100644 index 8b48b7af165e..000000000000 --- a/pkgs/by-name/xo/xo/package.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - stdenv, - buildGoModule, - fetchFromGitHub, - installShellFiles, - buildPackages, - versionCheckHook, - nix-update-script, -}: -buildGoModule rec { - pname = "xo"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "xo"; - repo = "xo"; - tag = "v${version}"; - hash = "sha256-cmSY+Et2rE+hLZ1+d2Vvwp+CX0hfLz08QKivQQd7SIQ="; - }; - - vendorHash = "sha256-aTjLoP7u2mMF1Ns/Wb9RR0xAqQCZJjjb5UzY2de6yBU="; - - ldflags = [ - "-X main.version=v${version}" - ]; - - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( - let - emulator = stdenv.hostPlatform.emulator buildPackages; - in - '' - installShellCompletion --cmd xo \ - --bash <(${emulator} $out/bin/xo completion bash) \ - --fish <(${emulator} $out/bin/xo completion fish) \ - --zsh <(${emulator} $out/bin/xo completion zsh) - '' - ); - - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgramArg = "--version"; - doInstallCheck = true; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Command line tool to generate idiomatic Go code for SQL databases supporting PostgreSQL, MySQL, SQLite, Oracle, and Microsoft SQL Server"; - homepage = "https://github.com/xo/xo"; - changelog = "https://github.com/xo/xo/releases/tag/v${version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ xiaoxiangmoe ]; - mainProgram = "xo"; - }; -} diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index ecdcf4d69b91..d44e68afa92c 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-1Wbznj4UQtb6r3k3UdfsfYfhh+2Q+8N5KaaHrkcBlDE="; + x86_64-linux = "sha256-HQ9d0yUaYRh20/OczwQzshbyO8wMh5vRh+RRNwNIx74="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "18.6"; + version = "18.7"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json index 499f5a11e386..2c248e36c928 100644 --- a/pkgs/by-name/ya/yandex-cloud/sources.json +++ b/pkgs/by-name/ya/yandex-cloud/sources.json @@ -1,25 +1,25 @@ { - "version": "0.166.0", + "version": "0.168.0", "binaries": { "aarch64-darwin": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.166.0/darwin/arm64/yc", - "hash": "sha256-2G5wfpadVkuaW3fHZASTNv/3nP9cOUUlXoRmsGRSqEM=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/darwin/arm64/yc", + "hash": "sha256-BeaUE3hSFNw9xoIsqfPVI3d4c2mE/mXQPGKx43DEE38=" }, "aarch64-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.166.0/linux/arm64/yc", - "hash": "sha256-UdE0wEsbessSKUYIWdB1KzvWz2n500+PKdZbA+8AzKo=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/arm64/yc", + "hash": "sha256-H0H+V94jQJCLJODcUj1ekK7v3PpipFLpuPaCtAKtEh0=" }, "i686-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.166.0/linux/386/yc", - "hash": "sha256-NQaVZgjoEjmcAOPVr8T0MBHIwIQx7XSBebM0iC5juYg=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/386/yc", + "hash": "sha256-TgqkCo3kitCLd8LhmJH5uaf6dA2Zq1HkPczGk7NBpJ4=" }, "x86_64-darwin": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.166.0/darwin/amd64/yc", - "hash": "sha256-Kl3QPn43IsPYszgUuV6GiWtkVd8CjxjI0v0Yu1c2UUY=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/darwin/amd64/yc", + "hash": "sha256-xom3Ml8+3IHew2CskcnDj+VWQdD+A7DjEjq3pGrwlIU=" }, "x86_64-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.166.0/linux/amd64/yc", - "hash": "sha256-yCpACnkkgD1p9wsYerCJbKHbWp8iahY9FtZeY/T02pc=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/amd64/yc", + "hash": "sha256-hj1zCcq4FYvWhfX0t9P/8wl94M0Rl6ieROPt4szYRZo=" } } } diff --git a/pkgs/by-name/ya/yarn-berry/package.nix b/pkgs/by-name/ya/yarn-berry/package.nix index fa36fe9deb40..a08f8f6712d0 100644 --- a/pkgs/by-name/ya/yarn-berry/package.nix +++ b/pkgs/by-name/ya/yarn-berry/package.nix @@ -10,9 +10,9 @@ }: let - version_4 = "4.9.4"; + version_4 = "4.10.3"; version_3 = "3.8.7"; - hash_4 = "sha256-7OLCWG4KqgwXT7yJ87vOjjBwGijECkggciCbFrpW0Zs="; + hash_4 = "sha256-sPA9XxWuYvxw/eYAsePuHOaaY2jIBRAv5YfDgVUF6YY="; hash_3 = "sha256-vRrk+Fs/7dZha3h7yI5NpMfd1xezesnigpFgTRCACZo="; in diff --git a/pkgs/by-name/ya/yatto/package.nix b/pkgs/by-name/ya/yatto/package.nix new file mode 100644 index 000000000000..4ce3cba28c97 --- /dev/null +++ b/pkgs/by-name/ya/yatto/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: +buildGoModule (finalAttrs: { + pname = "yatto"; + version = "0.18.1"; + + src = fetchFromGitHub { + owner = "handlebargh"; + repo = "yatto"; + tag = "v${finalAttrs.version}"; + hash = "sha256-GI/Q9lI6SqIOSYi5shMKlgegS8WdlWSFsPs7WLCB6Qg="; + }; + + vendorHash = "sha256-BqOuZUtyA7a8imzj3Oj1SUZ4k3kNjDYWiPlQRG9I0m8="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Terminal-based to-do application built with Bubble Tea"; + homepage = "https://github.com/handlebargh/yatto"; + changelog = "https://github.com/handlebargh/yatto/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gwg313 ]; + mainProgram = "yatto"; + }; +}) diff --git a/pkgs/by-name/ya/yaxg/package.nix b/pkgs/by-name/ya/yaxg/package.nix index b8a7fbe0b83c..3fcd3762f7a9 100644 --- a/pkgs/by-name/ya/yaxg/package.nix +++ b/pkgs/by-name/ya/yaxg/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; license = licenses.gpl3Plus; - maintainers = with maintainers; [ neonfuz ]; mainProgram = "yaxg"; }; } diff --git a/pkgs/by-name/yu/yubikey-touch-detector/package.nix b/pkgs/by-name/yu/yubikey-touch-detector/package.nix index 560de6887dad..fdd20ad21f90 100644 --- a/pkgs/by-name/yu/yubikey-touch-detector/package.nix +++ b/pkgs/by-name/yu/yubikey-touch-detector/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "maximbaz"; repo = "yubikey-touch-detector"; - rev = version; + tag = version; hash = "sha256-aHR/y8rAKS+dMvRdB3oAmOiI7hTA6qlF4Z05OjwYOO4="; }; vendorHash = "sha256-oHEcpu3QvcVC/YCtGtP7nNT9++BSU8BPT5pf8NdLrOo="; @@ -33,9 +33,9 @@ buildGoModule rec { ]; postInstall = '' - install -Dm444 -t $out/share/doc/${pname} *.{md,example} + install -Dm444 -t $out/share/doc/yubikey-touch-detector *.{md,example} - install -Dm444 -t $out/share/licenses/${pname} LICENSE + install -Dm444 -t $out/share/licenses/yubikey-touch-detector LICENSE install -Dm444 -t $out/share/icons/hicolor/128x128/apps yubikey-touch-detector.png @@ -48,12 +48,12 @@ buildGoModule rec { installManPage yubikey-touch-detector.1 ''; - meta = with lib; { + meta = { description = "Tool to detect when your YubiKey is waiting for a touch"; homepage = "https://github.com/maximbaz/yubikey-touch-detector"; - maintainers = with maintainers; [ sumnerevans ]; - license = licenses.isc; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ sumnerevans ]; + license = lib.licenses.isc; + platforms = lib.platforms.linux; mainProgram = "yubikey-touch-detector"; }; } diff --git a/pkgs/by-name/yu/yuicompressor/package.nix b/pkgs/by-name/yu/yuicompressor/package.nix index a2d32b65fd50..1d0b8d2efb8f 100644 --- a/pkgs/by-name/yu/yuicompressor/package.nix +++ b/pkgs/by-name/yu/yuicompressor/package.nix @@ -6,12 +6,12 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yuicompressor"; version = "2.4.8"; src = fetchurl { - url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar"; + url = "https://github.com/yui/yuicompressor/releases/download/v${finalAttrs.version}/yuicompressor-${finalAttrs.version}.jar"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; }; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" ''; - meta = with lib; { + meta = { description = "JavaScript and CSS minifier"; mainProgram = "yuicompressor"; homepage = "http://yui.github.io/yuicompressor/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.bsd3; - maintainers = with maintainers; [ jwiegley ]; - platforms = platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jwiegley ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix index 6d59ac49b6c1..5ccf3bff026d 100644 --- a/pkgs/by-name/za/zammad/package.nix +++ b/pkgs/by-name/za/zammad/package.nix @@ -37,7 +37,7 @@ let }; rubyEnv = bundlerEnv { - name = "${pname}-gems-${version}"; + name = "zammad-gems-${version}"; inherit version; # Which ruby version to select: @@ -127,15 +127,15 @@ stdenvNoCC.mkDerivation { }; }; - meta = with lib; { + meta = { description = "Web-based, open source user support/ticketing solution"; homepage = "https://zammad.org"; - license = licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ taeer netali ]; diff --git a/pkgs/by-name/za/zap/package.nix b/pkgs/by-name/za/zap/package.nix index 3e5e23c2c8b7..5dbf70e3a184 100644 --- a/pkgs/by-name/za/zap/package.nix +++ b/pkgs/by-name/za/zap/package.nix @@ -8,12 +8,12 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zap"; version = "2.16.1"; src = fetchurl { - url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "sha256-Wy64MZsIUSGm6K1Q1p1n2++MhnFm9xqTe/yIjSR6KsE="; + url = "https://github.com/zaproxy/zaproxy/releases/download/v${finalAttrs.version}/ZAP_${finalAttrs.version}_Linux.tar.gz"; + hash = "sha256-Wy64MZsIUSGm6K1Q1p1n2++MhnFm9xqTe/yIjSR6KsE="; }; desktopItems = [ @@ -44,35 +44,35 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share} - cp -pR . "$out/share/${pname}/" + cp -pR . "$out/share/zap/" - cat >> "$out/bin/${pname}" << EOF + cat >> "$out/bin/zap" << EOF #!${runtimeShell} export PATH="${lib.makeBinPath [ jre ]}:\$PATH" export JAVA_HOME='${jre}' if ! [ -f "\$HOME/.ZAP/config.xml" ];then mkdir -p "\$HOME/.ZAP" - head -n 2 $out/share/${pname}/xml/config.xml > "\$HOME/.ZAP/config.xml" - echo "${version_tag}" >> "\$HOME/.ZAP/config.xml" - tail -n +3 $out/share/${pname}/xml/config.xml >> "\$HOME/.ZAP/config.xml" + head -n 2 $out/share/zap/xml/config.xml > "\$HOME/.ZAP/config.xml" + echo "${finalAttrs.version_tag}" >> "\$HOME/.ZAP/config.xml" + tail -n +3 $out/share/zap/xml/config.xml >> "\$HOME/.ZAP/config.xml" fi - exec "$out/share/${pname}/zap.sh" "\$@" + exec "$out/share/zap/zap.sh" "\$@" EOF - chmod u+x "$out/bin/${pname}" + chmod u+x "$out/bin/zap" runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://www.zaproxy.org/"; description = "Java application for web penetration testing"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ mog rafael ]; - platforms = platforms.linux; - license = licenses.asl20; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; mainProgram = "zap"; }; -} +}) diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix index 8278d2871aff..96162b13aca7 100644 --- a/pkgs/by-name/zi/zile/package.nix +++ b/pkgs/by-name/zi/zile/package.nix @@ -12,12 +12,12 @@ vala, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zile"; version = "2.6.4"; src = fetchurl { - url = "mirror://gnu/zile/${pname}-${version}.tar.gz"; + url = "mirror://gnu/zile/zile-${finalAttrs.version}.tar.gz"; hash = "sha256-1dRLhctJBkPQcH4aIYbzoymYwvbquqlIFHm2XK7uV8A="; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/zile/"; - changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${version}"; + changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${finalAttrs.version}"; description = "Implements Lua Editors"; longDescription = '' GNU Zile is a text editor development kit, so that you can (relatively) @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "zile"; }; -} +}) diff --git a/pkgs/by-name/zi/zita-ajbridge/package.nix b/pkgs/by-name/zi/zita-ajbridge/package.nix index f3b78a8204fd..bc69c540bbdb 100644 --- a/pkgs/by-name/zi/zita-ajbridge/package.nix +++ b/pkgs/by-name/zi/zita-ajbridge/package.nix @@ -8,13 +8,13 @@ zita-resampler, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zita-ajbridge"; version = "0.8.4"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-ajbridge-${finalAttrs.version}.tar.bz2"; + hash = "sha256-vCZONrpNcVw07H3W4xfNHtS7ikZWmA1rIgDi+gEFuzw="; }; buildInputs = [ @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Connect additional ALSA devices to JACK"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ orivej ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/zn/znapzend/package.nix b/pkgs/by-name/zn/znapzend/package.nix index 3c8d4c8566f9..43ec11adbd5d 100644 --- a/pkgs/by-name/zn/znapzend/package.nix +++ b/pkgs/by-name/zn/znapzend/package.nix @@ -15,7 +15,7 @@ let pname = "Mojo-Log-Clearable"; version = "1.001"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-Log-Clearable-${version}.tar.gz"; hash = "sha256-guBqKdWemc4mC/xp77Wd7qeV2iRqY4wrQ5NRsHtsCnI="; }; buildInputs = with perl.pkgs; [ ModuleBuildTiny ]; @@ -70,14 +70,14 @@ stdenv.mkDerivation (finalAttrs: { $out/bin/znapzend --version ''; - meta = with lib; { + meta = { description = "High performance open source ZFS backup with mbuffer and ssh support"; homepage = "https://www.znapzend.org"; - license = licenses.gpl3; - maintainers = with maintainers; [ + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ otwieracz ma27 ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/zo/zod/package.nix b/pkgs/by-name/zo/zod/package.nix index 1c8dab9f3a30..2626a6d18a34 100644 --- a/pkgs/by-name/zo/zod/package.nix +++ b/pkgs/by-name/zo/zod/package.nix @@ -21,7 +21,7 @@ let version = "2011-09-06"; src = fetchzip { url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz"; - sha256 = "017v96aflrv07g8j8zk9mq8f8rqxl5228rjff5blq8dxpsv1sx7h"; + hash = "sha256-8HQdtr69IUxXcU5mJEShHWfkEK5pfiTRO2Bn6pRJ+wQ="; }; postPatch = '' sed '1i#include ' -i zod_src/common.cpp # gcc12 @@ -50,7 +50,7 @@ let hardeningDisable NIX_LDFLAGS ; - pname = "${pname}-engine"; + pname = "zod-engine-engine"; enableParallelBuilding = true; preBuild = "cd zod_src"; installPhase = '' @@ -69,7 +69,7 @@ let hardeningDisable NIX_LDFLAGS ; - pname = "${pname}-map_editor"; + pname = "zod-engine-map_editor"; enableParallelBuilding = true; preBuild = "cd zod_src"; makeFlags = [ "map_editor" ]; @@ -88,7 +88,7 @@ let zod_engine zod_map_editor ; - pname = "${pname}-launcher"; + pname = "zod-engine-launcher"; # This is necessary because the zod_launcher has terrible fixed-width window # the Idea is to apply the scalingFactor to all positions and sizes and I tested 1,2,3 and 4 # 2,3,4 look acceptable on my 4k monitor and 1 is unreadable. @@ -109,7 +109,7 @@ let install -m755 zod_launcher $out/bin ''; }; - zod_assets = runCommandLocal "${pname}-assets" { } '' + zod_assets = runCommandLocal "zod-engine-assets" { } '' mkdir -p $out/usr/lib/commander-zod{,blank_maps} cp -r ${src}/assets $out/usr/lib/commander-zod/assets for i in ${src}/*.map ${src}/*.txt; do @@ -128,11 +128,11 @@ symlinkJoin { zod_map_editor zod_assets ]; - meta = with lib; { + meta = { description = "Multiplayer remake of ZED"; homepage = "https://zod.sourceforge.net/"; - maintainers = with maintainers; [ zeri ]; - license = licenses.gpl3Plus; # Says the website - platforms = platforms.linux; + maintainers = with lib.maintainers; [ zeri ]; + license = lib.licenses.gpl3Plus; # Says the website + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/zo/zookeeper/package.nix b/pkgs/by-name/zo/zookeeper/package.nix index f2f20529a3a5..75ed804993b9 100644 --- a/pkgs/by-name/zo/zookeeper/package.nix +++ b/pkgs/by-name/zo/zookeeper/package.nix @@ -13,12 +13,12 @@ let # https://zookeeper.apache.org/doc/r3.9.2/zookeeperAdmin.html#sc_requiredSoftware jre = jdk11_headless; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zookeeper"; version = "3.9.3"; src = fetchurl { - url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz"; + url = "mirror://apache/zookeeper/zookeeper-${finalAttrs.version}/apache-zookeeper-${finalAttrs.version}-bin.tar.gz"; hash = "sha512-1E2HDBaRZi778ai68YWckBuCDcX/Fjs26BvrJ7b7880xtfHwdWl+2q9tPnpMsMyS+STc/2SylO8T1TVYm9rxQw=="; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper"; - changelog = "https://zookeeper.apache.org/doc/r${version}/releasenotes.html"; + changelog = "https://zookeeper.apache.org/doc/r${finalAttrs.version}/releasenotes.html"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nathan-gs @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; -} +}) diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix index a08191d79ab4..1a0b3a1f710d 100644 --- a/pkgs/by-name/zs/zsh-forgit/package.nix +++ b/pkgs/by-name/zs/zsh-forgit/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-forgit"; - version = "25.09.0"; + version = "25.10.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; tag = finalAttrs.version; - hash = "sha256-hbPiuuiyPOCtnByInhoA0atVDwNaMRfzp1n9dusg59I="; + hash = "sha256-MG60GzRG0NFQsGXBXBedSweucxo88S/NACXTme7ixRM="; }; strictDeps = true; diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index d341218101fe..d808ae3690a8 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "0.8.1"; + version = "0.8.5"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${version}"; - hash = "sha256-GMRtvAG6jdnm+WxXOZb5eOyX1rEqzk7tHZbjSI9/47g="; + hash = "sha256-ef63PVG0JOHY4zyq5M5oAAcxtfhm1XOvpsxgSeXvgDo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-maps/default.nix b/pkgs/desktops/pantheon/apps/elementary-maps/default.nix new file mode 100644 index 000000000000..f6fb16c8e54f --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-maps/default.nix @@ -0,0 +1,64 @@ +{ + stdenv, + lib, + fetchFromGitHub, + glib, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook4, + geoclue2, + geocode-glib_2, + granite7, + gtk4, + libadwaita, + libshumate, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "elementary-maps"; + version = "8.1.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "maps"; + tag = finalAttrs.version; + hash = "sha256-tS8UnW/oNjLaUZ1XgGuAmeMrHEa2jbtBc0xMcTKki1k="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + glib + meson + ninja + pkg-config + vala + wrapGAppsHook4 + ]; + + buildInputs = [ + geoclue2 + geocode-glib_2 + glib + granite7 + gtk4 + libadwaita + libshumate + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://github.com/elementary/maps"; + description = "Map viewer designed for elementary OS"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.pantheon ]; + mainProgram = "io.elementary.maps"; + }; +}) diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 04050a28e6d1..3d15f9b9f72b 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -74,6 +74,8 @@ lib.makeScope pkgs.newScope ( elementary-mail = callPackage ./apps/elementary-mail { }; + elementary-maps = callPackage ./apps/elementary-maps { }; + elementary-music = callPackage ./apps/elementary-music { }; elementary-photos = callPackage ./apps/elementary-photos { }; diff --git a/pkgs/desktops/pantheon/libraries/granite/7/default.nix b/pkgs/desktops/pantheon/libraries/granite/7/default.nix index c749c9262053..a1c65b89f474 100644 --- a/pkgs/desktops/pantheon/libraries/granite/7/default.nix +++ b/pkgs/desktops/pantheon/libraries/granite/7/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nix-update-script, meson, ninja, @@ -10,6 +9,7 @@ vala, pkg-config, libgee, + libshumate, gtk4, glib, gettext, @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "7.6.0"; + version = "7.7.0"; outputs = [ "out" @@ -31,18 +31,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "granite"; rev = version; - sha256 = "sha256-bv2rOq16xg9lCWfcLzAFN4LjBTJBxPhXvEJzutkdYzs="; + sha256 = "sha256-ypSkzz9BaVweR1C0OkkfwDl8tehMK1S5iExL14LuKmI="; }; - patches = [ - # Init: Avoid crash with Gtk >= 4.17 - # https://github.com/elementary/granite/pull/893 - (fetchpatch { - url = "https://github.com/elementary/granite/commit/60cb8c4119b579592e6c7f3b1476e4d729f58699.patch"; - hash = "sha256-6NB/Tu3mdmiBd77SOi4twdY/HidyhMn7mNN+54iFLIc="; - }) - ]; - nativeBuildInputs = [ gettext gobject-introspection @@ -54,6 +45,10 @@ stdenv.mkDerivation rec { wrapGAppsHook4 ]; + buildInputs = [ + libshumate # demo + ]; + propagatedBuildInputs = [ glib gsettings-desktop-schemas # is_clock_format_12h uses "org.gnome.desktop.interface clock-format" diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 6757fbcfd17c..adac56501409 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, python3, nodejs, closurecompiler, @@ -51,10 +50,14 @@ stdenv.mkDerivation rec { rev = version; }; - nativeBuildInputs = [ makeWrapper ]; + strictDeps = true; + + nativeBuildInputs = [ + makeWrapper + python3 + ]; buildInputs = [ nodejs - python3 ]; patches = [ diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json index 915626fd790a..f383afef4294 100644 --- a/pkgs/development/compilers/flutter/versions/3_35/data.json +++ b/pkgs/development/compilers/flutter/versions/3_35/data.json @@ -1,17 +1,17 @@ { - "version": "3.35.4", - "engineVersion": "c29809135135e262a912cf583b2c90deb9ded610", + "version": "3.35.5", + "engineVersion": "d3d45dcf251823c1769909cd43698d126db38deb", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-lUqqu4OgveDOmVJw1BMnSYFCDooReGuj7Gh9ZCalcmE=", - "x86_64-linux": "sha256-lUqqu4OgveDOmVJw1BMnSYFCDooReGuj7Gh9ZCalcmE=" + "aarch64-linux": "sha256-0g9ozn4aamUI85j11xEwW6Xv61APIpuLSmg6I0cHiiM=", + "x86_64-linux": "sha256-0g9ozn4aamUI85j11xEwW6Xv61APIpuLSmg6I0cHiiM=" }, "x86_64-linux": { - "aarch64-linux": "sha256-Kw2I9ztyYOVl1V2ewLOIlxvvlX4+P3Hp5yZK82eLIbo=", - "x86_64-linux": "sha256-Kw2I9ztyYOVl1V2ewLOIlxvvlX4+P3Hp5yZK82eLIbo=" + "aarch64-linux": "sha256-tXUALuEJZUiUoVOV6vxfdjrSSUe4Mm4Nax+j9lvVCJM=", + "x86_64-linux": "sha256-tXUALuEJZUiUoVOV6vxfdjrSSUe4Mm4Nax+j9lvVCJM=" } }, "dartVersion": "3.9.2", @@ -21,53 +21,53 @@ "x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=", "aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw=" }, - "flutterHash": "sha256-8mX5KZGti5TR1AhB6ACAhGziZOgmnaaNF4RFyD1a3O4=", + "flutterHash": "sha256-EVJ/2Qk5r9CL/WObLsH3J/KW/ota6HgkAUYNgLYZwkw=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-59z28tm0Pr6Jwln/MlTJmCNoZrxRuqEOW5Ua1M6bryI=", - "aarch64-linux": "sha256-odC1O8RbcqLndwsRFtguPguH6oda3mDAabBAuFQKCLY=", - "x86_64-darwin": "sha256-59z28tm0Pr6Jwln/MlTJmCNoZrxRuqEOW5Ua1M6bryI=", - "x86_64-linux": "sha256-odC1O8RbcqLndwsRFtguPguH6oda3mDAabBAuFQKCLY=" + "aarch64-darwin": "sha256-XU2WMX8lYGZgERKcUXXRCG0i+v+NeJQt05ZcwVEPkwE=", + "aarch64-linux": "sha256-SDJXjztXecAQPwDgZlg3Lk04LRVmuVLhEoC1nPTlDw0=", + "x86_64-darwin": "sha256-XU2WMX8lYGZgERKcUXXRCG0i+v+NeJQt05ZcwVEPkwE=", + "x86_64-linux": "sha256-SDJXjztXecAQPwDgZlg3Lk04LRVmuVLhEoC1nPTlDw0=" }, "fuchsia": { - "aarch64-darwin": "sha256-xoET0OFPSF/OWiNHJSYoEgNwaopRTMMAdHZkBN6n/5k=", - "aarch64-linux": "sha256-xoET0OFPSF/OWiNHJSYoEgNwaopRTMMAdHZkBN6n/5k=", - "x86_64-darwin": "sha256-xoET0OFPSF/OWiNHJSYoEgNwaopRTMMAdHZkBN6n/5k=", - "x86_64-linux": "sha256-xoET0OFPSF/OWiNHJSYoEgNwaopRTMMAdHZkBN6n/5k=" + "aarch64-darwin": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=", + "aarch64-linux": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=", + "x86_64-darwin": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=", + "x86_64-linux": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=" }, "ios": { - "aarch64-darwin": "sha256-IUWziLP2FtBo041VkxVQCDVRYztybPTcNFfhMvHlReQ=", - "aarch64-linux": "sha256-IUWziLP2FtBo041VkxVQCDVRYztybPTcNFfhMvHlReQ=", - "x86_64-darwin": "sha256-IUWziLP2FtBo041VkxVQCDVRYztybPTcNFfhMvHlReQ=", - "x86_64-linux": "sha256-IUWziLP2FtBo041VkxVQCDVRYztybPTcNFfhMvHlReQ=" + "aarch64-darwin": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=", + "aarch64-linux": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=", + "x86_64-darwin": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=", + "x86_64-linux": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=" }, "linux": { - "aarch64-darwin": "sha256-Y8j7Mr8tbgbl89/bxnNnqTb4plTijv24CYtWlKxAxqs=", - "aarch64-linux": "sha256-Y8j7Mr8tbgbl89/bxnNnqTb4plTijv24CYtWlKxAxqs=", - "x86_64-darwin": "sha256-FZ8y8zTUSxhbGiFLyhgFRrwWAE77jSINuY6ypbL8Gjg=", - "x86_64-linux": "sha256-FZ8y8zTUSxhbGiFLyhgFRrwWAE77jSINuY6ypbL8Gjg=" + "aarch64-darwin": "sha256-2ggkx/GSox34XxRfHJM3ipf9wqsR4rKYfn8Mzo4NmqI=", + "aarch64-linux": "sha256-2ggkx/GSox34XxRfHJM3ipf9wqsR4rKYfn8Mzo4NmqI=", + "x86_64-darwin": "sha256-uObm7ogCp1JEMJ7CFeIzcN/ore6VPGvmvhsEYiXroWY=", + "x86_64-linux": "sha256-uObm7ogCp1JEMJ7CFeIzcN/ore6VPGvmvhsEYiXroWY=" }, "macos": { - "aarch64-darwin": "sha256-fHf8/MunFZ24Q3CEF032nljlZH2I8w7KlKfLVqKCpJc=", - "aarch64-linux": "sha256-fHf8/MunFZ24Q3CEF032nljlZH2I8w7KlKfLVqKCpJc=", - "x86_64-darwin": "sha256-fHf8/MunFZ24Q3CEF032nljlZH2I8w7KlKfLVqKCpJc=", - "x86_64-linux": "sha256-fHf8/MunFZ24Q3CEF032nljlZH2I8w7KlKfLVqKCpJc=" + "aarch64-darwin": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=", + "aarch64-linux": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=", + "x86_64-darwin": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=", + "x86_64-linux": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=" }, "universal": { - "aarch64-darwin": "sha256-naywuR7a5kNzp32cg/n7x+rNP/nEPDzMILeaAkW1rZ0=", - "aarch64-linux": "sha256-++veEABUJp9nCvawRC+PzgG7I/Qg/WTEDjB0BLixnhY=", - "x86_64-darwin": "sha256-Ctt79i77YOqIzLzs1BNh50zbCEcLHPNm/nH+cICp1S8=", - "x86_64-linux": "sha256-ZFHB4gT3O/U+eKHSAynvbG1Kov1mshhcibmJlG1MsRs=" + "aarch64-darwin": "sha256-dXJmnOZunesXmUAGt32LE+hXB2b3KNhauSYeduPuK70=", + "aarch64-linux": "sha256-xWvFZH3RcTMuV2wn6bpEe4eiKdjGy7u/YlxZrqfOCQA=", + "x86_64-darwin": "sha256-9anTlYdSTIK1go8dxZ0TqfWQNz0YTCEGEESvXw+nTec=", + "x86_64-linux": "sha256-5DQ+4pPBtmc391cm446Ql6OtSGz3DLtO4pI3ueX0jUY=" }, "web": { - "aarch64-darwin": "sha256-SkH+u5yQwY2JxLLW/4hG0tSr8l0diL4QMvi8kS064WY=", - "aarch64-linux": "sha256-SkH+u5yQwY2JxLLW/4hG0tSr8l0diL4QMvi8kS064WY=", - "x86_64-darwin": "sha256-SkH+u5yQwY2JxLLW/4hG0tSr8l0diL4QMvi8kS064WY=", - "x86_64-linux": "sha256-SkH+u5yQwY2JxLLW/4hG0tSr8l0diL4QMvi8kS064WY=" + "aarch64-darwin": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=", + "aarch64-linux": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=", + "x86_64-darwin": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=", + "x86_64-linux": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=" }, "windows": { - "x86_64-darwin": "sha256-yYn8BChjhZgqUyrENcpAZRpBf1w0LmzCjXnx9z4aw4Q=", - "x86_64-linux": "sha256-yYn8BChjhZgqUyrENcpAZRpBf1w0LmzCjXnx9z4aw4Q=" + "x86_64-darwin": "sha256-aZ7owKiUsfuV6UqlO9I8aD1aWVjA55sOHdq+pgaLJGQ=", + "x86_64-linux": "sha256-aZ7owKiUsfuV6UqlO9I8aD1aWVjA55sOHdq+pgaLJGQ=" } }, "pubspecLock": { diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 17d32f60d6cd..c1a4d5478a51 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -258,7 +258,7 @@ let ++ lib.optional ( lib.systems.equals targetPlatform hostPlatform && targetPlatform.isx86_32 ) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" - ++ lib.optional targetPlatform.isNetBSD "--disable-libssp" # Provided by libc. + ++ lib.optional (targetPlatform.isNetBSD || targetPlatform.isCygwin) "--disable-libssp" # Provided by libc. ++ lib.optionals hostPlatform.isSunOS [ "--enable-long-long" "--enable-libssp" diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix index da2ab3029561..437a015dbf7b 100644 --- a/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -27,7 +27,9 @@ in ] ); in - mkFlags libcCross ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null)); + mkFlags libcCross + ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null)) + ++ mkFlags (libcCross.w32api or null); EXTRA_LDFLAGS_FOR_TARGET = let @@ -50,5 +52,7 @@ in ) ); in - mkFlags libcCross ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null)); + mkFlags libcCross + ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null)) + ++ mkFlags (libcCross.w32api or null); } diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index e0437bc6e6e0..ead87e5e6630 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -53,7 +53,10 @@ lib.pipe drv useLibgccFromTargetLibc = libcCross != null && libcCross ? passthru.libgcc; enableLibGccOutput = - (!stdenv.targetPlatform.isWindows || (lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform)) + ( + !(stdenv.targetPlatform.isWindows || stdenv.targetPlatform.isCygwin) + || (lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform) + ) && !langJit && !stdenv.hostPlatform.isDarwin && enableShared diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 1b52cd4903da..2c0fa1b40852 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -223,3 +223,17 @@ in } .${majorVersion} or [ ] ) + +++ optional targetPlatform.isCygwin (fetchpatch { + name = "libstdc-fix-compilation-in-freestanding-win32.patch"; + url = "https://inbox.sourceware.org/gcc-patches/20250922182808.2599390-2-corngood@gmail.com/raw"; + hash = "sha256-+EYW9lG8CviVX7RyNHp+iX+8BRHUjt5b07k940khbbY="; +}) + +++ optionals targetPlatform.isCygwin [ + (fetchpatch { + name = "cygwin-fix-compilation-with-inhibit_libc.patch"; + url = "https://inbox.sourceware.org/gcc-patches/20250926170154.2222977-1-corngood@gmail.com/raw"; + hash = "sha256-mgzMRvgPdhj+Q2VRsFhpE2WQzg0CvWsc5/FRAsSU1Es="; + }) +] diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix index cc73f02be4e6..f0e39e7ed391 100644 --- a/pkgs/development/compilers/llvm/common/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix @@ -12,7 +12,7 @@ python3, libcxx, enableShared ? !stdenv.hostPlatform.isStatic, - doFakeLibgcc ? stdenv.hostPlatform.useLLVM, + doFakeLibgcc ? stdenv.hostPlatform.useLLVM && !stdenv.hostPlatform.isStatic, devExtraCmakeFlags ? [ ], getVersionFile, }: diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index a508347ba23b..a2cc98db07f3 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -27,9 +27,9 @@ let "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.1".officialRelease.sha256 = "sha256-IB9Z3bIMwfgw2W2Vxo89CmtCM9DfOyV2Ei64nqgHrgc="; "22.0.0-git".gitRelease = { - rev = "e396dab01f3da49df16c710d105a409973df5a03"; - rev-version = "22.0.0-unstable-2025-09-21"; - sha256 = "sha256-pYu/IVFvptxbtMo5GQePPKFlFnD/7FA13uzSuJWq3dc="; + rev = "cac0635ee9e947b5f90130df2f471aa4b722e04b"; + rev-version = "22.0.0-unstable-2025-09-28"; + sha256 = "sha256-wOhLGRYbkJOM6uglKXWZ7/94w/Fi3K2tlyPWdOVsCvM="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/openjdk/25/patches/make-4.4.1.patch b/pkgs/development/compilers/openjdk/25/patches/make-4.4.1.patch new file mode 100644 index 000000000000..980eed347ce4 --- /dev/null +++ b/pkgs/development/compilers/openjdk/25/patches/make-4.4.1.patch @@ -0,0 +1,25 @@ +diff --git a/make/PreInit.gmk b/make/PreInit.gmk +index 3df44308dd..490d7c24e9 100644 +--- a/make/PreInit.gmk ++++ b/make/PreInit.gmk +@@ -60,13 +60,19 @@ + # Extract non-global targets that require a spec file. + CALLED_SPEC_TARGETS := $(filter-out $(ALL_GLOBAL_TARGETS), $(CALLED_TARGETS)) + ++# GNU make-4.4 (and later) include not just single-letter form of the ++# options MAKEFILES but also long for and even some of the arguments. ++# Skip long form and use only short form: ++# MAKEFLAGS=' --debug=basic -- LOG=trace ...' ++MAKEFLAGS_SINGLE_LETTER := $(firstword -$(MAKEFLAGS)) ++ + # If we have only global targets, or if we are called with -qp (assuming an + # external part, e.g. bash completion, is trying to understand our targets), + # we will skip SPEC location and the sanity checks. + ifeq ($(CALLED_SPEC_TARGETS), ) + SKIP_SPEC := true + endif +-ifeq ($(findstring p, $(MAKEFLAGS))$(findstring q, $(MAKEFLAGS)), pq) ++ifeq ($(findstring p, $(MAKEFLAGS_SINGLE_LETTER))$(findstring q, $(MAKEFLAGS_SINGLE_LETTER)), pq) + SKIP_SPEC := true + endif + diff --git a/pkgs/development/compilers/openjdk/25/source.json b/pkgs/development/compilers/openjdk/25/source.json new file mode 100644 index 000000000000..b34a8438ef74 --- /dev/null +++ b/pkgs/development/compilers/openjdk/25/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-5kQ7xPyWGk/weVYVVNEFPUF1HspfisqcPHA+DM6Q35c=", + "owner": "openjdk", + "repo": "jdk25u", + "rev": "refs/tags/jdk-25+36" +} diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 24f0e384cb4c..2a9012113690 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -60,12 +60,14 @@ openjfx21, openjfx23, openjfx24, + openjfx25, openjfx_jdk ? { "17" = openjfx17; "21" = openjfx21; "23" = openjfx23; "24" = openjfx24; + "25" = openjfx25; } .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"), @@ -80,6 +82,7 @@ temurin-bin-21, temurin-bin-23, temurin-bin-24, + temurin-bin-25, jdk-bootstrap ? { "8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8; @@ -88,6 +91,7 @@ "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21; "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23; "24" = temurin-bin-24.__spliced.buildBuild or temurin-bin-24; + "25" = temurin-bin-25.__spliced.buildBuild or temurin-bin-25; } .${featureVersion}, }: @@ -104,6 +108,7 @@ let atLeast21 = lib.versionAtLeast featureVersion "21"; atLeast23 = lib.versionAtLeast featureVersion "23"; atLeast24 = lib.versionAtLeast featureVersion "24"; + atLeast25 = lib.versionAtLeast featureVersion "25"; tagPrefix = if atLeast11 then "jdk-" else "jdk"; version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev; @@ -217,7 +222,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; }) ] - ++ lib.optionals atLeast11 [ + ++ lib.optionals (atLeast11 && !atLeast25) [ # Fix build for gnumake-4.4.1: # https://github.com/openjdk/jdk/pull/12992 (fetchpatch { @@ -226,6 +231,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) ] + ++ lib.optionals atLeast25 [ + ./25/patches/make-4.4.1.patch + ] ++ lib.optionals (!headless && enableGtk) [ ( if atLeast17 then diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 056c8436b82d..e58a42d6d2b5 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -303,6 +303,19 @@ let }) ]; } + { + cases = [ + (isEq "9.0") + (isEq "3.16") + ]; + out = [ + # Support for Coq 9.0.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/a962ef9da0fb4ef2a4314ccedd111eb248e42cf2.patch"; + hash = "sha256-ipYqcfcgz3cKyI1NGSgfOgiVdV1WUwlv6DVB1S1hJvw="; + }) + ]; + } ] [ ]; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ce69e1c41e70..d424d3f3d8ee 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -733,7 +733,6 @@ unsupported-platforms: iwlib: [ platforms.darwin ] Jazzkell: [ platforms.darwin ] # depends on Euterpea jsaddle-webkit2gtk: [ platforms.darwin ] - kmonad: [ platforms.darwin ] Kulitta: [ platforms.darwin ] # depends on Euterpea LambdaHack: [ platforms.darwin ] libmodbus: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c74f95d74739..209a854a7a4d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -400965,7 +400965,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; - badPlatforms = lib.platforms.darwin; mainProgram = "kmonad"; maintainers = [ lib.maintainers.slotThe ]; } diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 007d5cb0e524..a77ea35bfd32 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -428,8 +428,15 @@ in }; ruby_3_4 = generic { - version = rubyVersion "3" "4" "5" ""; - hash = "sha256-HYjYontEL93kqgbcmehrC78LKIlj2EMxEt1frHmP1e4="; + version = rubyVersion "3" "4" "6" ""; + hash = "sha256-48Gauej0GzcjEk+8ARTN58v1XmWqnFjBKs2J7JwN0bk="; cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0="; }; + + ruby_3_5 = generic { + version = rubyVersion "3" "5" "0" "preview1"; + hash = "sha256-7PCcfrkC6Rza+cxVPNAMypuEiz/A4UKXhQ+asIzdRvA="; + cargoHash = "sha256-z7NwWc4TaR042hNx0xgRkh/BQEpEJtE53cfrN0qNiE0="; + }; + } diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index ff8f8734926b..b6da2c585748 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -41,6 +41,7 @@ wayland-protocols, libxkbcommon, wayland-scanner, + libdecor, withExamples ? (stdenv.buildPlatform == stdenv.hostPlatform), @@ -118,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-protocols libxkbcommon + libdecor ] ++ lib.optionals withCairo [ cairo diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 35644296a1d5..5688614ee207 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Fix dlopen path postPatch = '' - substituteInPlace include/cecloader.h --replace "libcec.so" "$out/lib/libcec.so" + substituteInPlace include/cecloader.h --replace "\"libcec." "\"$out/lib/libcec." ''; nativeBuildInputs = [ @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { cmake ]; buildInputs = [ - udev libcec_platform ] + ++ lib.optional stdenv.hostPlatform.isLinux udev ++ lib.optional withLibraspberrypi libraspberrypi; cmakeFlags = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; homepage = "http://libcec.pulse-eight.com"; license = lib.licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; teams = [ teams.kodi ]; }; } diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index e5e05bde22ca..11139df5e027 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_CXX_FLAGS='-std=c++11'"; + meta = with lib; { description = "Platform library for libcec and Kodi addons"; homepage = "https://github.com/Pulse-Eight/platform"; diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index 2730ab54e558..79aeadb8d9c3 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.2.3"; + version = "25.2.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-3URQ9ZZ22vdZpToZqpWbcpsAI4e8a5X35/5HWOprbPM="; + hash = "sha256-75bJyFGaLc8H9w83O1WXIrFFFP7/O5HNzabdqkWI/hQ="; }; meta = { diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 1fc17df01a32..d23a732a4068 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -295,6 +295,8 @@ let cat ${conf} > $etc/etc/ssl/openssl.cnf ''; + allowedImpureDLLs = [ "CRYPT32.dll" ]; + postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' # Check to make sure the main output and the static runtime dependencies diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index 94f56bd914f4..5faa617b441d 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -35,7 +35,9 @@ let ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_CODE_GEN" true) + (lib.cmakeBool ( + if lib.versionOlder finalAttrs.version "2.0.0" then "BUILD_CODE_GEN" else "SDBUSCPP_BUILD_CODEGEN" + ) true) ]; meta = { @@ -52,7 +54,7 @@ let inherent design complexities and limitations. ''; license = lib.licenses.lgpl2Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ etwas ]; platforms = lib.platforms.linux; mainProgram = "sdbus-c++-xml2cpp"; }; @@ -65,7 +67,7 @@ in }; sdbus-cpp_2 = generic { - version = "2.0.0"; - hash = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g="; + version = "2.1.0"; + hash = "sha256-JnjabBr7oELLsUV9a+dAAaRyUzaMIriu90vkaVJg2eY="; }; } diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix deleted file mode 100644 index a02f91e527eb..000000000000 --- a/pkgs/development/libraries/soqt/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - fetchFromGitHub, - lib, - stdenv, - coin3d, - qtbase, - cmake, - pkg-config, -}: - -stdenv.mkDerivation { - pname = "soqt"; - version = "2020-12-05-unstable"; - - src = fetchFromGitHub { - owner = "coin3d"; - repo = "soqt"; - # rev = "SoQt-${version}"; - rev = "fb8f655632bb9c9c60e0ff9fa69a5ba22d3ff99d"; - hash = "sha256-YoBq8P3Tag2Sepqxf/qIcJDBhH/gladBmDUj78aacZs="; - fetchSubmodules = true; - }; - - buildInputs = [ - coin3d - qtbase - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - dontWrapQtApps = true; - - meta = with lib; { - homepage = "https://github.com/coin3d/soqt"; - license = licenses.bsd3; - description = "Glue between Coin high-level 3D visualization library and Qt"; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index d53f97ed814b..6c1528c9cd17 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -40,7 +40,6 @@ mapAliases { throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16 "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 "@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20 - "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07 "@maizzle/cli" = pkgs.maizzle; # added 2023-08-17 "@medable/mdctl-cli" = throw "@medable/mdctl-cli was removed because it was broken"; # added 2023-08-21 @@ -74,10 +73,12 @@ mapAliases { inherit (pkgs) coc-clangd; # added 2024-06-29 inherit (pkgs) coc-css; # added 2024-06-29 inherit (pkgs) coc-diagnostic; # added 2024-06-29 + inherit (pkgs) coc-docker; # added 2025-10-01 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 + coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01 inherit (pkgs) coc-toml; coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 @@ -272,6 +273,7 @@ mapAliases { inherit (pkgs) uglify-js; # added 2024-06-15 inherit (pkgs) undollar; # added 2024-06-29 inherit (pkgs) ungit; # added 2023-08-20 + unified-language-server = throw "unified-language-server was removed as it is a library that should be imported within a Javascript project, not an end-user tool"; # added 2025-10-02 inherit (pkgs) vim-language-server; # added 2024-06-25 vls = throw "vls has been deprecated by upstream as vetur is also deprecated. Upstream suggests migrating to Volar for Vue LSP tooling instead."; # added 2024-12-09 inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 1f473a018c11..b02fde94cd25 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -24,7 +24,6 @@ , "cdktf-cli" , "clipboard-cli" , "coc-cmake" -, "coc-docker" , "coc-emmet" , "coc-eslint" , "coc-explorer" @@ -43,7 +42,6 @@ , "coc-pairs" , "coc-prettier" , "coc-r-lsp" -, "coc-rls" , "coc-rust-analyzer" , "coc-sh" , "coc-smartf" @@ -147,7 +145,6 @@ , "tsun" , "ts-node" , "ttf2eot" -, "unified-language-server" , "vega-cli" , "vega-lite" , "vercel" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index af270592afa0..962bb9782d90 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4676,15 +4676,6 @@ let sha512 = "uSz+elSGzjCMANWa5IlbGczLYPkNI/LeR+cHrgaTqTrTSh9RHhOFA4daD2eRUz6lMtOW+Fnsb+qv7V2Zz8ML0g=="; }; }; - "@npmcli/config-8.3.4" = { - name = "_at_npmcli_slash_config"; - packageName = "@npmcli/config"; - version = "8.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/config/-/config-8.3.4.tgz"; - sha512 = "01rtHedemDNhUXdicU7s+QYz/3JyV5Naj84cvdXGH4mgCdL+agmSYaLF4LUG4vMCLzhBO8YtS0gPpH1FGvbgAw=="; - }; - }; "@npmcli/fs-1.1.1" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; @@ -4712,15 +4703,6 @@ let sha512 = "/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q=="; }; }; - "@npmcli/git-5.0.8" = { - name = "_at_npmcli_slash_git"; - packageName = "@npmcli/git"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz"; - sha512 = "liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ=="; - }; - }; "@npmcli/git-6.0.3" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; @@ -4784,15 +4766,6 @@ let sha512 = "+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA=="; }; }; - "@npmcli/package-json-5.2.1" = { - name = "_at_npmcli_slash_package-json"; - packageName = "@npmcli/package-json"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.1.tgz"; - sha512 = "f7zYC6kQautXHvNbLEWgD/uGu1+xCn9izgqBfgItWSx22U0ZDekxN08A1vM8cTxj/cRVe0Q94Ode+tdoYmIOOQ=="; - }; - }; "@npmcli/package-json-6.1.1" = { name = "_at_npmcli_slash_package-json"; packageName = "@npmcli/package-json"; @@ -4802,15 +4775,6 @@ let sha512 = "d5qimadRAUCO4A/Txw71VM7UrRZzV+NPclxz/dc+M6B2oYwjWTjqh8HA/sGQgs9VZuJ6I/P7XIAlJvgrl27ZOw=="; }; }; - "@npmcli/promise-spawn-7.0.2" = { - name = "_at_npmcli_slash_promise-spawn"; - packageName = "@npmcli/promise-spawn"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz"; - sha512 = "xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ=="; - }; - }; "@npmcli/promise-spawn-8.0.2" = { name = "_at_npmcli_slash_promise-spawn"; packageName = "@npmcli/promise-spawn"; @@ -15666,24 +15630,6 @@ let sha512 = "ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ=="; }; }; - "dockerfile-ast-0.4.2" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.4.2.tgz"; - sha512 = "k770mVWaCm3KbyOSPFizP6WB2ucZjfAv8aun4UsKl+IivowK7ItwBixNbziBjN05yNpvCL1/IxBdZiSz6KQIvA=="; - }; - }; - "dockerfile-language-server-nodejs-0.9.0" = { - name = "dockerfile-language-server-nodejs"; - packageName = "dockerfile-language-server-nodejs"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.9.0.tgz"; - sha512 = "QPWcUxbbNTaWaRQrJKUBmCXI6iE8l7f81bCVaZizCIkVg4py/4o2mho+AKlLUsZcCml5ss8MkJ257SFV2BZWCg=="; - }; - }; "dockerfile-language-service-0.9.0" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; @@ -15693,15 +15639,6 @@ let sha512 = "sDUkTR4LUimEAWXDIbUTEx2CytCBlx+XlJkg4B2Ptvak9HkwPD4JpXesaWxXPpp6YHCzxqwsTDY7Gf79ic340g=="; }; }; - "dockerfile-utils-0.10.0" = { - name = "dockerfile-utils"; - packageName = "dockerfile-utils"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.10.0.tgz"; - sha512 = "gnEhxITHpOXNXdlwJgJEq3xnJokm0IZOmrmHlJv8zCB2EDsgZWwdYWuktMMslIywK2YT22gxgZEoFjtEaJqzhQ=="; - }; - }; "dockerode-4.0.4" = { name = "dockerode"; packageName = "dockerode"; @@ -21363,15 +21300,6 @@ let sha512 = "hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="; }; }; - "ignore-6.0.2" = { - name = "ignore"; - packageName = "ignore"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz"; - sha512 = "InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A=="; - }; - }; "ignore-7.0.3" = { name = "ignore"; packageName = "ignore"; @@ -24945,15 +24873,6 @@ let sha512 = "Lg1CZa1CFj2CbNaxijTL6PCbzd4qGTlZov+iH2p5Xwy/ApcZJh+i6jMN2cYePouTfjJfrNu3nXFdEw8LvbjPFQ=="; }; }; - "load-plugin-6.0.3" = { - name = "load-plugin"; - packageName = "load-plugin"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/load-plugin/-/load-plugin-6.0.3.tgz"; - sha512 = "kc0X2FEUZr145odl68frm+lMJuQ23+rTXYmR6TImqPtbpmXC4vVXbWKDQ9IzndA0HfyQamWfKLhzsqGSTxE63w=="; - }; - }; "load-yaml-file-0.2.0" = { name = "load-yaml-file"; packageName = "load-yaml-file"; @@ -29294,15 +29213,6 @@ let sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; }; - "npm-install-checks-6.3.0" = { - name = "npm-install-checks"; - packageName = "npm-install-checks"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz"; - sha512 = "W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw=="; - }; - }; "npm-install-checks-7.1.1" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -29348,15 +29258,6 @@ let sha512 = "TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w=="; }; }; - "npm-package-arg-11.0.3" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "11.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz"; - sha512 = "sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw=="; - }; - }; "npm-package-arg-12.0.2" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -29402,15 +29303,6 @@ let sha512 = "r4fFa4FqYY8xaM7fHecQ9Z2nE9hgNfJR+EmoKv0+chvzWkBcORX3r0FpTByP+CbOVJDladMXnPQGVN8PBLGuTQ=="; }; }; - "npm-pick-manifest-9.1.0" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz"; - sha512 = "nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA=="; - }; - }; "npm-registry-client-8.6.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -30806,15 +30698,6 @@ let sha512 = "SA5aMiaIjXkAiBrW/yPgLgQAQg42f7K3ACO+2l/zOvtQBwX58DMUsFJXelW2fx3yMBmWOVkR6j1MGsdSbCA4UA=="; }; }; - "parse-json-7.1.1" = { - name = "parse-json"; - packageName = "parse-json"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz"; - sha512 = "SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw=="; - }; - }; "parse-json-8.1.0" = { name = "parse-json"; packageName = "parse-json"; @@ -32075,15 +31958,6 @@ let sha512 = "++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A=="; }; }; - "proc-log-4.2.0" = { - name = "proc-log"; - packageName = "proc-log"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz"; - sha512 = "g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA=="; - }; - }; "proc-log-5.0.0" = { name = "proc-log"; packageName = "proc-log"; @@ -37124,15 +36998,6 @@ let sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; }; }; - "string-width-6.1.0" = { - name = "string-width"; - packageName = "string-width"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-6.1.0.tgz"; - sha512 = "k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ=="; - }; - }; "string-width-7.2.0" = { name = "string-width"; packageName = "string-width"; @@ -39356,15 +39221,6 @@ let sha512 = "5+JDIs4hqKfHnJcVCxTid1yBoI/++FfF/1PFdSMpaftZZZY+qg2JFruRbf7PaIwa9KgLotXQV3gSjtY0IdcFGQ=="; }; }; - "unified-engine-11.2.2" = { - name = "unified-engine"; - packageName = "unified-engine"; - version = "11.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-11.2.2.tgz"; - sha512 = "15g/gWE7qQl9tQ3nAEbMd5h9HV1EACtFs6N9xaRBZICoCwnNGbal1kOs++ICf4aiTdItZxU2s/kYWhW7htlqJg=="; - }; - }; "unified-lint-rule-1.0.6" = { name = "unified-lint-rule"; packageName = "unified-lint-rule"; @@ -39590,15 +39446,6 @@ let sha512 = "Op0XnmHUl6C2zo/yJCwhXQSm/SmW22eDZdWP2qdf4WpGrgO1ZxFodq+5zFyeRGasFjJotAnLgfuD1jkcKqiH1Q=="; }; }; - "unist-util-inspect-8.1.0" = { - name = "unist-util-inspect"; - packageName = "unist-util-inspect"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-8.1.0.tgz"; - sha512 = "mOlg8Mp33pR0eeFpo5d2902ojqFFOKMMG2hF8bmH7ZlhnmjFgh0NI3/ZDwdaBJNbvrS7LZFVrBVtIE9KZ9s7vQ=="; - }; - }; "unist-util-is-3.0.0" = { name = "unist-util-is"; packageName = "unist-util-is"; @@ -39635,15 +39482,6 @@ let sha512 = "2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw=="; }; }; - "unist-util-lsp-2.1.0" = { - name = "unist-util-lsp"; - packageName = "unist-util-lsp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-lsp/-/unist-util-lsp-2.1.0.tgz"; - sha512 = "ICI1PWbalSfOrsdosGk+WXdZBvdjhZVjbkgHOzKFdkCdzBpVEi8GjsVTAG6NR3VLGcwTOGLj/+k4L0HwGQYvEQ=="; - }; - }; "unist-util-map-1.0.5" = { name = "unist-util-map"; packageName = "unist-util-map"; @@ -40922,15 +40760,6 @@ let sha512 = "NdWWXkv6gcd7AZMvDomlQbK3MqFWL1RlGzMn++/O2TI+68+nqxCPTvLugdOtfSzXmjh+xUyhp07HhlrbJjT+mw=="; }; }; - "vfile-reporter-8.1.1" = { - name = "vfile-reporter"; - packageName = "vfile-reporter"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-8.1.1.tgz"; - sha512 = "qxRZcnFSQt6pWKn3PAk81yLK2rO2i7CDXpy8v8ZquiEOMLSnPw6BMSi9Y1sUCwGGl7a9b3CJT1CKpnRF7pp66g=="; - }; - }; "vfile-reporter-pretty-7.0.0" = { name = "vfile-reporter-pretty"; packageName = "vfile-reporter-pretty"; @@ -40949,15 +40778,6 @@ let sha512 = "1os1733XY6y0D5x0ugqSeaVJm9lYgj0j5qdcZQFyxlZOSy1jYarL77lLyb5gK4Wqr1d5OxmuyflSO3zKyFnTFw=="; }; }; - "vfile-sort-4.0.0" = { - name = "vfile-sort"; - packageName = "vfile-sort"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-4.0.0.tgz"; - sha512 = "lffPI1JrbHDTToJwcq0rl6rBmkjQmMuXkAxsZPRS9DXbaJQvc642eCg6EGxcX2i1L+esbuhq+2l9tBll5v8AeQ=="; - }; - }; "vfile-statistics-2.0.1" = { name = "vfile-statistics"; packageName = "vfile-statistics"; @@ -41174,15 +40994,6 @@ let sha512 = "eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw=="; }; }; - "vscode-languageserver-9.0.1" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz"; - sha512 = "woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g=="; - }; - }; "vscode-languageserver-protocol-3.14.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -41282,15 +41093,6 @@ let sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; }; }; - "vscode-languageserver-types-3.17.0-next.3" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.17.0-next.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.3.tgz"; - sha512 = "VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg=="; - }; - }; "vscode-languageserver-types-3.17.2" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -48209,50 +48011,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-docker = nodeEnv.buildNodePackage { - name = "coc-docker"; - packageName = "coc-docker"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-docker/-/coc-docker-1.0.2.tgz"; - sha512 = "6As7Y7yhU0aI5UwI/QOuJzmAluoDMUcOcNg0yJZOMsnpjw9ezrPdNMIo+vRImXp1V/STU0j27CztwnH8vofOQQ=="; - }; - dependencies = [ - sources."dockerfile-ast-0.4.2" - sources."dockerfile-language-server-nodejs-0.9.0" - ( - sources."dockerfile-language-service-0.9.0" - // { - dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.3" - ]; - } - ) - sources."dockerfile-utils-0.10.0" - sources."tslib-2.8.1" - sources."vscode-jsonrpc-8.1.0" - sources."vscode-languageserver-8.1.0" - ( - sources."vscode-languageserver-protocol-3.17.3" - // { - dependencies = [ - sources."vscode-languageserver-types-3.17.3" - ]; - } - ) - sources."vscode-languageserver-textdocument-1.0.12" - sources."vscode-languageserver-types-3.17.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "docker extension for coc"; - homepage = "https://github.com/josa42/coc-docker#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-emmet = nodeEnv.buildNodePackage { name = "coc-emmet"; packageName = "coc-emmet"; @@ -48680,24 +48438,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-rls = nodeEnv.buildNodePackage { - name = "coc-rls"; - packageName = "coc-rls"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.6.tgz"; - sha512 = "/XUM5UjOtnVBHghxBtwHz6C2lWnWgF8kX2+uocc356c2Bn8msQa6mrN0lijhlpDlsomSMPkGpZiY4zS1tNakMw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Rust language support - code completion, Intellisense, refactoring, reformatting, errors, snippets. A client for the Rust Language Server, built by the RLS team"; - homepage = "https://github.com/neoclide/coc-rls#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; @@ -62699,193 +62439,6 @@ in bypassCache = true; reconstructLock = true; }; - unified-language-server = nodeEnv.buildNodePackage { - name = "unified-language-server"; - packageName = "unified-language-server"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unified-language-server/-/unified-language-server-4.0.1.tgz"; - sha512 = "cWjMoW3QcUCtJfQ1ifms2qz8fbO9fuT4YizOSDmv299khazt2e3e5jtJ1fUBBN1zKY/EWir7ZfK+4ffj5xe7Wg=="; - }; - dependencies = [ - sources."@babel/code-frame-7.26.2" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@isaacs/cliui-8.0.2" - sources."@npmcli/config-8.3.4" - ( - sources."@npmcli/git-5.0.8" - // { - dependencies = [ - sources."isexe-3.1.1" - sources."which-4.0.0" - ]; - } - ) - sources."@npmcli/map-workspaces-3.0.6" - sources."@npmcli/name-from-folder-2.0.0" - sources."@npmcli/package-json-5.2.1" - ( - sources."@npmcli/promise-spawn-7.0.2" - // { - dependencies = [ - sources."isexe-3.1.1" - sources."which-4.0.0" - ]; - } - ) - sources."@types/concat-stream-2.0.3" - sources."@types/debug-4.1.12" - sources."@types/is-empty-1.2.3" - sources."@types/ms-2.1.0" - sources."@types/node-22.13.10" - sources."@types/supports-color-8.1.3" - sources."@types/unist-3.0.3" - sources."abbrev-2.0.0" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."buffer-from-1.1.2" - sources."ci-info-4.2.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-stream-2.0.0" - sources."cross-spawn-7.0.6" - sources."debug-4.4.0" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."err-code-2.0.3" - sources."error-ex-1.3.2" - sources."extend-3.0.2" - sources."find-up-6.3.0" - sources."foreground-child-3.3.1" - sources."glob-10.4.5" - sources."hosted-git-info-7.0.2" - sources."ignore-6.0.2" - sources."import-meta-resolve-4.1.0" - sources."inherits-2.0.4" - sources."ini-4.1.3" - sources."is-arrayish-0.2.1" - sources."is-empty-1.2.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-plain-obj-4.1.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-3.0.2" - sources."lines-and-columns-2.0.4" - sources."load-plugin-6.0.3" - sources."locate-path-7.2.0" - sources."lru-cache-10.4.3" - sources."minimatch-9.0.5" - sources."minipass-7.1.2" - sources."ms-2.1.3" - sources."nopt-7.2.1" - sources."normalize-package-data-6.0.2" - sources."npm-install-checks-6.3.0" - sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-11.0.3" - sources."npm-pick-manifest-9.1.0" - sources."p-limit-4.0.0" - sources."p-locate-6.0.0" - sources."package-json-from-dist-1.0.1" - sources."parse-json-7.1.1" - sources."path-exists-5.0.0" - sources."path-key-3.1.1" - sources."path-scurry-1.11.1" - sources."picocolors-1.1.1" - sources."proc-log-4.2.0" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.2" - sources."retry-0.12.0" - sources."safe-buffer-5.2.1" - sources."semver-7.7.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.21" - sources."string-width-5.1.2" - ( - sources."string-width-cjs-4.2.3" - // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - } - ) - sources."string_decoder-1.3.0" - ( - sources."strip-ansi-7.1.0" - // { - dependencies = [ - sources."ansi-regex-6.1.0" - ]; - } - ) - sources."strip-ansi-cjs-6.0.1" - sources."supports-color-9.4.0" - sources."trough-2.2.0" - sources."type-fest-3.13.1" - sources."typedarray-0.0.6" - sources."undici-types-6.20.0" - sources."unified-engine-11.2.2" - sources."unist-util-inspect-8.1.0" - sources."unist-util-lsp-2.1.0" - sources."unist-util-stringify-position-4.0.0" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.1" - sources."vfile-6.0.3" - sources."vfile-message-4.0.2" - ( - sources."vfile-reporter-8.1.1" - // { - dependencies = [ - sources."emoji-regex-10.4.0" - sources."string-width-6.1.0" - ]; - } - ) - sources."vfile-sort-4.0.0" - sources."vfile-statistics-3.0.0" - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-9.0.1" - sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-textdocument-1.0.12" - sources."vscode-languageserver-types-3.17.5" - sources."walk-up-path-3.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - ( - sources."wrap-ansi-cjs-7.0.0" - // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - } - ) - sources."yaml-2.7.0" - sources."yocto-queue-1.2.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Language server for unified"; - homepage = "https://github.com/unifiedjs/unified-language-server#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 7dd1a2b0d0ae..f2cd3187e90f 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.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz"; - hash = "sha256-4jhxNsqFTfK0FSE53U1LOVOmRugElIBz3t/gojLwihU="; + hash = "sha256-HinDtB1DKQYhBbcj39o6/4a4zvXnx1ANDkkfxf145II="; }; nativeBuildInputs = [ ocaml-syntax-shims ]; diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index 4d07d9a35d91..1f8aad31337b 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -20,15 +20,15 @@ buildDunePackage rec { pname = "earlybird"; - version = "1.3.3"; + version = "1.3.4"; minimalOCamlVersion = "4.12"; src = fetchFromGitHub { owner = "hackwaly"; repo = "ocamlearlybird"; - rev = version; - hash = "sha256-TzRJ+0I3VEx4Lvj3lhN9POzlXRgmTTdD5Bg1AX0pf3c="; + tag = version; + hash = "sha256-uwx8N4GDs7NT2fEmNlvdBe2cIZGVPQpoaiiKROFa+kk="; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix index 530351a27dac..42ce81f3af77 100644 --- a/pkgs/development/ocaml-modules/hxd/default.nix +++ b/pkgs/development/ocaml-modules/hxd/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "hxd"; - version = "0.3.4"; + version = "0.3.5"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-${version}.tbz"; - sha256 = "sha256-jor8KLUvHqgt37Dnh3JRB/eMIYSevVzGEBsvG4quDmI="; + sha256 = "sha256-E1I198ErT9/Cpvdk/Qjpq360OIVuAsbmaNc7qJzndEM="; }; propagatedBuildInputs = lib.optional withLwt lwt; diff --git a/pkgs/development/ocaml-modules/uring/default.nix b/pkgs/development/ocaml-modules/uring/default.nix index 7ab261c06e12..6ee432359967 100644 --- a/pkgs/development/ocaml-modules/uring/default.nix +++ b/pkgs/development/ocaml-modules/uring/default.nix @@ -1,5 +1,7 @@ { lib, + ocaml, + version ? if lib.versionAtLeast ocaml.version "5.1" then "2.7.0" else "0.9", buildDunePackage, cstruct, dune-configurator, @@ -9,15 +11,28 @@ mdx, }: +let + param = + { + "0.9" = { + minimalOCamlVersion = "4.12"; + hash = "sha256-eXWIxfL9UsKKf4sanBjKfr6Od4fPDctVnkU+wjIXW0M="; + }; + "2.7.0" = { + minimalOCamlVersion = "5.1.0"; + hash = "sha256-mePi6/TXtxgtLYLyHRAdnRcgeldCVgUaPY+MZXSzC6U="; + }; + } + .${version}; +in buildDunePackage rec { pname = "uring"; - version = "0.9"; - - minimalOCamlVersion = "4.12"; + inherit version; + inherit (param) minimalOCamlVersion; src = fetchurl { url = "https://github.com/ocaml-multicore/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-eXWIxfL9UsKKf4sanBjKfr6Od4fPDctVnkU+wjIXW0M="; + inherit (param) hash; }; propagatedBuildInputs = [ diff --git a/pkgs/development/php-packages/php-codesniffer/default.nix b/pkgs/development/php-packages/php-codesniffer/default.nix index fb77f15451b1..c05c79048294 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.13.2"; + version = "4.0.0"; src = fetchFromGitHub { owner = "PHPCSStandards"; repo = "PHP_CodeSniffer"; tag = finalAttrs.version; - hash = "sha256-W+svoVatRY53KM7ZJQmFxyDf+N738TrCljv1erZUFuU="; + hash = "sha256-2fubJMn44pS+++QgK66vm4YTT+0zdgtAJVHKvvWO/QA="; }; - vendorHash = "sha256-y1tC9owXaa/l6M4RH/DEIuqTWgcU7zjrWi//zjwMvuo="; + vendorHash = "sha256-SswaHYkDhuW2HZX7QiBd7K6wTmt42z2/TpB7HP68b7k="; 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 ddac0bfb0a3b..85e6dbd38bb9 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "2.1.27"; + version = "2.1.29"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; tag = finalAttrs.version; - hash = "sha256-oqqONolgMiqINpW1P6orbQ70xyNjNA7WVS/u2pLiR5o="; + hash = "sha256-8HPMXJ64qkV6fXfdr6fZTp2m1EhcWiq0cE51VQHuyro="; }; - vendorHash = "sha256-OQlgrwBI4aDrtQ9Te3Sloq7xnXRQ5SJJfgOWSoQlruI="; + vendorHash = "sha256-mSlxWkqhniphYUOjE0zucOqN9gKe3Th0GEikB7DyYVY="; composerStrictValidation = false; doInstallCheck = true; diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index ca58eb4c845e..7e0df378b41f 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -8,12 +8,12 @@ }: let - version = "6.8.6"; + version = "6.13.1"; # The PHAR file is only required to get the `composer.lock` file psalm-phar = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - hash = "sha256-nPvA/pxBMJe4Ux4NmFOdrEmKqRqmwz8gFlCgsB0GbPI="; + hash = "sha256-bOxm5LYiQDCY0hU998Wnnp2+x44sidfCf/OqlQ+1gvA="; }; in php.buildComposerProject2 (finalAttrs: { @@ -24,14 +24,14 @@ php.buildComposerProject2 (finalAttrs: { owner = "vimeo"; repo = "psalm"; tag = finalAttrs.version; - hash = "sha256-CewFeIUG+/5QCRpoPSOv1gqwBL9voBf4zgIzdnhk2t8="; + hash = "sha256-QsANvg/QXJucjxwM6IF20mZu4DPw/RcBJV6+5tJkZB0="; }; composerLock = runCommand "composer.lock" { } '' ${lib.getExe php} -r '$phar = new Phar("${psalm-phar}"); $phar->extractTo(".", "composer.lock");' cp composer.lock $out ''; - vendorHash = "sha256-QObqXzazypumDnFtfNiFSZdpZ7PbsBZZBUsS3fseZok="; + vendorHash = "sha256-18FAMuOO6rWAQEIJOLGxj/Avr5ZQRuI4ao2RL2nJlYc="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix index bea2aad00759..bfea69412d59 100644 --- a/pkgs/development/php-packages/spx/default.nix +++ b/pkgs/development/php-packages/spx/default.nix @@ -29,6 +29,6 @@ buildPecl { description = "Simple & straight-to-the-point PHP profiling extension with its built-in web UI"; homepage = "https://github.com/NoiseByNorthwest/php-spx"; license = lib.licenses.php301; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ piotrkwiecinski ]; }; } diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 3ff0db1c2071..3c1ed7d52f8d 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "accelerate"; - version = "1.10.0"; + version = "1.10.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "accelerate"; tag = "v${version}"; - hash = "sha256-UsnGLBCt3uodzaBLeOKV4eYEoxwHkUlHDBAe6kAleDc="; + hash = "sha256-guUlgNRSgBmi5HZNnwPA6GQ1vq5LzZEW2J9w4Wmqh6o="; }; buildInputs = [ llvmPackages.openmp ]; diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index e1586de94bfb..10f676f7b721 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -1,29 +1,27 @@ { - nodejs, lib, + stdenv, + aiohttp, buildPythonPackage, - pythonOlder, - fetchFromGitHub, - poetry-core, - # install_requires charset-normalizer, + fetchFromGitHub, h2, - onecache, - # test dependencies httpx, + onecache, + pkgs, + poetry-core, pytest-aiohttp, pytest-cov-stub, pytest-mock, - uvicorn, - requests, - aiohttp, pytestCheckHook, - stdenv, + pythonOlder, + requests, + uvicorn, }: buildPythonPackage rec { pname = "aiosonic"; - version = "0.24.0"; + version = "0.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +32,7 @@ buildPythonPackage rec { owner = "sonic182"; repo = "aiosonic"; tag = version; - hash = "sha256-Yh1AD/tBHQBpwAA86XuP9UuXnCAFcMw/XSv6z46XP0k="; + hash = "sha256-sYd7qjOiRENO6hPhJ01RLsr+2RtTITrXjcT6/ZaGfAU="; }; postPatch = '' @@ -47,64 +45,73 @@ buildPythonPackage rec { dependencies = [ charset-normalizer - onecache h2 + onecache ]; nativeCheckInputs = [ aiohttp httpx + pkgs.nodejs pytest-aiohttp pytest-cov-stub pytest-mock - uvicorn - requests pytestCheckHook + requests + uvicorn ]; pythonImportsCheck = [ "aiosonic" ]; disabledTests = lib.optionals stdenv.hostPlatform.isLinux [ - # need network - "test_simple_get" - "test_get_python" - "test_post_http2" - "test_get_http2" - "test_method_lower" - "test_keep_alive_smart_pool" - "test_keep_alive_cyclic_pool" - "test_get_with_params" - "test_get_with_params_in_url" - "test_get_with_params_tuple" - "test_post_form_urlencoded" - "test_post_tuple_form_urlencoded" - "test_post_json" - "test_put_patch" - "test_delete" - "test_delete_2" - "test_get_keepalive" - "test_post_multipart_to_django" - "test_connect_timeout" - "test_read_timeout" - "test_timeouts_overriden" - "test_pool_acquire_timeout" - "test_simple_get_ssl" - "test_simple_get_ssl_ctx" - "test_simple_get_ssl_no_valid" - "test_get_chunked_response" - "test_get_chunked_response_and_not_read_it" - "test_read_chunks_by_text_method" - "test_get_body_gzip" - "test_get_body_deflate" - "test_post_chunked" + # Tests require network access "test_close_connection" "test_close_old_keeped_conn" - "test_get_redirect" - "test_max_redirects" - "test_get_image" + "test_connect_timeout" + "test_delete_2" + "test_delete" + "test_get_body_deflate" + "test_get_body_gzip" + "test_get_chunked_response_and_not_read_it" + "test_get_chunked_response" + "test_get_http2" "test_get_image_chunked" + "test_get_image" + "test_get_keepalive" + "test_get_python" + "test_get_redirect" "test_get_with_cookies" + "test_get_with_params_in_url" + "test_get_with_params_tuple" + "test_get_with_params" + "test_keep_alive_cyclic_pool" + "test_keep_alive_smart_pool" + "test_max_conn_idle_ms" + "test_max_redirects" + "test_method_lower" + "test_multipart_backward_compatibility" + "test_pool_acquire_timeout" + "test_post_chunked" + "test_post_form_urlencoded" + "test_post_http2" + "test_post_json" + "test_post_multipart_with_class" + "test_post_multipart_with_metadata" + "test_post_multipart_with_multipartfile_class" + "test_post_multipart_with_multipartfile_path" + "test_post_multipart" + "test_post_tuple_form_urlencoded" + "test_put_patch" + "test_read_chunks_by_text_method" + "test_read_timeout" + "test_simple_get" + "test_timeouts_overriden" + "test_wrapper_delete_http_serv" + "test_wrapper_get_http_serv" + # Tests can't trigger server + "test_ws" + # Test requires proxy "test_proxy_request" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index d85878a9550c..480cf805eafe 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -1,7 +1,6 @@ { lib, async-interrupt, - async-timeout, bleak, bleak-retry-connector, buildPythonPackage, @@ -10,21 +9,18 @@ poetry-core, pytest-cov-stub, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "airthings-ble"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; - disabled = pythonOlder "3.12"; - src = fetchFromGitHub { owner = "vincegio"; repo = "airthings-ble"; tag = version; - hash = "sha256-eZjMRely3UxcnjPB6DQDBOKdP+2kFCe/5fchiX+rcEM="; + hash = "sha256-fZvmgRQuSrgraj6e3BtsoKyFX38BedqVh6cHsliT9ns="; }; build-system = [ poetry-core ]; @@ -46,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Airthings BLE devices"; homepage = "https://github.com/vincegio/airthings-ble"; - changelog = "https://github.com/vincegio/airthings-ble/releases/tag/${version}"; + changelog = "https://github.com/vincegio/airthings-ble/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index f3744f6ec2a8..7d6e14079f73 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "6.8.3"; + version = "6.8.4"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-CCMjWqFxGH/A+x39KCEevPX+d2iyp+GSnQZnHhYkOa4="; + hash = "sha256-/Q7RSvcaKUnZrrlrcs4VF8tKSKXFVmfNBIO37TMVaio="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/approval-utilities/default.nix b/pkgs/development/python-modules/approval-utilities/default.nix index e0081554dedd..4d5da8a1c5c3 100644 --- a/pkgs/development/python-modules/approval-utilities/default.nix +++ b/pkgs/development/python-modules/approval-utilities/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, approvaltests, - pythonOlder, setuptools, typing-extensions, }: @@ -10,16 +9,15 @@ buildPythonPackage { pname = "approval-utilities"; inherit (approvaltests) version src; - disabled = pythonOlder "3.7"; pyproject = true; - postPatch = '' + postPatch = approvaltests.postPatch or "" + '' mv setup.approval_utilities.py setup.py ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ # used in approval_utilities/utilities/time_utilities.py typing-extensions ]; diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index f089156fa44a..dac819f912b2 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -12,6 +12,7 @@ pytest, pytest-asyncio, pytestCheckHook, + pyyaml, setuptools, testfixtures, typing-extensions, @@ -19,16 +20,23 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "15.0.0"; + version = "15.3.2"; pyproject = true; src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; tag = "v${version}"; - hash = "sha256-lXc81hQzxHxpg96OSWkkWmdmLOf4nU56dIKYVgLo+s8="; + hash = "sha256-cOaL8u5q9kx+yLB0e/ALnGYYGF5v50wsIIF1UUTPe1Y="; }; + postPatch = '' + echo 'version_number = "${version}"' > version.py + mv .github approvaltests approval_utilities tests setup + cd setup + rm setup.cfg + ''; + build-system = [ setuptools ]; dependencies = [ @@ -47,6 +55,7 @@ buildPythonPackage rec { numpy pytest-asyncio pytestCheckHook + pyyaml ]; disabledTests = [ diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 32932d8ec878..5fd351b2f3f6 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.25"; + version = "0.26"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-CLrceuZbmGygZtPM0ETVvsBosjY3FlQDo0sJh2I1uF0="; + hash = "sha256-JgimP4XvcfqMLtI25aELRg04eO2d7Z+0vyvqV0+tFlw="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 76216913df50..57566cfb675c 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.21.0"; + version = "2.21.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-RQ/hO7jYao9OfXtfr853kRgco+fJLhW7xF37JYZuSLM="; + hash = "sha256-mUOAKVXiExU2wrHnGqzGj1aXOjmZN+0LclCG10YcmQw="; }; build-system = [ setuptools ]; @@ -91,7 +91,10 @@ buildPythonPackage rec { description = "Asynchronous SSHv2 Python client and server library"; homepage = "https://asyncssh.readthedocs.io/"; changelog = "https://github.com/ronf/asyncssh/blob/v${version}/docs/changes.rst"; - license = licenses.epl20; + license = with licenses; [ + epl20 # or + gpl2Plus + ]; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index f208334661a6..d5d6ecd95907 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.1.6"; + version = "1.1.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; tag = "v${version}"; - hash = "sha256-GxjEbzPvley0EL7xuZWr1jzR9Lpui1fVL2FOWnRL34Q="; + hash = "sha256-0eay/NlWn0I2oF0fTln9/d4y31zGfAj9ph3bWkgd8Nk="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index cbee0a61aacb..6e589f4ff4f4 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -7,6 +7,7 @@ fetchFromGitHub, fetchpatch, more-itertools, + pendulum, poetry-core, pprintpp, pythonOlder, @@ -39,6 +40,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "attrs" "more-itertools" + "pendulum" ]; build-system = [ poetry-core ]; @@ -48,6 +50,7 @@ buildPythonPackage rec { bidict bitstruct more-itertools + pendulum pprintpp tbm-utils ]; diff --git a/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix b/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix index b6c49b3b6c88..b5b96f9fa24a 100644 --- a/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-mgmt-mysqlflexibleservers"; - version = "1.0.0b2"; + version = "1.0.0b3"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_mysqlflexibleservers"; inherit version; - hash = "sha256-pL3z3s/H7OYaPiGNGdUIzo3ppp6sR/G+6iDB219Mp9A="; + hash = "sha256-YR/Yjz2x4KhHehYz/pTEYdFyE+IVFw61PB7qm4I71MM="; }; build-system = [ diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index 0de71843bf96..3396f5c13634 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, # build-system - poetry-core, + uv-build, # dependencies scikit-learn, @@ -34,7 +34,12 @@ buildPythonPackage rec { hash = "sha256-CYkFobGLlh5cPLwChRWXCow0d5uz8eN5hcRanNMfW8s="; }; - build-system = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.7.21,<0.8.0" "uv_build" + ''; + + build-system = [ uv-build ]; dependencies = [ scikit-learn diff --git a/pkgs/development/python-modules/benqprojector/default.nix b/pkgs/development/python-modules/benqprojector/default.nix index 4dd1e9c0fea8..9097b9312db7 100644 --- a/pkgs/development/python-modules/benqprojector/default.nix +++ b/pkgs/development/python-modules/benqprojector/default.nix @@ -1,5 +1,6 @@ { lib, + aiofiles, buildPythonPackage, fetchFromGitHub, hatchling, @@ -10,14 +11,14 @@ buildPythonPackage rec { pname = "benqprojector"; - version = "0.1.6"; + version = "0.1.8"; pyproject = true; src = fetchFromGitHub { owner = "rrooggiieerr"; repo = "benqprojector.py"; tag = version; - hash = "sha256-Ys2C44kr5gd6tXO51OFRx4YVKVRGLfFPCYDFGt+gN0c="; + hash = "sha256-BttaLpjiybjeoJhOXfo6Qlox4bRqf9auvNg/wtm9gMQ="; }; build-system = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { ]; dependencies = [ + aiofiles pyserial pyserial-asyncio-fast ]; @@ -38,7 +40,7 @@ buildPythonPackage rec { meta = rec { description = "Python library to control BenQ projectors"; homepage = "https://github.com/rrooggiieerr/benqprojector.py"; - changelog = "${homepage}/releases/tag/${version}"; + changelog = "${homepage}/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ sephalon ]; }; diff --git a/pkgs/development/python-modules/biosppy/default.nix b/pkgs/development/python-modules/biosppy/default.nix index 29d1968731ff..afb93e5f30df 100644 --- a/pkgs/development/python-modules/biosppy/default.nix +++ b/pkgs/development/python-modules/biosppy/default.nix @@ -1,22 +1,23 @@ { lib, stdenv, - fetchFromGitHub, - buildPythonPackage, - setuptools, bidict, + buildPythonPackage, + fetchFromGitHub, h5py, + joblib, matplotlib, + mock, numpy, + opencv-python, + peakutils, + pywavelets, scikit-learn, scipy, + setuptools, shortuuid, six, - joblib, - pywavelets, - mock, tkinter, - opencv-python, }: buildPythonPackage rec { @@ -31,23 +32,22 @@ buildPythonPackage rec { hash = "sha256-R+3K8r+nzrCiZegxur/rf3/gDGhN9bVNMhlK94SHer0="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ - opencv-python bidict h5py + joblib matplotlib + mock numpy + opencv-python + peakutils + pywavelets scikit-learn scipy shortuuid six - joblib - pywavelets - mock ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tkinter ]; diff --git a/pkgs/development/python-modules/blake3/Cargo.lock b/pkgs/development/python-modules/blake3/Cargo.lock index 9adde9f9b2b4..51c44b074a00 100644 --- a/pkgs/development/python-modules/blake3/Cargo.lock +++ b/pkgs/development/python-modules/blake3/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayref" @@ -22,13 +22,12 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "blake3" -version = "1.0.6" +version = "1.0.7" dependencies = [ "blake3 1.8.2", "hex", "pyo3", "rayon", - "rayon-core", ] [[package]] @@ -48,9 +47,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.38" +version = "1.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f41ae168f955c12fb8960b057d70d0ca153fb83182b57d86380443527be7e9" +checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f" dependencies = [ "find-msvc-tools", "shlex", @@ -125,9 +124,9 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" [[package]] name = "libc" -version = "0.2.175" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "memmap2" @@ -170,9 +169,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ "indoc", "libc", @@ -187,19 +186,18 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", "pyo3-build-config", @@ -207,9 +205,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -219,9 +217,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck", "proc-macro2", @@ -232,18 +230,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -251,9 +249,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", diff --git a/pkgs/development/python-modules/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix index b70fc76201d0..ff6dfe06ceb3 100644 --- a/pkgs/development/python-modules/blake3/default.nix +++ b/pkgs/development/python-modules/blake3/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "blake3"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchFromGitHub { owner = "oconnor663"; repo = "blake3-py"; tag = version; - hash = "sha256-YeIRY/3S/onlc9ip7oCZ7FHln6MmHJ49STwORsX3nzs="; + hash = "sha256-km4vN/xKvjNd/bdHEIsUR9+Hmi0K5ju+wlQ2kuuDzzI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 02074d16a471..d488da95bbc9 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.40.39"; + version = "1.40.42"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-MgMVQA2aHnFwFLMDYrhFPwlXoJ3DMcWuxhKMMjE8qOI="; + hash = "sha256-ELtE4zJfrpwHwP4eupmLz3Fsd0f/LC0DBOuwEZgOstU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index 8714c9c1176d..954e4e748d8a 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "bx-py-utils"; - version = "111"; + version = "113"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "boxine"; repo = "bx_py_utils"; tag = "v${version}"; - hash = "sha256-B+05yBjqfnBaVvRZo47Akqyap4W5do+Xsumi69Ez4iY="; + hash = "sha256-rpDRLiqcbg/aRzdmKwGJAGrhBJTA+7tXsjPUIeeC03I="; }; postPatch = '' @@ -82,7 +82,11 @@ buildPythonPackage rec { "test_code_style" ]; - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTestPaths = [ + # depends on cli-base-utilities, which depends on bx-py-utils + "bx_py_utils_tests/tests/test_project_setup.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # processify() doesn't work under darwin # https://github.com/boxine/bx_py_utils/issues/80 "bx_py_utils_tests/tests/test_processify.py" diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 0a2ec5b2093d..9b7cff62808c 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { hash = "sha256-IKhLxJizTa3XnOzkZ9O74ZWRwcAqjzkzG8xgZcTYsus="; }; + __darwinAllowLocalNetworking = true; + build-system = [ setuptools-scm ]; dependencies = [ python-can ]; diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index 474722bc39ba..807804da6a19 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "cantools"; - version = "40.7.0"; + version = "40.7.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-V3kROwaKsEMUDqlEGtd9RK1NOC7tiN4WZ4+zIOMhRuw="; + hash = "sha256-Rn4EzIbgdjBzda6bzYNwcQjpmOPqYBm/lodzWAuaqV8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix new file mode 100644 index 000000000000..5a9e4894eb52 --- /dev/null +++ b/pkgs/development/python-modules/catkin-pkg/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + docutils, + pyparsing, + python-dateutil, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "catkin-pkg"; + version = "1.1.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "ros-infrastructure"; + repo = "catkin_pkg"; + tag = version; + hash = "sha256-V4iurFt1WmY2jXy0A4Qa2eKMCWmR+Hs3d9pru0/zUSM="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + docutils + pyparsing + python-dateutil + ]; + + pythonImportsCheck = [ "catkin_pkg" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ "test/test_flake8.py" ]; + + meta = { + changelog = "https://github.com/ros-infrastructure/catkin_pkg/blob/${src.tag}/CHANGELOG.rst"; + description = "Library for retrieving information about catkin packages"; + homepage = "http://wiki.ros.org/catkin_pkg"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + wentasah + ]; + }; +} diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index f0962e14788a..571550ba24f2 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "cirq-core"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "quantumlib"; repo = "cirq"; tag = "v${version}"; - hash = "sha256-LlWv4wWQWZsTB9JXS21O1WkIYhKkJwY5SM70hnzfnDQ="; + hash = "sha256-M+ojGXJOnrBipjSA9hd3++yTS70kCjPru9FG/rm7zI8="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/ckzg/default.nix b/pkgs/development/python-modules/ckzg/default.nix index 939b96703bdf..bd4b07e4cc10 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.1.2"; + version = "2.1.4"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "c-kzg-4844"; tag = "v${version}"; - hash = "sha256-B06Nm3D3+m2dEkQthDFowY0MfOOW5TUo324zO5PVSlA="; + hash = "sha256-692u5EFiA3sfJbd3CUdTO/9LP2y4+WjLZZaFkY9vlP4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix index 82f529f7b061..109fe65523b2 100644 --- a/pkgs/development/python-modules/click-odoo-contrib/default.nix +++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "click-odoo-contrib"; - version = "1.21"; + version = "1.22"; format = "pyproject"; src = fetchPypi { pname = "click_odoo_contrib"; inherit version; - hash = "sha256-EllrOAUW9ONJ0sUHfL7BYIaKTXeHjw8KF5as9l4W/cE="; + hash = "sha256-L0Slv0ExVsnlMH23FX06aAEYMqzQEAc4mrKb96TtjRY="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index d00f2831963e..bb733c0978ce 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = "cloudsplaining"; tag = version; - hash = "sha256-lMnqoDfvnWiEMGW1auhb0i4egLjLPuSYtm+rwuxHKc8="; + hash = "sha256-Ix4SlkGMtserksazXCk0XcDhmxNcfV/QCVsDJjWbu2k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/comet-ml/default.nix b/pkgs/development/python-modules/comet-ml/default.nix new file mode 100644 index 000000000000..a1933a4bfa00 --- /dev/null +++ b/pkgs/development/python-modules/comet-ml/default.nix @@ -0,0 +1,73 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + dulwich, + everett, + importlib-metadata, + jsonschema, + numpy, + psutil, + python-box, + requests, + requests-toolbelt, + rich, + semantic-version, + sentry-sdk, + setuptools, + simplejson, + urllib3, + wrapt, + wurlitzer, +}: + +buildPythonPackage rec { + pname = "comet-ml"; + version = "3.53.0"; + + src = fetchPypi { + pname = "comet_ml"; + inherit version; + hash = "sha256-KYMe6lDNj5nyXaB0hsk2STwGATkAuRwr8SSzlz3W4tA="; + }; + + pyproject = true; + build-system = [ + setuptools + ]; + + dependencies = [ + dulwich + everett + importlib-metadata + jsonschema + numpy + psutil + python-box + requests + requests-toolbelt + rich + semantic-version + sentry-sdk + simplejson + urllib3 + wrapt + wurlitzer + ]; + + pythonRelaxDeps = [ + "everett" + "python-box" + ]; + + pythonImportsCheck = [ "comet_ml" ]; + + meta = { + description = "Platform designed to help machine learning teams track, compare, explain, and optimize their models"; + homepage = "https://www.comet.com/site/"; + changelog = "https://www.comet.com/docs/v2/api-and-sdk/python-sdk/releases/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jherland ]; + mainProgram = "comet"; + }; +} diff --git a/pkgs/development/python-modules/cometx/default.nix b/pkgs/development/python-modules/cometx/default.nix new file mode 100644 index 000000000000..e1c1638ba3de --- /dev/null +++ b/pkgs/development/python-modules/cometx/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + comet-ml, + ipython, + matplotlib, + numpy, + requests, + scipy, + selenium, + urllib3, + zipfile2, + tqdm, +}: + +buildPythonPackage rec { + pname = "cometx"; + version = "2.6.0"; + + pyproject = true; + build-system = [ setuptools ]; + + src = fetchFromGitHub { + owner = "comet-ml"; + repo = "cometx"; + tag = version; + hash = "sha256-zlSk3DlrkvPOPCe6gtiXvn65NCw/y5BxCiVmC0GzvFg="; + }; + + dependencies = [ + comet-ml + ipython + matplotlib + numpy + requests + scipy + selenium + urllib3 + zipfile2 + tqdm + ]; + + # WARNING: Running the tests will create experiments, models, assets, etc. + # on your Comet account. + doCheck = false; + + pythonImportsCheck = [ "cometx" ]; + + meta = { + description = "Open source extensions for the Comet SDK"; + homepage = "https://github.com/comet-ml/comet-sdk-extensions/"; + changelog = "https://github.com/comet-ml/cometx/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jherland ]; + mainProgram = "cometx"; + }; +} diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 7b19da5033d5..0aeb5535f799 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.11.0"; + version = "2.11.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "confluentinc"; repo = "confluent-kafka-python"; tag = "v${version}"; - hash = "sha256-s4UeuFXieyUcFJsYHTaJBKfUssYZ7mt4YoHgXN7bZKI="; + hash = "sha256-WpvWv6UG7T0yJ1ZKZweHbWjh+C0PbEIYbbMAS4yyhzg="; }; buildInputs = [ rdkafka ]; @@ -82,6 +82,7 @@ buildPythonPackage rec { authlib cachetools httpx + orjson ]; }; @@ -111,7 +112,7 @@ buildPythonPackage rec { "tests/schema_registry/_async/test_config.py" "tests/schema_registry/_sync/test_config.py" # crashes the test runner on shutdown - "tests/test_KafkaError.py" + "tests/test_kafka_error.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix index 77d51cdeeb98..ebaaea6079cf 100644 --- a/pkgs/development/python-modules/cynthion/default.nix +++ b/pkgs/development/python-modules/cynthion/default.nix @@ -27,14 +27,14 @@ }: buildPythonPackage rec { pname = "cynthion"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "cynthion"; tag = version; - hash = "sha256-NAsELeOnWgMa6iWCJ0+hpbHIO3BsZBv0N/nK1XP+IpU="; + hash = "sha256-ebd2L7o6GO57TpwJ7+MOhVSb+I/E8kD7d7DqPj4B3FM="; }; sourceRoot = "${src.name}/cynthion/python"; diff --git a/pkgs/development/python-modules/daqp/default.nix b/pkgs/development/python-modules/daqp/default.nix index a68a54de281c..cc36c927cb6f 100644 --- a/pkgs/development/python-modules/daqp/default.nix +++ b/pkgs/development/python-modules/daqp/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { pname = "daqp"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; src = fetchFromGitHub { owner = "darnstrom"; repo = "daqp"; tag = "v${version}"; - hash = "sha256-s22LVnK1qGjIpat21eXYF/Io49IYbWf1y+VUbYuPZaY="; + hash = "sha256-I+ObnFAAhRoYtPEDXGP6BI+Zk9CH5yU27JJ+tWbcACQ="; }; sourceRoot = "${src.name}/interfaces/daqp-python"; diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 3e4c205684f6..fcd5efe78395 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.65.0"; + version = "0.67.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-57qaTymMOkEJ+DzBDshhMoCJQk1UqJ796mv5uTOkUDw="; + hash = "sha256-3UGPB3KEO7M4QFYiniU4hcaOUmCMq3vW4yBIxDUhHLk="; }; build-system = [ diff --git a/pkgs/development/python-modules/datamodel-code-generator/default.nix b/pkgs/development/python-modules/datamodel-code-generator/default.nix index 1338520fdb30..24d17d60da1a 100644 --- a/pkgs/development/python-modules/datamodel-code-generator/default.nix +++ b/pkgs/development/python-modules/datamodel-code-generator/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "datamodel-code-generator"; - version = "0.33.0"; + version = "0.34.0"; pyproject = true; src = fetchFromGitHub { owner = "koxudaxi"; repo = "datamodel-code-generator"; tag = version; - hash = "sha256-SyRF4Rn9LdcMTEH0xphDNIfEABknwvUoN2BYlNJFbrA="; + hash = "sha256-fJ7+TtWLJXBaTil0LGsCyu9njDuj1pOVUZYN2huoKao="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/deep-chainmap/default.nix b/pkgs/development/python-modules/deep-chainmap/default.nix index 1b12d8bd9d56..5e1c1baeabb2 100644 --- a/pkgs/development/python-modules/deep-chainmap/default.nix +++ b/pkgs/development/python-modules/deep-chainmap/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - hatchling, + flit-core, }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-Cw6Eiey501mzeigfdwnMuZH28abG4rcoACUGlmkzECA="; }; - build-system = [ hatchling ]; + build-system = [ flit-core ]; # Tests are not published to pypi doCheck = false; diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 9f8b1b70aaef..1c84dd071747 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "9.6.0"; + version = "9.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-deW8BW3Kpoxsh8n7TgfJ5g2u8VtujQNNVtLaniyEqHI="; + hash = "sha256-oDt4vGS33Cfdp/EcRrxtRPThIcj7mlBo1B8goF1GNUg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index d2c9a7c91f04..15890451fe7a 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.3.9"; + version = "4.3.10"; pyproject = true; src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; tag = version; - hash = "sha256-qcxvXq+pC2leDhaeor2hrWll8bQ+x6xN99pDlnmtUic="; + hash = "sha256-amc5Qp3tdtqUGGN+DMT/r/CKMkMNnx5ryA+HlzQEejk="; }; pythonRelaxDeps = [ "tablib" ]; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 7bfe64c0ea6d..b30ada9f6cec 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.14.5"; + version = "1.14.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "jschneier"; repo = "django-storages"; tag = version; - hash = "sha256-KWYDcHDLIoS42RqtD66tC/gKoeOBuYyT6jVOJ+cPYYU="; + hash = "sha256-br7JGPf5EAAl0Qg7b+XaksxNPCTJsSS8HLgvA0wZmeI="; }; patches = [ diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index 31a38588fc9c..ccddedf731c3 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.48.1"; + version = "2.48.2"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-hXVEjToV6YMIJ1XYPhkZjYMbZPf10KmtYDuwBA0N/Hw="; + hash = "sha256-nZ9uPy6H8VhtoC7TXuFfXHefqvQ72jfUSwM6VmuFyxo="; }; build-system = [ diff --git a/pkgs/development/python-modules/docling-mcp/default.nix b/pkgs/development/python-modules/docling-mcp/default.nix index 58801822260f..4e5f5599105d 100644 --- a/pkgs/development/python-modules/docling-mcp/default.nix +++ b/pkgs/development/python-modules/docling-mcp/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "docling-mcp"; - version = "1.2.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-mcp"; tag = "v${version}"; - hash = "sha256-ktJ5K+1Qb7/lUHPkmv2FMnSe6PiIQ1BvWj5qIG8xfdE="; + hash = "sha256-MEGj/tPHDZqvgqmzXsoeEIWWU7vlLo8H4KhMFgf6q2c="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/dsl2html/default.nix b/pkgs/development/python-modules/dsl2html/default.nix index 258f7a389a94..69af6cca431f 100644 --- a/pkgs/development/python-modules/dsl2html/default.nix +++ b/pkgs/development/python-modules/dsl2html/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "dsl2html"; - version = "0.1.5"; + version = "0.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LUtTMqQuwahIeMm9QvMe6rdHEw5LEjMQdyZFZvf/HRU="; + hash = "sha256-GIJgkUbnU3eRkBgkguAINgMH1YnDSs5I9gIdQWvmVc0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix index 3c5f7e79ee60..6645c0fc1fd6 100644 --- a/pkgs/development/python-modules/e3-core/default.nix +++ b/pkgs/development/python-modules/e3-core/default.nix @@ -14,6 +14,7 @@ requests-cache, requests-toolbelt, requests, + resolvelib, setuptools, stevedore, tqdm, @@ -45,6 +46,7 @@ buildPythonPackage rec { requests requests-cache requests-toolbelt + resolvelib stevedore tqdm ] diff --git a/pkgs/development/python-modules/eheimdigital/default.nix b/pkgs/development/python-modules/eheimdigital/default.nix index 2a0ea80cd540..2267fd230aa4 100644 --- a/pkgs/development/python-modules/eheimdigital/default.nix +++ b/pkgs/development/python-modules/eheimdigital/default.nix @@ -1,7 +1,7 @@ { aiohttp, buildPythonPackage, - fetchFromGitHub, + fetchFromGitea, hatchling, lib, yarl, @@ -9,14 +9,15 @@ buildPythonPackage rec { pname = "eheimdigital"; - version = "1.3.0"; + version = "1.3.2"; pyproject = true; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "autinerd"; repo = "eheimdigital"; tag = version; - hash = "sha256-zpFINbhzh0SuWfapZWPTr+8qh9b0Ux0TiV4cHXQuGRM="; + hash = "sha256-wFKkfzZ4LLwWhVYigospWYBxTGAJGZWO6Wrj3bvUsc8="; }; build-system = [ hatchling ]; @@ -32,9 +33,9 @@ buildPythonPackage rec { doCheck = false; meta = { - changelog = "https://github.com/autinerd/eheimdigital/releases/tag/${src.tag}"; + changelog = "https://codeberg.org/autinerd/eheimdigital/releases/tag/${src.tag}"; description = "Offers a Python API for the EHEIM Digital smart aquarium devices"; - homepage = "https://github.com/autinerd/eheimdigital"; + homepage = "https://codeberg.org/autinerd/eheimdigital"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/eq3btsmart/default.nix b/pkgs/development/python-modules/eq3btsmart/default.nix index 3f286274b64b..f8e0c902c4da 100644 --- a/pkgs/development/python-modules/eq3btsmart/default.nix +++ b/pkgs/development/python-modules/eq3btsmart/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, setuptools, bleak, + bleak-retry-connector, construct-typing, pytest-asyncio, pytestCheckHook, @@ -11,20 +12,21 @@ buildPythonPackage rec { pname = "eq3btsmart"; - version = "2.1.1"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "EuleMitKeule"; repo = "eq3btsmart"; tag = version; - hash = "sha256-/Z/lSZXJ+c+G5iDF/BGacSpxrgJK4NLU7ShIAV4ipLc="; + hash = "sha256-9x2uQUpLl0bSOiEBTvt6IPZCJ3Oj+U4knlvrTXPGs3I="; }; build-system = [ setuptools ]; dependencies = [ bleak + bleak-retry-connector construct-typing ]; diff --git a/pkgs/development/python-modules/everett/default.nix b/pkgs/development/python-modules/everett/default.nix new file mode 100644 index 000000000000..718e68c10ef7 --- /dev/null +++ b/pkgs/development/python-modules/everett/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + configobj, + pytestCheckHook, + pyyaml, + setuptools, + sphinx, +}: + +buildPythonPackage rec { + pname = "everett"; + version = "3.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "willkg"; + repo = "everett"; + tag = "v${version}"; + hash = "sha256-olYxUbsKaL7C5UTAPwW+EufjbWbbHZdZcQ/lfogNJrg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + configobj + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + sphinx + ]; + + pythonImportsCheck = [ "everett" ]; + + meta = { + description = "Python configuration library for your app"; + homepage = "https://github.com/willkg/everett"; + changelog = "https://github.com/willkg/everett/releases/tag/${version}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ jherland ]; + }; +} diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix index d1d3198525fa..681730794e01 100644 --- a/pkgs/development/python-modules/exifread/default.nix +++ b/pkgs/development/python-modules/exifread/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "exifread"; - version = "3.4.0"; + version = "3.5.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3H+Np3OWcJykFKDu4cJikC9xOvycBDuqi4IzfXYwb/w="; + hash = "sha256-n5mPgNMGJ0HJdt/E/QM0JLxAkyk3mU5NIYHrcMS2rt0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 7b8e1b0205d3..8b42a9d32ba4 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -3,22 +3,19 @@ buildPythonPackage, fetchFromGitHub, packaging, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "fastcore"; - version = "1.8.11"; + version = "1.8.12"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "fastai"; repo = "fastcore"; tag = version; - hash = "sha256-gqC5dVYWfWLNvum8ffIpT9qlm2yD6txPm3KQaP/rHao="; + hash = "sha256-YJONK7WMAQLCkROosGbT5C1G/JtTC7iZs2t+mx03yOo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix index fcffa502451a..17d7cb13353a 100644 --- a/pkgs/development/python-modules/fastmcp/default.nix +++ b/pkgs/development/python-modules/fastmcp/default.nix @@ -15,17 +15,21 @@ exceptiongroup, httpx, mcp, + openai, openapi-core, openapi-pydantic, pydantic, pyperclip, python-dotenv, rich, + websockets, # tests dirty-equals, email-validator, fastapi, + inline-snapshot, + psutil, pytest-asyncio, pytest-httpx, pytestCheckHook, @@ -33,14 +37,14 @@ buildPythonPackage rec { pname = "fastmcp"; - version = "2.11.3"; + version = "2.12.4"; pyproject = true; src = fetchFromGitHub { owner = "jlowin"; repo = "fastmcp"; tag = "v${version}"; - hash = "sha256-jIXrMyNnyPE2DUgg+sxT6LD4dTmKQglh4cFuaw179Z0="; + hash = "sha256-d8DOdyoyYDxZOpiUSxsYXnGrgFYN9CjdmAeHmJiDBP0="; }; build-system = [ @@ -56,10 +60,17 @@ buildPythonPackage rec { mcp openapi-core openapi-pydantic + pydantic pyperclip python-dotenv rich - ]; + websockets + ] + ++ pydantic.optional-dependencies.email; + + optional-dependencies = { + openai = [ openai ]; + }; pythonImportsCheck = [ "fastmcp" ]; @@ -67,25 +78,34 @@ buildPythonPackage rec { dirty-equals email-validator fastapi - pydantic + inline-snapshot + psutil pytest-asyncio pytest-httpx pytestCheckHook writableTmpDirAsHomeHook ] - ++ pydantic.optional-dependencies.email; + ++ lib.flatten (lib.attrValues optional-dependencies) + ++ inline-snapshot.optional-dependencies.dirty-equals; disabledTests = [ + "test_logging_middleware_with_payloads" + "test_structured_logging_middleware_produces_json" + # AssertionError: assert 'INFO' == 'DEBUG' "test_temporary_settings" - # RuntimeError: Client failed to connect: Connection close + # RuntimeError: Client failed to connect: Connection closed "test_keep_alive_maintains_session_across_multiple_calls" "test_keep_alive_false_starts_new_session_across_multiple_calls" + "test_keep_alive_false_exit_scope_kills_server" "test_keep_alive_starts_new_session_if_manually_closed" + "test_keep_alive_true_exit_scope_kills_client" "test_keep_alive_maintains_session_if_reentered" "test_close_session_and_try_to_use_client_raises_error" + "test_parallel_calls" "test_run_mcp_config" + "test_settings_from_environment_issue_1749" "test_uv_transport" "test_uv_transport_module" "test_github_api_schema_performance" @@ -98,6 +118,9 @@ buildPythonPackage rec { "test_multi_client" "test_canonical_multi_client_with_transforms" + # AssertionError: assert {'annotations...object'}, ...} == {'annotations...sers']}}, ...} + "test_list_tools" + # fastmcp.exceptions.ToolError: Unknown tool "test_multi_client_with_logging" "test_multi_client_with_elicitation" diff --git a/pkgs/development/python-modules/fhir-py/default.nix b/pkgs/development/python-modules/fhir-py/default.nix index e12e62043554..bc2316f0f5ca 100644 --- a/pkgs/development/python-modules/fhir-py/default.nix +++ b/pkgs/development/python-modules/fhir-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fhir-py"; - version = "2.0.15"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "beda-software"; repo = "fhir-py"; tag = "v${version}"; - hash = "sha256-XZC3cLjAy1VZfMsHy/QmwJXKiW/WxVous1LrbkGOeRs="; + hash = "sha256-ffaDWo/6xQwpMjiOCx3JIGtSHUjwcEilInD/YN73ZMI="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix index c08e987a7b65..b8c28b464746 100644 --- a/pkgs/development/python-modules/formulae/default.nix +++ b/pkgs/development/python-modules/formulae/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, setuptools, setuptools-scm, @@ -14,9 +13,7 @@ buildPythonPackage rec { pname = "formulae"; version = "0.5.4"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "bambinos"; @@ -25,23 +22,27 @@ buildPythonPackage rec { hash = "sha256-SSyQa7soIp+wSXX5wek9LG95q7J7K34mztzx01lPiWo="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ numpy pandas scipy ]; nativeCheckInputs = [ pytestCheckHook ]; - # use assertions of form `assert pytest.approx(...)`, which is now disallowed: + disabledTests = [ + # use assertions of form `assert pytest.approx(...)`, which is now disallowed: "test_basic" "test_degree" + # AssertionError + "test_evalenv_equality" ]; + pythonImportsCheck = [ "formulae" "formulae.matrices" @@ -50,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://bambinos.github.io/formulae"; description = "Formulas for mixed-effects models in Python"; - changelog = "https://github.com/bambinos/formulae/releases/tag/${version}"; + changelog = "https://github.com/bambinos/formulae/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 2457054d95cf..772dd3577cc5 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.21.0"; + version = "5.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dataproc"; inherit version; - hash = "sha256-LSoMxquZrJVB9z0uIRqFH6TQp18btRsjwk3vyGzWxPo="; + hash = "sha256-zkGy0LLTnTqvLckUCRMtNP4n+KpdKtat3fQqz78rW/A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix index cef446d47c18..70db8134153d 100644 --- a/pkgs/development/python-modules/groq/default.nix +++ b/pkgs/development/python-modules/groq/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "groq"; - version = "0.31.1"; + version = "0.32.0"; pyproject = true; src = fetchFromGitHub { owner = "groq"; repo = "groq-python"; tag = "v${version}"; - hash = "sha256-vckFFnk66gkxaoqKpjykkpQIbiWqUyuTDgSvhKqsC4A="; + hash = "sha256-31doHBwdZWlEb1tk0OjfLciPhde0kfiMY6heiXDvnWI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index add1bbf2b647..74c95e745c69 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202509271"; + version = "0.1.202509301"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-hZpNv2Yst/JtIhOFd8apaKl+Y3G3fMhmNQ70AGNI55o="; + hash = "sha256-M1UGzjo1r2BZg0ytJ1dZsaGQucYZp/ixdQRnwp/jEeQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix index 5ddb2784b5ea..550965904ff8 100644 --- a/pkgs/development/python-modules/icalevents/default.nix +++ b/pkgs/development/python-modules/icalevents/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "icalevents"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "icalevents"; tag = version; - hash = "sha256-PHx83oHhKdKxvO+mBc5tLonAxn1zJUQL3+u+1BRhxvA="; + hash = "sha256-QDqmcZY/UANVKRjk1ZFEFHgrjtD+hXE4qd3tX64sE7c="; }; build-system = [ diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index f2e7585def44..8a7991648d02 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.11.2"; + version = "1.11.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OxOBvRIBhPlwpdZt6sM7hZKmZsjhq3pa/TPs/zQuCpU="; + hash = "sha256-gLO2EItEjrF7fJ6ww5ta04Rxir3NJKgvhTrTBiuDtBs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/irm-kmi-api/default.nix b/pkgs/development/python-modules/irm-kmi-api/default.nix new file mode 100644 index 000000000000..91e32ab59695 --- /dev/null +++ b/pkgs/development/python-modules/irm-kmi-api/default.nix @@ -0,0 +1,47 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + freezegun, + lib, + pytest-asyncio, + pytestCheckHook, + setuptools, + svgwrite, +}: + +buildPythonPackage rec { + pname = "irm-kmi-api"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jdejaegh"; + repo = "irm-kmi-api"; + tag = version; + hash = "sha256-E8lf2TpeA91mRbxXYCsuum0mJdE5XLXX0l8CKEl5SFw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + svgwrite + ]; + + pythonImportsCheck = [ "irm_kmi_api" ]; + + nativeCheckInputs = [ + freezegun + pytest-asyncio + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/jdejaegh/irm-kmi-api/releases/tag/${src.tag}"; + description = "Retrieve data from the Belgian Royal Meteorological Institute"; + homepage = "https://github.com/jdejaegh/irm-kmi-api"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index b691dd015eee..d09ead373c51 100644 --- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "json-stream-rs-tokenizer"; - version = "0.4.29"; + version = "0.4.30"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "smheidrich"; repo = "py-json-stream-rs-tokenizer"; tag = "v${version}"; - hash = "sha256-eXlxbZRiUdp28taLxsuQ4wh1rPO/zUAC0Owt7yc0bzc="; + hash = "sha256-kzeEG42KcmczIC69aJe1dkqeBpMYn5uBBj1Ni+/+sTM="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/development/python-modules/langchain-mistralai/default.nix b/pkgs/development/python-modules/langchain-mistralai/default.nix index e8e67b354643..9b6f5d9abc4c 100644 --- a/pkgs/development/python-modules/langchain-mistralai/default.nix +++ b/pkgs/development/python-modules/langchain-mistralai/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-mistralai"; - version = "0.2.11"; + version = "0.2.12"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-mistralai==${version}"; - hash = "sha256-14mYvW7j2hxAFZanRhuuo1seX6E4+tAuEPExDbdwHKg="; + hash = "sha256-eZyoveKn4S0nkK/2q8+HK0bpFAQEez4PyRETQeZItMo="; }; sourceRoot = "${src.name}/libs/partners/mistralai"; diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix index 8a9c8ec391c3..396046068540 100644 --- a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix +++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "langgraph-runtime-inmem"; - version = "0.12.0"; + version = "0.14.1"; pyproject = true; # Not available in any repository src = fetchPypi { pname = "langgraph_runtime_inmem"; inherit version; - hash = "sha256-h1YFV8lqb929MjzOIHPI8hahjDCkShr83kevjUWFF8A="; + hash = "sha256-OIgTFwx0f8W/oRpF12jtaENWcripe1Tr/6Mx0k+nnLw="; }; build-system = [ diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index e2ab1f82f2b1..ee956d45e690 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.4.29"; + version = "0.4.31"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${version}"; - hash = "sha256-/x8e9ZfHhAQYPtGpp4PRW92QAeLNCPs9p+TnviGg6bY="; + hash = "sha256-lHehU+qJBl1pX7H0QmmmVuMYrcbopQZhmCiyQ6D3k2Q="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index 9515619827df..da2e50226b23 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, defusedxml, + fastjsonschema, fetchFromGitHub, jsonschema, pytestCheckHook, - pythonOlder, pyyaml, semantic-version, setuptools, @@ -14,22 +14,21 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.8.7"; + version = "0.8.8"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "anthonyharrison"; repo = "lib4sbom"; tag = "v${version}"; - hash = "sha256-qHKedDh7G6yvk6LOs5drJJbkLo20/dP49GG7Q/pOmBw="; + hash = "sha256-JfY47bskOnQeh5ueQfBtQz8Hmi9mPjCMoaFrzpxQMhU="; }; build-system = [ setuptools ]; dependencies = [ defusedxml + fastjsonschema jsonschema pyyaml semantic-version diff --git a/pkgs/development/python-modules/libbs/default.nix b/pkgs/development/python-modules/libbs/default.nix index 96eed62a0ebe..3a5925b85305 100644 --- a/pkgs/development/python-modules/libbs/default.nix +++ b/pkgs/development/python-modules/libbs/default.nix @@ -30,14 +30,14 @@ let in buildPythonPackage rec { pname = "libbs"; - version = "2.15.4"; + version = "2.16.4"; pyproject = true; src = fetchFromGitHub { owner = "binsync"; repo = "libbs"; tag = "v${version}"; - hash = "sha256-i5y0aPCBcCzR2pYYtdxy9OEFFF47chINMRfhj9zAf7g="; + hash = "sha256-if27Tg5S0Esrw9xHi6nr+kDIw4OTz7yZ2256/4Kbkeo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/livekit-api/default.nix b/pkgs/development/python-modules/livekit-api/default.nix index 6dc8377f023a..601095a58b82 100644 --- a/pkgs/development/python-modules/livekit-api/default.nix +++ b/pkgs/development/python-modules/livekit-api/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "livekit-api"; - version = "1.0.12"; + version = "1.0.6"; pyproject = true; src = fetchFromGitHub { owner = "livekit"; repo = "python-sdks"; - tag = "rtc-v${version}"; - hash = "sha256-NfFlj44aRMA7oUXyIKljNdtb/2MLvjIJGcAvIGNbNxM="; + tag = "api-v${version}"; + hash = "sha256-AsTJC0j8dztua7B6JvAYQlHGsE1RCIGoCzfGgbHSnGU="; }; pypaBuildFlags = [ "livekit-api" ]; diff --git a/pkgs/development/python-modules/livisi/default.nix b/pkgs/development/python-modules/livisi/default.nix index ac9f5f3d24ad..5b6c514794a9 100644 --- a/pkgs/development/python-modules/livisi/default.nix +++ b/pkgs/development/python-modules/livisi/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-5TRJfI4irg2/ZxpfgzShXE08HWU2aWLR8zGbrZKpwbc="; }; - pythonRelaxDeps = [ "colorlog" ]; - build-system = [ setuptools ]; dependencies = [ @@ -38,6 +36,7 @@ buildPythonPackage rec { doCheck = false; meta = { + changelog = "https://github.com/planbnet/livisi/releases/tag/${src.tag}"; description = "Connection library for the abandoned Livisi Smart Home system"; homepage = "https://github.com/planbnet/livisi"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/llama-cloud-services/default.nix b/pkgs/development/python-modules/llama-cloud-services/default.nix index be625ea4f3d1..8e89b1f83bb6 100644 --- a/pkgs/development/python-modules/llama-cloud-services/default.nix +++ b/pkgs/development/python-modules/llama-cloud-services/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "llama-cloud-services"; - version = "0.6.66"; + version = "0.6.69"; pyproject = true; src = fetchFromGitHub { owner = "run-llama"; repo = "llama_cloud_services"; tag = "v${version}"; - hash = "sha256-6UskoqlnmfoDFeWem8gjKJPE9vg5DtOrzVHQ1Q0eEA4="; + hash = "sha256-+90b/EwG8OfpjG/MJM5shvQHLsLpLe+TviufwoWI7mg="; }; sourceRoot = "${src.name}/py"; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index a44ea022a763..e3e6072c0794 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.6.8"; + version = "0.7.0"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-AwbZxv4ClJYNgeX4UydcOZcAb+8UUc34u/BNHUGSeiI="; + hash = "sha256-wWn3y/NEb71N2hCcd06iof7favJxcVHZmBCvP4UQJl8="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/llama-stack-client/default.nix b/pkgs/development/python-modules/llama-stack-client/default.nix index 449fdb9d3b30..ccf1ff2bc72e 100644 --- a/pkgs/development/python-modules/llama-stack-client/default.nix +++ b/pkgs/development/python-modules/llama-stack-client/default.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { pname = "llama-stack-client"; - version = "0.2.22"; + version = "0.2.23"; pyproject = true; src = fetchPypi { pname = "llama_stack_client"; inherit version; - hash = "sha256-mgvHVrkevVOYWO6vHyMcXlxpAOHqT8ztcmxnF/PSfKc="; + hash = "sha256-aPNOisjupqc+2dSXfYSZkrLYvYNYBNdwoRhDQxzVv3Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix index 6282a686260d..a0a26213c5b6 100644 --- a/pkgs/development/python-modules/llm-gemini/default.nix +++ b/pkgs/development/python-modules/llm-gemini/default.nix @@ -50,6 +50,9 @@ buildPythonPackage rec { homepage = "https://github.com/simonw/llm-gemini"; changelog = "https://github.com/simonw/llm-gemini/releases/tag/${src.tag}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ josh ]; + maintainers = with lib.maintainers; [ + josh + philiptaron + ]; }; } diff --git a/pkgs/development/python-modules/llm-jq/default.nix b/pkgs/development/python-modules/llm-jq/default.nix index f88e6ae566f4..4769b5b6a99b 100644 --- a/pkgs/development/python-modules/llm-jq/default.nix +++ b/pkgs/development/python-modules/llm-jq/default.nix @@ -31,6 +31,10 @@ buildPythonPackage rec { homepage = "https://github.com/simonw/llm-jq"; changelog = "https://github.com/simonw/llm-jq/releases/tag/${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ josh ]; + maintainers = with lib.maintainers; [ + erethon + josh + philiptaron + ]; }; } diff --git a/pkgs/development/python-modules/llm-openai-plugin/default.nix b/pkgs/development/python-modules/llm-openai-plugin/default.nix index f6e673366d81..20a97ffb81a1 100644 --- a/pkgs/development/python-modules/llm-openai-plugin/default.nix +++ b/pkgs/development/python-modules/llm-openai-plugin/default.nix @@ -50,6 +50,9 @@ buildPythonPackage rec { homepage = "https://github.com/simonw/llm-openai-plugin"; changelog = "https://github.com/simonw/llm-openai-plugin/releases/tag/${src.tag}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ josh ]; + maintainers = with lib.maintainers; [ + josh + philiptaron + ]; }; } diff --git a/pkgs/development/python-modules/mammoth/default.nix b/pkgs/development/python-modules/mammoth/default.nix index ed1fc588da84..b90aaa8a5a0a 100644 --- a/pkgs/development/python-modules/mammoth/default.nix +++ b/pkgs/development/python-modules/mammoth/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mammoth"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; src = fetchFromGitHub { owner = "mwilliamson"; repo = "python-mammoth"; tag = version; - hash = "sha256-I+PHag4e+RA6EppRTyBe/ywFsRhS+pZZHTh+g151l7Y="; + hash = "sha256-x1wSudTD/C1uHnudaCCrhi9fyQInCej+Kd7CyBI2sus="; }; postPatch = '' diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 01fa47856207..d417fb25ca10 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "markdown2"; - version = "2.5.2"; + version = "2.5.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "trentm"; repo = "python-markdown2"; tag = version; - hash = "sha256-SL93JEBBpiYqgCazRkPN5nFBidMpfnGLrHIe7EUwlAY="; + hash = "sha256-2w11vVzZUS6HzXmZT+Ag5rPqRnn/tlLnHL4xIDv0l+g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index 4e47efbb27ce..5d9a744079c3 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "materialx"; - version = "1.39.3"; + version = "1.39.4"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "MaterialX"; rev = "v${version}"; - hash = "sha256-ceVYD/dyb3SEEENoJZxjn94DGmUj6IYSNLjsJvmPM84="; + hash = "sha256-XNfXOC76zM5Ns2DyyE3mKCJ1iJaszs1M0rBdVLRDo8E="; }; format = "other"; diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix index a75d694e6bbf..3a5adae06097 100644 --- a/pkgs/development/python-modules/mcp/default.nix +++ b/pkgs/development/python-modules/mcp/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { pname = "mcp"; - version = "1.14.0"; + version = "1.15.0"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-LHc2G5mzyfZ2GvUIuaXYp8AHOVGs6Xtk4MTDYtUcySI="; + hash = "sha256-pvbrNkGfQaZX95JZyYXuuH2gMzWouuGXjaDxPyKW0Zw="; }; postPatch = lib.optionalString stdenv.buildPlatform.isDarwin '' diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 70c10fc9d993..77141d5675fb 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.16"; + version = "7.2.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; tag = version; - hash = "sha256-NyHdZKHyok7CbzNZscUJm67+LK4hYkMp/p14M5vm7og="; + hash = "sha256-SP681EBKSyLl9V1TaI/7jsQOLPKKI+XwkR6hpoaSG/Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 2ebd59759fff..2a03aa21651d 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.6.17"; + version = "9.6.20"; pyproject = true; src = fetchFromGitHub { owner = "squidfunk"; repo = "mkdocs-material"; tag = version; - hash = "sha256-yl5bc037gr3oAUH01uNvNj7fIe8ca2jH+yfWlgMImZE="; + hash = "sha256-4VvMy3eAkITASX8qRu8Qdgj2n92dz0vfZJo4q8EFLuU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index e5405c713a12..422a5513b0e4 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "1.2.10"; + version = "1.2.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-wU79zM2hGjmv/IxfQHHSLPBJFzoAPusHgtAaFSumFr0="; + hash = "sha256-OcF1aJgQFB+YTC6Ksx/WImKciOjodY0wq/KRUAxiqqU="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/modelcif/default.nix b/pkgs/development/python-modules/modelcif/default.nix index 242986272bc5..79efba47008c 100644 --- a/pkgs/development/python-modules/modelcif/default.nix +++ b/pkgs/development/python-modules/modelcif/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "modelcif"; - version = "1.4"; + version = "1.5"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-modelcif"; tag = version; - hash = "sha256-Uj6E25uqFdCo2lGf0Cmhc7rs3Rwj7vkpe2G0uhv53gc="; + hash = "sha256-NVsADYEemnhuFwvM4lMebkU5WrqF+gL/3i6LoZ/Alt8="; }; build-system = [ diff --git a/pkgs/development/python-modules/momonga/default.nix b/pkgs/development/python-modules/momonga/default.nix new file mode 100644 index 000000000000..d894d4f698e6 --- /dev/null +++ b/pkgs/development/python-modules/momonga/default.nix @@ -0,0 +1,39 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pyserial, + setuptools, +}: + +buildPythonPackage rec { + pname = "momonga"; + version = "0.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nbtk"; + repo = "momonga"; + tag = "v${version}"; + hash = "sha256-sc81L71DJq+XiIYUSMH6knfaPfV7cng/Sp0ZTY6N7ZI="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyserial + ]; + + pythonImportsCheck = [ "momonga" ]; + + # tests require access to the API + doCheck = false; + + meta = { + changelog = "https://github.com/nbtk/momonga/releases/tag/${src.tag}"; + description = "Python Route B Library: A Communicator for Low-voltage Smart Electric Energy Meters"; + homepage = "https://github.com/nbtk/momonga"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index ef996dba7eec..2096a289c734 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -182,8 +182,8 @@ rec { "sha256-UzM2sg9jxU/kU6kmMizVJwYLqq+nrZi+D6GLHYPdmJQ="; mypy-boto3-ce = - buildMypyBoto3Package "ce" "1.40.31" - "sha256-7tuIhj+Kz01F4sPhL8N6g+e0CcdWwtAl7jF0Xii3c0Q="; + buildMypyBoto3Package "ce" "1.40.40" + "sha256-ygUnU/oDBQPqmRfZ6jKMnvVXdORQkBuC57UyXjV6Xi0="; mypy-boto3-chime = buildMypyBoto3Package "chime" "1.40.19" @@ -206,8 +206,8 @@ rec { "sha256-knAtab953lppnI8SioY6V3nMN6pt/l5p4XEsE3CpDGc="; mypy-boto3-chime-sdk-voice = - buildMypyBoto3Package "chime-sdk-voice" "1.40.19" - "sha256-HQWGDqUurjpbCTJJ+GDZn/UvVz421D3Ls7EHemTa8uY="; + buildMypyBoto3Package "chime-sdk-voice" "1.40.42" + "sha256-axa2niA9HlLpV9Tf01p0fG2GhK2lNlCM/O8LLPHQVRc="; mypy-boto3-cleanrooms = buildMypyBoto3Package "cleanrooms" "1.40.37" @@ -338,8 +338,8 @@ rec { "sha256-MIxmEy+/mlDwWKpHrb0jo8Yu1C7+xP6JRNvUeDmlfZ0="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.40.35" - "sha256-uiE7vhxNtCMrxZeH3CbEIv2n5Qs5B3ohx/sg+L7lvpQ="; + buildMypyBoto3Package "connect" "1.40.40" + "sha256-k9Q5WmeCTzqlhjIsPUPlbZXB6kB2Ll6sNdhybOWrUHk="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.40.0" @@ -350,8 +350,8 @@ rec { "sha256-nAOKVy+aH2gw8NZ8cNSYqQ0kFWV4Gb4oU6y1vHz3fpI="; mypy-boto3-connectcases = - buildMypyBoto3Package "connectcases" "1.40.0" - "sha256-dDHPNM+HVEIBXu9GFRtnnY+j5J31Z0gNfv/cd91QX4I="; + buildMypyBoto3Package "connectcases" "1.40.42" + "sha256-DJcEbPyJZVRVF1FnTSQpuUZlBTEYcOXJ42yN1o4yUwU="; mypy-boto3-connectparticipant = buildMypyBoto3Package "connectparticipant" "1.40.18" @@ -366,8 +366,8 @@ rec { "sha256-QRwEUkDj7S0/VuQrcwuPWqKnzXEN6NYUSakhT+9T2wk="; mypy-boto3-customer-profiles = - buildMypyBoto3Package "customer-profiles" "1.40.0" - "sha256-fMWdXDlTjSkf5R5U+cd85E5qEEHAyl4Mc0v1W2rW4WA="; + buildMypyBoto3Package "customer-profiles" "1.40.42" + "sha256-9zxTdvAc7+MgUM1KZJndXBCc0qL6jp50u7I93zZXrJY="; mypy-boto3-databrew = buildMypyBoto3Package "databrew" "1.40.20" @@ -382,8 +382,8 @@ rec { "sha256-VBJsQqd5m5RfO+tJklYHd+pk2zqpqyDXO4BmRGdFxS4="; mypy-boto3-datasync = - buildMypyBoto3Package "datasync" "1.40.0" - "sha256-I5xvx5UCp1h2H1c2xI6mSI4ZaXsONs/09/BJfRXCr3A="; + buildMypyBoto3Package "datasync" "1.40.42" + "sha256-utMenSLve20f+TKyA5xeoAGTEPlizo7uQJSEKt2gq68="; mypy-boto3-dax = buildMypyBoto3Package "dax" "1.40.38" @@ -430,24 +430,24 @@ rec { "sha256-dtw54zAzP4HddWx0kZr7SzxmWiKCiiP6g4+aDRRid2k="; mypy-boto3-ds = - buildMypyBoto3Package "ds" "1.40.19" - "sha256-tAZhpQXC0FqcE3eviZLyzwURR0JNeYdTTXvy4uVesnY="; + buildMypyBoto3Package "ds" "1.40.42" + "sha256-gKzshS6Q6O/lTAsrkuXOvKkGz+ECRlmSeb5NxNCBim8="; mypy-boto3-dynamodb = buildMypyBoto3Package "dynamodb" "1.40.20" "sha256-L0JDFdKZzPCztOOysjAPkPCc0LfGn8Rz0M3Atr5sMNY="; mypy-boto3-dynamodbstreams = - buildMypyBoto3Package "dynamodbstreams" "1.40.0" - "sha256-x/0Scc259VN45rx94YT48Q3NS7nnd2oNRgxQAmy3nSQ="; + buildMypyBoto3Package "dynamodbstreams" "1.40.40" + "sha256-TgENR4bY5AHy0hqJkTq63jApASafB6agMPFPYDlzJ7A="; mypy-boto3-ebs = buildMypyBoto3Package "ebs" "1.40.15" "sha256-jtkx0kbI7SB74U5uWyGdVhKMlsy/T82lz3P89k8LMPA="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.40.37" - "sha256-/fjsvFbryW6xD+B1rQT+XpPmwHS9KlbYogTtxo9tFgM="; + buildMypyBoto3Package "ec2" "1.40.40" + "sha256-I+YOlaDhTIFN3fd8f5MctMEFEQNKR+lyMTyPXiPqaRo="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.40.20" @@ -462,8 +462,8 @@ rec { "sha256-mkaBmHn3LsOHnH4kTWkGbCsL4w/TrPBt/pBXnj+1Ai8="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.40.29" - "sha256-EDI1QRd8X3KbDuqb42Kfoe8YtWBll5T+zwkGNj3JYaQ="; + buildMypyBoto3Package "ecs" "1.40.42" + "sha256-1U8AdbZK5u7HVuuCPoeyMqSzQDZEzfYfJzqf1mAjqVI="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.40.0" @@ -558,8 +558,8 @@ rec { "sha256-BpY3WWeFvaGfDaGk/dxJijSK3giz7wrgvHk/lKOaxzk="; mypy-boto3-fsx = - buildMypyBoto3Package "fsx" "1.40.10" - "sha256-E9s3Mh66bXUsy/BUPorYaOp58hkY0HpkyX3dX0OsXz4="; + buildMypyBoto3Package "fsx" "1.40.42" + "sha256-phgje7MZt9KoKUb6bQYqZ4/BqjYflEDPJ/uN7J04zuE="; mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.40.0" @@ -613,8 +613,8 @@ rec { "sha256-nOj8fkesQ6iVsoLwa/29LYl9X16UUL13k7M2rTEln0U="; mypy-boto3-imagebuilder = - buildMypyBoto3Package "imagebuilder" "1.40.36" - "sha256-aOo29FyR1QdV3DCIQAM/rumH/LjbQozDfmisNyyCi4I="; + buildMypyBoto3Package "imagebuilder" "1.40.41" + "sha256-vGem/ZZqqYL3sjrf2gTlMx/YTB+lHcG9lJcJLjGRkOk="; mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.40.0" @@ -889,8 +889,8 @@ rec { "sha256-hkzc8MTCssJPCjME7CMCVewYgNf9Gz/c68hAC3fuKnE="; mypy-boto3-mediatailor = - buildMypyBoto3Package "mediatailor" "1.40.0" - "sha256-1uTPx4K0dGJfRPupXqkRKTOifmVzNhDgvaBYPpd0A4c="; + buildMypyBoto3Package "mediatailor" "1.40.42" + "sha256-wTzLtvXBVTEs1ywAw8sL92Xzyo9TOscaIptPE1oHrUg="; mypy-boto3-medical-imaging = buildMypyBoto3Package "medical-imaging" "1.40.31" @@ -1073,8 +1073,8 @@ rec { "sha256-g5Mh+Uz/YrF4v7GV3kPUarzTr0miTUioaMaxwYUX4p0="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.40.29" - "sha256-SaFCAROxWpTo4sqW3FOhFeu9haAy4fX1IxfEPOXTnVI="; + buildMypyBoto3Package "quicksight" "1.40.42" + "sha256-N2azeTi2ixXGbVbeYYFly4/Mui56T6DlLKnZRD0Kp14="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.40.18" @@ -1085,16 +1085,16 @@ rec { "sha256-zye0xv5P6GemZiH+T/cIyzx9qaeOKitEWpW6LOkc8KM="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.40.29" - "sha256-groMjFopUdDaTOuQlBUgIF4fA/0/n133wLG2oWSZJ2Q="; + buildMypyBoto3Package "rds" "1.40.42" + "sha256-d9jOB2pCQA+HFUxODEwpg1jLsSvGoC7EH7baqXU50TI="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.40.0" "sha256-EjuSI3v4i4PRTmcQtqRTRdgfBXBBzF9ChJV9x6VCdtY="; mypy-boto3-redshift = - buildMypyBoto3Package "redshift" "1.40.19" - "sha256-+noMuqryk81BMx7hTdJq30i2bDUXH3zVTFWkLkoMuAA="; + buildMypyBoto3Package "redshift" "1.40.40" + "sha256-S2Kq4+up5zWfLS2rM14qwmzLd1h13hz8YURBq9O715w="; mypy-boto3-redshift-data = buildMypyBoto3Package "redshift-data" "1.40.0" @@ -1369,8 +1369,8 @@ rec { "sha256-i50560hic1ItkD0zJjAyHraepEyxioFBvHwMWkfg0kk="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.40.0" - "sha256-BMsYO2mBrK/CtWRj9jVNO2sC4IarhQ+1hYd9FeJDIEw="; + buildMypyBoto3Package "transfer" "1.40.42" + "sha256-1jkEh4zfoBl1sOPdAY++CheU6by2ps53OqBTN+FhwAc="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.40.17" @@ -1385,8 +1385,8 @@ rec { "sha256-voJSA17LDkjLBNDd7/TPS5tC63BfyEffvp7JUb46trk="; mypy-boto3-vpc-lattice = - buildMypyBoto3Package "vpc-lattice" "1.40.0" - "sha256-I2rPZoC+WSv7qNHD/UKqeACtX11wyse4CKBFy7hoBfI="; + buildMypyBoto3Package "vpc-lattice" "1.40.41" + "sha256-ULIgKqAo6aDuFZpl/NFS77RrR8yCss7HbRV7E25OcqE="; mypy-boto3-waf = buildMypyBoto3Package "waf" "1.40.20" diff --git a/pkgs/development/python-modules/netbox-bgp/default.nix b/pkgs/development/python-modules/netbox-bgp/default.nix index daed65ce182f..a5b89ce17477 100644 --- a/pkgs/development/python-modules/netbox-bgp/default.nix +++ b/pkgs/development/python-modules/netbox-bgp/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "netbox-bgp"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-bgp"; tag = "v${version}"; - hash = "sha256-pm6Xn34kPlGMzQAsiwrfTprPZtw7edsyr3PpRtJWnNE="; + hash = "sha256-2Ss1ImJTqhr1FTRpnk1cwpFbHPjoNuUdpXoJJ9mjzHQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netbox-qrcode/default.nix b/pkgs/development/python-modules/netbox-qrcode/default.nix index a8dc1a40a3fe..f3153a0ca32f 100644 --- a/pkgs/development/python-modules/netbox-qrcode/default.nix +++ b/pkgs/development/python-modules/netbox-qrcode/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "netbox-qrcode"; - version = "0.0.18"; + version = "0.0.19"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-qrcode"; tag = "v${version}"; - hash = "sha256-8PPab0sByr03zoSI2d+BpxeTnLHmbN+4c+s99x+yNvA="; + hash = "sha256-hrVnNEgLL3r1BtZdBaJu6H5b/tuXUxzGjKcITTopE60="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 7381dc0e797b..0259bee51712 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "nitransforms"; - version = "25.0.1"; + version = "25.1.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-6unmr9iWCmX0ub6Vr0d5gwH4fdjOysUKlKBbO0BSWDw="; + hash = "sha256-Wcs0iV/ENCLhsjH6hTDmxoAsNAN9qzd9n+wWbiA04aU="; }; build-system = [ diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index cdb6f63efca3..45904d90c38f 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "niworkflows"; - version = "1.14.1"; + version = "1.14.2"; pyproject = true; src = fetchFromGitHub { owner = "nipreps"; repo = "niworkflows"; tag = version; - hash = "sha256-NvUIVH6CFv2DMr6bV4bV/VXM/fOqiatFp9YOL0/UEdw="; + hash = "sha256-LzzbletoZdI9HuaBWhFB6IGs1nX6ZItNP6cWlw5m5EE="; }; pythonRelaxDeps = [ "traits" ]; diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix index c3bb1fce5b5f..7c3c0f6e826d 100644 --- a/pkgs/development/python-modules/notobuilder/default.nix +++ b/pkgs/development/python-modules/notobuilder/default.nix @@ -68,7 +68,7 @@ buildPythonPackage { meta = { description = "Python module for building Noto fonts"; homepage = "https://github.com/notofonts/notobuilder"; - license = lib.licenses.unfree; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jopejoe1 ]; }; } diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index ec8ebb7cfce5..892a20b56dce 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -40,12 +40,6 @@ buildPythonPackage rec { yamllint ]; - # https://github.com/networktocode/ntc-templates/issues/743 - disabledTests = [ - "test_raw_data_against_mock" - "test_verify_parsed_and_reference_data_exists" - ]; - meta = with lib; { description = "TextFSM templates for parsing show commands of network devices"; homepage = "https://github.com/networktocode/ntc-templates"; diff --git a/pkgs/development/python-modules/nuclear/default.nix b/pkgs/development/python-modules/nuclear/default.nix index c25cd24c53bc..a30e4a1fd26f 100644 --- a/pkgs/development/python-modules/nuclear/default.nix +++ b/pkgs/development/python-modules/nuclear/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "nuclear"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "igrek51"; repo = "nuclear"; rev = version; - hash = "sha256-0jeRoWk1PRyIEoEhWsA/9FtMy7CcN4mZpLpC6FZyM/A="; + hash = "sha256-6ZuRFZLhOqS9whkD0WtWD1/xSLhE8czDA3Za7Vcn1Mc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 6410beb3aa20..a1cc5706074f 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, @@ -12,14 +13,14 @@ buildPythonPackage rec { pname = "nuitka"; - version = "2.6.9"; + version = "2.7.15"; pyproject = true; src = fetchFromGitHub { owner = "Nuitka"; repo = "Nuitka"; rev = version; - hash = "sha256-QKJAMDVXO78VQ0P+nuuQ4dxCKEJLtcqCinJYs018rTA="; + hash = "sha256-o+rXk8Qh9SeBpuSppPBap9TL69gy9ag7PCArFSNSv7g="; }; build-system = [ @@ -49,5 +50,7 @@ buildPythonPackage rec { description = "Python compiler with full language support and CPython compatibility"; license = licenses.asl20; homepage = "https://nuitka.net/"; + # never built on darwin since first introduction in nixpkgs + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/numbagg/default.nix b/pkgs/development/python-modules/numbagg/default.nix index 2b0a92699a0c..8ec945dd890f 100644 --- a/pkgs/development/python-modules/numbagg/default.nix +++ b/pkgs/development/python-modules/numbagg/default.nix @@ -21,7 +21,7 @@ }: buildPythonPackage rec { - version = "0.9.2"; + version = "0.9.3"; pname = "numbagg"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "numbagg"; repo = "numbagg"; tag = "v${version}"; - hash = "sha256-W5c0tZUggNyP9O+t9+S14nz9acR53cLIWaBwXJo1dcg="; + hash = "sha256-MEgSxxKZaL0sPhERFa8DWF+Vkc/VuHDyyB2yfFv/uYw="; }; build-system = [ diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 5aaa75e1dd00..76883ec8067b 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "oelint-data"; - version = "1.0.28"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; tag = version; - hash = "sha256-y/feC6p7Aab2ypjIW5o7IurqlvN6V9Q20xTF4fDlDj4="; + hash = "sha256-yqS0zYUjDg9y0nOeQ2ujQ+LGvGJpF3tuoz3GghUbrF0="; }; build-system = [ diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 8d8eb1394455..86cda036beb5 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.17.3"; + version = "0.17.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "packageurl_python"; inherit version; - hash = "sha256-cZmV8Mf3BokCd7pX7JWvyqlpbINqdnV3ChJ5sBpB974="; + hash = "sha256-p74/O6cNcF9zis6b9hJPMZICRaSfpp1LQW2nA33S3mE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/peakutils/default.nix b/pkgs/development/python-modules/peakutils/default.nix new file mode 100644 index 000000000000..bc6167877aa0 --- /dev/null +++ b/pkgs/development/python-modules/peakutils/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + numpy, + pandas, + pytestCheckHook, + scipy, + setuptools, +}: + +buildPythonPackage rec { + pname = "peakutils"; + version = "1.3.5"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-T/Ln8zMLkwJP6Noe4E4AOJ4mvLLveb0vnPhszUli4RQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + numpy + scipy + ]; + + nativeCheckInputs = [ + pandas + pytestCheckHook + ]; + + pythonImportsCheck = [ "peakutils" ]; + + meta = { + description = "Peak detection utilities for 1D data"; + homepage = "https://pypi.org/project/PeakUtils/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index e29a2eee51fc..5853e01ce922 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "peft"; - version = "0.17.0"; + version = "0.17.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "peft"; tag = "v${version}"; - hash = "sha256-YkJGVSeeEs+ErOUgRL5OXDUaJDqABjOTicM+1gX+CDM="; + hash = "sha256-xtpxwbKf7ZaUYblGdwtPZE09qrlBQTMm5oryUJwa6AA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index bed59c001b8e..a6f5a98a36fd 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "1.7.1"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pypa"; repo = "pipx"; tag = version; - hash = "sha256-diHWzrSpXWbNosXKN5nj2FM09HicDhHWKxQDXc+AZ4o="; + hash = "sha256-TEF5zBAB0tvfY0dsZOnu2r9P+pheMr/OOI6CCY8PItg="; }; build-system = [ diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 0e66042a1d85..a817681896aa 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -2,17 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, - pkgs, - qtbase, - qmake, + python, + pythonRecompileBytecodeHook, + swig, + cmake, + coin3d, soqt, + libGLU, }: buildPythonPackage rec { pname = "pivy"; version = "0.6.10"; - pyproject = true; + format = "other"; src = fetchFromGitHub { owner = "coin3d"; @@ -21,54 +23,31 @@ buildPythonPackage rec { hash = "sha256-DRA4NTAHg2iB/D1CU9pJEpsZwX9GW3X5gpxbIwP54Ko="; }; - build-system = [ setuptools ]; - - dontUseCmakeConfigure = true; - - nativeBuildInputs = with pkgs; [ + nativeBuildInputs = [ swig - qmake cmake + pythonRecompileBytecodeHook ]; - buildInputs = - with pkgs; - with xorg; - [ - coin3d - soqt - qtbase - libGLU - libGL - libXi - libXext - libSM - libICE - libX11 - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-I${qtbase.dev}/include/QtCore" - "-I${qtbase.dev}/include/QtGui" - "-I${qtbase.dev}/include/QtOpenGL" - "-I${qtbase.dev}/include/QtWidgets" + buildInputs = [ + coin3d + soqt + libGLU # dummy buildInput that provides missing header + ]; + + cmakeFlags = [ + (lib.cmakeBool "PIVY_USE_QT6" true) + (lib.cmakeFeature "PIVY_Python_SITEARCH" "${placeholder "out"}/${python.sitePackages}") ]; - dontUseQmakeConfigure = true; dontWrapQtApps = true; - doCheck = false; - - postPatch = '' - substituteInPlace distutils_cmake/CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \ - \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}' - ''; pythonImportsCheck = [ "pivy" ]; - meta = with lib; { + meta = { homepage = "https://github.com/coin3d/pivy/"; description = "Python binding for Coin"; - license = licenses.bsd0; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 7f63915d1aee..4bacb6954ab8 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "plux"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; # Tests are not available from PyPi @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "localstack"; repo = "plux"; tag = "v${version}"; - hash = "sha256-2Sxn/LuiwTzByAAz7VlNLsxEiPIyJWXr86/76Anx+EU="; + hash = "sha256-daAFv5tIekWDq0iI/yolmuak0MMXXVCfAcbHcYY7Qd4="; }; build-system = [ diff --git a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix index 513c958bb98c..6b3f56135673 100644 --- a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix +++ b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "proton-vpn-local-agent"; - version = "1.4.5"; + version = "1.4.8"; pyproject = false; withDistOutput = false; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ProtonVPN"; repo = "python-proton-vpn-local-agent"; rev = version; - hash = "sha256-njulvM8CNURy5Gy8thOT08y4cq9T68Ktl6wlfvg5I4w="; + hash = "sha256-AHY2b0JaYaLhgnNkTsm9ERkw0s0NWnpbPAPgw+r2Gz4="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -28,7 +28,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-RrMhkOZyG0JBEk+ikRpQtsNVR6Jt94u71+srQ6qMq5U="; + hash = "sha256-zzUZsF0R0QGhxe4To6xSHYUVJTIDddf+UdTJg7E9Ef8="; }; sourceRoot = "${src.name}/python-proton-vpn-local-agent"; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index ce3b58296aa8..db47ca9e0e49 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -45,6 +45,10 @@ buildPythonPackage rec { # Upstream hardcoded the check for the command `gdb-multiarch`; # Forcefully use the provided debugger as `gdb`. sed -i 's/gdb-multiarch/${debuggerName}/' pwnlib/gdb.py + + # Disable update checks + substituteInPlace pwnlib/update.py \ + --replace-fail 'disabled = False' 'disabled = True' ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index f27f7ba4f426..931db4ee8f56 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "0.3.27"; + version = "0.3.31"; format = "setuptools"; pname = "pyaxmlparser"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "appknox"; repo = "pyaxmlparser"; rev = "v${version}"; - hash = "sha256-NtAsO/I1jDEv676yhAgLguQnB/kHdAqPoLt2QFWbvmw="; + hash = "sha256-ZV2PyWQfK9xidzGUz7XPAReaVjlB8tMUKQiXoGcFCGs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 46dd6db8deef..a9ad750c9a51 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pybids"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; src = fetchFromGitHub { owner = "bids-standard"; repo = "pybids"; tag = version; - hash = "sha256-x1OlqfuRZvfWwOt+WTR8lAtOPWcrsymQyXPfiEj4lk4="; + hash = "sha256-e1uD9rNs50GP8myNY+5VbcdRKlLykSTd9ESKrhSW+r8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 57d7472fcb62..e887180fc357 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -152,9 +152,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" -version = "0.3.78" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", @@ -162,9 +162,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.175" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "lock_api" @@ -184,9 +184,9 @@ checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memoffset" @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.12.32" +version = "0.12.37" dependencies = [ "pyo3", "serde_json", @@ -315,9 +315,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] @@ -331,6 +331,12 @@ dependencies = [ "bitflags", ] +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + [[package]] name = "ryu" version = "1.0.20" @@ -345,18 +351,28 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -365,14 +381,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.143" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -403,24 +420,24 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "thiserror" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -429,9 +446,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unindent" @@ -447,21 +464,22 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasm-bindgen" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", @@ -473,9 +491,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -483,9 +501,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", @@ -496,9 +514,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 22c1301ee1d3..7d9d6e33e517 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.32"; + version = "0.12.37"; pyproject = true; src = fetchFromGitHub { owner = "y-crdt"; repo = "pycrdt"; tag = version; - hash = "sha256-kQuQwEuHRmg0aovXewvsfog+L/SsJSFhYYVAbK5pZHo="; + hash = "sha256-jcp7rxpnNMa0xS+ig9CX4Mwzk05PuzhfkiAFYLoaAQI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index d6449035de18..40a02a959e62 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.10.21"; + version = "1.10.24"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic"; tag = "v${version}"; - hash = "sha256-0kwqJsay+4xh+jgDStNciRPJmuqm8GzA+6ble4K4HuI="; + hash = "sha256-eDmVpo6tI6a1lfBOU7Bvq9Wv/+I959c7krYPzZEoQig="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index cbe84b89c0e6..cc02c9efa926 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.99"; + version = "0.2.100"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-J7Go+tEbhHpgnA/qvVPLB6/iOcX+qbg2GJj1eoujzwk="; + hash = "sha256-z98mrmfIM96rb+PT25HzwkfFDgZ50wRw9eQlsD4yqik="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyhive-integration/default.nix b/pkgs/development/python-modules/pyhive-integration/default.nix index 45c0d7196c92..8ecacc3fdb59 100644 --- a/pkgs/development/python-modules/pyhive-integration/default.nix +++ b/pkgs/development/python-modules/pyhive-integration/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, setuptools, unasync, @@ -15,16 +14,14 @@ buildPythonPackage rec { pname = "pyhive-integration"; - version = "1.0.2"; + version = "1.0.5"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "Pyhass"; repo = "Pyhiveapi"; tag = "v${version}"; - hash = "sha256-lfBr889s6NHcos/kdzQa9HJEcQ4dfCEMjuLYiLzesfE="; + hash = "sha256-chAIFBd51a4QHVhAm5jsQvDhe7huSMyv8oARZKEc2Qw="; }; pythonRemoveDeps = [ "pre-commit" ]; @@ -53,11 +50,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyhiveapi" ]; - meta = with lib; { + meta = { description = "Python library to interface with the Hive API"; homepage = "https://github.com/Pyhass/Pyhiveapi"; changelog = "https://github.com/Pyhass/Pyhiveapi/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 2d87062de302..a7d1bc73ef6e 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -1,56 +1,69 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pythonAtLeast, - setuptools, certifi, click, + fetchFromGitHub, + fido2, keyring, keyrings-alt, - requests, - tzlocal, pytest-mock, + pytest-socket, pytestCheckHook, + pythonAtLeast, + requests, + setuptools, + setuptools-scm, + srp, + tzlocal, }: buildPythonPackage rec { pname = "pyicloud"; - version = "1.0.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { - owner = "picklepete"; + owner = "timlaing"; repo = "pyicloud"; - rev = version; - hash = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w="; + tag = version; + hash = "sha256-bGS5yAizdaZUdwKNoZPKP/DSpJs5XI70hyTLfJg9QmI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ certifi click + fido2 keyring keyrings-alt requests + srp tzlocal ]; nativeCheckInputs = [ pytest-mock + pytest-socket pytestCheckHook ]; + pythonImportsCheck = [ "pyicloud" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ # https://github.com/picklepete/pyicloud/issues/446 "test_storage" ]; meta = with lib; { - description = "PyiCloud is a module which allows pythonistas to interact with iCloud webservices"; + description = "Module to interact with iCloud webservices"; mainProgram = "icloud"; - homepage = "https://github.com/picklepete/pyicloud"; + homepage = "https://github.com/timlaing/pyicloud"; + changelog = "https://github.com/timlaing/pyicloud/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix index fefa0bc3cdf5..a161f54482e0 100644 --- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix +++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyinstaller-hooks-contrib"; - version = "2025.8"; + version = "2025.9"; pyproject = true; src = fetchPypi { pname = "pyinstaller_hooks_contrib"; inherit version; - hash = "sha256-NAKtQd/ptREK8TRCLjf8XUIbo0LGy5gL1nyzC3QVZBw="; + hash = "sha256-VulyvarU6a92ftR9EyNi0WIRImDL5IjJ2n/uAfIopaY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 1a5930595d73..313303716046 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pykka"; - version = "4.3.0"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { owner = "jodal"; repo = "pykka"; tag = "v${version}"; - hash = "sha256-xCvWqWThsi78S9DW4ssz0gezb0RFGlqW2W8oMxkNc+E="; + hash = "sha256-OwY8EKCRuc9Tli7Q+rHieqEAYxb7KNBHiPUuycNO8J4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix index c0e29e3b6df0..01f41b00b9ab 100644 --- a/pkgs/development/python-modules/pylint-odoo/default.nix +++ b/pkgs/development/python-modules/pylint-odoo/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "pylint-odoo"; - version = "9.3.15"; + version = "9.3.18"; pyproject = true; src = fetchFromGitHub { owner = "OCA"; repo = "pylint-odoo"; tag = "v${version}"; - hash = "sha256-N/HbsdkObnEC39dewIpFkRX4rn+7aJHua3gz2Bg0aI8="; + hash = "sha256-8nrAwjfz28INoLD4xuQ/R5lYodZjw/PqBdZAF+wBXN0="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index bce7b5e39e06..1be0a2a6731c 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -21,16 +21,18 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.11.1"; + version = "3.11.3"; pyproject = true; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = "pymodbus"; tag = "v${version}"; - hash = "sha256-wanWE0FDaTtIR2V5pjd7Vffp2C8qGYMyMrdG6pHFspo="; + hash = "sha256-2wOeghoi8FSk1II/0rid+ddRq7ceerH7ZeLcb+SSXKY="; }; + __darwinAllowLocalNetworking = true; + build-system = [ setuptools ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index c9f20c0fbc6a..ba9d70c538ba 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.51"; + version = "1.0.53"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "semuconsulting"; repo = "pynmeagps"; tag = "v${version}"; - hash = "sha256-v/7OQ/jBDpu27mCeSO1iY5EH3Aa7urDQge8dKbQZd0I="; + hash = "sha256-ULkyvm66VAWc0SzU3tLwCeLQiVYU9xWgNS3Qz1nCcHQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pypika/default.nix b/pkgs/development/python-modules/pypika/default.nix index 70e3d3bcb114..699f4e08cdab 100644 --- a/pkgs/development/python-modules/pypika/default.nix +++ b/pkgs/development/python-modules/pypika/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "pypika"; - version = "0.48.9"; + version = "0.49.0"; format = "setuptools"; src = fetchFromGitHub { owner = "kayak"; repo = "pypika"; rev = "v${version}"; - hash = "sha256-9HKT1xRu23F5ptiKhIgIR8srLIcpDzpowBNuYOhqMU0="; + hash = "sha256-Lawsc19sJ3U7rCOnYvDWhWqK/J+Hd3zKG6TrhDsTtVs="; }; pythonImportsCheck = [ "pypika" ]; diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix new file mode 100644 index 000000000000..aa22c41e24fb --- /dev/null +++ b/pkgs/development/python-modules/pyportainer/default.nix @@ -0,0 +1,53 @@ +{ + aiohttp, + aresponses, + buildPythonPackage, + fetchFromGitHub, + lib, + mashumaro, + orjson, + poetry-core, + pytest-cov-stub, + pytestCheckHook, + syrupy, + yarl, +}: + +buildPythonPackage rec { + pname = "pyportainer"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "erwindouna"; + repo = "pyportainer"; + tag = "v${version}"; + hash = "sha256-SAHcIP6M4WjWnrRwz4FlsV6rel1vHzH+cGHT8D/PcQk="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + mashumaro + orjson + yarl + ]; + + pythonImportsCheck = [ "pyportainer" ]; + + nativeCheckInputs = [ + aresponses + pytest-cov-stub + pytestCheckHook + syrupy + ]; + + meta = { + changelog = "https://github.com/erwindouna/pyportainer/releases/tag/${src.tag}"; + description = "Asynchronous Python client for the Portainer API"; + homepage = "https://github.com/erwindouna/pyportainer"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index 763a89f84831..3df8c781aaa2 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -7,9 +7,9 @@ fetchpatch, lxml, packaging, - py, pytestCheckHook, - pythonOlder, + replaceVars, + setuptools, termcolor, wireshark-cli, }: @@ -17,9 +17,7 @@ buildPythonPackage rec { pname = "pyshark"; version = "0.6"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "KimiNewt"; @@ -37,24 +35,24 @@ buildPythonPackage rec { url = "https://github.com/KimiNewt/pyshark/commit/7142c5bf88abcd4c65c81052a00226d6155dda42.patch"; hash = "sha256-Ti7cwRyYSbF4a4pEEV9FntNevkV/JVXNqACQWzoma7g="; }) + (replaceVars ./hardcode-tshark-path.patch { + tshark = lib.getExe' wireshark-cli "tshark"; + }) ]; sourceRoot = "${src.name}/src"; - # propagate wireshark, so pyshark can find it when used - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ appdirs lxml packaging - py termcolor - wireshark-cli ]; nativeCheckInputs = [ - py pytestCheckHook - wireshark-cli ]; preCheck = '' diff --git a/pkgs/development/python-modules/pyshark/hardcode-tshark-path.patch b/pkgs/development/python-modules/pyshark/hardcode-tshark-path.patch new file mode 100644 index 000000000000..36efd4e0cdb9 --- /dev/null +++ b/pkgs/development/python-modules/pyshark/hardcode-tshark-path.patch @@ -0,0 +1,30 @@ +diff --git a/src/pyshark/tshark/tshark.py b/src/pyshark/tshark/tshark.py +index 73ede9d..17c0488 100644 +--- a/src/pyshark/tshark/tshark.py ++++ b/src/pyshark/tshark/tshark.py +@@ -47,24 +47,7 @@ def get_process_path(tshark_path=None, process_name="tshark"): + f"{process_name}.exe" if sys.platform.startswith("win") else process_name) + possible_paths.insert(0, user_tshark_path) + +- # Windows search order: configuration file"s path, common paths. +- if sys.platform.startswith("win"): +- for env in ("ProgramFiles(x86)", "ProgramFiles"): +- program_files = os.getenv(env) +- if program_files is not None: +- possible_paths.append( +- os.path.join(program_files, "Wireshark", f"{process_name}.exe") +- ) +- # Linux, etc. search order: configuration file's path, the system's path +- else: +- os_path = os.getenv( +- "PATH", +- "/usr/bin:/usr/sbin:/usr/lib/tshark:/usr/local/bin" +- ) +- for path in os_path.split(":"): +- possible_paths.append(os.path.join(path, process_name)) +- if sys.platform.startswith("darwin"): +- possible_paths.append(f"/Applications/Wireshark.app/Contents/MacOS/{process_name}") ++ possible_paths.append("@tshark@") + + for path in possible_paths: + if os.path.exists(path): diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 7811afc42edd..239113899107 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyshp"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "GeospatialPython"; repo = "pyshp"; tag = version; - hash = "sha256-bN6n/cHuhoJPP2N9hcaPY87QgLNDSNdjHkpmyjO/+70="; + hash = "sha256-/ziHRjMwzQe3rnMZW9FTT0fyFDPWSv+Tm+tNG67t4gE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix index 8c0f66ee40ea..ded4e7073e8b 100644 --- a/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -18,25 +18,48 @@ buildPythonPackage rec { pname = "python-lsp-ruff"; - version = "2.2.2"; + version = "2.3.0"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-ruff"; tag = "v${version}"; - hash = "sha256-czGA/gl7uoWG9UqYUaY9zER79IKfv7ClqgimgyNCAa4="; + hash = "sha256-jtfDdZ68AroXlmR+AIVk/b3WpZk78BCtT8TUh4ELZZI="; }; - postPatch = '' - # ruff binary is used directly, the ruff python package is not needed - sed -i '/"ruff>=/d' pyproject.toml - sed -i 's|sys.executable, "-m", "ruff"|"${ruff}/bin/ruff"|' pylsp_ruff/plugin.py - sed -i -e '/sys.executable/,+2c"${ruff}/bin/ruff",' -e 's|assert "ruff" in call_args|assert "${ruff}/bin/ruff" in call_args|' tests/test_ruff_lint.py + postPatch = + let + ruffBin = lib.getExe ruff; + in + '' + substituteInPlace pylsp_ruff/plugin.py \ + --replace-fail \ + "*find_executable(executable)" \ + '"${ruffBin}"' + + substituteInPlace tests/test_ruff_lint.py \ + --replace-fail "str(sys.executable)" '"${ruffBin}"' \ + --replace-fail '"-m",' "" \ + --replace-fail '"ruff",' "" \ + --replace-fail \ + 'assert "ruff" in call_args' \ + 'assert "${ruffBin}" in call_args' \ + --replace-fail \ + 'ruff_executable = ruff_exe.name' \ + 'ruff_executable = "${ruffBin}"' \ + --replace-fail 'os.chmod(ruff_executable, st.st_mode | stat.S_IEXEC)' "" + '' # Nix builds everything in /build/ but ruff somehow doesn't run on files in /build/ and outputs empty results. - sed -i -e "s|workspace.root_path|'/tmp/'|g" tests/*.py - ''; + + '' + substituteInPlace tests/*.py \ + --replace-fail "workspace.root_path" '"/tmp/"' + ''; + + pythonRemoveDeps = [ + # ruff binary is used directly, the ruff python package is not needed + "ruff" + ]; dependencies = [ cattrs diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index effbf7b4b2d1..b5e8aadf05c0 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.47.1"; + version = "2.49.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "Python-roborock"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-bA7KPLVh3Jo6xdDdJS8czUaEyOilmbzHYoQJG8/soT4="; + hash = "sha256-Fvrr+ILPy1vOPv1xw3TBJFBPLqz+6fmLTqTKWQ2IGY8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 12d6e311251c..c8954b43c20f 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytomlpp"; - version = "1.0.13"; + version = "1.0.14"; format = "setuptools"; src = fetchFromGitHub { @@ -22,7 +22,7 @@ buildPythonPackage rec { repo = "pytomlpp"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-QJeXvj1M3Vq5ctmx7RhczONsPRXAecv3WhJgKWtNK+M="; + hash = "sha256-P41jEs1ShpiuSenreE4ykesY2wgBaR7TUKuv3tcD5J0="; }; buildInputs = [ pybind11 ]; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 9b5de647dcb8..33c8cc87e749 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytools"; - version = "2025.2.2"; + version = "2025.2.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-iOxR2SM7CisJNe1/FTRX7nDf0xpaCuQA8/xs3K8tQ90="; + hash = "sha256-nLgr50dW0ZIcArrTx2fr3kZ50tFDqFpMNY0y9lRuVG8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index aa05ec2c606e..12ab592aaaed 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -12,29 +12,26 @@ psutil, zeroconf, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa-py"; tag = version; - hash = "sha256-bYxl7zJ36uorEasAKvPiVWLaG2ISQGBHrQZJcnkbfzU="; + hash = "sha256-fXLT3W48HQ744LkwZn784KKmUE8gxDCR+lkcL9xX45g="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ pyvisa typing-extensions ]; @@ -50,11 +47,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Module that implements the Virtual Instrument Software Architecture"; homepage = "https://github.com/pyvisa/pyvisa-py"; changelog = "https://github.com/pyvisa/pyvisa-py/blob/${src.tag}/CHANGES"; - license = licenses.mit; - maintainers = with maintainers; [ mvnetbiz ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mvnetbiz ]; }; } diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 05b97478adf7..cfcf76e741dc 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.16.1"; + version = "0.16.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "python-quantities"; repo = "python-quantities"; tag = "v${version}"; - hash = "sha256-gXxUmuhFAqHVj8jqWt8Ed2M6UvnPxku6hr/yJoa3nXE="; + hash = "sha256-6Kl7TiSCSDtMjRKMNVweoGJ1y8kmo1j4SY0tikyAozs="; }; build-system = [ diff --git a/pkgs/development/python-modules/rapidocr/default.nix b/pkgs/development/python-modules/rapidocr/default.nix index 7e567d93bf0c..5734de8c8bc6 100644 --- a/pkgs/development/python-modules/rapidocr/default.nix +++ b/pkgs/development/python-modules/rapidocr/default.nix @@ -23,13 +23,13 @@ requests, }: let - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "RapidAI"; repo = "RapidOCR"; tag = "v${version}"; - hash = "sha256-yeDWs9axfVl1SlsVwqztlP7BXV+6w6dMpLmlpWaqVko="; + hash = "sha256-Q8QtjI+5QDv6zQ96aXLyEepHfMh75DR+ZWj/ygVx3o0="; }; models = diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 77cd25503084..55d548fbdfab 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -1,13 +1,14 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, + fetchzip, + applyPatches, + replaceVars, cmake, comic-neue, boost, catch2_3, - inchi, cairo, eigen, python, @@ -26,11 +27,27 @@ let rev = "AvalonToolkit_2.0.5-pre.3"; hash = "sha256-2MuFZgRIHXnkV7Nc1da4fa7wDx57VHUtwLthrmjk+5o="; }; - yaehmop = fetchFromGitHub { - owner = "greglandrum"; - repo = "yaehmop"; - rev = "v2024.03.1"; - hash = "sha256-rhR7Ev+9Fk/Ks7R2x2SjWu1L/48a4zHDHUBohx1Dw/M="; + chemdraw = fetchFromGitHub { + owner = "Glysade"; + repo = "chemdraw"; + tag = "v1.0.10"; + hash = "sha256-ee2Oxvo2d7Yb59lN0zkrbFqy/3rOvVLo6qdS+f23wVQ="; + }; + yaehmop = applyPatches { + src = fetchFromGitHub { + owner = "greglandrum"; + repo = "yaehmop"; + rev = "v2025.03.1"; + hash = "sha256-rhR7Ev+9Fk/Ks7R2x2SjWu1L/48a4zHDHUBohx1Dw/M="; + }; + + # Compatibility with CMake < 3.5 has been removed from CMake. + postPatch = '' + substituteInPlace tightbind/CMakeLists.txt \ + --replace-fail \ + "cmake_minimum_required(VERSION 3.0)" \ + "cmake_minimum_required(VERSION 3.5)" + ''; }; freesasa = fetchFromGitHub { owner = "mittinatten"; @@ -44,12 +61,23 @@ let rev = "daefab3dd0c90ca56da9d3d5e375fe4d651e6be3"; hash = "sha256-tQB4wqza9rlSoy4Uj9bA99ddawjxGyN9G7DYbcv/Qdo="; }; + better_enums = fetchFromGitHub { + owner = "aantron"; + repo = "better-enums"; + tag = "0.11.3"; + hash = "sha256-UYldCOkRTySc78oEOJzgoY9h2lB386W/D5Rz3KjVCO8="; + }; + # We cannot use the inchi from nixpkgs as the version is too old + inchi = fetchzip { + url = "https://github.com/IUPAC-InChI/InChI/releases/download/v1.07.3/INCHI-1-SRC.zip"; + hash = "sha256-TUC2175HifB63EfSsg/ixA3wYzAxsvUnY6ZyNjVR/Fc="; + }; }; boost' = boost.override { enableNumpy = true; }; in buildPythonPackage rec { pname = "rdkit"; - version = "2024.09.1"; + version = "2025.03.6"; pyproject = false; src = @@ -59,8 +87,8 @@ buildPythonPackage rec { fetchFromGitHub { owner = "rdkit"; repo = "rdkit"; - rev = "Release_${versionTag}"; - hash = "sha256-UsyPlAJ8FISblF8szEmRqWansunIhW/gbEBZx13YM+A="; + tag = "Release_${versionTag}"; + hash = "sha256-DqnwfT+lX7OnArIcFlCBrDl+QDmNpbPO9u7OGwu8fJo="; }; unpackPhase = '' @@ -72,19 +100,46 @@ buildPythonPackage rec { # see https://github.com/rdkit/rdkit/pull/5928 cp -r ${external.avalon}/* External/AvalonTools/avalon + mkdir External/ChemDraw/chemdraw + cp -r ${external.chemdraw}/* External/ChemDraw/chemdraw/ + chmod -R +w External/ChemDraw/chemdraw + mkdir External/YAeHMOP/yaehmop ln -s ${external.yaehmop}/* External/YAeHMOP/yaehmop - mkdir -p External/FreeSASA/freesasa + mkdir External/FreeSASA/freesasa cp -r ${external.freesasa}/* External/FreeSASA/freesasa chmod +w External/FreeSASA/freesasa/src cp External/FreeSASA/freesasa2.c External/FreeSASA/freesasa/src - ln -s ${external.pubchem-align3d} External/pubchem_shape/pubchem-align3d + mkdir External/pubchem_shape/pubchem-align3d + cp -r ${external.pubchem-align3d}/* External/pubchem_shape/pubchem-align3d + + mkdir External/INCHI-API/src + ln -s ${external.inchi}/* External/INCHI-API/src + ln -s ${rapidjson} External/rapidjson-1.1.0 ln -s ${comic-neue}/share/fonts/truetype/ComicNeue-Regular.ttf Data/Fonts/ ''; + patches = [ + (replaceVars ./dont-fetch-better-enums.patch { + inherit (external) better_enums; + }) + ]; + + # Prevent linking to libpython which fails on darwin with: + # Undefined symbols for architecture arm64 + # Reverts https://github.com/rdkit/rdkit/commit/470df8cd2fab78d64ef1dd254576097b651c3dd9 + postPatch = '' + substituteInPlace \ + CMakeLists.txt \ + External/pubchem_shape/Wrap/CMakeLists.txt \ + --replace-fail \ + "find_package(Python3 COMPONENTS Interpreter Development.Module NumPy" \ + "find_package(Python3 COMPONENTS Interpreter Development NumPy" \ + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -93,7 +148,6 @@ buildPythonPackage rec { catch2_3 coordgenlibs eigen - inchi maeparser ]; @@ -126,8 +180,8 @@ buildPythonPackage rec { (lib.cmakeBool "RDK_USE_URF" false) (lib.cmakeFeature "AVALONTOOLS_DIR" "avalon") (lib.cmakeFeature "FREESASA_SRC_DIR" "freesasa") - (lib.cmakeFeature "INCHI_INCLUDE_DIR" "${inchi}/include/inchi") - (lib.cmakeFeature "PUBCHEMSHAPE_DIR" "External/pubchem_shape/pubchem-align3d") + (lib.cmakeFeature "maeparser_DIR" "${maeparser}/lib/cmake") + (lib.cmakeFeature "coordgen_DIR" "${coordgenlibs}/lib/cmake") ]; checkPhase = '' @@ -144,14 +198,14 @@ buildPythonPackage rec { "rdkit.Chem.rdDetermineBonds" ]; - meta = with lib; { + meta = { description = "Open source toolkit for cheminformatics"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ rmcgibbo natsukium ]; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://www.rdkit.org"; - changelog = "https://github.com/rdkit/rdkit/releases/tag/${src.rev}"; + changelog = "https://github.com/rdkit/rdkit/releases/tag/${src.tag}"; }; } diff --git a/pkgs/development/python-modules/rdkit/dont-fetch-better-enums.patch b/pkgs/development/python-modules/rdkit/dont-fetch-better-enums.patch new file mode 100644 index 000000000000..c52f30a2c20f --- /dev/null +++ b/pkgs/development/python-modules/rdkit/dont-fetch-better-enums.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77939f452..9cace7fe1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,8 +184,7 @@ Include(FetchContent) + + FetchContent_Declare( + better_enums +- GIT_REPOSITORY https://github.com/aantron/better-enums.git +- GIT_TAG c35576bed0295689540b39873126129adfa0b4c8 # 0.11.3 ++ URL @better_enums@ + ) + + if(RDK_INSTALL_INTREE) diff --git a/pkgs/development/python-modules/readabilipy/default.nix b/pkgs/development/python-modules/readabilipy/default.nix index 65bca92865c5..9e2139840643 100644 --- a/pkgs/development/python-modules/readabilipy/default.nix +++ b/pkgs/development/python-modules/readabilipy/default.nix @@ -29,6 +29,12 @@ buildPythonPackage rec { hash = "sha256-FYdSbq3rm6fBHm5fDRAB0airX9fNcUGs1wHN4i6mnG0="; }; + patches = [ + # Fix test failures with Python 3.13.6 + # https://github.com/alan-turing-institute/ReadabiliPy/pull/116 + ./python3.13.6-compatibility.patch + ]; + javascript = buildNpmPackage { pname = "readabilipy-javascript"; inherit version; diff --git a/pkgs/development/python-modules/readabilipy/python3.13.6-compatibility.patch b/pkgs/development/python-modules/readabilipy/python3.13.6-compatibility.patch new file mode 100644 index 000000000000..91e3ddb3c3d1 --- /dev/null +++ b/pkgs/development/python-modules/readabilipy/python3.13.6-compatibility.patch @@ -0,0 +1,115 @@ +diff --git a/readabilipy/simplifiers/html.py b/readabilipy/simplifiers/html.py +index f68aafd..5c8d95c 100644 +--- a/readabilipy/simplifiers/html.py ++++ b/readabilipy/simplifiers/html.py +@@ -284,6 +284,10 @@ def wrap_bare_text(soup): + # - we are adding additional structure that was not present in the original document + if element.parent.name in block_level_whitelist() and len(element.parent.contents) == 1: + pass ++ # title elements should not have their text wrapped in

tags ++ # as they can only contain text content according to HTML spec. ++ elif element.parent.name == 'title': ++ pass + # ... otherwise wrap them in

tags + else: + p_element = soup.new_tag("p") +diff --git a/tests/data/addictinginfo.com-1_simple_article_from_full_page.json b/tests/data/addictinginfo.com-1_simple_article_from_full_page.json +index 3e58c1e..37b4ccf 100644 +--- a/tests/data/addictinginfo.com-1_simple_article_from_full_page.json ++++ b/tests/data/addictinginfo.com-1_simple_article_from_full_page.json +@@ -2,8 +2,8 @@ + "title": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video", + "byline": null, + "date": "2018-10-15T12:13:54", +- "content": "

<p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", +- "plain_content": "
<p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "plain_content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", + "plain_text": [ + {"text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, + {"text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, +diff --git a/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest.json b/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest.json +index 4531c15..8650a7e 100644 +--- a/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest.json ++++ b/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest.json +@@ -2,8 +2,8 @@ + "title": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video", + "byline": null, + "date": "2018-10-15T12:13:54", +- "content": "
<p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", +- "plain_content": "
<p data-content-digest=\"ccdf3c0529ffdbc11eff7fbebc390f64dc12d9f8eb458b8b11225fa77a583faa\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p data-content-digest=\"fdba4f206dce87355a1a1d677ebe2de75ae6b80894984256907f8d6bde6e9421\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "plain_content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", + "plain_text": [ + {"text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, + {"text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, +diff --git a/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest_node_indexes.json b/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest_node_indexes.json +index 0ec8329..2e4a83d 100644 +--- a/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest_node_indexes.json ++++ b/tests/data/addictinginfo.com-1_simple_article_from_full_page_content_digest_node_indexes.json +@@ -2,11 +2,11 @@ + "title": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video", + "byline": null, + "date": "2018-10-15T12:13:54", +- "content": "
<p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", +- "plain_content": "
<p data-content-digest=\"ccdf3c0529ffdbc11eff7fbebc390f64dc12d9f8eb458b8b11225fa77a583faa\" data-node-index=\"0.1.1\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p data-content-digest=\"fdba4f206dce87355a1a1d677ebe2de75ae6b80894984256907f8d6bde6e9421\" data-node-index=\"0.2.1\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "plain_content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", + "plain_text": [ +- {"node_index": "0.1.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, +- {"node_index": "0.2.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, ++ {"node_index": "0.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, ++ {"node_index": "0.2", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, + {"node_index": "0.3.1.1.1.1.1", "text": "* About Us, * Contact Us, * Creative Commons License, * Privacy Policy, * Terms of Service,"}, + {"node_index": "0.3.1.1.2.1.1", "text": "* Home, * News, * Important Information, * Discredited Myths, * Historical Information, * Political Humor,"}, + {"node_index": "0.3.1.2.1.1.1", "text": "Current Issues, News"}, +diff --git a/tests/data/addictinginfo.com-1_simple_article_from_full_page_node_indexes.json b/tests/data/addictinginfo.com-1_simple_article_from_full_page_node_indexes.json +index f6b3026..b725000 100644 +--- a/tests/data/addictinginfo.com-1_simple_article_from_full_page_node_indexes.json ++++ b/tests/data/addictinginfo.com-1_simple_article_from_full_page_node_indexes.json +@@ -2,11 +2,11 @@ + "title": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video", + "byline": null, + "date": "2018-10-15T12:13:54", +- "content": "
<p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p>Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", +- "plain_content": "
<p data-node-index=\"0.1.1\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave</p><p data-node-index=\"0.2.1\">Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video</p>
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", ++ "plain_content": "
Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You CraveTrump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video
  • About Us
  • Contact Us
  • Creative Commons License
  • Privacy Policy
  • Terms of Service
  • Home
  • News
  • Important Information
  • Discredited Myths
  • Historical Information
  • Political Humor
Current Issues, News

Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video

By Conover Kennard on October 15, 2018 12:13 pm ·

Donald Trump has repeatedly lashed out at Sen. Elizabeth Warren (D-MA) at his rallies, calling her Pochahontas to cast doubt on her Native American Heritage. Trump even referred to Warren as Pocahontas at a November 2017 White House event honoring Navajo code-breakers. At a rally in Montana this past July, Trump offered Sen. Warren $1 million if she took a DNA test to prove her heritage. Trump spoke of bringing a DNA test to a debate if she challenges him.

“We will take that little kit — but we have to do it gently. Because we’re in the #MeToo generation, we have to do it gently,” Trump said. “And we will very gently take that kit, and slowly toss it, hoping it doesn’t injure her arm, and we will say: I will give you a million dollars to your favorite charity, paid for by Trump, if you take the test and it shows you’re an Indian. I have a feeling she will say no.”

Today the Massachusetts Senator released her DNA results.

“The facts suggest that you absolutely have a Native American ancestor in your pedigree,” an Ancestry.com and 23andMe adviser told Warren.

Warren tweeted Trump to demand he pay what he promised and requested that he make the donation to the National Indigenous Women’s Resource Center.

By the way, @realDonaldTrump: Remember saying on 7/5 that you’d give $1M to a charity of my choice if my DNA showed Native American ancestry? I remember – and here’s the verdict. Please send the check to the National Indigenous Women’s Resource Center: https://t.co/I6YQ9hf7Tv pic.twitter.com/J4gBamaeeo

— Elizabeth Warren (@elizabethforma) October 15, 2018

In response, White House counselor Kellyanne Conway called DNA testing “junk science.”

Then, Trump flat out denied ever promising to make that donation even though it’s on tape.

“Who cares?” Trump told reporters today. “I didn’t say that. Nope, you better read it again.”

Well, MSNBC has the receipts:

MSNBC put together video of Trump unequivocally telling Elizabeth Warren in July that “I’ll give you a million dollars, to your favorite charity, paid for by Trump, if you take [a DNA] test and it shows you’re an Indian” — followed by him denying he ever said that this morning. pic.twitter.com/zR3n2DqaiY

— Aaron Rupar (@atrupar) October 15, 2018

Image via screen capture.

Share this Article!
Share on Facebook
Share on Twitter

Author: Conover KennardConover makes tea partiers cry as a hobby. She was Commander of Jade Helm15 during the failed takeover of the South. She's also one of the biggest arseholes on Twitter. At night, she can be found drinking Conservative tears while pulling off the wings of flies just because she can. She is the founder of a Marxist, Commie, Maoist, Socialist site and has contributed to several other sites, blah blah blah. She is an awful person but she doesn't like to brag about that.

Search

Archives

Share on Facebook
Comments

Addicting Info | The Knowledge You Crave

Copyright © 2018 AddictingInfo.org. All Rights Reserved
", + "plain_text": [ +- {"node_index": "0.1.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, +- {"node_index": "0.2.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, ++ {"node_index": "0.1", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video | Addicting Info | The Knowledge You Crave"}, ++ {"node_index": "0.2", "text": "Trump Denies Charitable Donation He Promised If Elizabeth Warren Releases DNA Results And It’s On Video"}, + {"node_index": "0.3.1.1.1.1.1", "text": "* About Us, * Contact Us, * Creative Commons License, * Privacy Policy, * Terms of Service,"}, + {"node_index": "0.3.1.1.2.1.1", "text": "* Home, * News, * Important Information, * Discredited Myths, * Historical Information, * Political Humor,"}, + {"node_index": "0.3.1.2.1.1.1", "text": "Current Issues, News"}, +diff --git a/tests/data/conservativehq.com-1_simple_article_from_full_page.json b/tests/data/conservativehq.com-1_simple_article_from_full_page.json +index 619a697..544d9a0 100644 +--- a/tests/data/conservativehq.com-1_simple_article_from_full_page.json ++++ b/tests/data/conservativehq.com-1_simple_article_from_full_page.json +@@ -2,8 +2,8 @@ + "title": "Beware Soros's \"Rented Evangelicals\"", + "byline": null, + "date": null, +- "content": "
<p>Beware Soros's \"Rented Evangelicals\" | ConservativeHQ.com</p>
  • Login
  • New to CHQ?
  • Home
  • Exclusive CHQ News
  • In The Media
  • About Us
  • Join CHQ
  • Login to CHQ
  • Contact

Share This Article with a Friend!

Printer-friendly version

Beware Soros's \"Rented Evangelicals\"

  • American Association of Evangelicals (AAE)
  • anti-Judeo Christian agenda
  • Christian VOLAGs
  • flip Congress
  • George Soros
  • Hillary Clinton
  • human organ trafficking
  • Immigration
  • Jim Wallis
  • mascots
  • ministers
  • open borders
  • Open Society Foundation
  • PICO
  • Pope Francis
  • refugee resettlement
  • Rented Evangelicals
  • Same-sex marriage
  • Socialism
  • Sojourners
  • Soros ministers
  • transgender agenda
CHQ Staff | 10/17/18

As Soros-funded “ministers” are on buses through swing states to “flip Congress,” our friends with the American Association of Evangelicals (AAE) have just put out a 3-minute video, Soros’s “Rented Evangelicals.”* It provides a lot of info in a short time and is reaching many thousands of people each day through social media.

“Soros’s Rented Evangelicals” is a wake-up call that we urge you to share with your family, friends, church and club members to alert them to this assault on the Body of Christ.

This is a very complex story, however, as leaked documents obtained by our friends at AAE confirm, and as Rev. Jim Wallis of Sojourners eventually admitted, wealthy, anti-Christian foundations, following the lead of billionaire George Soros’s Open Society Foundation, fund and “rent” curious \"evangelical\" and \"Catholic\" \"mascots” serving as deceptive validators for their causes. The consequent realities include injury to countless people, the Church, the family, nation and the global Church including many martyrs.

Consider some of the consequences of 'Progressive' political activism over the past few decades documented by AAE:

A growth industry trafficking in human baby organs and body parts, funded and defended by the Democratic Party.

The abandonment of a biblical view of marriage that protected and liberated children and adults from centuries of pagan slavery, poverty, polygamy and non-life-giving sexuality.

The Transgender agenda including gender \"reorientation\" of our children, also being forced on our neighbors, businesses, schools, military and churches.

Socialism, higher taxes and government regulations. These policies stifle human creativity, productivity, family stability and generosity. Such policies increase joblessness, welfare dependency and national debt.

Heightened racial division and tension, and the growing phenomenon of paid demonstrators being recruited and dispatched to instigate protests that often become riots.

Open borders and lawless ‘sanctuary’ cities increasing drugs, disease, crime, gangs and terrorism.

Amnesty efforts that attempt to give voting rights to millions of non-citizens, giving the results of our elections and nation's future to many who disregarded our laws, customs, history, identity and values. This does not honor our long-standing tradition of legal immigration to those who come in good faith and to assimilate and bless America.

Forced refugee resettlement in hundreds of American cities without citizen consent, mandated by the Obama-era federal government in partnership with the United Nations. (Refugees were primarily non-assimilating Muslims, while authorities often reject persecuted Christians.)

Hostility towards Judeo-Christian religious liberty in our courts, large corporations, media and universities including the suppression of conservative speakers, free thought and moral education.

The growing recognition of a \"Deep State\" within our government, including ideological bureaucrats embedded in our DOJ, IRS, FBI and Department of State, that intimidates and seeks to subvert conservative, patriotic and Christian groups that disagree with the 'Progressive' political establishment.

After such demoralization and pain, asked AAE, why would any religious leader ask Christians to embrace, support or vote for a Progressive political agenda that is clearly anti-Christian?

When Hillary Clinton stated during a 2015 speech at the Women in the World Summit that religious beliefs “have to be changed,” she revealed the radical Left's war on Christian believers and the Church.

And now the Religious Left claims that supporting such a view is the Christian thing to do? This is spiritual abuse of human beings, the family, the Church and the nation.

“The framers of our Constitution meant we were to have freedom of religion, not freedom from religion.” Rev. Billy Graham

For many years, Soros’s Open Society and other liberal foundations have funded not only most of the disturbing campaigns mentioned above (1-10) but also the Religious Left, using and creating ostensibly evangelical and Catholic organizations to “message and mobilize” Christians into Progressive causes. They use the Marxist-Alinsky tactic of funding “ministers” who cherry-pick faith language to confuse and divide the Church’s morality, mission and vote.

At a time when many Christian ministries are struggling, a few of the Soros network “faith” and “interfaith” grantees are Jim Wallis of Sojourners, Richard Cizik’s New Evangelical Partnership, Telos, J Street to malign Israel, Catholics in Alliance for the Common Good, Faithful America and Gamaliel. Faith in Public Life to “counter” Christians and conservatives in the media and, with PICO, advocate for amnesty, mass Islamic migration, and even to attempt to influence the visit and priorities of the Vatican and Pope Francis himself. Billions of additional dollars to “Christian VOLAGs” for large scale “refugee” and migrant resettlement come from the Obama administration.

Joining “faith” fronts, the Soros network also funds thousands of other collaborators and projects that suggest a pattern and goal to demoralize America (and Europe). The list includes: film studios and hundreds of media outlets; attempts to control the Internet; racial and gender agitation; euthanasia; drug legalization and “injection zones;” abortion and the “sex worker” industry; Al Gore’s Climate campaign; pro-Palestinian and anti-Israel projects; the rights of jihadists and Sharia advocates.

In the ironic rhetoric of compassion, Soros and allies fund mass immigration, redistricting schemes, illegals' voting “rights,” protests and smears on Judge Kavanaugh and the Supreme Court, while financing the 2018 campaigns of Democrats Andrew Gillum (D-FL), Jon Tester (D-MT), Claire McCaskill (D-MO), Tim Kaine (D-VA), Kristen Gillibrand (D-NY), Krysten Sinema (D-AZ), Elizabeth Warren (D-MA) and many more. (Soros has long been a major donor to the Democratic Party, co-chairman of Ready for Hillary PAC and previously funded Al Gore, John Kerry, Barack Obama, Hillary Clinton, Al Franken and many far-Left Democrats).

One wonders if the end goal is the destruction of national identity through demoralization, open borders and debt, thus the “fundamental transformation” (weakening) of American civil society for their leveraged global power. (Soros broke the Bank of England, is a convicted felon in France, and is undermining many nations.)

We urge you to go to https://americanevangelicals.com/ for more information on Soros and his releationship with some who claim to be speaking for Evangelical Christians. We should all question the true intentions of persons or organizations that receive money from Soros and related globalist social engineers. We must not give America's future to him and his surrogates, for more harm.

*The phrase comes from the New America Foundation strategy, “Rent An Evangelical” and “Rent A General” as “mascots.”

  • Login or register to post comments

Fake Christians

Submitted by charlyc on Wed, 10/17/2018 - 12:17.

Jesus said you cannot serve God and mammon. (Mammon=wealth, riches) \"Rented Evangelicals\" transparently means mammon servers. Jesus also said, You shall know them by their fruits. What fruits are they producing? These are the tares (weeds) sown into the wheat that Jesus warned us about in the parable of the wheat and the tares (Matt 13:25). \"the tares are the children of The Evil One.\" (Matt 13:38) Just because someone goes to \"church\" on Sunday doesn't mean they're a true Christian. Even Satan can quote scripture. (Matt 4:6 in which he quotes Psalms 91:11-12)

  • Login or register to post comments

Fake Christians

Submitted by email_registrat... on Fri, 10/19/2018 - 14:08.

Yeshua says to: “BEWARE of false prophets, who come to you in sheep’s clothing, but inwardly they are ravenous wolves. YOU WILL KNOW THEM BY THEIR FRUITS. Do men gather grapes from thorn bushes or figs from thistles? Even so, EVERY GOOD TREE BEARS GOOD FRUIT, but A BAD TREE BEARS BAD FRUIT. A GOOD tree CANNOT BEAR BAD fruit, nor can a BAD tree BEAR GOOD fruit. Every tree that does not bear good fruit is cut down and thrown into the fire. THEREFORE BY THEIR FRUITS you WILL KNOW them” (Matthew 7:15-20) [emphasis mine].

  • Login or register to post comments

Learn How Conservatives Can Fight Back & Win in 2018

FOLLOW US on FACEBOOK, TWITTER

* Richard Viguerie on Twitter * ConservativeHQ on Facebook * Conservative TAKEOVER on Facebook

Login to CHQ

Register to become a ConservativeHQ.com member - click here. If you are already a member, please log-in by clicking here.

ConservativeHQ.com Officers: Richard A. Viguerie - Chairman

Editor:
George Rasley
Writers:
Mark Fitzgibbons
Ben Hart
George Rasley
Richard A. Viguerie

ConservativeHQ.com is the online news source for conservatives and Tea Partiers committed to bringing limited government constitutional conservatives to power.

  • Copyright © 2017 ConservativeHQ.com, Inc. To view our privacy policy, click here
", +- "plain_content": "
<p>Beware Soros's \"Rented Evangelicals\" | ConservativeHQ.com</p>
  • Login
  • New to CHQ?
  • Home
  • Exclusive CHQ News
  • In The Media
  • About Us
  • Join CHQ
  • Login to CHQ
  • Contact

Share This Article with a Friend!

Printer-friendly version

Beware Soros's \"Rented Evangelicals\"

  • American Association of Evangelicals (AAE)
  • anti-Judeo Christian agenda
  • Christian VOLAGs
  • flip Congress
  • George Soros
  • Hillary Clinton
  • human organ trafficking
  • Immigration
  • Jim Wallis
  • mascots
  • ministers
  • open borders
  • Open Society Foundation
  • PICO
  • Pope Francis
  • refugee resettlement
  • Rented Evangelicals
  • Same-sex marriage
  • Socialism
  • Sojourners
  • Soros ministers
  • transgender agenda
CHQ Staff | 10/17/18

As Soros-funded “ministers” are on buses through swing states to “flip Congress,” our friends with the American Association of Evangelicals (AAE) have just put out a 3-minute video, Soros’s “Rented Evangelicals.”* It provides a lot of info in a short time and is reaching many thousands of people each day through social media.

“Soros’s Rented Evangelicals” is a wake-up call that we urge you to share with your family, friends, church and club members to alert them to this assault on the Body of Christ.

This is a very complex story, however, as leaked documents obtained by our friends at AAE confirm, and as Rev. Jim Wallis of Sojourners eventually admitted, wealthy, anti-Christian foundations, following the lead of billionaire George Soros’s Open Society Foundation, fund and “rent” curious \"evangelical\" and \"Catholic\" \"mascots” serving as deceptive validators for their causes. The consequent realities include injury to countless people, the Church, the family, nation and the global Church including many martyrs.

Consider some of the consequences of 'Progressive' political activism over the past few decades documented by AAE:

A growth industry trafficking in human baby organs and body parts, funded and defended by the Democratic Party.

The abandonment of a biblical view of marriage that protected and liberated children and adults from centuries of pagan slavery, poverty, polygamy and non-life-giving sexuality.

The Transgender agenda including gender \"reorientation\" of our children, also being forced on our neighbors, businesses, schools, military and churches.

Socialism, higher taxes and government regulations. These policies stifle human creativity, productivity, family stability and generosity. Such policies increase joblessness, welfare dependency and national debt.

Heightened racial division and tension, and the growing phenomenon of paid demonstrators being recruited and dispatched to instigate protests that often become riots.

Open borders and lawless ‘sanctuary’ cities increasing drugs, disease, crime, gangs and terrorism.

Amnesty efforts that attempt to give voting rights to millions of non-citizens, giving the results of our elections and nation's future to many who disregarded our laws, customs, history, identity and values. This does not honor our long-standing tradition of legal immigration to those who come in good faith and to assimilate and bless America.

Forced refugee resettlement in hundreds of American cities without citizen consent, mandated by the Obama-era federal government in partnership with the United Nations. (Refugees were primarily non-assimilating Muslims, while authorities often reject persecuted Christians.)

Hostility towards Judeo-Christian religious liberty in our courts, large corporations, media and universities including the suppression of conservative speakers, free thought and moral education.

The growing recognition of a \"Deep State\" within our government, including ideological bureaucrats embedded in our DOJ, IRS, FBI and Department of State, that intimidates and seeks to subvert conservative, patriotic and Christian groups that disagree with the 'Progressive' political establishment.

After such demoralization and pain, asked AAE, why would any religious leader ask Christians to embrace, support or vote for a Progressive political agenda that is clearly anti-Christian?

When Hillary Clinton stated during a 2015 speech at the Women in the World Summit that religious beliefs “have to be changed,” she revealed the radical Left's war on Christian believers and the Church.

And now the Religious Left claims that supporting such a view is the Christian thing to do? This is spiritual abuse of human beings, the family, the Church and the nation.

“The framers of our Constitution meant we were to have freedom of religion, not freedom from religion.” Rev. Billy Graham

For many years, Soros’s Open Society and other liberal foundations have funded not only most of the disturbing campaigns mentioned above (1-10) but also the Religious Left, using and creating ostensibly evangelical and Catholic organizations to “message and mobilize” Christians into Progressive causes. They use the Marxist-Alinsky tactic of funding “ministers” who cherry-pick faith language to confuse and divide the Church’s morality, mission and vote.

At a time when many Christian ministries are struggling, a few of the Soros network “faith” and “interfaith” grantees are Jim Wallis of Sojourners, Richard Cizik’s New Evangelical Partnership, Telos, J Street to malign Israel, Catholics in Alliance for the Common Good, Faithful America and Gamaliel. Faith in Public Life to “counter” Christians and conservatives in the media and, with PICO, advocate for amnesty, mass Islamic migration, and even to attempt to influence the visit and priorities of the Vatican and Pope Francis himself. Billions of additional dollars to “Christian VOLAGs” for large scale “refugee” and migrant resettlement come from the Obama administration.

Joining “faith” fronts, the Soros network also funds thousands of other collaborators and projects that suggest a pattern and goal to demoralize America (and Europe). The list includes: film studios and hundreds of media outlets; attempts to control the Internet; racial and gender agitation; euthanasia; drug legalization and “injection zones;” abortion and the “sex worker” industry; Al Gore’s Climate campaign; pro-Palestinian and anti-Israel projects; the rights of jihadists and Sharia advocates.

In the ironic rhetoric of compassion, Soros and allies fund mass immigration, redistricting schemes, illegals' voting “rights,” protests and smears on Judge Kavanaugh and the Supreme Court, while financing the 2018 campaigns of Democrats Andrew Gillum (D-FL), Jon Tester (D-MT), Claire McCaskill (D-MO), Tim Kaine (D-VA), Kristen Gillibrand (D-NY), Krysten Sinema (D-AZ), Elizabeth Warren (D-MA) and many more. (Soros has long been a major donor to the Democratic Party, co-chairman of Ready for Hillary PAC and previously funded Al Gore, John Kerry, Barack Obama, Hillary Clinton, Al Franken and many far-Left Democrats).

One wonders if the end goal is the destruction of national identity through demoralization, open borders and debt, thus the “fundamental transformation” (weakening) of American civil society for their leveraged global power. (Soros broke the Bank of England, is a convicted felon in France, and is undermining many nations.)

We urge you to go to https://americanevangelicals.com/ for more information on Soros and his releationship with some who claim to be speaking for Evangelical Christians. We should all question the true intentions of persons or organizations that receive money from Soros and related globalist social engineers. We must not give America's future to him and his surrogates, for more harm.

*The phrase comes from the New America Foundation strategy, “Rent An Evangelical” and “Rent A General” as “mascots.”

  • Login or register to post comments

Fake Christians

Submitted by charlyc on Wed, 10/17/2018 - 12:17.

Jesus said you cannot serve God and mammon. (Mammon=wealth, riches) \"Rented Evangelicals\" transparently means mammon servers. Jesus also said, You shall know them by their fruits. What fruits are they producing? These are the tares (weeds) sown into the wheat that Jesus warned us about in the parable of the wheat and the tares (Matt 13:25). \"the tares are the children of The Evil One.\" (Matt 13:38) Just because someone goes to \"church\" on Sunday doesn't mean they're a true Christian. Even Satan can quote scripture. (Matt 4:6 in which he quotes Psalms 91:11-12)

  • Login or register to post comments

Fake Christians

Submitted by email_registrat... on Fri, 10/19/2018 - 14:08.

Yeshua says to: “BEWARE of false prophets, who come to you in sheep’s clothing, but inwardly they are ravenous wolves. YOU WILL KNOW THEM BY THEIR FRUITS. Do men gather grapes from thorn bushes or figs from thistles? Even so, EVERY GOOD TREE BEARS GOOD FRUIT, but A BAD TREE BEARS BAD FRUIT. A GOOD tree CANNOT BEAR BAD fruit, nor can a BAD tree BEAR GOOD fruit. Every tree that does not bear good fruit is cut down and thrown into the fire. THEREFORE BY THEIR FRUITS you WILL KNOW them” (Matthew 7:15-20) [emphasis mine].

  • Login or register to post comments

Learn How Conservatives Can Fight Back & Win in 2018

FOLLOW US on FACEBOOK, TWITTER

* Richard Viguerie on Twitter * ConservativeHQ on Facebook * Conservative TAKEOVER on Facebook

Login to CHQ

Register to become a ConservativeHQ.com member - click here. If you are already a member, please log-in by clicking here.

ConservativeHQ.com Officers: Richard A. Viguerie - Chairman

Editor:
George Rasley
Writers:
Mark Fitzgibbons
Ben Hart
George Rasley
Richard A. Viguerie

ConservativeHQ.com is the online news source for conservatives and Tea Partiers committed to bringing limited government constitutional conservatives to power.

  • Copyright © 2017 ConservativeHQ.com, Inc. To view our privacy policy, click here
", ++ "content": "
Beware Soros's \"Rented Evangelicals\" | ConservativeHQ.com
  • Login
  • New to CHQ?
  • Home
  • Exclusive CHQ News
  • In The Media
  • About Us
  • Join CHQ
  • Login to CHQ
  • Contact

Share This Article with a Friend!

Printer-friendly version

Beware Soros's \"Rented Evangelicals\"

  • American Association of Evangelicals (AAE)
  • anti-Judeo Christian agenda
  • Christian VOLAGs
  • flip Congress
  • George Soros
  • Hillary Clinton
  • human organ trafficking
  • Immigration
  • Jim Wallis
  • mascots
  • ministers
  • open borders
  • Open Society Foundation
  • PICO
  • Pope Francis
  • refugee resettlement
  • Rented Evangelicals
  • Same-sex marriage
  • Socialism
  • Sojourners
  • Soros ministers
  • transgender agenda
CHQ Staff | 10/17/18

As Soros-funded “ministers” are on buses through swing states to “flip Congress,” our friends with the American Association of Evangelicals (AAE) have just put out a 3-minute video, Soros’s “Rented Evangelicals.”* It provides a lot of info in a short time and is reaching many thousands of people each day through social media.

“Soros’s Rented Evangelicals” is a wake-up call that we urge you to share with your family, friends, church and club members to alert them to this assault on the Body of Christ.

This is a very complex story, however, as leaked documents obtained by our friends at AAE confirm, and as Rev. Jim Wallis of Sojourners eventually admitted, wealthy, anti-Christian foundations, following the lead of billionaire George Soros’s Open Society Foundation, fund and “rent” curious \"evangelical\" and \"Catholic\" \"mascots” serving as deceptive validators for their causes. The consequent realities include injury to countless people, the Church, the family, nation and the global Church including many martyrs.

Consider some of the consequences of 'Progressive' political activism over the past few decades documented by AAE:

A growth industry trafficking in human baby organs and body parts, funded and defended by the Democratic Party.

The abandonment of a biblical view of marriage that protected and liberated children and adults from centuries of pagan slavery, poverty, polygamy and non-life-giving sexuality.

The Transgender agenda including gender \"reorientation\" of our children, also being forced on our neighbors, businesses, schools, military and churches.

Socialism, higher taxes and government regulations. These policies stifle human creativity, productivity, family stability and generosity. Such policies increase joblessness, welfare dependency and national debt.

Heightened racial division and tension, and the growing phenomenon of paid demonstrators being recruited and dispatched to instigate protests that often become riots.

Open borders and lawless ‘sanctuary’ cities increasing drugs, disease, crime, gangs and terrorism.

Amnesty efforts that attempt to give voting rights to millions of non-citizens, giving the results of our elections and nation's future to many who disregarded our laws, customs, history, identity and values. This does not honor our long-standing tradition of legal immigration to those who come in good faith and to assimilate and bless America.

Forced refugee resettlement in hundreds of American cities without citizen consent, mandated by the Obama-era federal government in partnership with the United Nations. (Refugees were primarily non-assimilating Muslims, while authorities often reject persecuted Christians.)

Hostility towards Judeo-Christian religious liberty in our courts, large corporations, media and universities including the suppression of conservative speakers, free thought and moral education.

The growing recognition of a \"Deep State\" within our government, including ideological bureaucrats embedded in our DOJ, IRS, FBI and Department of State, that intimidates and seeks to subvert conservative, patriotic and Christian groups that disagree with the 'Progressive' political establishment.

After such demoralization and pain, asked AAE, why would any religious leader ask Christians to embrace, support or vote for a Progressive political agenda that is clearly anti-Christian?

When Hillary Clinton stated during a 2015 speech at the Women in the World Summit that religious beliefs “have to be changed,” she revealed the radical Left's war on Christian believers and the Church.

And now the Religious Left claims that supporting such a view is the Christian thing to do? This is spiritual abuse of human beings, the family, the Church and the nation.

“The framers of our Constitution meant we were to have freedom of religion, not freedom from religion.” Rev. Billy Graham

For many years, Soros’s Open Society and other liberal foundations have funded not only most of the disturbing campaigns mentioned above (1-10) but also the Religious Left, using and creating ostensibly evangelical and Catholic organizations to “message and mobilize” Christians into Progressive causes. They use the Marxist-Alinsky tactic of funding “ministers” who cherry-pick faith language to confuse and divide the Church’s morality, mission and vote.

At a time when many Christian ministries are struggling, a few of the Soros network “faith” and “interfaith” grantees are Jim Wallis of Sojourners, Richard Cizik’s New Evangelical Partnership, Telos, J Street to malign Israel, Catholics in Alliance for the Common Good, Faithful America and Gamaliel. Faith in Public Life to “counter” Christians and conservatives in the media and, with PICO, advocate for amnesty, mass Islamic migration, and even to attempt to influence the visit and priorities of the Vatican and Pope Francis himself. Billions of additional dollars to “Christian VOLAGs” for large scale “refugee” and migrant resettlement come from the Obama administration.

Joining “faith” fronts, the Soros network also funds thousands of other collaborators and projects that suggest a pattern and goal to demoralize America (and Europe). The list includes: film studios and hundreds of media outlets; attempts to control the Internet; racial and gender agitation; euthanasia; drug legalization and “injection zones;” abortion and the “sex worker” industry; Al Gore’s Climate campaign; pro-Palestinian and anti-Israel projects; the rights of jihadists and Sharia advocates.

In the ironic rhetoric of compassion, Soros and allies fund mass immigration, redistricting schemes, illegals' voting “rights,” protests and smears on Judge Kavanaugh and the Supreme Court, while financing the 2018 campaigns of Democrats Andrew Gillum (D-FL), Jon Tester (D-MT), Claire McCaskill (D-MO), Tim Kaine (D-VA), Kristen Gillibrand (D-NY), Krysten Sinema (D-AZ), Elizabeth Warren (D-MA) and many more. (Soros has long been a major donor to the Democratic Party, co-chairman of Ready for Hillary PAC and previously funded Al Gore, John Kerry, Barack Obama, Hillary Clinton, Al Franken and many far-Left Democrats).

One wonders if the end goal is the destruction of national identity through demoralization, open borders and debt, thus the “fundamental transformation” (weakening) of American civil society for their leveraged global power. (Soros broke the Bank of England, is a convicted felon in France, and is undermining many nations.)

We urge you to go to https://americanevangelicals.com/ for more information on Soros and his releationship with some who claim to be speaking for Evangelical Christians. We should all question the true intentions of persons or organizations that receive money from Soros and related globalist social engineers. We must not give America's future to him and his surrogates, for more harm.

*The phrase comes from the New America Foundation strategy, “Rent An Evangelical” and “Rent A General” as “mascots.”

  • Login or register to post comments

Fake Christians

Submitted by charlyc on Wed, 10/17/2018 - 12:17.

Jesus said you cannot serve God and mammon. (Mammon=wealth, riches) \"Rented Evangelicals\" transparently means mammon servers. Jesus also said, You shall know them by their fruits. What fruits are they producing? These are the tares (weeds) sown into the wheat that Jesus warned us about in the parable of the wheat and the tares (Matt 13:25). \"the tares are the children of The Evil One.\" (Matt 13:38) Just because someone goes to \"church\" on Sunday doesn't mean they're a true Christian. Even Satan can quote scripture. (Matt 4:6 in which he quotes Psalms 91:11-12)

  • Login or register to post comments

Fake Christians

Submitted by email_registrat... on Fri, 10/19/2018 - 14:08.

Yeshua says to: “BEWARE of false prophets, who come to you in sheep’s clothing, but inwardly they are ravenous wolves. YOU WILL KNOW THEM BY THEIR FRUITS. Do men gather grapes from thorn bushes or figs from thistles? Even so, EVERY GOOD TREE BEARS GOOD FRUIT, but A BAD TREE BEARS BAD FRUIT. A GOOD tree CANNOT BEAR BAD fruit, nor can a BAD tree BEAR GOOD fruit. Every tree that does not bear good fruit is cut down and thrown into the fire. THEREFORE BY THEIR FRUITS you WILL KNOW them” (Matthew 7:15-20) [emphasis mine].

  • Login or register to post comments

Learn How Conservatives Can Fight Back & Win in 2018

FOLLOW US on FACEBOOK, TWITTER

* Richard Viguerie on Twitter * ConservativeHQ on Facebook * Conservative TAKEOVER on Facebook

Login to CHQ

Register to become a ConservativeHQ.com member - click here. If you are already a member, please log-in by clicking here.

ConservativeHQ.com Officers: Richard A. Viguerie - Chairman

Editor:
George Rasley
Writers:
Mark Fitzgibbons
Ben Hart
George Rasley
Richard A. Viguerie

ConservativeHQ.com is the online news source for conservatives and Tea Partiers committed to bringing limited government constitutional conservatives to power.

  • Copyright © 2017 ConservativeHQ.com, Inc. To view our privacy policy, click here
", ++ "plain_content": "
Beware Soros's \"Rented Evangelicals\" | ConservativeHQ.com
  • Login
  • New to CHQ?
  • Home
  • Exclusive CHQ News
  • In The Media
  • About Us
  • Join CHQ
  • Login to CHQ
  • Contact

Share This Article with a Friend!

Printer-friendly version

Beware Soros's \"Rented Evangelicals\"

  • American Association of Evangelicals (AAE)
  • anti-Judeo Christian agenda
  • Christian VOLAGs
  • flip Congress
  • George Soros
  • Hillary Clinton
  • human organ trafficking
  • Immigration
  • Jim Wallis
  • mascots
  • ministers
  • open borders
  • Open Society Foundation
  • PICO
  • Pope Francis
  • refugee resettlement
  • Rented Evangelicals
  • Same-sex marriage
  • Socialism
  • Sojourners
  • Soros ministers
  • transgender agenda
CHQ Staff | 10/17/18

As Soros-funded “ministers” are on buses through swing states to “flip Congress,” our friends with the American Association of Evangelicals (AAE) have just put out a 3-minute video, Soros’s “Rented Evangelicals.”* It provides a lot of info in a short time and is reaching many thousands of people each day through social media.

“Soros’s Rented Evangelicals” is a wake-up call that we urge you to share with your family, friends, church and club members to alert them to this assault on the Body of Christ.

This is a very complex story, however, as leaked documents obtained by our friends at AAE confirm, and as Rev. Jim Wallis of Sojourners eventually admitted, wealthy, anti-Christian foundations, following the lead of billionaire George Soros’s Open Society Foundation, fund and “rent” curious \"evangelical\" and \"Catholic\" \"mascots” serving as deceptive validators for their causes. The consequent realities include injury to countless people, the Church, the family, nation and the global Church including many martyrs.

Consider some of the consequences of 'Progressive' political activism over the past few decades documented by AAE:

A growth industry trafficking in human baby organs and body parts, funded and defended by the Democratic Party.

The abandonment of a biblical view of marriage that protected and liberated children and adults from centuries of pagan slavery, poverty, polygamy and non-life-giving sexuality.

The Transgender agenda including gender \"reorientation\" of our children, also being forced on our neighbors, businesses, schools, military and churches.

Socialism, higher taxes and government regulations. These policies stifle human creativity, productivity, family stability and generosity. Such policies increase joblessness, welfare dependency and national debt.

Heightened racial division and tension, and the growing phenomenon of paid demonstrators being recruited and dispatched to instigate protests that often become riots.

Open borders and lawless ‘sanctuary’ cities increasing drugs, disease, crime, gangs and terrorism.

Amnesty efforts that attempt to give voting rights to millions of non-citizens, giving the results of our elections and nation's future to many who disregarded our laws, customs, history, identity and values. This does not honor our long-standing tradition of legal immigration to those who come in good faith and to assimilate and bless America.

Forced refugee resettlement in hundreds of American cities without citizen consent, mandated by the Obama-era federal government in partnership with the United Nations. (Refugees were primarily non-assimilating Muslims, while authorities often reject persecuted Christians.)

Hostility towards Judeo-Christian religious liberty in our courts, large corporations, media and universities including the suppression of conservative speakers, free thought and moral education.

The growing recognition of a \"Deep State\" within our government, including ideological bureaucrats embedded in our DOJ, IRS, FBI and Department of State, that intimidates and seeks to subvert conservative, patriotic and Christian groups that disagree with the 'Progressive' political establishment.

After such demoralization and pain, asked AAE, why would any religious leader ask Christians to embrace, support or vote for a Progressive political agenda that is clearly anti-Christian?

When Hillary Clinton stated during a 2015 speech at the Women in the World Summit that religious beliefs “have to be changed,” she revealed the radical Left's war on Christian believers and the Church.

And now the Religious Left claims that supporting such a view is the Christian thing to do? This is spiritual abuse of human beings, the family, the Church and the nation.

“The framers of our Constitution meant we were to have freedom of religion, not freedom from religion.” Rev. Billy Graham

For many years, Soros’s Open Society and other liberal foundations have funded not only most of the disturbing campaigns mentioned above (1-10) but also the Religious Left, using and creating ostensibly evangelical and Catholic organizations to “message and mobilize” Christians into Progressive causes. They use the Marxist-Alinsky tactic of funding “ministers” who cherry-pick faith language to confuse and divide the Church’s morality, mission and vote.

At a time when many Christian ministries are struggling, a few of the Soros network “faith” and “interfaith” grantees are Jim Wallis of Sojourners, Richard Cizik’s New Evangelical Partnership, Telos, J Street to malign Israel, Catholics in Alliance for the Common Good, Faithful America and Gamaliel. Faith in Public Life to “counter” Christians and conservatives in the media and, with PICO, advocate for amnesty, mass Islamic migration, and even to attempt to influence the visit and priorities of the Vatican and Pope Francis himself. Billions of additional dollars to “Christian VOLAGs” for large scale “refugee” and migrant resettlement come from the Obama administration.

Joining “faith” fronts, the Soros network also funds thousands of other collaborators and projects that suggest a pattern and goal to demoralize America (and Europe). The list includes: film studios and hundreds of media outlets; attempts to control the Internet; racial and gender agitation; euthanasia; drug legalization and “injection zones;” abortion and the “sex worker” industry; Al Gore’s Climate campaign; pro-Palestinian and anti-Israel projects; the rights of jihadists and Sharia advocates.

In the ironic rhetoric of compassion, Soros and allies fund mass immigration, redistricting schemes, illegals' voting “rights,” protests and smears on Judge Kavanaugh and the Supreme Court, while financing the 2018 campaigns of Democrats Andrew Gillum (D-FL), Jon Tester (D-MT), Claire McCaskill (D-MO), Tim Kaine (D-VA), Kristen Gillibrand (D-NY), Krysten Sinema (D-AZ), Elizabeth Warren (D-MA) and many more. (Soros has long been a major donor to the Democratic Party, co-chairman of Ready for Hillary PAC and previously funded Al Gore, John Kerry, Barack Obama, Hillary Clinton, Al Franken and many far-Left Democrats).

One wonders if the end goal is the destruction of national identity through demoralization, open borders and debt, thus the “fundamental transformation” (weakening) of American civil society for their leveraged global power. (Soros broke the Bank of England, is a convicted felon in France, and is undermining many nations.)

We urge you to go to https://americanevangelicals.com/ for more information on Soros and his releationship with some who claim to be speaking for Evangelical Christians. We should all question the true intentions of persons or organizations that receive money from Soros and related globalist social engineers. We must not give America's future to him and his surrogates, for more harm.

*The phrase comes from the New America Foundation strategy, “Rent An Evangelical” and “Rent A General” as “mascots.”

  • Login or register to post comments

Fake Christians

Submitted by charlyc on Wed, 10/17/2018 - 12:17.

Jesus said you cannot serve God and mammon. (Mammon=wealth, riches) \"Rented Evangelicals\" transparently means mammon servers. Jesus also said, You shall know them by their fruits. What fruits are they producing? These are the tares (weeds) sown into the wheat that Jesus warned us about in the parable of the wheat and the tares (Matt 13:25). \"the tares are the children of The Evil One.\" (Matt 13:38) Just because someone goes to \"church\" on Sunday doesn't mean they're a true Christian. Even Satan can quote scripture. (Matt 4:6 in which he quotes Psalms 91:11-12)

  • Login or register to post comments

Fake Christians

Submitted by email_registrat... on Fri, 10/19/2018 - 14:08.

Yeshua says to: “BEWARE of false prophets, who come to you in sheep’s clothing, but inwardly they are ravenous wolves. YOU WILL KNOW THEM BY THEIR FRUITS. Do men gather grapes from thorn bushes or figs from thistles? Even so, EVERY GOOD TREE BEARS GOOD FRUIT, but A BAD TREE BEARS BAD FRUIT. A GOOD tree CANNOT BEAR BAD fruit, nor can a BAD tree BEAR GOOD fruit. Every tree that does not bear good fruit is cut down and thrown into the fire. THEREFORE BY THEIR FRUITS you WILL KNOW them” (Matthew 7:15-20) [emphasis mine].

  • Login or register to post comments

Learn How Conservatives Can Fight Back & Win in 2018

FOLLOW US on FACEBOOK, TWITTER

* Richard Viguerie on Twitter * ConservativeHQ on Facebook * Conservative TAKEOVER on Facebook

Login to CHQ

Register to become a ConservativeHQ.com member - click here. If you are already a member, please log-in by clicking here.

ConservativeHQ.com Officers: Richard A. Viguerie - Chairman

Editor:
George Rasley
Writers:
Mark Fitzgibbons
Ben Hart
George Rasley
Richard A. Viguerie

ConservativeHQ.com is the online news source for conservatives and Tea Partiers committed to bringing limited government constitutional conservatives to power.

  • Copyright © 2017 ConservativeHQ.com, Inc. To view our privacy policy, click here
", + "plain_text": [ + {"text": "Beware Soros's \"Rented Evangelicals\" | ConservativeHQ.com"}, + {"text": "* Login, * New to CHQ?,"}, +diff --git a/tests/data/davidwolfe.com-1_simple_article_from_full_page.json b/tests/data/davidwolfe.com-1_simple_article_from_full_page.json +index 09c48c5..854075d 100644 +--- a/tests/data/davidwolfe.com-1_simple_article_from_full_page.json ++++ b/tests/data/davidwolfe.com-1_simple_article_from_full_page.json +@@ -2,8 +2,8 @@ + "title": "New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication", + "byline": null, + "date": "2018-02-19T09:53:28", +- "content": "
<p>Medication: The Thread That Links Mass Shooters Together</p>
  • Menu
  • Skip to primary navigation
  • Skip to secondary navigation
  • Skip to content
  • Skip to primary sidebar

Natural Remedies, Treatment and Health

header-right

  • Join The Inner Circle
  • Contact
  • SHOP
  • Search
  • Health
  • Conditions
  • Natural Remedies
  • Essential Oils
  • Recipes
  • News

Main navigation

Home » New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

Feb 19, 2018 Ricky Raps Leave a Comment

Share
Tweet
Pin
+1
Share
3K Shares

What do nearly all mass shooters have in common since this recent spike in shootings? Most if not nearly all of them were prescribed some type of psychiatric medication. The world has recently been shaken to its core by the mass shooting in Parkland, Florida. According to the Sun Sentinel, Nikolas Cruz was being treated for multiple psychiatric disorders and was on medication.

The Sun Sentinel is reporting on Nikolas Cruz’s psychiatric history:

His mother, Lynda Cruz, told investigators that her son had been diagnosed with autism and attention deficit hyperactivity disorder. He was being treated for depression, had a behavioral disorder and had been taking medication for the ADHD, the report said. Investigators wrote that they did not know whether he was still taking the medication.

We're now learning that Nikolas Cruz had a history of violent behavior and in some instances a counselor prescribed him medication. Psychiatrist Dr. Erik Fisher explains how to identify signs of mental illness. https://t.co/DHBDZ2PWSe

— HLN Weekend Express (@WeekendExp) February 17, 2018

Nikolas Cruz isn’t the only mass shooter who was prescribed psychotropic medication. Sadly, one thing school shooters all seem to have in common is that they were given psychiatric medications.

CBS reports that Adam Lanza, the Sandy Hook Elementary School shooter, was prescribed medication that led to even more problems...

Documents released by police in December 2013 included descriptions of sporadic treatment for his mental health troubles. At one point, experts at the Yale Child Studies Center prescribed antidepressant/anti-anxiety medication, but his mother discontinued the treatment after her son was unable to raise his arm after taking the medicine and never scheduled follow-up visits, police reports said.

This trend isn’t new, with CNN reporting in 1999 about the Columbine shooter Eric Harris’ relationship with anti-depressants...

Reports surfaced Wednesday that one of the gunmen in the Littleton, Colorado, school shooting, Eric Harris, was rejected by Marine Corps recruiters days before the Columbine High School massacre because he was under a doctor’s care and had been prescribed an anti-depressant medication.

Harris’ prescription was for Luvox, an anti-depressant medication commonly used to treat patients with obsessive-compulsive disorder.

Mass shooters of every age have been found to have traces of psychiatric medication in their blood...

This trend is not exclusive to just school shooters. CNN reports that an autopsy on the Las Vegas Shooter, Stephen Paddock, showed that there was anti-anxiety medication in his system when he massacred 58 innocent people and injured over 850 others.

Stephen Paddock was reportedly prescribed anti-anxiety medication this past summer https://t.co/ZSDfwHskhg

— New York Post (@nypost) October 4, 2017

Reuters has previously reported that Pulse Nightclub shooter Omar Mateen would stay up all night researching psychiatric medication. One acquaintance told Reuters that Mateen was “obsessed” with looking up the medication online. The obsession only intensified in the weeks prior to the shooting.

Fort Hood gunman Ivan Lopez was on a “cocktail of prescription drugs,” according to The Telegraph. The article goes on to explain that the soldier had been prescribed anti-depressants along with the sleeping medication Ambien.

According to a CNN report, James Holmes who was responsible for the Aurora, Colorado movie theater shooting was prescribed multiple medications including Clonazepam and Sertraline.

BBC spoke with Professor David Healy about the Aurora movie theater shootings, and he believes the connection between the medication and mass killings is no coincidence...

These killings would never have happened had it not been for the medication James Holmes had been prescribed.”

Professor Peter Tyrer told the BBC that the medications James Holmes was prescribed could have exacerbated his condition...

His symptoms were exactly right for giving sertraline. But with his underlying personality, with that sort of person. Some of the underlying predispositions can come out more strongly. In the case of Holmes these were very dangerous indeed.

The list goes on and on...

Myron May, who went on a shooting spree at Florida State University’s Strozier Liberary in 2014 was reportedly on a combination of Wellbutrin and Vyvanse.

University of Texas student Kendrex J. White was reportedly on Zoloft when he went on a stabbing spree on campus that killed one person and injured three last year.

Aaron Ybarra who went on a rampage with a shotgun at Seattle Pacific University in 2014 was reportedly on “a lot of medication” which included Risperdal and Prozac. Ybarra claimed he could hear the voice of Eric Harris, the Columbine shooter who was prescribed similar medication.

12-year-old Jose Reyes who went on a shooting spree at his middle school was reportedly prescribed a generic form of Prozac by his local psychotherapist before taking a 9mm handgun to school and using it to kill his teacher and wound two others before taking his own life.

The Washington Post also reported that the Navy Yard shooter Aaron Alexis was prescribed the antidepressant Trazodone before he went on to shoot 12 people to death at the Washington Navy Yard.

A vast majority if not all of the recent mass shooters have taken these medications. Still, the medical community claims that there is no evidence to connect homicidal behavior and these drugs. Doctors and pharmaceutical companies continue to claim that these medications are safe to use. However, many are questioning the spike in deadly shootings and the increase in psychiatric drug use.

Sources: Sun Sentinel. CNN, CBS, CNN, CNN. Reuters, The Telegraph, BBC, Tampa Bay Times, KXAN, Seattle Times, USA Today

Share
Tweet
Pin
+1
Share
3K Shares

Category: News

« The Top 13 Superfoods You Should Start Eating Today!
7 White Tea Benefits & Uses »

You Might Also Like

  • Obsessive Compulsive Disorder (OCD) Treatment: 3 Steps To Relieve Symptoms

    Approximately 1 in 40 adults in the United...

  • Schools Now Offer Bullet Proof Backpacks Following Multiple Mass Shootings

    In the wake of terrorist attacks across America,...

  • New Research Reveals 46% Of Americans Have This Dangerous Health Condition

    Thanks to a new hypertension treatment guideline, 30 million...

  • CONFIRMED: Las Vegas Shooter Was On Medications Linked To Aggressive Behavior

    It has just been revealed that the Las...

  • #PharmaControlNow: Researchers Reveal The 1 Link Between Most Mass Shooters

    Within half a day of the tragic Las...

  • Binge Eating Disorder Causes & 5 Natural Treatments

    While binge eating disorder is severely dangerous, there...

About Ricky Raps

Florida based journalist and political activist. Ricky is a senior at Florida State University studying Political Science, Communication, Emergency Management, and US Intelligence Policy. Ricky grew up in New England and is a fan of the Patriots.

Reader Interactions

Leave a Reply Cancel reply

You must be logged in to post a comment.

Copyright © 2018 DavidWolfe.com · All Rights Reserved ·

", +- "plain_content": "
<p>Medication: The Thread That Links Mass Shooters Together</p>
  • Menu
  • Skip to primary navigation
  • Skip to secondary navigation
  • Skip to content
  • Skip to primary sidebar

Natural Remedies, Treatment and Health

header-right

  • Join The Inner Circle
  • Contact
  • SHOP
  • Search
  • Health
  • Conditions
  • Natural Remedies
  • Essential Oils
  • Recipes
  • News

Main navigation

Home » New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

Feb 19, 2018 Ricky Raps Leave a Comment

Share
Tweet
Pin
+1
Share
3K Shares

What do nearly all mass shooters have in common since this recent spike in shootings? Most if not nearly all of them were prescribed some type of psychiatric medication. The world has recently been shaken to its core by the mass shooting in Parkland, Florida. According to the Sun Sentinel, Nikolas Cruz was being treated for multiple psychiatric disorders and was on medication.

The Sun Sentinel is reporting on Nikolas Cruz’s psychiatric history:

His mother, Lynda Cruz, told investigators that her son had been diagnosed with autism and attention deficit hyperactivity disorder. He was being treated for depression, had a behavioral disorder and had been taking medication for the ADHD, the report said. Investigators wrote that they did not know whether he was still taking the medication.

We're now learning that Nikolas Cruz had a history of violent behavior and in some instances a counselor prescribed him medication. Psychiatrist Dr. Erik Fisher explains how to identify signs of mental illness. https://t.co/DHBDZ2PWSe

— HLN Weekend Express (@WeekendExp) February 17, 2018

Nikolas Cruz isn’t the only mass shooter who was prescribed psychotropic medication. Sadly, one thing school shooters all seem to have in common is that they were given psychiatric medications.

CBS reports that Adam Lanza, the Sandy Hook Elementary School shooter, was prescribed medication that led to even more problems...

Documents released by police in December 2013 included descriptions of sporadic treatment for his mental health troubles. At one point, experts at the Yale Child Studies Center prescribed antidepressant/anti-anxiety medication, but his mother discontinued the treatment after her son was unable to raise his arm after taking the medicine and never scheduled follow-up visits, police reports said.

This trend isn’t new, with CNN reporting in 1999 about the Columbine shooter Eric Harris’ relationship with anti-depressants...

Reports surfaced Wednesday that one of the gunmen in the Littleton, Colorado, school shooting, Eric Harris, was rejected by Marine Corps recruiters days before the Columbine High School massacre because he was under a doctor’s care and had been prescribed an anti-depressant medication.

Harris’ prescription was for Luvox, an anti-depressant medication commonly used to treat patients with obsessive-compulsive disorder.

Mass shooters of every age have been found to have traces of psychiatric medication in their blood...

This trend is not exclusive to just school shooters. CNN reports that an autopsy on the Las Vegas Shooter, Stephen Paddock, showed that there was anti-anxiety medication in his system when he massacred 58 innocent people and injured over 850 others.

Stephen Paddock was reportedly prescribed anti-anxiety medication this past summer https://t.co/ZSDfwHskhg

— New York Post (@nypost) October 4, 2017

Reuters has previously reported that Pulse Nightclub shooter Omar Mateen would stay up all night researching psychiatric medication. One acquaintance told Reuters that Mateen was “obsessed” with looking up the medication online. The obsession only intensified in the weeks prior to the shooting.

Fort Hood gunman Ivan Lopez was on a “cocktail of prescription drugs,” according to The Telegraph. The article goes on to explain that the soldier had been prescribed anti-depressants along with the sleeping medication Ambien.

According to a CNN report, James Holmes who was responsible for the Aurora, Colorado movie theater shooting was prescribed multiple medications including Clonazepam and Sertraline.

BBC spoke with Professor David Healy about the Aurora movie theater shootings, and he believes the connection between the medication and mass killings is no coincidence...

These killings would never have happened had it not been for the medication James Holmes had been prescribed.”

Professor Peter Tyrer told the BBC that the medications James Holmes was prescribed could have exacerbated his condition...

His symptoms were exactly right for giving sertraline. But with his underlying personality, with that sort of person. Some of the underlying predispositions can come out more strongly. In the case of Holmes these were very dangerous indeed.

The list goes on and on...

Myron May, who went on a shooting spree at Florida State University’s Strozier Liberary in 2014 was reportedly on a combination of Wellbutrin and Vyvanse.

University of Texas student Kendrex J. White was reportedly on Zoloft when he went on a stabbing spree on campus that killed one person and injured three last year.

Aaron Ybarra who went on a rampage with a shotgun at Seattle Pacific University in 2014 was reportedly on “a lot of medication” which included Risperdal and Prozac. Ybarra claimed he could hear the voice of Eric Harris, the Columbine shooter who was prescribed similar medication.

12-year-old Jose Reyes who went on a shooting spree at his middle school was reportedly prescribed a generic form of Prozac by his local psychotherapist before taking a 9mm handgun to school and using it to kill his teacher and wound two others before taking his own life.

The Washington Post also reported that the Navy Yard shooter Aaron Alexis was prescribed the antidepressant Trazodone before he went on to shoot 12 people to death at the Washington Navy Yard.

A vast majority if not all of the recent mass shooters have taken these medications. Still, the medical community claims that there is no evidence to connect homicidal behavior and these drugs. Doctors and pharmaceutical companies continue to claim that these medications are safe to use. However, many are questioning the spike in deadly shootings and the increase in psychiatric drug use.

Sources: Sun Sentinel. CNN, CBS, CNN, CNN. Reuters, The Telegraph, BBC, Tampa Bay Times, KXAN, Seattle Times, USA Today

Share
Tweet
Pin
+1
Share
3K Shares

Category: News

« The Top 13 Superfoods You Should Start Eating Today!
7 White Tea Benefits & Uses »

You Might Also Like

  • Obsessive Compulsive Disorder (OCD) Treatment: 3 Steps To Relieve SymptomsApproximately 1 in 40 adults in the United...
  • Schools Now Offer Bullet Proof Backpacks Following Multiple Mass ShootingsIn the wake of terrorist attacks across America,...
  • New Research Reveals 46% Of Americans Have This Dangerous Health ConditionThanks to a new hypertension treatment guideline, 30 million...
  • CONFIRMED: Las Vegas Shooter Was On Medications Linked To Aggressive BehaviorIt has just been revealed that the Las...
  • #PharmaControlNow: Researchers Reveal The 1 Link Between Most Mass ShootersWithin half a day of the tragic Las...
  • Binge Eating Disorder Causes & 5 Natural TreatmentsWhile binge eating disorder is severely dangerous, there...

About Ricky Raps

Florida based journalist and political activist. Ricky is a senior at Florida State University studying Political Science, Communication, Emergency Management, and US Intelligence Policy. Ricky grew up in New England and is a fan of the Patriots.

Reader Interactions

Leave a Reply Cancel reply

You must be logged in to post a comment.

Copyright © 2018 DavidWolfe.com · All Rights Reserved ·

", ++ "content": "
Medication: The Thread That Links Mass Shooters Together
  • Menu
  • Skip to primary navigation
  • Skip to secondary navigation
  • Skip to content
  • Skip to primary sidebar

Natural Remedies, Treatment and Health

header-right

  • Join The Inner Circle
  • Contact
  • SHOP
  • Search
  • Health
  • Conditions
  • Natural Remedies
  • Essential Oils
  • Recipes
  • News

Main navigation

Home » New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

Feb 19, 2018 Ricky Raps Leave a Comment

Share
Tweet
Pin
+1
Share
3K Shares

What do nearly all mass shooters have in common since this recent spike in shootings? Most if not nearly all of them were prescribed some type of psychiatric medication. The world has recently been shaken to its core by the mass shooting in Parkland, Florida. According to the Sun Sentinel, Nikolas Cruz was being treated for multiple psychiatric disorders and was on medication.

The Sun Sentinel is reporting on Nikolas Cruz’s psychiatric history:

His mother, Lynda Cruz, told investigators that her son had been diagnosed with autism and attention deficit hyperactivity disorder. He was being treated for depression, had a behavioral disorder and had been taking medication for the ADHD, the report said. Investigators wrote that they did not know whether he was still taking the medication.

We're now learning that Nikolas Cruz had a history of violent behavior and in some instances a counselor prescribed him medication. Psychiatrist Dr. Erik Fisher explains how to identify signs of mental illness. https://t.co/DHBDZ2PWSe

— HLN Weekend Express (@WeekendExp) February 17, 2018

Nikolas Cruz isn’t the only mass shooter who was prescribed psychotropic medication. Sadly, one thing school shooters all seem to have in common is that they were given psychiatric medications.

CBS reports that Adam Lanza, the Sandy Hook Elementary School shooter, was prescribed medication that led to even more problems...

Documents released by police in December 2013 included descriptions of sporadic treatment for his mental health troubles. At one point, experts at the Yale Child Studies Center prescribed antidepressant/anti-anxiety medication, but his mother discontinued the treatment after her son was unable to raise his arm after taking the medicine and never scheduled follow-up visits, police reports said.

This trend isn’t new, with CNN reporting in 1999 about the Columbine shooter Eric Harris’ relationship with anti-depressants...

Reports surfaced Wednesday that one of the gunmen in the Littleton, Colorado, school shooting, Eric Harris, was rejected by Marine Corps recruiters days before the Columbine High School massacre because he was under a doctor’s care and had been prescribed an anti-depressant medication.

Harris’ prescription was for Luvox, an anti-depressant medication commonly used to treat patients with obsessive-compulsive disorder.

Mass shooters of every age have been found to have traces of psychiatric medication in their blood...

This trend is not exclusive to just school shooters. CNN reports that an autopsy on the Las Vegas Shooter, Stephen Paddock, showed that there was anti-anxiety medication in his system when he massacred 58 innocent people and injured over 850 others.

Stephen Paddock was reportedly prescribed anti-anxiety medication this past summer https://t.co/ZSDfwHskhg

— New York Post (@nypost) October 4, 2017

Reuters has previously reported that Pulse Nightclub shooter Omar Mateen would stay up all night researching psychiatric medication. One acquaintance told Reuters that Mateen was “obsessed” with looking up the medication online. The obsession only intensified in the weeks prior to the shooting.

Fort Hood gunman Ivan Lopez was on a “cocktail of prescription drugs,” according to The Telegraph. The article goes on to explain that the soldier had been prescribed anti-depressants along with the sleeping medication Ambien.

According to a CNN report, James Holmes who was responsible for the Aurora, Colorado movie theater shooting was prescribed multiple medications including Clonazepam and Sertraline.

BBC spoke with Professor David Healy about the Aurora movie theater shootings, and he believes the connection between the medication and mass killings is no coincidence...

These killings would never have happened had it not been for the medication James Holmes had been prescribed.”

Professor Peter Tyrer told the BBC that the medications James Holmes was prescribed could have exacerbated his condition...

His symptoms were exactly right for giving sertraline. But with his underlying personality, with that sort of person. Some of the underlying predispositions can come out more strongly. In the case of Holmes these were very dangerous indeed.

The list goes on and on...

Myron May, who went on a shooting spree at Florida State University’s Strozier Liberary in 2014 was reportedly on a combination of Wellbutrin and Vyvanse.

University of Texas student Kendrex J. White was reportedly on Zoloft when he went on a stabbing spree on campus that killed one person and injured three last year.

Aaron Ybarra who went on a rampage with a shotgun at Seattle Pacific University in 2014 was reportedly on “a lot of medication” which included Risperdal and Prozac. Ybarra claimed he could hear the voice of Eric Harris, the Columbine shooter who was prescribed similar medication.

12-year-old Jose Reyes who went on a shooting spree at his middle school was reportedly prescribed a generic form of Prozac by his local psychotherapist before taking a 9mm handgun to school and using it to kill his teacher and wound two others before taking his own life.

The Washington Post also reported that the Navy Yard shooter Aaron Alexis was prescribed the antidepressant Trazodone before he went on to shoot 12 people to death at the Washington Navy Yard.

A vast majority if not all of the recent mass shooters have taken these medications. Still, the medical community claims that there is no evidence to connect homicidal behavior and these drugs. Doctors and pharmaceutical companies continue to claim that these medications are safe to use. However, many are questioning the spike in deadly shootings and the increase in psychiatric drug use.

Sources: Sun Sentinel. CNN, CBS, CNN, CNN. Reuters, The Telegraph, BBC, Tampa Bay Times, KXAN, Seattle Times, USA Today

Share
Tweet
Pin
+1
Share
3K Shares

Category: News

« The Top 13 Superfoods You Should Start Eating Today!
7 White Tea Benefits & Uses »

You Might Also Like

  • Obsessive Compulsive Disorder (OCD) Treatment: 3 Steps To Relieve Symptoms

    Approximately 1 in 40 adults in the United...

  • Schools Now Offer Bullet Proof Backpacks Following Multiple Mass Shootings

    In the wake of terrorist attacks across America,...

  • New Research Reveals 46% Of Americans Have This Dangerous Health Condition

    Thanks to a new hypertension treatment guideline, 30 million...

  • CONFIRMED: Las Vegas Shooter Was On Medications Linked To Aggressive Behavior

    It has just been revealed that the Las...

  • #PharmaControlNow: Researchers Reveal The 1 Link Between Most Mass Shooters

    Within half a day of the tragic Las...

  • Binge Eating Disorder Causes & 5 Natural Treatments

    While binge eating disorder is severely dangerous, there...

About Ricky Raps

Florida based journalist and political activist. Ricky is a senior at Florida State University studying Political Science, Communication, Emergency Management, and US Intelligence Policy. Ricky grew up in New England and is a fan of the Patriots.

Reader Interactions

Leave a Reply Cancel reply

You must be logged in to post a comment.

Copyright © 2018 DavidWolfe.com · All Rights Reserved ·

", ++ "plain_content": "
Medication: The Thread That Links Mass Shooters Together
  • Menu
  • Skip to primary navigation
  • Skip to secondary navigation
  • Skip to content
  • Skip to primary sidebar

Natural Remedies, Treatment and Health

header-right

  • Join The Inner Circle
  • Contact
  • SHOP
  • Search
  • Health
  • Conditions
  • Natural Remedies
  • Essential Oils
  • Recipes
  • News

Main navigation

Home » New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

New Information Reveals Florida School Shooter Was On A Dangerous Type Of Medication

Feb 19, 2018 Ricky Raps Leave a Comment

Share
Tweet
Pin
+1
Share
3K Shares

What do nearly all mass shooters have in common since this recent spike in shootings? Most if not nearly all of them were prescribed some type of psychiatric medication. The world has recently been shaken to its core by the mass shooting in Parkland, Florida. According to the Sun Sentinel, Nikolas Cruz was being treated for multiple psychiatric disorders and was on medication.

The Sun Sentinel is reporting on Nikolas Cruz’s psychiatric history:

His mother, Lynda Cruz, told investigators that her son had been diagnosed with autism and attention deficit hyperactivity disorder. He was being treated for depression, had a behavioral disorder and had been taking medication for the ADHD, the report said. Investigators wrote that they did not know whether he was still taking the medication.

We're now learning that Nikolas Cruz had a history of violent behavior and in some instances a counselor prescribed him medication. Psychiatrist Dr. Erik Fisher explains how to identify signs of mental illness. https://t.co/DHBDZ2PWSe

— HLN Weekend Express (@WeekendExp) February 17, 2018

Nikolas Cruz isn’t the only mass shooter who was prescribed psychotropic medication. Sadly, one thing school shooters all seem to have in common is that they were given psychiatric medications.

CBS reports that Adam Lanza, the Sandy Hook Elementary School shooter, was prescribed medication that led to even more problems...

Documents released by police in December 2013 included descriptions of sporadic treatment for his mental health troubles. At one point, experts at the Yale Child Studies Center prescribed antidepressant/anti-anxiety medication, but his mother discontinued the treatment after her son was unable to raise his arm after taking the medicine and never scheduled follow-up visits, police reports said.

This trend isn’t new, with CNN reporting in 1999 about the Columbine shooter Eric Harris’ relationship with anti-depressants...

Reports surfaced Wednesday that one of the gunmen in the Littleton, Colorado, school shooting, Eric Harris, was rejected by Marine Corps recruiters days before the Columbine High School massacre because he was under a doctor’s care and had been prescribed an anti-depressant medication.

Harris’ prescription was for Luvox, an anti-depressant medication commonly used to treat patients with obsessive-compulsive disorder.

Mass shooters of every age have been found to have traces of psychiatric medication in their blood...

This trend is not exclusive to just school shooters. CNN reports that an autopsy on the Las Vegas Shooter, Stephen Paddock, showed that there was anti-anxiety medication in his system when he massacred 58 innocent people and injured over 850 others.

Stephen Paddock was reportedly prescribed anti-anxiety medication this past summer https://t.co/ZSDfwHskhg

— New York Post (@nypost) October 4, 2017

Reuters has previously reported that Pulse Nightclub shooter Omar Mateen would stay up all night researching psychiatric medication. One acquaintance told Reuters that Mateen was “obsessed” with looking up the medication online. The obsession only intensified in the weeks prior to the shooting.

Fort Hood gunman Ivan Lopez was on a “cocktail of prescription drugs,” according to The Telegraph. The article goes on to explain that the soldier had been prescribed anti-depressants along with the sleeping medication Ambien.

According to a CNN report, James Holmes who was responsible for the Aurora, Colorado movie theater shooting was prescribed multiple medications including Clonazepam and Sertraline.

BBC spoke with Professor David Healy about the Aurora movie theater shootings, and he believes the connection between the medication and mass killings is no coincidence...

These killings would never have happened had it not been for the medication James Holmes had been prescribed.”

Professor Peter Tyrer told the BBC that the medications James Holmes was prescribed could have exacerbated his condition...

His symptoms were exactly right for giving sertraline. But with his underlying personality, with that sort of person. Some of the underlying predispositions can come out more strongly. In the case of Holmes these were very dangerous indeed.

The list goes on and on...

Myron May, who went on a shooting spree at Florida State University’s Strozier Liberary in 2014 was reportedly on a combination of Wellbutrin and Vyvanse.

University of Texas student Kendrex J. White was reportedly on Zoloft when he went on a stabbing spree on campus that killed one person and injured three last year.

Aaron Ybarra who went on a rampage with a shotgun at Seattle Pacific University in 2014 was reportedly on “a lot of medication” which included Risperdal and Prozac. Ybarra claimed he could hear the voice of Eric Harris, the Columbine shooter who was prescribed similar medication.

12-year-old Jose Reyes who went on a shooting spree at his middle school was reportedly prescribed a generic form of Prozac by his local psychotherapist before taking a 9mm handgun to school and using it to kill his teacher and wound two others before taking his own life.

The Washington Post also reported that the Navy Yard shooter Aaron Alexis was prescribed the antidepressant Trazodone before he went on to shoot 12 people to death at the Washington Navy Yard.

A vast majority if not all of the recent mass shooters have taken these medications. Still, the medical community claims that there is no evidence to connect homicidal behavior and these drugs. Doctors and pharmaceutical companies continue to claim that these medications are safe to use. However, many are questioning the spike in deadly shootings and the increase in psychiatric drug use.

Sources: Sun Sentinel. CNN, CBS, CNN, CNN. Reuters, The Telegraph, BBC, Tampa Bay Times, KXAN, Seattle Times, USA Today

Share
Tweet
Pin
+1
Share
3K Shares

Category: News

« The Top 13 Superfoods You Should Start Eating Today!
7 White Tea Benefits & Uses »

You Might Also Like

  • Obsessive Compulsive Disorder (OCD) Treatment: 3 Steps To Relieve SymptomsApproximately 1 in 40 adults in the United...
  • Schools Now Offer Bullet Proof Backpacks Following Multiple Mass ShootingsIn the wake of terrorist attacks across America,...
  • New Research Reveals 46% Of Americans Have This Dangerous Health ConditionThanks to a new hypertension treatment guideline, 30 million...
  • CONFIRMED: Las Vegas Shooter Was On Medications Linked To Aggressive BehaviorIt has just been revealed that the Las...
  • #PharmaControlNow: Researchers Reveal The 1 Link Between Most Mass ShootersWithin half a day of the tragic Las...
  • Binge Eating Disorder Causes & 5 Natural TreatmentsWhile binge eating disorder is severely dangerous, there...

About Ricky Raps

Florida based journalist and political activist. Ricky is a senior at Florida State University studying Political Science, Communication, Emergency Management, and US Intelligence Policy. Ricky grew up in New England and is a fan of the Patriots.

Reader Interactions

Leave a Reply Cancel reply

You must be logged in to post a comment.

Copyright © 2018 DavidWolfe.com · All Rights Reserved ·

", + "plain_text": [ + {"text": "Medication: The Thread That Links Mass Shooters Together"}, + {"text": "* Menu, * Skip to primary navigation, * Skip to secondary navigation, * Skip to content, * Skip to primary sidebar,"}, diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index e6d70e5dad6a..65e1c704cbb3 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "remarshal"; - version = "1.0.1"; # test with `nix-build pkgs/pkgs-lib/format` + version = "1.2.0"; # test with `nix-build pkgs/pkgs-lib/format` pyproject = true; src = fetchFromGitHub { owner = "dbohdan"; repo = "remarshal"; tag = "v${version}"; - hash = "sha256-7Gng/Oc9dwtWx4Xej6hf5IuUGM9/E9Hk9QTntqWk/Z0="; + hash = "sha256-y/odWWFJ7KDehYzUKSM/cprcCd+UaArEZFoYbtyW0Ok="; }; 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 1f8ad9f379e9..25875dcb3ae9 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.15.2"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-ySA+OHLY1whrZjWVrbcP3cabEpF02Mjf/AFqy5NXchs="; + hash = "sha256-pxU3QuBH/xV77YLp0JqfYTJPVIbLvRKuaWnH5YU6vsE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix index 64ed130ea16e..3e1816a95999 100644 --- a/pkgs/development/python-modules/rigour/default.nix +++ b/pkgs/development/python-modules/rigour/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "rigour"; - version = "1.3.6"; + version = "1.3.7"; pyproject = true; src = fetchFromGitHub { owner = "opensanctions"; repo = "rigour"; tag = "v${version}"; - hash = "sha256-GIgIG8roy93XBo5AuUGvDHODSrF4DaBy83Ey5seYbME="; + hash = "sha256-XlKP5XHJGnDwaHS43enkGVPoSXDz7+oEyDSG3xghBXM="; }; build-system = [ diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix index 7e06e06bc3b7..c4e96a449cb0 100644 --- a/pkgs/development/python-modules/rkm-codes/default.nix +++ b/pkgs/development/python-modules/rkm-codes/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "rkm-codes"; - version = "0.6"; - format = "pyproject"; + version = "1.0"; + pyproject = true; src = fetchFromGitHub { owner = "KenKundert"; repo = "rkm_codes"; tag = "v${version}"; - hash = "sha256-CkLLZuWcNL8sqAupc7lHXu0DXUXrX3qwd1g/ekyHdw4="; + hash = "sha256-S1ng2eTR+dNg7TkkpLTtJvX105FOqCi2eiMdRaqQrVg="; }; nativeBuildInputs = [ flit-core ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "QuantiPhy support for RKM codes"; homepage = "https://github.com/kenkundert/rkm_codes/"; - license = licenses.gpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ jpetrucciani ]; }; } diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 69ea26d867df..3fed106b865f 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -20,15 +20,9 @@ buildPythonPackage rec { hash = "sha256-YyiGd3XSIe+4PEL2l9LYDGH3lt1iRAAJflcBGYXaBzY="; }; - postPatch = '' - # https://github.com/robotframework/statuschecker/issues/46 - substituteInPlace test/tests.robot \ - --replace-fail BuiltIn.Log Log - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ robotframework ]; + dependencies = [ robotframework ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix index 717c92e16d76..70eb5045bc8e 100644 --- a/pkgs/development/python-modules/rucio/default.nix +++ b/pkgs/development/python-modules/rucio/default.nix @@ -40,13 +40,13 @@ }: let - version = "38.2.0"; + version = "38.3.0"; src = fetchFromGitHub { owner = "rucio"; repo = "rucio"; tag = version; - hash = "sha256-HYHiW/izKSkn08xLY7gJfuYK1C/ArOQ2DAwleSkcZ/I="; + hash = "sha256-hMFWydOWfpRooOVd1wJ5jDWsdvF2oT1n/SlLj3CM9Qs="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/scalar-fastapi/default.nix b/pkgs/development/python-modules/scalar-fastapi/default.nix index 9ed4d5f2ecd6..c86b95fc6f66 100644 --- a/pkgs/development/python-modules/scalar-fastapi/default.nix +++ b/pkgs/development/python-modules/scalar-fastapi/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "scalar-fastapi"; - version = "1.4.0"; + version = "1.4.2"; pyproject = true; src = fetchPypi { pname = "scalar_fastapi"; inherit version; - hash = "sha256-acR6eTAThDHvUt6Frfslk2W+yuHwMTyI8zvfD3E2uO8="; + hash = "sha256-mXeUxDobSdZmxWWiuF2C+oY5Zvh6LljdZQc9/YwdqGI="; }; build-system = [ diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 26b108b0a3bd..28c8c1ab9a4d 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2025.7.0"; + version = "2025.9.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-qYr08ABWul+m8lt+sXScUMSBwYE7ZQDIhDPjTvRcGfk="; + hash = "sha256-QoO4pMAtrsgaJ1yUYHc+otG3eMpw67W8sS7B/H3AoJk="; }; build-system = [ diff --git a/pkgs/development/python-modules/sdbus/default.nix b/pkgs/development/python-modules/sdbus/default.nix index 00b53c5c4e60..3af1b04b1aad 100644 --- a/pkgs/development/python-modules/sdbus/default.nix +++ b/pkgs/development/python-modules/sdbus/default.nix @@ -8,7 +8,7 @@ let pname = "sdbus"; - version = "0.14.0"; + version = "0.14.1.post0"; in buildPythonPackage { format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-QdYbdswFqepB0Q1woR6fmobtlfQPcTYwxeGDQODkx28="; + hash = "sha256-rjkVqz4/ChFmMuHlh235krlSnoKwtJIAbrIvh5Htbes="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix index d064b3f477ac..82507b6b6623 100644 --- a/pkgs/development/python-modules/securesystemslib/default.nix +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "securesystemslib"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "secure-systems-lab"; repo = "securesystemslib"; tag = "v${version}"; - hash = "sha256-XONgT0qE6SHgHULCnjI9JvqKN1SAnr/Xw/nfeGUwYjs="; + hash = "sha256-ERFRLNHD3OhbMEGBEnDLkRYGv4f+bYg9MStS5IarcPA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/shlib/default.nix b/pkgs/development/python-modules/shlib/default.nix index c78b73220430..1ee79e0ed4f2 100644 --- a/pkgs/development/python-modules/shlib/default.nix +++ b/pkgs/development/python-modules/shlib/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "shlib"; - version = "1.7"; + version = "1.8"; pyproject = true; src = fetchFromGitHub { owner = "KenKundert"; repo = "shlib"; tag = "v${version}"; - hash = "sha256-clhiTuU5vvZSzdGPA3CISiBTnAahvv1SOKAfMpb6lYU="; + hash = "sha256-0BWTaHKGVKYIPQ9ifVWp2VZkSH3Gg/NgP3gPhkmw5S4="; }; postPatch = '' @@ -39,7 +39,7 @@ buildPythonPackage rec { description = "Shell library"; homepage = "https://github.com/KenKundert/shlib"; changelog = "https://github.com/KenKundert/shlib/releases/tag/${src.tag}"; - license = licenses.gpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ jpetrucciani ]; }; } diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix index 16ba119d7ca2..a980c1a0a05b 100644 --- a/pkgs/development/python-modules/streamdeck/default.nix +++ b/pkgs/development/python-modules/streamdeck/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "streamdeck"; - version = "0.9.7"; + version = "0.9.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-jVhuZihvjuA5rwl55JAmtFq+h/f5M68Vo44jh8HjUI4="; + hash = "sha256-rO5K0gekDUzCJW06TCK59ZHjw5DvvlFeQ5zlGLMdASU="; }; patches = [ diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix index d85e0d16278f..91845201a6d0 100644 --- a/pkgs/development/python-modules/stringzilla/default.nix +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "stringzilla"; - version = "4.0.14"; + version = "4.0.15"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "stringzilla"; tag = "v${version}"; - hash = "sha256-kEo5lNCdC9676ZrBNIkav+9wT9qjzZHbauKuVnrXxK8="; + hash = "sha256-qiWuK0gtgGd6D05LJIi1erdWI6QTwo5lJWb6NpSPQa4="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index a602032cfb9d..bcbbc502495d 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "superqt"; - version = "0.7.5"; + version = "0.7.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "superqt"; tag = "v${version}"; - hash = "sha256-fLlItQRCxam7wlQZKKY+9/qAm8IFsVQZzyz3Ro5tDuU="; + hash = "sha256-Hdi1aTMZeQqaqeK7B4yynTOBc6Cy1QcX5BHsr6g1xwM="; }; build-system = [ diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index 5f0771129d6c..b76d95cbda02 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -47,7 +47,10 @@ buildPythonPackage rec { --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' ''; - pythonRelaxDeps = [ "attrs" ]; + pythonRelaxDeps = [ + "attrs" + "pendulum" + ]; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 7c500fbd9a71..0a95adc37b9b 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1467"; + version = "3.0.1470"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-qbmPZ6QSAe46SO3CvjcRBgLYlFxzIj/cy+ffdzclHG0="; + hash = "sha256-j6DD4JZ2hzKZM1hr0jiwK9bqWgKhAsWi7vFG/CYTRGg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index 397b1cb2ce27..26b8053d859d 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; - repo = pname; + repo = "textfsm"; tag = "v${version}"; hash = "sha256-ygVcDdT85mRN+qYfTZqraRVyp2JlLwwujBW1e/pPJNc="; }; @@ -23,6 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { + changelog = "https://github.com/google/textfsm/releases/tag/${src.tag}"; description = "Python module for parsing semi-structured text into python tables"; mainProgram = "textfsm"; homepage = "https://github.com/google/textfsm"; diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index fe7d97ff8117..20d04b0a03b1 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "textual"; - version = "6.1.0"; + version = "6.2.1"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-awieNrdyORLxQU52rmon/jftzt/A4+HMbMpa6V0HaG8="; + hash = "sha256-2myMafLHxJNw3EWLvlvg0wWznY6m04BOQjhYtRvYTP8="; }; build-system = [ poetry-core ]; @@ -77,6 +77,9 @@ buildPythonPackage rec { disabledTests = [ # Assertion issues "test_textual_env_var" + + # fixture 'snap_compare' not found + "test_progress_bar_width_1fr" ]; pytestFlags = [ diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix index 41d6f6e6596f..0e54101b44e4 100644 --- a/pkgs/development/python-modules/textx/default.nix +++ b/pkgs/development/python-modules/textx/default.nix @@ -12,14 +12,14 @@ let textx = buildPythonPackage rec { pname = "textx"; - version = "4.0.1"; + version = "4.2.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-qiKOG6B7yWWzkL7bmcRAVv6AOHKTWmrlrsJlXD5RoaQ="; + hash = "sha256-AlFXaB+D03GAsXNd2GnFOLxo2g5BjWAu6K1/GsncwLw="; }; outputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 0019d714b2d9..4853f7735218 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.8.2"; + version = "4.8.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "mikedh"; repo = "trimesh"; tag = version; - hash = "sha256-9D3cuQ6parDq2pWSJmGlMzUyxUOs6Nn9T4l8Fpz50nw="; + hash = "sha256-ywLbXOE3qO3+hrqy/+cVGZA4V202eHaMUnn3Wz1iNLI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ubelt/default.nix b/pkgs/development/python-modules/ubelt/default.nix index 9aa0967b06ed..ba8c0ac03ab8 100644 --- a/pkgs/development/python-modules/ubelt/default.nix +++ b/pkgs/development/python-modules/ubelt/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "ubelt"; - version = "1.3.7"; + version = "1.4.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Erotemic"; repo = "ubelt"; tag = "v${version}"; - hash = "sha256-LGcCJCP3iBjwDxMN/qqkvcUt1ry5OMEJ9xqTp27rk0A="; + hash = "sha256-9f22hNi/YrxAVoEOGojdziogUN/YNCrpUuOfib9nqfQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index c83bfc6434dd..9ff816afc946 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "ultralytics"; - version = "8.3.199"; + version = "8.3.203"; pyproject = true; src = fetchFromGitHub { owner = "ultralytics"; repo = "ultralytics"; tag = "v${version}"; - hash = "sha256-15Ktt16pS9ac7g21mWTSLnB7oGtyak6J3wdYN9gVLpk="; + hash = "sha256-j19eHxhrkvZ8tyVjO+VSNwXHrH1+c16g9byg69G7miI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix index 2d5c43ecfbdc..3042ab22cb68 100644 --- a/pkgs/development/python-modules/upcloud-api/default.nix +++ b/pkgs/development/python-modules/upcloud-api/default.nix @@ -4,30 +4,36 @@ fetchFromGitHub, setuptools, requests, + keyring, pytestCheckHook, responses, }: buildPythonPackage rec { pname = "upcloud-api"; - version = "2.7.0"; + version = "2.9.0"; pyproject = true; src = fetchFromGitHub { owner = "UpCloudLtd"; repo = "upcloud-python-api"; tag = "v${version}"; - hash = "sha256-YTccjuoagjS/Gllw8VtJ4NFoVqN1YeqXdgHI7BtP98w="; + hash = "sha256-OnHKKSlj6JbqXL1YDkmR7d6ae8eVdXOPx6Los5qPDJE="; }; build-system = [ setuptools ]; dependencies = [ requests ]; + optional-dependencies = { + keyring = [ keyring ]; + }; + nativeCheckInputs = [ pytestCheckHook responses - ]; + ] + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "upcloud_api" ]; diff --git a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix index 8f252dfd22ab..0c0d0ff317d7 100644 --- a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "uv-dynamic-versioning"; - version = "0.11.1"; + version = "0.11.2"; pyproject = true; src = fetchFromGitHub { @@ -28,7 +28,7 @@ buildPythonPackage rec { tag = "v${version}"; # Tests perform mock operations on the local repo leaveDotGit = true; - hash = "sha256-lnEi1supRlVGgMGpjG2DcWtX/bga9mE5jMDE0o26XM0="; + hash = "sha256-KB5EhXXQfaxAWM3DpkRxpBbelJc25btTtTppSn38b3o="; }; build-system = [ diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 18e4aba217eb..888375a07d14 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "wagtail"; - version = "7.1"; + version = "7.1.1"; pyproject = true; # The GitHub source requires some assets to be compiled, which in turn @@ -39,7 +39,7 @@ buildPythonPackage rec { # until https://github.com/wagtail/wagtail/pull/13136 gets merged. src = fetchPypi { inherit pname version; - hash = "sha256-4d4q+Ctiy/TTt3qTxVd5vGetezF5trT4JOxPIU1XDAE="; + hash = "sha256-e90eWww0VDeYXAHwp/YKYX5114jzfH2DlVj05qElGvk="; }; build-system = [ diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index e9dd929cb33c..e2d344c14f66 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.16.10"; + version = "4.17.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-wI/lbMFxxh5Kl30hf42o5FnFiXmANl69/ll9d3ZQC70="; + hash = "sha256-4/8HDxS6PKnYt1LaMuXQtMeb4HNFjaagLfQ8xuyLXLo="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 54957ee4c74c..7937886192b2 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "west"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-kIoHrnzDNKiMsvBptDBITf392gw0ItFLniOkMDDPnMY="; + hash = "sha256-cIj+Dpr+Bxnr7pXFHFKRSfe8/JGdg6ggbTX6nGg+0KU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix index e6ad813d8e33..335ad245075e 100644 --- a/pkgs/development/python-modules/whisperx/default.nix +++ b/pkgs/development/python-modules/whisperx/default.nix @@ -35,14 +35,14 @@ let in buildPythonPackage rec { pname = "whisperx"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; src = fetchFromGitHub { owner = "m-bain"; repo = "whisperX"; tag = "v${version}"; - hash = "sha256-7MjrtvZGWfgtdQNotzdVMjj0sYfab/6PLQcZCOoqoNM="; + hash = "sha256-zx77Fx8KYTWCFcC6Uy6pbe8LJtXP3b6lkwuOSEEYJfU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix index 4c22f44105a4..101b0376a41c 100644 --- a/pkgs/development/python-modules/xdoctest/default.nix +++ b/pkgs/development/python-modules/xdoctest/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "xdoctest"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Erotemic"; repo = "xdoctest"; tag = "v${version}"; - hash = "sha256-1c3wnQ30J2OfnBffzGfPPt9St8VpLGmFGbifzbw+cOc="; + hash = "sha256-kxisUcpfAxhB7wd2QLY5jkoUXXDYrkJx7bNB1wMVB30="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 3b5243f2190c..c8efa3b2f66c 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.65"; + version = "0.2.66"; pyproject = true; src = fetchFromGitHub { owner = "ranaroussi"; repo = "yfinance"; tag = version; - hash = "sha256-vc+oFjuo9JeK+pCdXKLG2wLGraBJZ+OYz2vOdySwLdU="; + hash = "sha256-v8K/mVNnun7ogBixaKAVYwSQgSrnnfvVw40/BeClCKY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a998bd5becc1..082b55c4c698 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,8 +1,8 @@ { callPackage, + jdk11, jdk17, jdk21, - jdk23, }: let @@ -56,7 +56,7 @@ let tests = { toolchains = let - javaVersion = lib.getVersion jdk23; + javaVersion = lib.getVersion jdk11; javaMajorVersion = lib.versions.major javaVersion; in runCommand "detects-toolchains-from-nix-env" @@ -65,7 +65,7 @@ let nativeBuildInputs = [ (gradle.override { javaToolchains = [ - jdk23 + jdk11 ]; }) ]; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 9dcab589024c..836faaa40936 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { pname = "buildah"; - version = "1.41.4"; + version = "1.41.5"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; tag = "v${finalAttrs.version}"; - hash = "sha256-8I8njiMayfpodX2rj8MqYIhah3lvMgOY+agwlPYPij0="; + hash = "sha256-NQ5nCU1uiw3SzPMo2rH4+GnAIbIzM9O0bJaXJg/rfZM="; }; outputs = [ diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index 68b4218a60e0..af9f7c1aba2c 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -1,4 +1,10 @@ -{ buildGoModule, callPackage }: +{ + buildGoModule, + callPackage, + installShellFiles, + lib, + stdenv, +}: let common = callPackage ./common.nix { }; in @@ -8,13 +14,23 @@ buildGoModule { version src ldflags - postInstall vendorHash ; subPackages = "cmd/cli"; + nativeBuildInputs = [ installShellFiles ]; + env.CGO_ENABLED = 0; + postInstall = '' + ${common.postInstall} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd woodpecker-cli \ + --bash <($out/bin/woodpecker-cli completion bash) \ + --fish <($out/bin/woodpecker-cli completion fish ) \ + --zsh <($out/bin/woodpecker-cli completion zsh) + ''; meta = common.meta // { description = "Command line client for the Woodpecker Continuous Integration server"; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 036e7283cd1c..daa6598b0184 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.9.0"; - srcHash = "sha256-Ymg6nJr83jt2EAv/p1B1wmZv3jvpx/3xRVRii3S1cNU="; + version = "3.10.0"; + srcHash = "sha256-Z9EGm14q9DySZ0lgw/wwam3NjvicltWBkVJ3cwi/eds="; # The tarball contains vendored dependencies vendorHash = null; in @@ -45,7 +45,6 @@ in maintainers = with maintainers; [ ambroisie techknowlogick - adamcstephens ]; }; } diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index fa6185480737..255219b50cba 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -12,35 +12,35 @@ }, "36": { "hashes": { - "aarch64-darwin": "32e25c46dfc1dc52d55a47d197f063534ac9932c7140ba06ac8686025ceb6072", - "aarch64-linux": "ab134d66bdbf558c0a222da59cd3a61e63914154c37186bc9d8299f24d70c9c9", - "armv7l-linux": "031aba9dd2b9041b8144bb6cb1cf4864aec6df1ed68ac96f35d414ba86525804", + "aarch64-darwin": "33892aeb000bd7f3f8a102f3bb3111b6fa1e2ccd92cbb5b787c79423e96d61b8", + "aarch64-linux": "55da6f2d692445f0eff0ee898160ff4da2c2d3f1736aff77fcb12c836f19db5e", + "armv7l-linux": "0631d0dc472c412f4c52def18adf6fddc0aefde37e0b15d0611cd4743f9e1e9b", "headers": "0fv8hz55xk76vksj8sagfhja0xx03ks8awi3sbmlinjb9m02hb9p", - "x86_64-darwin": "6594c103081f9e57fc0a7baebec8c9be6362c674afc3b3804938b510ae4fcb51", - "x86_64-linux": "234ab7c9e9eea1ab2e502ebaea8fcfbcfc10bcfa120f5dca45624c39daee64f2" + "x86_64-darwin": "8448b9f39e6c540b326b2abfcdfd41349482247b936a72914f9c843478b6597c", + "x86_64-linux": "bab89894ad4336ee8f855de3bb5405ee3d872d90b2ba7b196ac24cbc7a3025b8" }, - "version": "36.9.1" + "version": "36.9.2" }, "37": { "hashes": { - "aarch64-darwin": "4594071c44edc118bc9c58175148a0881c05d4ff95b8e9d7a24465c7a54131a3", - "aarch64-linux": "87ff5353f05b7d4ed83b0131dc73923957c5a9948c4748c9c696e94b90c5546b", - "armv7l-linux": "3fb1c01cadd627e7bb2126629557c277441dc1064de1c7e1946f7ce26f743abb", + "aarch64-darwin": "82869e916e74cb763c03fefb5fcee1fc99536e597716d4f3a9c716f9c37effab", + "aarch64-linux": "7c76a5147a9870b8bcbd859278148e1e326f98ea6a5dcb3ac2707d39bd22b2d5", + "armv7l-linux": "0d4a49b5f462972173daf6e919664cc04cad7a7d2a96b074cb181ea07bb0cd74", "headers": "0pxwny0ynvyqb3zqnharc4mkgj6acipqra1jjmf4hbr2a8m5fnc6", - "x86_64-darwin": "27cd4f024df5c7bc377a5e93dc4815567ac301ee8bb1ebd5ba04bf448bdebc28", - "x86_64-linux": "00873612a8c1b0c29dff6d3c759585013deaacf64e38b4cb173b7b18d0f272fc" + "x86_64-darwin": "258a104f781c50939ec6b45177a6f810da646ade15567a09cf9d14ec81b82cb2", + "x86_64-linux": "02e644d75392a1ea8991106bc77e1db243ee1fc0c23107dc3b253ed545dd4c66" }, - "version": "37.5.1" + "version": "37.6.0" }, "38": { "hashes": { - "aarch64-darwin": "2b47e58564eea4e7de76c337b5257e8538e657b3e7c9d403d03834ace0e6b358", - "aarch64-linux": "e28841bb9e47617cec0eea9abed88ea6b5e87d378d59553fb646c789df13f089", - "armv7l-linux": "6cea25eadd6c9af1e5015dd23d2f2a06f1f8d6c3aa6eb5574e0a76c081a96859", + "aarch64-darwin": "cff178e2cb9ae0d957d43009ef46d249d5594bc107d7704130bc0ce2e234bbd1", + "aarch64-linux": "76116429b368c883f93eb98cbdb053f98d811c35943133fe3cf9b408018ebe2f", + "armv7l-linux": "a4345bb87504b6b2bef29c0dc53b99770b203a7052fd2c5d38fd3e16177d3e68", "headers": "096wv1fp5m6nlsv11hsa2jj4yr8mb8pjh16s7ip5amj0phlx5783", - "x86_64-darwin": "0bbd87ff8fc608ebc340b425e69b7489421bb51ba5fb623ece8cdc85e4e041ab", - "x86_64-linux": "12944d0afa00b107d6f918216059aa9b3838f55301eeb752dd5321b5f56b1b63" + "x86_64-darwin": "232a83cb11b37f67dc0683402463ef30ac0309afb8e96f3bc1ea53e72fafa789", + "x86_64-linux": "f0028975282a6f2946797175ac406a95096f29c5dcda98048148668dfa36eff8" }, - "version": "38.1.2" + "version": "38.2.0" } } diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index b06010d5bd9a..70d8453feddb 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -12,35 +12,35 @@ }, "36": { "hashes": { - "aarch64-darwin": "77ec0308c8dfa3a44c3c0d7254285b622e3d5fa6a5ba990acda5d0a651c2173e", - "aarch64-linux": "02a798cf281bfcb8f1ca27016b92e2b869323bf9338a8f10801f4ba355fe4b45", - "armv7l-linux": "65b958043ee8a39278fe4eaa5fd00932ae5d23d0e279e56a8a39e0db46bdaafa", + "aarch64-darwin": "843592feae9fd5cd698cf5db2bcebe59654b108899fa5987a0b3cb34a0245bad", + "aarch64-linux": "9d6c593a608d8a9eb4e6bd1e6aaa84a6c3417b3080f933100790d22661d6b10e", + "armv7l-linux": "78070ec874d829b836cb929272c6264fff1855a1b85cc562d5d907b3f735715c", "headers": "0fv8hz55xk76vksj8sagfhja0xx03ks8awi3sbmlinjb9m02hb9p", - "x86_64-darwin": "f00ff6f5b3c029427ecd27fb94949bc1abddad64d5fddb23ecb8ce30db4d0cd4", - "x86_64-linux": "07bdcb9f55367caef1cbbe11ee9d15cf479ccead63632713c268123c6a5ef720" + "x86_64-darwin": "c1c4dd9cda4d9b9b31599716fc63dc71e1f1d6e300a4d4c019fe2bc02ef56557", + "x86_64-linux": "609de7bc826d6c858ce7703d8be9abc0a14d35ab745d178893cadf1291f35fa7" }, - "version": "36.9.1" + "version": "36.9.2" }, "37": { "hashes": { - "aarch64-darwin": "402c841a5fc2638f50b8b9e409d877e78bb6d597cc341fd320502a3845444d62", - "aarch64-linux": "b2c813e32f2336817682fe978a8045091c0e3ee1c4aa795c8e891bbd865b6276", - "armv7l-linux": "39371e49f3ae7b24b9c1f7577db6eff8e9928862884cb6fe578159bcf7882368", + "aarch64-darwin": "ea1b52ec0af04037b419897585ebb2e81f65ccd79dd8f331e26578d042c01a2f", + "aarch64-linux": "5c588569bbbca2bcef0881ea877d70dafcf7955e0d19765797f60e2c4d228c8a", + "armv7l-linux": "87a781e82f4fc530820311edc059eafe30e9cec673704c8e73ebf452c5382bc6", "headers": "0pxwny0ynvyqb3zqnharc4mkgj6acipqra1jjmf4hbr2a8m5fnc6", - "x86_64-darwin": "f3cfb979890539a28692b885a07be17707c953f538bd28630afe14a8d1526574", - "x86_64-linux": "bd5370472537117793e99ca7019e8cb626117de3f6058e5fdcea0adeed364699" + "x86_64-darwin": "667a9067a774a5ada82a44bc310a23657dc2942067732b6c2879ae0042e2faf2", + "x86_64-linux": "e1c04c3826e506765e90d95738d1cf0ecbb3a798f2f3a7bf17d0cc03fe0be1fe" }, - "version": "37.5.1" + "version": "37.6.0" }, "38": { "hashes": { - "aarch64-darwin": "e0ce8aa3fe8e2bf36478e406197f3926f1cfc57ec862c3eaceef8f33792933a8", - "aarch64-linux": "6bbfa5d1a0d8b1619f6676c0771675bc5d037fccc143df2c42f658e30e7347df", - "armv7l-linux": "3f464df339753efcb14038be3588c85fd29e913f46d266de4b3d7f31f3c2f377", + "aarch64-darwin": "97345d6f601c009ae810ee82dea77d90ff32040f95aefa7d1dbd95ab76ccebc7", + "aarch64-linux": "a1402389fe0b9687308020bc9b58909fa0987e5af3f5368557a88f18c9576a02", + "armv7l-linux": "7d038066c6c708517c08f06972dc688364a60b4537e1b83c3bf1db1baf290e45", "headers": "096wv1fp5m6nlsv11hsa2jj4yr8mb8pjh16s7ip5amj0phlx5783", - "x86_64-darwin": "871bbf03fce46eee78b067e17d4fc917ada1f55b6aedc1d0762f7078ab482ddd", - "x86_64-linux": "ebaa24fecc77539ae0f6b20bee9ce37da0143775ea168a48bc4e455d8bdb8c3f" + "x86_64-darwin": "d116d52170eecf0b982c0019f538aa7f01646c8b32b85512ec36096d18a3ed68", + "x86_64-linux": "0ad0238eedb81f71ade28056288b13a3c6a5223654300c423eb266ac0163765c" }, - "version": "38.1.2" + "version": "38.2.0" } } diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index c0b3171d3910..6bc1079b6481 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -56,10 +56,10 @@ }, "src/electron": { "args": { - "hash": "sha256-36H0FNNB3QUFdO22BqtHcIys/J3WBsghaoA/3a8gaTM=", + "hash": "sha256-iVs4TcW6ymx+vmYabOZnYbHLwHsnuTb/2iXfQYOZnho=", "owner": "electron", "repo": "electron", - "tag": "v36.9.1" + "tag": "v36.9.2" }, "fetcher": "fetchFromGitHub" }, @@ -1321,7 +1321,7 @@ "electron_yarn_hash": "1lqvsfr1w32n4as7g7ms49jjdfw7sl1fyvg2640cpdgjs4dd96ky", "modules": "135", "node": "22.19.0", - "version": "36.9.1" + "version": "36.9.2" }, "37": { "chrome": "138.0.7204.251", @@ -1380,10 +1380,10 @@ }, "src/electron": { "args": { - "hash": "sha256-lE8WyIAjLQqZZyuIHPgA217lqCFUEh0mzPhvzOzQ39c=", + "hash": "sha256-bmXyAQGG2oORXDALL5sV6ZLtrpZls4PzBOD0vQINcsg=", "owner": "electron", "repo": "electron", - "tag": "v37.5.1" + "tag": "v37.6.0" }, "fetcher": "fetchFromGitHub" }, @@ -2650,10 +2650,10 @@ "fetcher": "fetchFromGitiles" } }, - "electron_yarn_hash": "1lqvsfr1w32n4as7g7ms49jjdfw7sl1fyvg2640cpdgjs4dd96ky", + "electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk", "modules": "136", "node": "22.19.0", - "version": "37.5.1" + "version": "37.6.0" }, "38": { "chrome": "140.0.7339.133", @@ -2712,10 +2712,10 @@ }, "src/electron": { "args": { - "hash": "sha256-xeRBL6x0kzPTjzCk9eR7aDFJcdZtKgxAZN7SSCPbRJQ=", + "hash": "sha256-XlMLp3I7nQmlaqTbwwAzg4r17t4f5/C69nGDtJj/r0g=", "owner": "electron", "repo": "electron", - "tag": "v38.1.2" + "tag": "v38.2.0" }, "fetcher": "fetchFromGitHub" }, @@ -3974,9 +3974,9 @@ "fetcher": "fetchFromGitiles" } }, - "electron_yarn_hash": "0iqvdzggcb35yiarmd1n72sdkzy482qzj385286vnwanc93hls6s", + "electron_yarn_hash": "1knhw3blk3bl2a8nl58ik272qj2q0cpqiih5gcsds1na3bbkbn2z", "modules": "139", "node": "22.19.0", - "version": "38.1.2" + "version": "38.2.0" } } diff --git a/pkgs/development/tools/godot/Linux-fix-missing-library-with-builtin_glslang-false.patch b/pkgs/development/tools/godot/Linux-fix-missing-library-with-builtin_glslang-false.patch new file mode 100644 index 000000000000..cdf6b4fab261 --- /dev/null +++ b/pkgs/development/tools/godot/Linux-fix-missing-library-with-builtin_glslang-false.patch @@ -0,0 +1,25 @@ +From 6d43e80c0a455fea5dcb656967e73f755ecdd645 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 9 Mar 2025 19:42:33 -0300 +Subject: [PATCH] Linux: fix missing library with builtin_glslang=false + +--- + platform/linuxbsd/detect.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py +index b5e80f4a4d..8389096e26 100644 +--- a/platform/linuxbsd/detect.py ++++ b/platform/linuxbsd/detect.py +@@ -472,7 +472,7 @@ def configure(env: "SConsEnvironment"): + env.ParseConfig("pkg-config vulkan --cflags --libs") + if not env["builtin_glslang"]: + # No pkgconfig file so far, hardcode expected lib name. +- env.Append(LIBS=["glslang", "SPIRV"]) ++ env.Append(LIBS=["glslang", "glslang-default-resource-limits", "SPIRV"]) + + if env["opengl3"]: + env.Append(CPPDEFINES=["GLES3_ENABLED"]) +-- +2.47.1 + diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index e2b8edfa63c7..f1cd98a46ce7 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -5,17 +5,27 @@ callPackage, dbus, dotnetCorePackages, + embree, + enet, exportTemplatesHash, fetchFromGitHub, fetchpatch, fontconfig, + freetype, glib, + glslang, + graphite2, + harfbuzz, hash, + icu, installShellFiles, lib, libdecor, libGL, + libjpeg_turbo, libpulseaudio, + libtheora, + libwebp, libX11, libXcursor, libXext, @@ -26,10 +36,16 @@ libXrandr, libXrender, makeWrapper, + mbedtls, + miniupnpc, + openxr-loader, + pcre2, perl, pkg-config, + recastnavigation, runCommand, scons, + sdl3, speechd-minimal, stdenv, stdenvNoCC, @@ -55,6 +71,8 @@ # https://github.com/godotengine/godot/pull/73504 withWayland ? true, withX11 ? true, + wslay, + zstd, }: assert lib.asserts.assertOneOf "withPrecision" withPrecision [ "single" @@ -369,8 +387,24 @@ let ccflags = "-fno-strict-aliasing"; linkflags = "-Wl,--build-id"; + # libraries that aren't available in nixpkgs + builtin_msdfgen = true; + builtin_rvo2_2d = true; + builtin_rvo2_3d = true; + builtin_xatlas = true; + + # using system clipper2 is currently not implemented + builtin_clipper2 = true; + use_sowrap = false; } + // lib.optionalAttrs (lib.versionOlder version "4.4") { + # libraries that aren't available in nixpkgs + builtin_squish = true; + + # broken with system packages + builtin_miniupnpc = true; + } // lib.optionalAttrs (lib.versionAtLeast version "4.5") { redirect_build_objects = false; # Avoid copying build objects to output } @@ -380,23 +414,31 @@ let strictDeps = true; - patches = - lib.optionals (lib.versionOlder version "4.4") [ - (fetchpatch { - name = "wayland-header-fix.patch"; - url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch"; - hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU="; - }) - # Fix a crash in the mono test project build. It no longer seems to - # happen in 4.4, but an existing fix couldn't be identified. - ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch - ] - ++ lib.optional (lib.versionAtLeast version "4.5") ./fix-freetype-link-error.patch; + patches = [ + ./Linux-fix-missing-library-with-builtin_glslang-false.patch + ] + ++ lib.optionals (lib.versionOlder version "4.4") [ + (fetchpatch { + name = "wayland-header-fix.patch"; + url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch"; + hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU="; + }) + # Fix a crash in the mono test project build. It no longer seems to + # happen in 4.4, but an existing fix couldn't be identified. + ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch + ] + ++ lib.optional (lib.versionAtLeast version "4.5") ./fix-freetype-link-error.patch; postPatch = '' # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE perl -pi -e '{ $r += s:(env = Environment\(.*):\1\nenv["ENV"] = os.environ: } END { exit ($r != 1) }' SConstruct + # disable all builtin libraries by default + perl -pi -e '{ $r |= s:(opts.Add\(BoolVariable\("builtin_.*, )True(\)\)):\1False\2: } END { exit ($r != 1) }' SConstruct + + substituteInPlace platform/linuxbsd/detect.py \ + --replace-fail /usr/include/recastnavigation ${lib.escapeShellArg (lib.getDev recastnavigation)}/include/recastnavigation + substituteInPlace thirdparty/glad/egl.c \ --replace-fail \ 'static const char *NAMES[] = {"libEGL.so.1", "libEGL.so"}' \ @@ -423,36 +465,57 @@ let pkg-config ]; - buildInputs = - lib.optionals (editor && withMono) dotnet-sdk.packages - ++ lib.optional withAlsa alsa-lib - ++ lib.optional (withX11 || withWayland) libxkbcommon - ++ lib.optionals withX11 [ - libX11 - libXcursor - libXext - libXfixes - libXi - libXinerama - libXrandr - libXrender - ] - ++ lib.optionals withWayland [ - # libdecor - wayland - ] - ++ lib.optionals withDbus [ - dbus - ] - ++ lib.optionals withFontconfig [ - fontconfig - ] - ++ lib.optional withPulseaudio libpulseaudio - ++ lib.optionals withSpeechd [ - speechd-minimal - glib - ] - ++ lib.optional withUdev udev; + buildInputs = [ + embree + enet + freetype + glslang + graphite2 + (harfbuzz.override { withIcu = true; }) + icu + libtheora + libwebp + mbedtls + miniupnpc + openxr-loader + pcre2 + recastnavigation + wslay + zstd + ] + ++ lib.optionals (lib.versionAtLeast version "4.5") [ + libjpeg_turbo + sdl3 + ] + ++ lib.optionals (editor && withMono) dotnet-sdk.packages + ++ lib.optional withAlsa alsa-lib + ++ lib.optional (withX11 || withWayland) libxkbcommon + ++ lib.optionals withX11 [ + libX11 + libXcursor + libXext + libXfixes + libXi + libXinerama + libXrandr + libXrender + ] + ++ lib.optionals withWayland [ + libdecor + wayland + ] + ++ lib.optionals withDbus [ + dbus + ] + ++ lib.optionals withFontconfig [ + fontconfig + ] + ++ lib.optional withPulseaudio libpulseaudio + ++ lib.optionals withSpeechd [ + speechd-minimal + glib + ] + ++ lib.optional withUdev udev; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index ae7f261ff6f2..91fe9b157b60 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -18,10 +18,12 @@ buildGoModule rec { vendorHash = "sha256-ajXW6H1XBgVtMdK7/asfpy6e3rFAD2pz3Lg+QFnkVpo="; installPhase = '' + mkdir -p $out/bin mkdir -p $out/lib/viaduct.ai/v1/ksops/ mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ - mv $GOPATH/bin/kustomize-sops $out/lib/viaduct.ai/v1/ksops/ksops - ln -s $out/lib/viaduct.ai/v1/ksops/ksops $out/lib/viaduct.ai/v1/ksops-exec/ksops-exec + mv $GOPATH/bin/kustomize-sops $out/bin/ksops + ln -s $out/bin/ksops $out/lib/viaduct.ai/v1/ksops-exec/ksops-exec + ln -s $ous/bin/ksops $out/lib/viaduct.ai/v1/ksops/ksops ''; # Tests are broken in a nix environment diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 4503795b8e5c..4823728839d2 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "minizinc-ide"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "MiniZincIDE"; rev = version; - hash = "sha256-wYS46keOPPQLs0fFeSeb2wz+VX6A1UUGjiGzHZhPxVk="; + hash = "sha256-ZESd83aqXr4vxEt9PvgarnELPi9BaEf68IUALYaTfzI="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 73c834c6624f..21ff45f76d0d 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -7,19 +7,17 @@ }: buildDunePackage rec { - version = "1.8.2"; + version = "1.9.0"; pname = "ocp-indent"; - duneVersion = "3"; - src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = version; - sha256 = "sha256-IyvURw/6R0eKrnahV1fqLV0iIeypykrmxDbliECgbLc="; + tag = version; + hash = "sha256-71dbZ8c842MYZfHad6RT0E48JlgzJSHnQgLVA5dGLv8="; }; - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.08"; buildInputs = [ cmdliner ]; propagatedBuildInputs = [ findlib ]; diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index d8ef0db55fd0..d1e28c481f44 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -26,8 +26,8 @@ let in buildNodejs { inherit enableNpm; - version = "24.8.0"; - sha256 = "1c03b362ebf4740d4758b9a3d3087e3de989f54823650ec80b47090ef414b2e0"; + version = "24.9.0"; + sha256 = "f17bc4cb01f59098c34a288c1bb109a778867c14eeb0ebbd608d0617b1193bbf"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then diff --git a/pkgs/games/papermc/derivation.nix b/pkgs/games/papermc/derivation.nix index 125052abc754..33171a1ab10e 100644 --- a/pkgs/games/papermc/derivation.nix +++ b/pkgs/games/papermc/derivation.nix @@ -56,7 +56,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aaronjanse - neonfuz MayNiklas ]; mainProgram = "minecraft-server"; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 93adc5def23d..f06da7310fda 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20250904.2376227"; + version = "20250926.e00cb46"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-FF+RSJqGMhmV5QSaNOBpVeIgS5jAcQJfkW0MvdVxnPI="; + hash = "sha256-CsMrhYpaTRMz364kt5b/bCY67PCoYwS50Fxw8mi2QCY="; }; sgt-puzzles-menu = fetchurl { diff --git a/pkgs/kde/misc/plasma-wayland-protocols/default.nix b/pkgs/kde/misc/plasma-wayland-protocols/default.nix index 0c124dfffd6c..eb2074e70e98 100644 --- a/pkgs/kde/misc/plasma-wayland-protocols/default.nix +++ b/pkgs/kde/misc/plasma-wayland-protocols/default.nix @@ -5,11 +5,11 @@ }: mkKdeDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-${version}.tar.xz"; - hash = "sha256-JWdHJnGtXZifiLUbrvndWTU6Xnw/LtfmuYl1XLkAQjM="; + hash = "sha256-RWef56Y8QU8sgXk6YlKPrmzO5YS2llcZ1/n8bdSLqEY="; }; meta.license = with lib.licenses; [ diff --git a/pkgs/os-specific/cygwin/default.nix b/pkgs/os-specific/cygwin/default.nix new file mode 100644 index 000000000000..09f69ff9f9b2 --- /dev/null +++ b/pkgs/os-specific/cygwin/default.nix @@ -0,0 +1,25 @@ +{ + makeScopeWithSplicing', + generateSplicesForMkScope, +}: + +let + otherSplices = generateSplicesForMkScope "cygwin"; +in +makeScopeWithSplicing' { + inherit otherSplices; + f = + self: + let + callPackage = self.callPackage; + in + { + w32api = callPackage ./w32api { }; + w32api-headers = callPackage ./w32api { headersOnly = true; }; + + newlib-cygwin = callPackage ./newlib-cygwin { }; + # this is here to avoid symlinks being made to cygwin1.dll in /nix/store + newlib-cygwin-nobin = callPackage ./newlib-cygwin/nobin.nix { }; + newlib-cygwin-headers = callPackage ./newlib-cygwin { headersOnly = true; }; + }; +} diff --git a/pkgs/os-specific/cygwin/newlib-cygwin/default.nix b/pkgs/os-specific/cygwin/newlib-cygwin/default.nix new file mode 100644 index 000000000000..9869493c3be8 --- /dev/null +++ b/pkgs/os-specific/cygwin/newlib-cygwin/default.nix @@ -0,0 +1,168 @@ +{ + lib, + stdenv, + stdenvNoCC, + stdenvNoLibc, + autoreconfHook, + bison, + buildPackages, + cocom-tool-set, + flex, + perl, + w32api, + w32api-headers, + + headersOnly ? false, +}: + +(if headersOnly then stdenvNoCC else stdenvNoLibc).mkDerivation ( + finalAttrs: + { + pname = "newlib-cygwin${lib.optionalString headersOnly "-headers"}"; + version = "3.6.4"; + + src = buildPackages.fetchgit { + url = "https://cygwin.com/git/newlib-cygwin.git"; + rev = "cygwin-${finalAttrs.version}"; + hash = "sha256-+WYKwqcDAc7286GzbgKKAxNJCOf3AeNnF8XEVPoor+g="; + }; + + outputs = [ + "out" + ] + ++ lib.optionals (!headersOnly) [ + "bin" + "dev" + "man" + ]; + + patches = [ + # Newer versions of gcc don't like struct winsize being used before being + # declared. Backport of https://cygwin.com/cgit/newlib-cygwin/commit/?id=73600d68227e125af24b7de7c3fccbd4eb66ee03 + ./fix-winsize.patch + ] + ++ lib.optional (!headersOnly) [ + # https://cygwin.com/pipermail/cygwin-developers/2020-September/011970.html + # This is required for boost coroutines to work. After we get to the point + # where nix runs on cygwin, we can attempt to upstream this again. + ./store-tls-pointer-in-win32-tls.patch + ] + # After cygwin hosted builds are working, we should upstream this + ++ lib.optional ( + !headersOnly && stdenvNoLibc.hostPlatform != stdenvNoLibc.buildPlatform + ) ./fix-cross.patch; + + passthru.w32api = if headersOnly then w32api-headers else w32api; + + meta = { + homepage = "https://cygwin.com/"; + description = "A DLL which provides substantial POSIX API functionality on Windows."; + license = with lib.licenses; [ + # newlib + gpl2 + # winsup + gpl3 + ]; + platforms = lib.platforms.cygwin; + maintainers = [ lib.maintainers.corngood ]; + }; + } + // ( + if headersOnly then + { + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/include/ + cp -r newlib/libc/include/* $out/include/ + cp -r winsup/cygwin/include/* $out/include/ + ''; + } + else + { + postPatch = '' + patchShebangs --build winsup/cygwin/scripts + ''; + + autoreconfFlags = [ + "winsup" + ] + # Only reconfigure root when fix-cross.patch is applied. Otherwise the + # autoconf version check will fail. + ++ lib.optional (stdenvNoLibc.hostPlatform != stdenvNoLibc.buildPlatform) "."; + + env = + let + libflag = "-Wl,-L${lib.getLib w32api}${w32api.libdir or "/lib/w32api"}"; + in + { + CFLAGS_FOR_TARGET = toString [ + libflag + ]; + + CXXFLAGS_FOR_TARGET = toString [ + "-Wno-error=register" + libflag + ]; + }; + + strictDeps = true; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ + autoreconfHook + bison + cocom-tool-set + flex + perl + ]; + + buildInputs = [ w32api ]; + + makeFlags = [ + "tooldir=${placeholder "out"}" + ]; + + enableParallelBuilding = true; + + # this is explicitly -j1 in cygwin.cygport + # without it the install order is non-deterministic + enableParallelInstalling = false; + + hardeningDisable = [ + # conflicts with internal definition of 'bzero' + "fortify" + "stackprotector" + ]; + + configurePlatforms = [ + "build" + "target" + ]; + + configureFlags = [ + "--disable-shared" + "--disable-doc" + "--enable-static" + "--disable-dumper" + "--with-cross-bootstrap" + ] + ++ lib.optional (stdenvNoLibc.hostPlatform != stdenvNoLibc.buildPlatform) [ + "ac_cv_prog_CC=gcc" + ]; + + allowedImpureDLLs = [ + "ADVAPI32.dll" + "PSAPI.DLL" + "NETAPI32.dll" + "SHELL32.dll" + "USER32.dll" + "USERENV.dll" + "dbghelp.dll" + "ntdll.dll" + ]; + } + ) +) diff --git a/pkgs/os-specific/cygwin/newlib-cygwin/fix-cross.patch b/pkgs/os-specific/cygwin/newlib-cygwin/fix-cross.patch new file mode 100644 index 000000000000..cba24ab12c40 --- /dev/null +++ b/pkgs/os-specific/cygwin/newlib-cygwin/fix-cross.patch @@ -0,0 +1,55 @@ +Disable strict autoconf version check so we can autoreconf in nixpkgs. + +diff --git a/config/override.m4 b/config/override.m4 +index 8b954d3cb..60c4cfd12 100644 +--- a/config/override.m4 ++++ b/config/override.m4 +@@ -44,7 +44,6 @@ AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK], + [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])]) + ]) + m4_define([AC_INIT], m4_defn([AC_INIT])[ +-_GCC_AUTOCONF_VERSION_CHECK + ]) + + + +This is needed for target linking to find e.g. crt0.o. +diff --git a/configure.ac b/configure.ac +index 05ddf6987..f5bbd5c72 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3166,7 +3166,7 @@ case " $target_configdirs " in + *" --with-newlib "*) + case "$target" in + *-cygwin*) +- FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include' ++ FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include' + ;; + esac + + +Autoconf clears EXEEXT= in cross, which breaks installation of utils/cygserver. + +AC_CHECK_LIB is disabled in cross after AC_NO_EXECUTABLES. +diff --git a/winsup/configure.ac b/winsup/configure.ac +index e7ac814b1..14b56e130 100644 +--- a/winsup/configure.ac ++++ b/winsup/configure.ac +@@ -40,6 +40,8 @@ AM_PROG_AS + AC_LANG(C) + AC_LANG(C++) + ++EXEEXT=.exe ++ + AC_ARG_WITH([cross-bootstrap],[AS_HELP_STRING([--with-cross-bootstrap],[do not build programs using the MinGW toolchain or check for MinGW libraries (useful for bootstrapping a cross-compiler)])],[],[with_cross_bootstrap=no]) + + AC_CYGWIN_INCLUDES +@@ -135,8 +137,6 @@ AM_CONDITIONAL(BUILD_DUMPER, [test "x$build_dumper" = "xyes"]) + # libbfd.a doesn't have a pkgconfig file, so we guess what it's dependencies + # are, based on what's present in the build environment + BFD_LIBS="-lintl -liconv -liberty -lz" +-AC_CHECK_LIB([sframe], [sframe_decode], [BFD_LIBS="${BFD_LIBS} -lsframe"]) +-AC_CHECK_LIB([zstd], [ZSTD_isError], [BFD_LIBS="${BFD_LIBS} -lzstd"]) + AC_SUBST([BFD_LIBS]) + + AC_CONFIG_FILES([ diff --git a/pkgs/os-specific/cygwin/newlib-cygwin/fix-winsize.patch b/pkgs/os-specific/cygwin/newlib-cygwin/fix-winsize.patch new file mode 100644 index 000000000000..0ac6b7499336 --- /dev/null +++ b/pkgs/os-specific/cygwin/newlib-cygwin/fix-winsize.patch @@ -0,0 +1,31 @@ +diff --git a/winsup/cygwin/include/sys/termios.h b/winsup/cygwin/include/sys/termios.h +index d1b4a0af5..75e0c5348 100644 +--- a/winsup/cygwin/include/sys/termios.h ++++ b/winsup/cygwin/include/sys/termios.h +@@ -282,6 +282,12 @@ struct termios + speed_t c_ospeed; + }; + ++struct winsize ++{ ++ unsigned short ws_row, ws_col; ++ unsigned short ws_xpixel, ws_ypixel; ++}; ++ + #define termio termios + + #ifdef __cplusplus +@@ -313,13 +319,6 @@ int tcsetwinsize(int fd, const struct winsize *winsz); + #define cfgetospeed(tp) ((tp)->c_ospeed) + #endif + +-/* Extra stuff to make porting stuff easier. */ +-struct winsize +-{ +- unsigned short ws_row, ws_col; +- unsigned short ws_xpixel, ws_ypixel; +-}; +- + #define TIOCGWINSZ (('T' << 8) | 1) + #define TIOCSWINSZ (('T' << 8) | 2) + #define TIOCLINUX (('T' << 8) | 3) diff --git a/pkgs/os-specific/cygwin/newlib-cygwin/nobin.nix b/pkgs/os-specific/cygwin/newlib-cygwin/nobin.nix new file mode 100644 index 000000000000..8745261b9815 --- /dev/null +++ b/pkgs/os-specific/cygwin/newlib-cygwin/nobin.nix @@ -0,0 +1,9 @@ +{ + emptyDirectory, + newlib-cygwin, +}: + +newlib-cygwin +// { + bin = emptyDirectory; +} diff --git a/pkgs/os-specific/cygwin/newlib-cygwin/remove-definitions-that-conflict-with-mingw.patch b/pkgs/os-specific/cygwin/newlib-cygwin/remove-definitions-that-conflict-with-mingw.patch new file mode 100644 index 000000000000..313ff2873910 --- /dev/null +++ b/pkgs/os-specific/cygwin/newlib-cygwin/remove-definitions-that-conflict-with-mingw.patch @@ -0,0 +1,88 @@ +From cc95494ed527e64fcd1ade7ed7ae44f9e0a6fa8a Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Tue, 9 Sep 2025 15:04:45 -0300 +Subject: [PATCH] remove definitions that conflict with mingw + +--- + winsup/cygwin/fhandler/socket_inet.cc | 2 ++ + winsup/cygwin/fhandler/socket_local.cc | 2 ++ + winsup/cygwin/local_includes/ntdll.h | 20 -------------------- + winsup/cygwin/net.cc | 2 ++ + 4 files changed, 6 insertions(+), 20 deletions(-) + +diff --git a/winsup/cygwin/fhandler/socket_inet.cc b/winsup/cygwin/fhandler/socket_inet.cc +index 63cc498f1..03681c07b 100644 +--- a/winsup/cygwin/fhandler/socket_inet.cc ++++ b/winsup/cygwin/fhandler/socket_inet.cc +@@ -20,7 +20,9 @@ + #undef u_long + #define u_long __ms_u_long + #include ++#define cmsghdr __ms_cmsghdr + #include ++#undef cmsghdr + #include + #include + #include +diff --git a/winsup/cygwin/fhandler/socket_local.cc b/winsup/cygwin/fhandler/socket_local.cc +index e4a88169b..b832d8a84 100644 +--- a/winsup/cygwin/fhandler/socket_local.cc ++++ b/winsup/cygwin/fhandler/socket_local.cc +@@ -21,7 +21,9 @@ + #define u_long __ms_u_long + #include "ntsecapi.h" + #include ++#define cmsghdr __ms_cmsghdr + #include ++#undef cmsghdr + #include + #include + #include +diff --git a/winsup/cygwin/local_includes/ntdll.h b/winsup/cygwin/local_includes/ntdll.h +index 4497fe53f..bf86a8293 100644 +--- a/winsup/cygwin/local_includes/ntdll.h ++++ b/winsup/cygwin/local_includes/ntdll.h +@@ -489,26 +489,6 @@ typedef struct _FILE_DISPOSITION_INFORMATION_EX // 64 + ULONG Flags; + } FILE_DISPOSITION_INFORMATION_EX, *PFILE_DISPOSITION_INFORMATION_EX; + +-typedef struct _FILE_STAT_INFORMATION // 68 +-{ +- LARGE_INTEGER FileId; +- LARGE_INTEGER CreationTime; +- LARGE_INTEGER LastAccessTime; +- LARGE_INTEGER LastWriteTime; +- LARGE_INTEGER ChangeTime; +- LARGE_INTEGER AllocationSize; +- LARGE_INTEGER EndOfFile; +- ULONG FileAttributes; +- ULONG ReparseTag; +- ULONG NumberOfLinks; +- ACCESS_MASK EffectiveAccess; +-} FILE_STAT_INFORMATION, *PFILE_STAT_INFORMATION; +- +-typedef struct _FILE_CASE_SENSITIVE_INFORMATION // 71 +-{ +- ULONG Flags; +-} FILE_CASE_SENSITIVE_INFORMATION, *PFILE_CASE_SENSITIVE_INFORMATION; +- + enum { + FILE_LINK_REPLACE_IF_EXISTS = 0x01, + FILE_LINK_POSIX_SEMANTICS = 0x02, +diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc +index 737e494f8..6a1a0d079 100644 +--- a/winsup/cygwin/net.cc ++++ b/winsup/cygwin/net.cc +@@ -18,7 +18,9 @@ details. */ + #undef u_long + #define u_long __ms_u_long + #include ++#define cmsghdr __ms_cmsghdr + #include ++#undef cmsghdr + #include + #define gethostname cygwin_gethostname + #include +-- +2.50.1 + diff --git a/pkgs/os-specific/cygwin/newlib-cygwin/store-tls-pointer-in-win32-tls.patch b/pkgs/os-specific/cygwin/newlib-cygwin/store-tls-pointer-in-win32-tls.patch new file mode 100644 index 000000000000..5ef61d65875c --- /dev/null +++ b/pkgs/os-specific/cygwin/newlib-cygwin/store-tls-pointer-in-win32-tls.patch @@ -0,0 +1,246 @@ +From f74059ffbcf53d8ff4db59ca9e7b07d58bd3e3c6 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Fri, 4 Sep 2020 10:15:57 -0300 +Subject: [PATCH] Cygwin: store tls pointer in win32 tls + +Use WIN32 TLS instead of stack-relative pointers for TLS. This allows windows +fibers and boost coroutines to be used without crashing whenever a syscall is +made from a fiber. + +NOTE: This should be submitted upstream, but there is a blocker first. In the +main branch there are conflicts with new ARM64 support. In addition to fixing +the conflicts, we should actually test whether ARM64 builds work too, first. +--- + winsup/cygwin/create_posix_thread.cc | 2 ++ + winsup/cygwin/cygtls.cc | 15 +++++++++++++++ + winsup/cygwin/dcrt0.cc | 1 + + winsup/cygwin/fork.cc | 1 + + winsup/cygwin/include/cygwin/config.h | 2 +- + winsup/cygwin/init.cc | 12 ++++++++---- + winsup/cygwin/local_includes/cygtls.h | 7 +++++-- + winsup/cygwin/scripts/gendef | 15 ++++++++++----- + 8 files changed, 43 insertions(+), 12 deletions(-) + +diff --git a/winsup/cygwin/create_posix_thread.cc b/winsup/cygwin/create_posix_thread.cc +index 3fcd61707..85c1a8af3 100644 +--- a/winsup/cygwin/create_posix_thread.cc ++++ b/winsup/cygwin/create_posix_thread.cc +@@ -52,6 +52,7 @@ pthread_wrapper (PVOID arg) + /* Set stack values in TEB */ + PTEB teb = NtCurrentTeb (); + teb->Tib.StackBase = wrapper_arg.stackbase; ++ _set_tls(); + teb->Tib.StackLimit = wrapper_arg.stacklimit ?: wrapper_arg.stackaddr; + /* Set DeallocationStack value. If we have an application-provided stack, + we set DeallocationStack to NULL, so NtTerminateThread does not deallocate +@@ -250,6 +251,7 @@ create_new_main_thread_stack (PVOID &allocationbase) + return NULL; + NtCurrentTeb()->Tib.StackBase = ((PBYTE) allocationbase + stacksize); + NtCurrentTeb()->Tib.StackLimit = stacklimit; ++ _set_tls(); + return ((PBYTE) allocationbase + stacksize - 16); + } + +diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc +index 13d133f47..d23f9b42a 100644 +--- a/winsup/cygwin/cygtls.cc ++++ b/winsup/cygwin/cygtls.cc +@@ -17,6 +17,20 @@ details. */ + #include "sigproc.h" + #include "exception.h" + ++extern DWORD cygtls_slot; ++ ++void _set_tls(TEB *teb) ++{ ++ TlsSetValue(cygtls_slot, teb->Tib.StackBase); ++} ++ ++_cygtls* _current_tls() ++{ ++ register void *ret; ++ __asm __volatile__ ("movl cygtls_slot(%%rip),%%r10d\nmovq %%gs:0x1480(,%%r10d,8),%0" : "=r" (ret) : : "r10"); ++ return (_cygtls *) ((PBYTE) ret - __CYGTLS_PADSIZE__); ++} ++ + /* Two calls to get the stack right... */ + void + _cygtls::call (DWORD (*func) (void *, void *), void *arg) +@@ -25,6 +39,7 @@ _cygtls::call (DWORD (*func) (void *, void *), void *arg) + /* Initialize this thread's ability to respond to things like + SIGSEGV or SIGFPE. */ + exception protect; ++ _set_tls(); + _my_tls.call2 (func, arg, buf); + } + +diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc +index f4c09befd..e6ba488f2 100644 +--- a/winsup/cygwin/dcrt0.cc ++++ b/winsup/cygwin/dcrt0.cc +@@ -462,6 +462,7 @@ child_info_fork::alloc_stack () + StackBase in the child to be the same as in the parent, so that the + computation of _my_tls is correct. */ + teb->Tib.StackBase = (PVOID) stackbase; ++ _set_tls(teb); + } + } + +diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc +index f88acdbbf..582f1a454 100644 +--- a/winsup/cygwin/fork.cc ++++ b/winsup/cygwin/fork.cc +@@ -141,6 +141,7 @@ frok::child (volatile char * volatile here) + myself->pid, myself->ppid, __builtin_frame_address (0)); + sigproc_printf ("hParent %p, load_dlls %d", hParent, load_dlls); + ++ _set_tls(); + /* Make sure threadinfo information is properly set up. */ + if (&_my_tls != _main_tls) + { +diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h +index 2a7083278..21ce484cf 100644 +--- a/winsup/cygwin/include/cygwin/config.h ++++ b/winsup/cygwin/include/cygwin/config.h +@@ -37,7 +37,7 @@ extern inline struct _reent *__getreent (void) + { + register char *ret; + #ifdef __x86_64__ +- __asm __volatile__ ("movq %%gs:8,%0" : "=r" (ret)); ++ __asm __volatile__ ("movl cygtls_slot(%%rip),%%r10d\nmovq %%gs:0x1480(,%%r10d,8),%0" : "=r" (ret) : : "r10"); + #else + #error unimplemented for this target + #endif +diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc +index ce6484aff..392ac8600 100644 +--- a/winsup/cygwin/init.cc ++++ b/winsup/cygwin/init.cc +@@ -11,7 +11,7 @@ details. */ + #include "ntdll.h" + #include "shared_info.h" + +-static DWORD _my_oldfunc; ++DWORD NO_COPY cygtls_slot; + + static char *search_for = (char *) cygthread::stub; + unsigned threadfunc_ix[8]; +@@ -22,7 +22,9 @@ static bool dll_finished_loading; + static void + threadfunc_fe (VOID *arg) + { +- _cygtls::call ((DWORD (*) (void *, void *)) TlsGetValue (_my_oldfunc), arg); ++ PVOID f = TlsGetValue (cygtls_slot); ++ _set_tls(); ++ _cygtls::call ((DWORD (*) (void *, void *)) f, arg); + } + + /* If possible, redirect the thread entry point to a cygwin routine which +@@ -59,7 +61,7 @@ munge_threadfunc () + for (i = 0; threadfunc_ix[i]; i++) + if (!threadfunc || ebp[threadfunc_ix[i]] == threadfunc) + ebp[threadfunc_ix[i]] = (char *) threadfunc_fe; +- TlsSetValue (_my_oldfunc, threadfunc); ++ TlsSetValue (cygtls_slot, threadfunc); + } + } + } +@@ -78,6 +80,8 @@ dll_entry (HANDLE h, DWORD reason, void *static_load) + switch (reason) + { + case DLL_PROCESS_ATTACH: ++ cygtls_slot = TlsAlloc (); ++ _set_tls(); + init_console_handler (false); + + cygwin_hmodule = (HMODULE) h; +@@ -94,7 +98,6 @@ dll_entry (HANDLE h, DWORD reason, void *static_load) + memcpy (_REENT, _GLOBAL_REENT, sizeof (struct _reent)); + + dll_crt0_0 (); +- _my_oldfunc = TlsAlloc (); + dll_finished_loading = true; + break; + case DLL_PROCESS_DETACH: +@@ -102,6 +105,7 @@ dll_entry (HANDLE h, DWORD reason, void *static_load) + shared_destroy (); + break; + case DLL_THREAD_ATTACH: ++ _set_tls(); + if (dll_finished_loading) + munge_threadfunc (); + break; +diff --git a/winsup/cygwin/local_includes/cygtls.h b/winsup/cygwin/local_includes/cygtls.h +index 306497a33..e3a216280 100644 +--- a/winsup/cygwin/local_includes/cygtls.h ++++ b/winsup/cygwin/local_includes/cygtls.h +@@ -301,8 +301,11 @@ private: + #include "cygerrno.h" + #include "ntdll.h" + +-#define _my_tls (*((_cygtls *) ((PBYTE) NtCurrentTeb()->Tib.StackBase \ +- - __CYGTLS_PADSIZE__))) ++void _set_tls(TEB*); ++inline void _set_tls() { _set_tls(NtCurrentTeb()); } ++_cygtls* _current_tls(); ++ ++#define _my_tls (*_current_tls()) + extern _cygtls *_main_tls; + extern _cygtls *_sig_tls; + +diff --git a/winsup/cygwin/scripts/gendef b/winsup/cygwin/scripts/gendef +index 861a2405b..9a4479bd8 100755 +--- a/winsup/cygwin/scripts/gendef ++++ b/winsup/cygwin/scripts/gendef +@@ -118,7 +118,8 @@ EOF + .seh_proc _sigfe_maybe + _sigfe_maybe: # stack is aligned on entry! + .seh_endprologue +- movq %gs:8,%r10 # location of bottom of stack ++ movl cygtls_slot(%rip),%r10d ++ movq %gs:0x1480(,%r10d,8),%r10 # location of bottom of stack + leaq _cygtls.initialized(%r10),%r11 # where we will be looking + cmpq %r11,%rsp # stack loc > than tls + jge 0f # yep. we don't have a tls. +@@ -131,7 +132,8 @@ _sigfe_maybe: # stack is aligned on entry! + .seh_proc _sigfe + _sigfe: # stack is aligned on entry! + .seh_endprologue +- movq %gs:8,%r10 # location of bottom of stack ++ movl cygtls_slot(%rip),%r10d ++ movq %gs:0x1480(,%r10d,8),%r10 # location of bottom of stack + 1: movl \$1,%r11d + xchgl %r11d,_cygtls.stacklock(%r10) # try to acquire lock + testl %r11d,%r11d # it will be zero +@@ -154,7 +156,8 @@ _sigfe: # stack is aligned on entry! + _sigbe: # return here after cygwin syscall + # stack is aligned on entry! + .seh_endprologue +- movq %gs:8,%r10 # address of bottom of tls ++ movl cygtls_slot(%rip),%r10d ++ movq %gs:0x1480(,%r10d,8),%r10 # address of bottom of tls + 1: movl \$1,%r11d + xchgl %r11d,_cygtls.stacklock(%r10) # try to acquire lock + testl %r11d,%r11d # it will be zero +@@ -249,7 +252,8 @@ sigdelayed: + 2: + .seh_endprologue + +- movq %gs:8,%r12 # get tls ++ movl cygtls_slot(%rip),%r12d ++ movq %gs:0x1480(,%r12d,8),%r12 # get tls + movl _cygtls.saved_errno(%r12),%r15d # temporarily save saved_errno + movq \$_cygtls.start_offset,%rcx # point to beginning of tls block + addq %r12,%rcx # and store as first arg to method +@@ -316,7 +320,8 @@ stabilize_sig_stack: + subq \$0x20,%rsp + .seh_stackalloc 32 + .seh_endprologue +- movq %gs:8,%r12 ++ movl cygtls_slot(%rip),%r12d ++ movq %gs:0x1480(,%r12d,8),%r12 + 1: movl \$1,%r10d + xchgl %r10d,_cygtls.stacklock(%r12) # try to acquire lock + testl %r10d,%r10d +-- +2.50.1 + diff --git a/pkgs/os-specific/cygwin/w32api/default.nix b/pkgs/os-specific/cygwin/w32api/default.nix new file mode 100644 index 000000000000..4950da53116d --- /dev/null +++ b/pkgs/os-specific/cygwin/w32api/default.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenvNoCC, + stdenvNoLibc, + autoreconfHook, + windows, + + headersOnly ? false, +}: + +(if headersOnly then stdenvNoCC else stdenvNoLibc).mkDerivation ( + { + pname = "w32api${lib.optionalString headersOnly "-headers"}"; + + inherit (windows.mingw_w64_headers) + version + src + ; + + outputs = [ + "out" + ] + ++ lib.optional (!headersOnly) "dev"; + + configureFlags = [ (lib.enableFeature true "w32api") ]; + + enableParallelBuilding = true; + + passthru = { + incdir = "/include/w32api/"; + libdir = "/lib/w32api/"; + }; + + meta = { + description = "MinGW w32api package for Cygwin"; + inherit (windows.mingw_w64_headers.meta) + homepage + downloadPage + license + ; + platforms = lib.platforms.unix ++ lib.platforms.windows; + teams = [ lib.maintainers.corngood ]; + }; + } + // ( + if headersOnly then + { + preConfigure = '' + cd mingw-w64-headers + ''; + } + else + { + nativeBuildInputs = [ autoreconfHook ]; + + hardeningDisable = [ + "stackprotector" + "fortify" + ]; + } + ) +) diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index 18874fa3b7a2..4ec7581c639b 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { patches = [ ./hardening-format.patch ./fix-dmevent_tool.patch + + # Fix build with gcc15, based on + # https://gitlab.alpinelinux.org/alpine/aports/-/raw/dc5b3135517ede55f5e3530e538ca75048d26565/main/dmraid/008-gcc15.patch + ./dmraid-fix-build-with-gcc15.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/pkgs/os-specific/linux/dmraid/dmraid-fix-build-with-gcc15.patch b/pkgs/os-specific/linux/dmraid/dmraid-fix-build-with-gcc15.patch new file mode 100644 index 000000000000..6ebbb51a6b9f --- /dev/null +++ b/pkgs/os-specific/linux/dmraid/dmraid-fix-build-with-gcc15.patch @@ -0,0 +1,33 @@ +diff --git a/1.0.0.rc16/lib/activate/activate.c b/1.0.0.rc16/lib/activate/activate.c +index 1d71ea8c0a..0a4ec6afa1 100644 +--- a/1.0.0.rc16/lib/activate/activate.c ++++ b/1.0.0.rc16/lib/activate/activate.c +@@ -866,7 +866,7 @@ + + #define LIB_NAME_LENGTH 255 + static int +-do_device(struct lib_context *lc, struct raid_set *rs, int (*f) ()) ++do_device(struct lib_context *lc, struct raid_set *rs, int (*f)(char *, char *)) + { + int ret = 0; + char lib_name[LIB_NAME_LENGTH]; +diff --git a/1.0.0.rc16/lib/misc/file.c b/1.0.0.rc16/lib/misc/file.c +index fe74d5c9c2..c060b6e712 100644 +--- a/1.0.0.rc16/lib/misc/file.c ++++ b/1.0.0.rc16/lib/misc/file.c +@@ -59,12 +59,12 @@ + int fd, ret = 0; + loff_t o; + struct { +- ssize_t(*func) (); ++ ssize_t(*func)(int, void *, size_t); + const char *what; + } rw_spec[] = { + { + read, "read"}, { +- write, "writ"},}, *rw = rw_spec + ((flags & O_WRONLY) ? 1 : 0); ++ (ssize_t(*)(int, void *, size_t))write, "writ"},}, *rw = rw_spec + ((flags & O_WRONLY) ? 1 : 0); + + if ((fd = open(path, flags, lc->mode)) == -1) + LOG_ERR(lc, 0, "opening \"%s\"", path); + diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix index fba09bc4c2ca..1cc4f2109f5f 100644 --- a/pkgs/os-specific/linux/freeipa/default.nix +++ b/pkgs/os-specific/linux/freeipa/default.nix @@ -67,11 +67,11 @@ let in stdenv.mkDerivation rec { pname = "freeipa"; - version = "4.12.4"; + version = "4.12.5"; src = fetchurl { url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz"; - hash = "sha256-Nn3dHoaAt6+MZ0gMFCJniXginq4guNM8HjChren9adY="; + hash = "sha256-jvXS9Hx9VGFccFL19HogfH15JVIW7pc3/TY1pOvJglM="; }; patches = [ diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 069f4b6c94a3..e5016ccb87fa 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -708,8 +708,8 @@ let BTRFS_FS_POSIX_ACL = yes; - BCACHEFS_QUOTA = whenAtLeast "6.7" (option yes); - BCACHEFS_POSIX_ACL = whenAtLeast "6.7" (option yes); + BCACHEFS_QUOTA = whenBetween "6.7" "6.18" (option yes); + BCACHEFS_POSIX_ACL = whenBetween "6.7" "6.18" (option yes); UBIFS_FS_ADVANCED_COMPR = option yes; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index e6e292087f22..41f2039606ca 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.16.7"; # zen + version = "6.16.9"; # zen suffix = "zen1"; # zen - sha256 = "1vca6b30k48ihizlsmrlgzxgfnp0zq7q7x1h728hny2h33pdhni4"; # zen + sha256 = "0248xc6smxxrn95w9cjc5r3fsh7dx0mdb6k3f59n3lrnlbyhgld1"; # zen isLqx = false; }; # ./update-zen.py lqx diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 17841e6a60f3..e10e803b0159 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -72,12 +72,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production; production = generic { - version = "580.82.09"; - sha256_64bit = "sha256-Puz4MtouFeDgmsNMKdLHoDgDGC+QRXh6NVysvltWlbc="; - sha256_aarch64 = "sha256-6tHiAci9iDTKqKrDIjObeFdtrlEwjxOHJpHfX4GMEGQ="; - openSha256 = "sha256-YB+mQD+oEDIIDa+e8KX1/qOlQvZMNKFrI5z3CoVKUjs="; - settingsSha256 = "sha256-um53cr2Xo90VhZM1bM2CH4q9b/1W2YOqUcvXPV6uw2s="; - persistencedSha256 = "sha256-lbYSa97aZ+k0CISoSxOMLyyMX//Zg2Raym6BC4COipU="; + version = "580.95.05"; + sha256_64bit = "sha256-hJ7w746EK5gGss3p8RwTA9VPGpp2lGfk5dlhsv4Rgqc="; + sha256_aarch64 = "sha256-zLRCbpiik2fGDa+d80wqV3ZV1U1b4lRjzNQJsLLlICk="; + openSha256 = "sha256-RFwDGQOi9jVngVONCOB5m/IYKZIeGEle7h0+0yGnBEI="; + settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14="; + persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg="; }; latest = selectHighestVersion production (generic { diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 04118ecc168f..1072c9aa148f 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + replaceVars, autoreconfHook, makeWrapper, glibc, @@ -72,8 +73,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-JN4GVx5rBfNBLaMpLcKgyd+CyNDafz85BXUcfg5kDXQ="; }; + patches = [ + (replaceVars ./fix-ldb-modules-path.patch { + inherit ldb; + out = null; # will be replaced in postPatch https://github.com/NixOS/nixpkgs/pull/446589#discussion_r2384899857 + }) + ]; + postPatch = '' patchShebangs ./sbus_generate.sh.in + + substituteInPlace src/confdb/confdb.c \ + --replace-fail "@out@" "${placeholder "out"}" ''; # Something is looking for instead of @@ -101,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: { --with-xml-catalog-path=''${SGML_CATALOG_FILES%%:*} --with-ldb-lib-dir=$out/modules/ldb --with-nscd=${glibc.bin}/sbin/nscd + --with-sssd-user=root ) '' + lib.optionalString withSudo '' diff --git a/pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch b/pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch new file mode 100644 index 000000000000..8324804a53e6 --- /dev/null +++ b/pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c +index 8c19142..7865684 100644 +--- a/src/confdb/confdb.c ++++ b/src/confdb/confdb.c +@@ -775,6 +775,8 @@ int confdb_init(TALLOC_CTX *mem_ctx, + int ret = EOK; + mode_t old_umask; + ++ setenv("LDB_MODULES_PATH", "@out@/modules/ldb:@ldb@/modules/ldb", 1); ++ + if (cdb_ctx == NULL) { + DEBUG(SSSDBG_FATAL_FAILURE, "Bad argument\n"); + return EFAULT; diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix index 7c175ba48a46..224070a720d1 100644 --- a/pkgs/os-specific/linux/zfs/2_3.nix +++ b/pkgs/os-specific/linux/zfs/2_3.nix @@ -3,6 +3,7 @@ lib, nixosTests, stdenv, + fetchpatch, ... }@args: @@ -17,6 +18,14 @@ callPackage ./generic.nix args { # this package should point to the latest release. version = "2.3.4"; + extraPatches = [ + (fetchpatch { + name = "fix_llvm-21_-wuninitialized-const-pointer_warning.patch"; + url = "https://github.com/openzfs/zfs/commit/9acedbaceec362d08a33ebfe7c4c7efcee81d094.patch"; + hash = "sha256-bjMRuT8gsMuwCnrS5PfG9vYthRvcFaWCCfQbCTVZdpw="; + }) + ]; + tests = { inherit (nixosTests.zfs) series_2_3; } diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 98d0236bcd90..d113e337bcc0 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -155,9 +155,13 @@ let substituteInPlace ./config/zfs-build.m4 \ --replace-fail "bashcompletiondir=/etc/bash_completion.d" \ "bashcompletiondir=$out/share/bash-completion/completions" - + '' + + lib.optionalString (lib.versionOlder version "2.4.0") '' substituteInPlace ./cmd/arc_summary --replace-fail "/sbin/modinfo" "modinfo" '' + + lib.optionalString (lib.versionAtLeast version "2.4.0") '' + substituteInPlace ./cmd/zarcsummary --replace-fail "/sbin/modinfo" "modinfo" + '' + '' echo 'Supported Kernel versions:' grep '^Linux-' META diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index e115be3336a0..8c9b35be6056 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -10,20 +10,20 @@ callPackage ./generic.nix args { kernelModuleAttribute = "zfs_unstable"; kernelMinSupportedMajorMinor = "4.18"; - kernelMaxSupportedMajorMinor = "6.16"; + kernelMaxSupportedMajorMinor = "6.17"; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.4.0-rc1"; + version = "2.4.0-rc2"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-6BU/Cotu+Lp7Pqp0eyECzAwsl82vKyDBkacxAh9wHPo="; + hash = "sha256-NoY8lXQ/qxO0cQLmU0tIjqqWUThfWzVioigpS2crbeE="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS. diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 3a8813b15aaa..98f438554ac0 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -7,6 +7,7 @@ newScope, overrideCC, stdenvNoLibc, + emptyDirectory, }: lib.makeScope newScope ( diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index acbc088e28e1..58eda45da319 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -988,6 +988,14 @@ optionalAttrs allowAliases aliases }; in attrsOf valueType; + + lib = { + mkRaw = value: { + inherit value; + _type = "raw"; + }; + }; + generate = name: value: pkgs.callPackage ( @@ -1002,16 +1010,43 @@ optionalAttrs allowAliases aliases python3 black ]; - value = builtins.toJSON value; + imports = builtins.toJSON (value._imports or [ ]); + value = builtins.toJSON (removeAttrs value [ "_imports" ]); pythonGen = '' import json import os + def recursive_repr(value: any) -> str: + if type(value) is list: + return '\n'.join([ + "[", + *[recursive_repr(x) + "," for x in value], + "]", + ]) + elif type(value) is dict and value.get("_type") == "raw": + return value.get("value") + elif type(value) is dict: + return '\n'.join([ + "{", + *[f"'{k.replace('\''', '\\\''')}': {recursive_repr(v)}," for k, v in value.items()], + "}", + ]) + else: + return repr(value) + + with open(os.environ["importsPath"], "r") as f: + imports = json.load(f) + if imports is not None: + for i in imports: + print(f"import {i}") + print() + with open(os.environ["valuePath"], "r") as f: for key, value in json.load(f).items(): - print(f"{key} = {repr(value)}") + print(f"{key} = {recursive_repr(value)}") ''; passAsFile = [ + "imports" "value" "pythonGen" ]; diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 9b1ab396a3fe..9afd9d783b65 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -904,6 +904,63 @@ runBuildTests { ''; }; + pythonVars = shouldPass ( + let + format = formats.pythonVars { }; + in + { + inherit format; + input = { + _imports = [ + "re" + "a.b.c" + ]; + + int = 10; + float = 3.141; + bool = true; + str = "foo"; + str_special = "foo\ntesthello'''"; + null = null; + list = [ + null + 1 + "str" + true + (format.lib.mkRaw "1 if True else 2") + ]; + attrs = { + foo = null; + conditional = format.lib.mkRaw "1 if True else 2"; + }; + func = format.lib.mkRaw "re.findall(r'\\bf[a-z]*', 'which foot or hand fell fastest')"; + }; + expected = '' + import re + import a.b.c + + attrs = { + "conditional": 1 if True else 2, + "foo": None, + } + bool = True + float = 3.141 + func = re.findall(r"\bf[a-z]*", "which foot or hand fell fastest") + int = 10 + list = [ + None, + 1, + "str", + True, + 1 if True else 2, + ] + null = None + str = "foo" + str_special = "foo\ntesthello''''" + ''; + } + ); + phpReturn = shouldPass { format = formats.php { }; input = { diff --git a/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix b/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix index 7d7f3f5446da..afe3f08d8307 100644 --- a/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix +++ b/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "christaangoossens"; domain = "auth_oidc"; - version = "0.6.2-alpha"; + version = "0.6.3-alpha"; src = fetchFromGitHub { owner = "christiaangoossens"; repo = "hass-oidc-auth"; tag = "v${version}"; - hash = "sha256-C/Nui0frlcRLaOqsfFH72QNo756karLq/UUcvs2LgE0="; + hash = "sha256-+R2IIs9MixR8epVpk4QycN8PjOfRITlZ+oUbdPEk2eA="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix index 2b86fdc7ec20..3169b45ac856 100644 --- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix +++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "amitfin"; domain = "oref_alert"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "amitfin"; repo = "oref_alert"; tag = "v${version}"; - hash = "sha256-pVRssAo1suKzctokUVAtN0RGB+kyk/eSIxYKTrsBOYg="; + hash = "sha256-+kZOwepyfehETfRDeA4w0eTaGSvkXNzG5rL2wdAKOy8="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index 490ab6a94803..02b445d97b76 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-t70Nm695FBBsxnZ2wxPjo86OQ7X2/NLKkhePQ23xj/4="; + hash = "sha256-jyY9x36HIiXpgPbK0Rms+78bP0edxivrm+Fm4znR2F4="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-TFfyq6wCQ6kAOHn75YqOTOrT17ASvOSnO2mr7qnc+Zw="; + npmDepsHash = "sha256-gJGdoa4euIq54aTLBl8Dg7aj6YDbyoQzDQ/rfLHH5G8="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 726189451f37..acd755224619 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.13.0-unstable-2025-09-16"; + version = "0.13.0-unstable-2025-09-26"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "8db5d254e077e10583cfaff0d9e70e08263383e5"; - sha256 = "sha256-5lPPWuQVqtFVGmBvZX5rUwnOw9V1SCKfyLDxZ416tMM="; + rev = "af17c8c238ba8cdeaaabb87b25a3ca2375b47c11"; + sha256 = "sha256-n3t58gsPXxlf2DnrofI28/0ZRC4EwnZvoFKxgxZ9vYA="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 002457487b45..da1e25b35abc 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -5,7 +5,6 @@ nixosTests, cacert, caBundle ? "${cacert}/etc/ssl/certs/ca-bundle.crt", - nextcloud30Packages, nextcloud31Packages, }: @@ -58,12 +57,6 @@ let }; in { - nextcloud30 = generic { - version = "30.0.16"; - hash = "sha256-YjbUrna8REq7U0lLN4AxWheqxUrxtC4+/gzGvRnf8zA="; - packages = nextcloud30Packages; - }; - nextcloud31 = generic { version = "31.0.9"; hash = "sha256-qrhBTMY1gco6jfRy9F60ErK4Q6lms4cCdUIbrQ1nD2g="; diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json deleted file mode 100644 index ad2c87ee2d52..000000000000 --- a/pkgs/servers/nextcloud/packages/30.json +++ /dev/null @@ -1,472 +0,0 @@ -{ - "app_api": { - "hash": "sha256-Ke0uGO+57JG39OoQdi+xa/w+l9ldhp2ZRy6bzJXv65g=", - "url": "https://github.com/cloud-py-api/app_api/releases/download/v3.2.0/app_api-v3.2.0.tar.gz", - "version": "3.2.0", - "description": "### Boost your Nextcloud with AppAPI and its specially designed applications.\n\n\nThe AppAPI is a project within the Nextcloud ecosystem designed to streamline and enhance the process of\napplication development, deployment, and management.\n\nIt introduces a new methodology that allows developers to create\napplications using a variety of programming languages, not limited to PHP, which was traditionally used in Nextcloud development.\n\n### Bundled App\n\n**Starting with Nextcloud 30.0.1, this application is included in the default Nextcloud package.**\n\n### Support\n\nWe appreciate any support for this project:\n\n- ⭐ Star our work on GitHub\n- ❗ Create an Issue or feature request\n- 💁 Resolve an Issue and create a Pull Request\n- 🧑‍💻 Develop your own application using AppAPI\n\nWe are genuinely excited about the future of the AppAPI project and its potential to transform\nthe way applications are developed and experienced within Nextcloud.\n\nAs we embark on this journey, we warmly invite you - developers, thinkers, creators, and visionaries -\nto join us in shaping a more versatile, stable, and secure app landscape.\n\n*Your insights, suggestions, and contributions are invaluable to us.*", - "homepage": "https://github.com/nextcloud/app_api", - "licenses": [ - "agpl" - ] - }, - "bookmarks": { - "hash": "sha256-GorOY1XRGFXnfGV115KlrdRLJ3TpJgWipKZ8cwprzGM=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.2.0/bookmarks-15.2.0.tar.gz", - "version": "15.2.0", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", - "homepage": "https://github.com/nextcloud/bookmarks", - "licenses": [ - "agpl" - ] - }, - "calendar": { - "hash": "sha256-YWoaCt8X4yCDtAoFw6/AxtaHYQKrX6jKnrDR1pEDLfM=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.5.5/calendar-v5.5.5.tar.gz", - "version": "5.5.5", - "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\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 or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\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": [ - "agpl" - ] - }, - "collectives": { - "hash": "sha256-W/bXZAMpDdFZ1AeBq9RtKEebyq4FQ8uWBn0YSmzQuos=", - "url": "https://github.com/nextcloud/collectives/releases/download/v3.1.2/collectives-3.1.2.tar.gz", - "version": "3.1.2", - "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.", - "homepage": "https://github.com/nextcloud/collectives", - "licenses": [ - "agpl" - ] - }, - "contacts": { - "hash": "sha256-WPswtqD9vOLZCnKMHv9hA3NbAthj50zaxc3ocXK4POY=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.2/contacts-v7.3.2.tar.gz", - "version": "7.3.2", - "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", - "homepage": "https://github.com/nextcloud/contacts#readme", - "licenses": [ - "agpl" - ] - }, - "cookbook": { - "hash": "sha256-EWLBypv588IkO1wx0vFv26NSk5GKx1pqSWTlAcW2mwE=", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.3/cookbook-0.11.3.tar.gz", - "version": "0.11.3", - "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", - "homepage": "https://github.com/nextcloud/cookbook/", - "licenses": [ - "agpl" - ] - }, - "cospend": { - "hash": "sha256-20k/ZoJ7OTDKW8RF0Nv/1wDVO7GtX2lZk5EUv173HuM=", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.1.3/cospend-3.1.3.tar.gz", - "version": "3.1.3", - "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be shared with other Nextcloud users or via public links.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\n\n## Features\n\n* ✎ Create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ Check member balances\n* 🗠 Display project statistics\n* ♻ Display settlement plan\n* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* 🎇 Automatically create reimbursement bills from settlement plan\n* 🗓 Create recurring bills (day/week/month/year)\n* 📊 Optionally provide custom amount for each member in new bills\n* 🔗 Link personal files to bills (picture of physical receipt for example)\n* 👩 Public links for people outside Nextcloud (can be password protected)\n* 👫 Share projects with Nextcloud users/groups/circles\n* 🖫 Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* 🔗 Generate link/QRCode to easily add projects in MoneyBuster\n* 🗲 Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* It does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", - "homepage": "https://github.com/julien-nc/cospend-nc", - "licenses": [ - "agpl" - ] - }, - "dav_push": { - "hash": "sha256-+Ji6xYFudC5ds4YLJnzZ34v7Ct615CdtkZPyq8iTsdA=", - "url": "https://github.com/bitfireAT/nc_ext_dav_push/releases/download/v0.0.3/dav_push.tar.gz", - "version": "0.0.3", - "description": "**This extension is in a very early stage of development. It is for demonstration and testing purposes only. Don't use it on production systems!**\n\nIn proprietary environments, changes in events and contacts are nowadays usually pushed to other clients so that they can update their views almost in real-time.\n\nWebDAV however (and in this context, especially CalDAV and CardDAV) doesn't currently support push notifications of clients when a collection has changed. So clients have to periodically ask the server for changes. This causes unnecessary delays and battery usage.\n\nThe WebDAV-Push standard, which is currently in development, wants to solve this problem with an open protocol, too.\n\nThis is the server part of these efforts to draft a standard and provide a working implementation (server + client) in order to demonstrate it.\n\n\nThe current WebDAV-Push draft is provided by [@bitfireAT](https://github.com/bitfireAT).\n \nThis Nextcloud extension has been developed by [@verdigado](https://github.com/verdigado).", - "homepage": "", - "licenses": [ - "agpl" - ] - }, - "deck": { - "hash": "sha256-cB2EaqyaSG+cE+51Q86au0cSl5/VEZeTW2exqajmKBY=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.6/deck-v1.14.6.tar.gz", - "version": "1.14.6", - "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", - "homepage": "https://github.com/nextcloud/deck", - "licenses": [ - "agpl" - ] - }, - "end_to_end_encryption": { - "hash": "sha256-ZPVvr84WTiZRobgWeagHCYxpfoVyRQgF8YIbwUoDpWo=", - "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.16.2/end_to_end_encryption-v1.16.2.tar.gz", - "version": "1.16.2", - "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption", - "homepage": "https://github.com/nextcloud/end_to_end_encryption", - "licenses": [ - "agpl" - ] - }, - "files_automatedtagging": { - "hash": "sha256-eXLTCtdIW/D0nigyYKnHj9iFQNAxWs8F46vivCUgVYs=", - "url": "https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v1.20.0/files_automatedtagging-v1.20.0.tar.gz", - "version": "1.20.0", - "description": "An app for Nextcloud that automatically assigns tags to newly uploaded files based on some conditions.\n\nThe tags can later be used to control retention, file access, automatic script execution and more.\n\n## How it works\nTo define tags, administrators can create and manage a set of rule groups. Each rule group consists of one or more rules combined through operators. Rules can include criteria like file type, size, time and more. A request matches a group if all rules evaluate to true. On uploading a file all defined groups are evaluated and when matching, the given tags are assigned to the file.", - "homepage": "https://github.com/nextcloud/files_automatedtagging", - "licenses": [ - "agpl" - ] - }, - "files_mindmap": { - "hash": "sha256-SRHkK3oaSEBsrQPhjgWy9WSliubYkrOc89lix5O/fZM=", - "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.33/files_mindmap-0.0.33.tar.gz", - "version": "0.0.33", - "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", - "homepage": "https://github.com/ACTom/files_mindmap", - "licenses": [ - "agpl" - ] - }, - "files_retention": { - "hash": "sha256-1Ga6l+k+QWyFxcR65Zf9aCXgIe6uSAwofTcsCvFN530=", - "url": "https://github.com/nextcloud-releases/files_retention/releases/download/v1.19.1/files_retention-v1.19.1.tar.gz", - "version": "1.19.1", - "description": "An app for Nextcloud to control automatic deletion of files after a given time.\nOptionally the users can be informed the day before.", - "homepage": "https://github.com/nextcloud/files_retention", - "licenses": [ - "agpl" - ] - }, - "forms": { - "hash": "sha256-6Y/W5xG+FjSDXBJkFfs+cyFde3l77bF0gkjbn4IfIVk=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.0/forms-v5.2.0.tar.gz", - "version": "5.2.0", - "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", - "homepage": "https://github.com/nextcloud/forms", - "licenses": [ - "agpl" - ] - }, - "gpoddersync": { - "hash": "sha256-PyyqE2mCClEQkW2cg3541VboCDtxKN2lwPRVRE9ewJs=", - "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.12.0/gpoddersync.tar.gz", - "version": "3.12.0", - "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", - "homepage": "https://github.com/thrillfall/nextcloud-gpodder", - "licenses": [ - "agpl" - ] - }, - "groupfolders": { - "hash": "sha256-rM1kYCe8lzTyeKzOgO1pSUci+6Giysq6VuXE5Hsq6qo=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.6/groupfolders-v18.1.6.tar.gz", - "version": "18.1.6", - "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.\nAs of Hub 10/Nextcloud 31, the admin needs to be a part of the team to be able to assign it a Teamfolder.", - "homepage": "https://github.com/nextcloud/groupfolders", - "licenses": [ - "agpl" - ] - }, - "impersonate": { - "hash": "sha256-LGA3m4vubYK9QPdv9E0eQ3R0hTLjuTgNcSAq4sZVUNU=", - "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.17.1/impersonate-v1.17.1.tar.gz", - "version": "1.17.1", - "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.", - "homepage": "https://github.com/nextcloud/impersonate", - "licenses": [ - "agpl" - ] - }, - "integration_deepl": { - "hash": "sha256-WjTg/+ckoZ/xFrfN0LaLvWIM/JbbnfvVO4EbnRnvB60=", - "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.0.0/integration_deepl-v2.0.0.tar.gz", - "version": "2.0.0", - "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: 🔴\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\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/integration_deepl", - "licenses": [ - "agpl" - ] - }, - "integration_openai": { - "hash": "sha256-VAvpbiTzbbQPsohQygdXRfPqPkxf7rEBuYELb0ADZqA=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.7.1/integration_openai-v3.7.1.tar.gz", - "version": "3.7.1", - "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\n⚠️ Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n⚠️ This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALL·E via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text-To-Speech via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\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/integration_openai", - "licenses": [ - "agpl" - ] - }, - "integration_paperless": { - "hash": "sha256-70goWT+uhdYCLIc68+kYEeWoO0rZMYbVgBcjQ88fKgw=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.7/integration_paperless-v1.0.7.tar.gz", - "version": "1.0.7", - "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", - "homepage": "", - "licenses": [ - "agpl" - ] - }, - "mail": { - "hash": "sha256-zL5fkfSZNnQcbbvDb+xOmeqp4yG+dIe81MyywunmXjk=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.5/mail-v5.5.5.tar.gz", - "version": "5.5.5", - "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://www.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": [ - "agpl" - ] - }, - "maps": { - "hash": "sha256-IupRymjs955TiUutzoTTMeESNfBmAp51l+oBaZwfdN0=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0/maps-1.6.0.tar.gz", - "version": "1.6.0", - "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", - "homepage": "https://github.com/nextcloud/maps", - "licenses": [ - "agpl" - ] - }, - "music": { - "hash": "sha256-/hlhplGc8IKiKBkOlnF63AhMP++sEoDCUxKmouuEAmw=", - "url": "https://github.com/owncloud/music/releases/download/v2.3.0/music_2.3.0_for_nextcloud.tar.gz", - "version": "2.3.0", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard", - "homepage": "https://github.com/owncloud/music", - "licenses": [ - "agpl" - ] - }, - "news": { - "hash": "sha256-8U2EOK8mXPEk70IU8GLXYU0EoZU7O4fhFkzhGpauvZc=", - "url": "https://github.com/nextcloud/news/releases/download/26.1.0/news.tar.gz", - "version": "26.1.0", - "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", - "homepage": "https://github.com/nextcloud/news", - "licenses": [ - "agpl" - ] - }, - "nextpod": { - "hash": "sha256-2IvsEv3teTGITE6ilaN3RHUtNpxDk3iCLEq5sAmJ+Y4=", - "url": "https://github.com/pbek/nextcloud-nextpod/releases/download/v0.7.8/nextpod-nc.tar.gz", - "version": "0.7.8", - "description": "This Nextcloud app lets you visualize your podcast subscriptions and episode downloads from\n[GPodderSync](https://apps.nextcloud.com/apps/gpoddersync), which acts as a basic gpodder.net\napi to sync podcast consumer apps (podcatchers) like AntennaPod.\n\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!", - "homepage": "https://github.com/pbek/nextcloud-nextpod", - "licenses": [ - "agpl" - ] - }, - "notes": { - "hash": "sha256-tFR9r5kmR7Egczt62I7k8JUllAc4cNu95d3NSUGD108=", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.12.3/notes-v4.12.3.tar.gz", - "version": "4.12.3", - "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", - "homepage": "https://github.com/nextcloud/notes", - "licenses": [ - "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-0g8y69XNKx8iEG0GM3hmIvnqACxO4YC3i83rNs9hsB8=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.11.0/onlyoffice.tar.gz", - "version": "9.11.0", - "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.", - "homepage": "https://www.onlyoffice.com", - "licenses": [ - "agpl" - ] - }, - "phonetrack": { - "hash": "sha256-Le3yvewei8vty8frz66X7ij2H9ju2h4JWdGNf46L9MY=", - "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.9.1/phonetrack-0.9.1.tar.gz", - "version": "0.9.1", - "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", - "homepage": "https://github.com/julien-nc/phonetrack", - "licenses": [ - "agpl" - ] - }, - "polls": { - "hash": "sha256-ib8fhoShdXaoHGra1erisE19w45D9HJ6KFMDMIcV8IE=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.3.10/polls-v8.3.10.tar.gz", - "version": "8.3.10", - "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).", - "homepage": "https://github.com/nextcloud/polls", - "licenses": [ - "agpl" - ] - }, - "previewgenerator": { - "hash": "sha256-4enkStAbo4dnMvPtVzOHzgKaeTKmEObBGOfrVAKvACI=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.10.0/previewgenerator-v5.10.0.tar.gz", - "version": "5.10.0", - "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", - "homepage": "https://github.com/nextcloud/previewgenerator", - "licenses": [ - "agpl" - ] - }, - "qownnotesapi": { - "hash": "sha256-zaASURjhqeiz8eYc0HmhYDOF5Z+kIjhggEcJFe96GA8=", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v25.8.0/qownnotesapi-nc.tar.gz", - "version": "25.8.0", - "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", - "homepage": "https://github.com/pbek/qownnotesapi", - "licenses": [ - "agpl" - ] - }, - "quota_warning": { - "hash": "sha256-SG+UxfA6+6Tna8LiwGzM3zWZ2G5zYOq1VWFhJvXEYdc=", - "url": "https://github.com/nextcloud-releases/quota_warning/releases/download/v1.21.0/quota_warning-v1.21.0.tar.gz", - "version": "1.21.0", - "description": "This app sends notifications to users when they reached 85, 90 and 95% of their quota (checked once a day).\nIn addition an email can be sent to the users. The three percentages can be changed in the admin settings.\nIt is also possible to have a link in the email and the notification for upsell options.", - "homepage": "https://github.com/nextcloud/quota_warning", - "licenses": [ - "agpl" - ] - }, - "registration": { - "hash": "sha256-iskmm8s32Nj65dyhx1ZO/Rg6fPi+usF/O/dYou+Ujjk=", - "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.7.0/registration-v2.7.0.tar.gz", - "version": "2.7.0", - "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", - "homepage": "https://github.com/nextcloud/registration", - "licenses": [ - "agpl" - ] - }, - "richdocuments": { - "hash": "sha256-yRAe/lw3i7sierzcVk6OCyldk0dQ30Gt55EMmVUbtds=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.11/richdocuments-v8.5.11.tar.gz", - "version": "8.5.11", - "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", - "homepage": "https://collaboraoffice.com/", - "licenses": [ - "agpl" - ] - }, - "sociallogin": { - "hash": "sha256-zuzQKtU+sEEYhBZ4UMfY1eMSsDfe7o/ymWYv2SJBiHw=", - "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.2/release.tar.gz", - "version": "6.2.2", - "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // See for allowed formats\n ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.", - "homepage": "https://github.com/zorn-v/nextcloud-social-login", - "licenses": [ - "agpl" - ] - }, - "spreed": { - "hash": "sha256-p6+uBVtMWVyef9wRavnUz+zaoyVtg/Govel7duRLOCM=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.10/spreed-v20.1.10.tar.gz", - "version": "20.1.10", - "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", - "homepage": "https://github.com/nextcloud/spreed", - "licenses": [ - "agpl" - ] - }, - "tables": { - "hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=", - "url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz", - "version": "0.9.5", - "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.", - "homepage": "https://github.com/nextcloud/tables", - "licenses": [ - "agpl" - ] - }, - "tasks": { - "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=", - "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz", - "version": "0.16.1", - "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", - "homepage": "https://github.com/nextcloud/tasks/", - "licenses": [ - "agpl" - ] - }, - "twofactor_admin": { - "hash": "sha256-zZvH7xfSooKBG4CKvSuf8D/6KnKEunLa+DRLAkWGoow=", - "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.8.0/twofactor_admin.tar.gz", - "version": "4.8.0", - "description": "This two-factor auth (2FA) provider for Nextcloud allows admins to generate a one-time\n\t\tcode for users to log into a 2FA protected account. This is helpful in situations where\n\t\tusers have lost access to their other 2FA methods or mandatory 2FA without any previously\n\t\tenabled 2FA provider.", - "homepage": "", - "licenses": [ - "agpl" - ] - }, - "twofactor_webauthn": { - "hash": "sha256-yAJRmuqZCiyzG7mrcjJQquFOamBcB7tP43ryAe/Z4UY=", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.4.0/twofactor_webauthn-v2.4.0.tar.gz", - "version": "2.4.0", - "description": "A two-factor provider for WebAuthn devices", - "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", - "licenses": [ - "agpl" - ] - }, - "unroundedcorners": { - "hash": "sha256-0+fOJnPsuengy8TPzTKizDnDXTlZStalFDOv+dFlRgc=", - "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.5/unroundedcorners-v1.1.5.tar.gz", - "version": "1.1.5", - "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.", - "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners", - "licenses": [ - "agpl" - ] - }, - "unsplash": { - "hash": "sha256-j0cQem+KLQFxj19DIqK6wqYYDs31V1VfVobH5JZ89RM=", - "url": "https://github.com/nextcloud-releases/unsplash/releases/download/v3.1.0/unsplash-v3.1.0.tar.gz", - "version": "3.1.0", - "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", - "homepage": "https://github.com/nextcloud/unsplash/", - "licenses": [ - "agpl" - ] - }, - "uppush": { - "hash": "sha256-3QD3gtCfhs9tWrbiiPPV7lYxpzGQhc31unSZukcrvN0=", - "url": "https://codeberg.org/NextPush/uppush/archive/2.3.0.tar.gz", - "version": "2.3.0", - "description": "Once the mobile phone is connected with NextPush, push notifications can be forwarded to applications implementing UnifiedPush.\n\nMore information about UnifiedPush at https://unifiedpush.org", - "homepage": "", - "licenses": [ - "agpl" - ] - }, - "user_oidc": { - "hash": "sha256-F92W+jiK8OJ7o/Q4tVsbAfxOSH3uhxkvjomm1ZkTZXM=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.0.0/user_oidc-v8.0.0.tar.gz", - "version": "8.0.0", - "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", - "homepage": "https://github.com/nextcloud/user_oidc", - "licenses": [ - "agpl" - ] - }, - "user_saml": { - "hash": "sha256-kE51sQWjGzDbJxgRQNFmexcW+s9/6lcbW2Rxf+Tj6hA=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.0.0/user_saml-v7.0.0.tar.gz", - "version": "7.0.0", - "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", - "homepage": "https://github.com/nextcloud/user_saml", - "licenses": [ - "agpl" - ] - }, - "whiteboard": { - "hash": "sha256-/tzGi1uq+1L74cLzGTdrnl+A9SMUrXOoyJPmijCOAN0=", - "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.2.1/whiteboard-v1.2.1.tar.gz", - "version": "1.2.1", - "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library", - "homepage": "https://github.com/nextcloud/whiteboard", - "licenses": [ - "agpl" - ] - } -} diff --git a/pkgs/servers/nextcloud/packages/apps/memories.nix b/pkgs/servers/nextcloud/packages/apps/memories.nix index cfe210a8d2ee..7a3facd503e2 100644 --- a/pkgs/servers/nextcloud/packages/apps/memories.nix +++ b/pkgs/servers/nextcloud/packages/apps/memories.nix @@ -12,8 +12,7 @@ }: let latestVersionForNc = { - "31" = latestVersionForNc."30"; - "30" = { + "31" = { version = "7.6.1"; appHash = "sha256-uRZBTwhdNr3OUw021WvTnEBcLd49EQbVr9bvU97zblc="; srcHash = "sha256-eKvdv3ng4YwPmFu7eapYvD8A2cliryAhPf6NDBJjX6c="; diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix index c0deead18dd4..0faecd1c0f50 100644 --- a/pkgs/servers/nextcloud/packages/apps/recognize.nix +++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix @@ -21,11 +21,6 @@ let appHash = "sha256-G7SDE72tszifozfT3vNxHW6WmMqQKhrSayQVANQaMbs="; modelHash = "sha256-dB4ot/65xisR700kUXg3+Y+SkrpQO4mWrFfp+En0QEE="; }; - "30" = { - version = "8.2.1"; - appHash = "sha256-xSJbfL5HI1bo5KYvk/ssEjSUsWF1hFQkl5MOm/kXYDE="; - modelHash = "sha256-O1gh3d0MGQOHUbrIyX3f+R7lGJ7+i8tTmrnfKlczrsk="; - }; }; currentVersionInfo = latestVersionForNc.${ncVersion} diff --git a/pkgs/servers/sql/postgresql/ext/omnigres.nix b/pkgs/servers/sql/postgresql/ext/omnigres.nix index b42885f42948..eca3b8721e85 100644 --- a/pkgs/servers/sql/postgresql/ext/omnigres.nix +++ b/pkgs/servers/sql/postgresql/ext/omnigres.nix @@ -21,13 +21,13 @@ let in postgresqlBuildExtension (finalAttrs: { pname = "omnigres"; - version = "0-unstable-2025-09-15"; + version = "0-unstable-2025-09-26"; src = fetchFromGitHub { owner = "omnigres"; repo = "omnigres"; - rev = "5535ce27d6c80b3e0cf891d93e3ee07af492346c"; - hash = "sha256-Ha5orh/6tvaNhGWmFpC/+ZV7WcD+nqkjwf3grhKUPys="; + rev = "247383198a95d045df0d97ece5a81adffb5c08e8"; + hash = "sha256-RrdtUtrs0Mh1VyMbF89qJhr2fnCVcQy2l1/85/mJ/4Y="; }; # This matches postInstall of PostgreSQL's generic.nix, which does this for the PGXS Makefile. diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index e0fd4ca55469..207e1577328c 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,13 +13,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.22.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; tag = finalAttrs.version; - hash = "sha256-6VXS/vTBXlFbEtzm7FfLBtD57GI+QHStDmFv2AvUdSs="; + hash = "sha256-SEuxHbSxgTC4Uk6nnznVzUqvoZMGgF+KSMNzkYfgfpI="; }; nativeBuildInputs = [ cmake ]; @@ -106,7 +106,7 @@ postgresqlBuildExtension (finalAttrs: { || # PostgreSQL 18 support issue upstream: https://github.com/timescale/timescaledb/issues/8233 # Check after next package update. - lib.warnIf (finalAttrs.version != "2.22.0") "Is postgresql18Packages.timescaledb still broken?" ( + lib.warnIf (finalAttrs.version != "2.22.1") "Is postgresql18Packages.timescaledb still broken?" ( lib.versionAtLeast postgresql.version "18" ); }; diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 5889a2270838..531ea7772604 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-jz9MFWkZBjiBu6jr1jp+bDpthB/OWE0pfrXhY5B08Jo="; + hash = "sha256-EpszwgYzobRA7LohtJJtgTefFAEmCXvcP3ilfsu+obo="; }; postPatch = '' diff --git a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix index d38ce32b8e06..1c1c68379677 100644 --- a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix +++ b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix @@ -6,13 +6,13 @@ }: buildFishPlugin { pname = "exercism-cli-fish-wrapper"; - version = "0-unstable-2025-09-04"; + version = "0-unstable-2025-09-28"; src = fetchFromGitHub { owner = "glennj"; repo = "exercism-cli-fish-wrapper"; - rev = "446420f62144aa6b1cbdd64d0429ba8bd4123dfc"; - hash = "sha256-HTRC47BMQaVkxXr2f81enL2Tr9ZoFN3X5RZdmAiGXtU="; + rev = "f6627c00324b2599239e3835af39adce04e1091c"; + hash = "sha256-bS1NN6oWi5j9uPwhuMApDRZlVYwOwlIC9NcdBZ9noL8="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 11b15ef56db4..333ea768fffe 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -6,13 +6,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "25.09.0"; + version = "25.10.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-hbPiuuiyPOCtnByInhoA0atVDwNaMRfzp1n9dusg59I="; + hash = "sha256-MG60GzRG0NFQsGXBXBedSweucxo88S/NACXTme7ixRM="; }; postInstall = '' diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index ed4abfb44125..f21a145db918 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -66,5 +66,6 @@ buildFishPlugin rec { euxane natsukium ]; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 7cd7257db484..bbd4c0a14f65 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -176,6 +176,7 @@ let "disallowedRequisites" "allowedReferences" "allowedRequisites" + "allowedImpureDLLs" ]; inherit (stdenv) @@ -198,6 +199,7 @@ let isLinux isDarwin isWindows + isCygwin isOpenBSD isStatic isMusl @@ -358,6 +360,8 @@ let sandboxProfile ? "", propagatedSandboxProfile ? "", + allowedImpureDLLs ? [ ], + hardeningEnable ? [ ], hardeningDisable ? [ ], @@ -479,6 +483,7 @@ let nativeBuildInputs ++ optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh ++ optional isWindows ../../build-support/setup-hooks/win-dll-link.sh + ++ optional isCygwin ../../build-support/setup-hooks/cygwin-dll-link.sh ++ optionals doCheck nativeCheckInputs ++ optionals doInstallCheck nativeInstallCheckInputs; @@ -701,6 +706,19 @@ let __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; } ) + // optionalAttrs (isWindows || isCygwin) ( + let + dlls = + allowedImpureDLLs + ++ lib.optionals isCygwin [ + "KERNEL32.dll" + "cygwin1.dll" + ]; + in + { + allowedImpureDLLs = if dlls != [ ] then dlls else null; + } + ) // ( if !__structuredAttrs then makeOutputChecks attrs diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index 45205734dd4c..cf09258d6fbc 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -279,7 +279,7 @@ in "-c" ": > $out" ]; - system = builtins.currentSystem; + inherit (stdenv.buildPlatform) system; }; dep2 = derivation { name = "dep2"; @@ -288,7 +288,7 @@ in "-c" ": > $out" ]; - system = builtins.currentSystem; + inherit (stdenv.buildPlatform) system; }; passAsFile = [ "dep2" ]; }) @@ -319,7 +319,7 @@ in "-c" ": > $out" ]; - system = builtins.currentSystem; + inherit (stdenv.buildPlatform) system; }; dep2 = derivation { name = "dep2"; @@ -328,7 +328,7 @@ in "-c" ": > $out" ]; - system = builtins.currentSystem; + inherit (stdenv.buildPlatform) system; }; name = "meow"; outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; @@ -386,7 +386,7 @@ in ensure-no-execve-in-setup-sh = derivation { name = "ensure-no-execve-in-setup-sh"; - system = stdenv.system; + inherit (stdenv.hostPlatform) system; builder = "${stdenv.bootstrapTools}/bin/bash"; PATH = "${pkgs.strace}/bin:${stdenv.bootstrapTools}/bin"; initialPath = [ diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 1dd6b48baec9..ec13f65c70b5 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,24 +1,24 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.197.0"; + version = "3.198.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.197.0-linux-x64.tar.gz"; - sha256 = "1hmcaiw85w25cfwvxdj99jdrw2bg3n6ij64rcymkshiavhsqi29h"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.198.0-linux-x64.tar.gz"; + sha256 = "07sz2787ycqivv7bd0j1rd2i24ax3w6rm7d1w4fani4999jifxsn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.1-linux-amd64.tar.gz"; - sha256 = "0kch5qyyd7b1kw6nk1z5k6qbj6frhcrj60v1mlq17b8pcj2r8rj2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.43.0-linux-amd64.tar.gz"; + sha256 = "01h8n6dqwzavqr6xgir42gv7fvcplkr270gqcfr6h21a3wi2vrrr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.1.0-linux-amd64.tar.gz"; sha256 = "1065l1ahklhl9b8f4lkaa6lv748lqqhpv8w3crgnznddnrz0g1sn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.85.0-linux-amd64.tar.gz"; - sha256 = "1bdmay56vhl6y0b6hdxlyy5j07z1ccl6n8mb39pywsxa242z3m1q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-linux-amd64.tar.gz"; + sha256 = "10mz7gv2bm93hvkvqvhsvqhkcziyci2wbxmqj9ggplgv44k49w68"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-linux-amd64.tar.gz"; @@ -32,10 +32,6 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-linux-amd64.tar.gz"; sha256 = "0f1vlzn3dagn78h2c07q573k1bshg47iz5x7bq1a44x1yjmkh3il"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-linux-amd64.tar.gz"; - sha256 = "0d0i764g4gcj6k5q94hi8pyd4822di1p2qz1kd1np9clhazghsc6"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-amd64.tar.gz"; sha256 = "1kvcw8163ghfnrdgc2rzvhfc9npfql7c2d6y6p32j6arwf7h2k4m"; @@ -44,6 +40,10 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-linux-amd64.tar.gz"; sha256 = "0r0s72v99wx2ggb45ifs0hjy76nq8aa6z66zlxjb8wgda3yrsldz"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-linux-amd64.tar.gz"; + sha256 = "0d0i764g4gcj6k5q94hi8pyd4822di1p2qz1kd1np9clhazghsc6"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.1-linux-amd64.tar.gz"; sha256 = "1d346bnzp503zzmmw2pck6sdsf7y1l3f6lalahl00rz4v1dp04y9"; @@ -61,8 +61,8 @@ sha256 = "1vd4wcpkwb01wb3916nna3wwqhbym234jj6ggyayw0mawhrx52rm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.8.2-linux-amd64.tar.gz"; - sha256 = "17xhgz6y2z78f2091brm4jslk783dmc3lvaxksi4j8ii6gi2ka0h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-linux-amd64.tar.gz"; + sha256 = "0b311liad597gbdk1yb5b2yyyxxr0kjgav1rbs1ans7fyfbp05kl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "0sm8gqay51g12l20n08pih9vhpm2b95aj71zj6nmqiq5gym89v6z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.0.0-linux-amd64.tar.gz"; - sha256 = "0lplnrxv7s55hwhlngpiakyp488zmidyplz7csb2grh7zyr9z7lb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.1.0-linux-amd64.tar.gz"; + sha256 = "11fva4n24v97fhdi0fncf16f8f332fww9yp8y098xpndjrp7wmgi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-amd64.tar.gz"; @@ -89,8 +89,8 @@ sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.24.0-linux-amd64.tar.gz"; - sha256 = "0f17cii2cnq3l3nhgxna76y2x0fxq2zwny1mgh33k11qkn43wllh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-linux-amd64.tar.gz"; + sha256 = "02dwixm2islad74jm7d3b7n1a9lsrm028np4j47s0959hmkqq7c1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-amd64.tar.gz"; @@ -133,8 +133,8 @@ sha256 = "0pppwgwl726rfy92fnya9afj3cciw13vzs9r60w2477i3250slqj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.21.1-linux-amd64.tar.gz"; - sha256 = "1lj0rrkvx97yqhvd0hbs5i0xf0n0spzmsfdaks5k3q1fvq4k1814"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.22.0-linux-amd64.tar.gz"; + sha256 = "1m4nyymbsdjnzqb389b98g0vcyz5cdyzrdr38i5dl70mah89c2kz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.2-linux-amd64.tar.gz"; @@ -163,20 +163,20 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.197.0-darwin-x64.tar.gz"; - sha256 = "1wimcyjv7ajv53hzy11l31af4lkk1vx17s09d78h06n1h8c2skf9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.198.0-darwin-x64.tar.gz"; + sha256 = "0761kk4kqxbwdfbr0k1r5ypd2aq251bsqwkq6d8n2m2k3ziq48ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.1-darwin-amd64.tar.gz"; - sha256 = "19099svjn5bmbpcm80ad00n98k9y87f1lms6r8j8digb91c88b42"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.43.0-darwin-amd64.tar.gz"; + sha256 = "19hrkc6mb9qqbv5la9hgsqw0mygsbmc7pfmgsfi3ygw3yssa2mkg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.1.0-darwin-amd64.tar.gz"; sha256 = "0kaa0wzf03j0s1wq3xw50yknai0qbkw2x2xjrxmw26x7y243f143"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.85.0-darwin-amd64.tar.gz"; - sha256 = "1hf7cbagw75cssml8jimnwsrafxfhgzs01l6jcjmhqzbjzv78avl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-darwin-amd64.tar.gz"; + sha256 = "1b8lwjbvppj7ssncfwqync169ydz7m8wx3zkxdvc8yw4ggcl2kxs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-darwin-amd64.tar.gz"; @@ -190,10 +190,6 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-darwin-amd64.tar.gz"; sha256 = "1a2pqy80034xm7syg6hfswrgj1bbvh643bllc5gfc7270p7vx05i"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-darwin-amd64.tar.gz"; - sha256 = "1fcy2ygwyd80kfrc45v51101gs79w0cphix4y7bmjrszg3aj695a"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-amd64.tar.gz"; sha256 = "1cdpx3540y3kp76ml1qi0awfzvm3172bzc76khdbsdcz9b8f3kb7"; @@ -202,6 +198,10 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-darwin-amd64.tar.gz"; sha256 = "124fk2mxxzc06dav25kk1wn8gqrys6607gg3nm53fk813wx76zg6"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-darwin-amd64.tar.gz"; + sha256 = "1fcy2ygwyd80kfrc45v51101gs79w0cphix4y7bmjrszg3aj695a"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.1-darwin-amd64.tar.gz"; sha256 = "1rp4gvflvjznb9n7r5w1mgfy1vs6cby1irdprajvjaal9cxi044x"; @@ -219,8 +219,8 @@ sha256 = "1vpp01zh6g2p3s1x061hrkzl83qcahf5mw6cdhl0m0h425mbzvam"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.8.2-darwin-amd64.tar.gz"; - sha256 = "1yh74dk52b21nhpvfxmqf033b4n1pavhb4fmsaq1g1j37vzxpcxb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-darwin-amd64.tar.gz"; + sha256 = "0db5b2dp9gaklqqm2l90ssk1jpgvffl9l1250axjl6q132ga380v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "12yzgpz05pf1y401p94p063c2yj8i5mlmy5bxdd69n4537z17z02"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.0.0-darwin-amd64.tar.gz"; - sha256 = "06iqgrq9mb1zcjjzgksyv7mmyc4z1lg6p3zyk60nqs5lm0524c52"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.1.0-darwin-amd64.tar.gz"; + sha256 = "10sdr0bdg05w8gx3kbvx45d9f62akwj52gssfp8ihd6las87f2by"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-amd64.tar.gz"; @@ -247,8 +247,8 @@ sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.24.0-darwin-amd64.tar.gz"; - sha256 = "0ccsm2i69vcbwr9yvs3bh3jsmjq7h490aj3i2n3qq96yyb65fd3f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-darwin-amd64.tar.gz"; + sha256 = "1q3nhm48rdxh2br72l8lgdks5m869v2ia67gwchkzsjjrjiysbqh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-amd64.tar.gz"; @@ -291,8 +291,8 @@ sha256 = "1jpcyp3lqiz4aab331x7shhqxzp4m6nz68vhkyqksvdplzr9rj44"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.21.1-darwin-amd64.tar.gz"; - sha256 = "0l4fzbsmy3kw223jq4vssggnxzbjp2cl7iwi9qzfxlf17b5kdbjy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.22.0-darwin-amd64.tar.gz"; + sha256 = "1vk28vsx7ay73dalgp0nisp293g2all38afw92wvfgxcbdjzdssd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.2-darwin-amd64.tar.gz"; @@ -321,20 +321,20 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.197.0-linux-arm64.tar.gz"; - sha256 = "10kld27ads85x0axi3y5fdsak0sh0rj7fmwmfhckixqckfqiqqcm"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.198.0-linux-arm64.tar.gz"; + sha256 = "1akffqaycds6bhz8767bh7g00cd09nnm7rlwxff5606i5ciji3ib"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.1-linux-arm64.tar.gz"; - sha256 = "1h6ff687hi6kvmma8gifgk13n05nvrr2d58c50kky6k5y0c1m5jn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.43.0-linux-arm64.tar.gz"; + sha256 = "16zq0w0l7ivslvgijpf8iy0c6fjs56p5f0nr9rjavgc4k3kvjzyg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.1.0-linux-arm64.tar.gz"; sha256 = "0lsyrcyfl29313pas8gch8lqmmh9irqcyaailzf531i0r75yi6xc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.85.0-linux-arm64.tar.gz"; - sha256 = "16fr46kvi83qcy56lnp626mjifjsq00djz827hvgrbb08b3ha77l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-linux-arm64.tar.gz"; + sha256 = "11hbjq49a1znx38xk81q2gp2pdq99c8sz166xxb2cmrv84bm2xfi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-linux-arm64.tar.gz"; @@ -348,10 +348,6 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-linux-arm64.tar.gz"; sha256 = "1a21bl4h9xwdlajhmks8wqd8v7fbnc0i66vx515p6l6mx1shrshv"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-linux-arm64.tar.gz"; - sha256 = "07zxxn4clplr90iamngk0xi6gkh88c8jvbipfly50xgv6s0s9b93"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-arm64.tar.gz"; sha256 = "17lndnmwmxshxz7n2zhgc07gr8cqfd06b1mgblyzbx8n2lc0x0sv"; @@ -360,6 +356,10 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-linux-arm64.tar.gz"; sha256 = "0mmkjim8q5wh0mikwjw3qzg87hm845777jyisz7256p211nrsmyx"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-linux-arm64.tar.gz"; + sha256 = "07zxxn4clplr90iamngk0xi6gkh88c8jvbipfly50xgv6s0s9b93"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.1-linux-arm64.tar.gz"; sha256 = "1zl13k3ijb34jb0izm79jpqwwpj8g2r3f65sfc4yk6w2hjg8r90z"; @@ -377,8 +377,8 @@ sha256 = "033lry88mpn9vfqim26hkjg13dc0jl9sqn28zhld1asx7sqbck3y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.8.2-linux-arm64.tar.gz"; - sha256 = "147j869ysd9984mdl1hg70b9gmfl6a7cn255nnxa0rgvk15kcggb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-linux-arm64.tar.gz"; + sha256 = "17gzapyqzj51nxza2wc4s2n9vgi52fzz6h84mn4k1vskvfvbpccs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "0f4bxwj7liyijbsqh0r43s823n02gvpkk0rdxwhg1li4d1mpsqxp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.0.0-linux-arm64.tar.gz"; - sha256 = "1c6mdpbbii600gabjpd1xn0ja4cf4vaypcwv8j2cbq08kb1gry2b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.1.0-linux-arm64.tar.gz"; + sha256 = "0qfpl3qx4gcq37wb4s3gppxb8nzy6vm7ml8zhzdr8077xa3faiis"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-arm64.tar.gz"; @@ -405,8 +405,8 @@ sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.24.0-linux-arm64.tar.gz"; - sha256 = "1llc16iwm347wi1gl15rngry5vbbh0w01d65l9ivn5r7ziwdchfg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-linux-arm64.tar.gz"; + sha256 = "0lxxdqx9g9zd0m3zzpgfcwv3h51sigzldh5fzrn2m6pnqniamqbw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-arm64.tar.gz"; @@ -449,8 +449,8 @@ sha256 = "0glljz03v764n53n5l33ji64vj86ipdv5bkr03ijl8wrc22j5syy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.21.1-linux-arm64.tar.gz"; - sha256 = "0qnh0xmv0mgnk8xz9gwkmx94s43qbg7nig79h7sn5rpqd4bj63qz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.22.0-linux-arm64.tar.gz"; + sha256 = "1g1i84wn4im0xk7xn2phpmqqvgc4168mz98xicylk18p17645pfz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.2-linux-arm64.tar.gz"; @@ -479,20 +479,20 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.197.0-darwin-arm64.tar.gz"; - sha256 = "0i7nwdn123n8hw98yqsc949i8ky5wi0dp7ndy5wg6p4r6lldyzbk"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.198.0-darwin-arm64.tar.gz"; + sha256 = "1nbpmrrwc10xp6529vbir40ig0j6vgn524005b2h886cr598j2xg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.1-darwin-arm64.tar.gz"; - sha256 = "0kzwjwjgkbs8glk94qy9jiw83b8dq2xikdb5wb40wqnssy6lm62v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.43.0-darwin-arm64.tar.gz"; + sha256 = "1z73gyijysdm04qzjlxnzrwb7x2mpp7wp0nbrj2gidgck2zhdppp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.1.0-darwin-arm64.tar.gz"; sha256 = "1jg74cslbxh741r19z8p4p9sgyn0qlf9vqd8gfdjv5cxa7phl2bm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.85.0-darwin-arm64.tar.gz"; - sha256 = "08pwk72k8iyf8vjkz8vs03fbwmy45y3073hvlfhmmjz1j41rs8xa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-darwin-arm64.tar.gz"; + sha256 = "1cglc5a507fy973wkk062wd22yn1pwn1pdn2laqqlk0n6y1hp33y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-darwin-arm64.tar.gz"; @@ -506,10 +506,6 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-darwin-arm64.tar.gz"; sha256 = "03fms51zwzwgd8bzn56y7kagnznvx9ghsxp5k4l76lafb8sz148i"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-darwin-arm64.tar.gz"; - sha256 = "19k6nz8idbc80x5fqp9vbc6rfd89m3aj52m33sw6x47fc98fim5b"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-arm64.tar.gz"; sha256 = "0b4srhyq2adbpzh74s0kcmfflayrk6c7jbq63s2l3zfq2zln4sbm"; @@ -518,6 +514,10 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-darwin-arm64.tar.gz"; sha256 = "00gahf4jlihzywbsd7rmw73jrnjfdsqxhag4qm7ms90gwl5qspa4"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-darwin-arm64.tar.gz"; + sha256 = "19k6nz8idbc80x5fqp9vbc6rfd89m3aj52m33sw6x47fc98fim5b"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.1-darwin-arm64.tar.gz"; sha256 = "078cyrbvf5xpdvv5lmwfv22msj5a1ljbbqzvgf44c07ggg1m1gyg"; @@ -535,8 +535,8 @@ sha256 = "0v50vs1d1cm6dgfjz9adzka34hbws3j6hwr1s3vxk6f6apx9p3x0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.8.2-darwin-arm64.tar.gz"; - sha256 = "0kd9wp3g2lfcrisp0v443cb2ih6wgx8p40mg0j0fy50rb0hmaqlk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-darwin-arm64.tar.gz"; + sha256 = "1r5i5hfq3qxic61fwz1m3s1lfcr60xkzkg4y8mqgp5vmfsgahqz7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "0a1fy15bf66gvy7jvimbnycxb51z85svrpa9flly1ch3g7276w60"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.0.0-darwin-arm64.tar.gz"; - sha256 = "0wgcr59bi1diviw77xbfqy1i51pa3w817ajcbmd748r3hh3x9nyq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.1.0-darwin-arm64.tar.gz"; + sha256 = "0gd71mnkmdcl79k5pxhg79ja8waamrc72fndxnfk00wlw94n2wq3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-arm64.tar.gz"; @@ -563,8 +563,8 @@ sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.24.0-darwin-arm64.tar.gz"; - sha256 = "056hhrdfclvy5l5dvhlrjw2dd5d6gl4ph9c4mhkmrx0mvrjax7zl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-darwin-arm64.tar.gz"; + sha256 = "17dr3i20y5f120mq4b8j85jwb5xwid3bbpw2vdfc1qgs1ib17yav"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-arm64.tar.gz"; @@ -607,8 +607,8 @@ sha256 = "1c4pn5nr8d97n9bqd7vz9gzlbi50hnfjylwwch445ylqp5l8gvqf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.21.1-darwin-arm64.tar.gz"; - sha256 = "0fafswdlzk0d8q8rcnzvlmzfygssyh3xjk33i8c3c6p3b6q3xksd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.22.0-darwin-arm64.tar.gz"; + sha256 = "05w2w7fjyhkfcb08gncyrl36ynay09qc2zrd9g0ykprcpps61h30"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.2.2-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/misc/qt6ct/default.nix b/pkgs/tools/misc/qt6ct/default.nix index 5fb7301afd4e..04fdb056b67c 100644 --- a/pkgs/tools/misc/qt6ct/default.nix +++ b/pkgs/tools/misc/qt6ct/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qt6ct"; - version = "0.10"; + version = "0.11"; src = fetchFromGitLab { domain = "www.opencode.net"; owner = "trialuser"; repo = "qt6ct"; tag = finalAttrs.version; - hash = "sha256-o2k/b4AGiblS1CkNInqNrlpM1Y7pydIJzEVgVd3ao50="; + hash = "sha256-aQmqLpM0vogMsYaDS9OeKVI3N53uY4NBC4FF10hK8Uw="; }; nativeBuildInputs = [ @@ -34,10 +34,9 @@ stdenv.mkDerivation (finalAttrs: { qtwayland ]; - postPatch = '' - substituteInPlace src/qt6ct-qtplugin/CMakeLists.txt src/qt6ct-style/CMakeLists.txt \ - --replace-fail "\''${PLUGINDIR}" "$out/${qtbase.qtPluginPrefix}" - ''; + cmakeFlags = [ + (lib.cmakeFeature "PLUGINDIR" "${placeholder "out"}/${qtbase.qtPluginPrefix}") + ]; meta = { description = "Qt6 Configuration Tool"; diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix index 39c354a100ed..b642886289cf 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "steampipe-plugin-aws"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-aws"; tag = "v${version}"; - hash = "sha256-T4Qew3GgJbgyNrx5oSXLtfA8ilfegybJqJ+zx0jLf7E="; + hash = "sha256-01eF1hs36dSdwT1PfvKeuRUBAA7CZTBFxEP53mvU4mw="; }; vendorHash = "sha256-9Kl4aTQQNQVIkFTLnXVEyN5WYxgihSeYlnL/r/vsGKU="; diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix index 63a869fae06f..322a69bc72cb 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix @@ -45,7 +45,7 @@ buildGoModule rec { homepage = "https://github.com/turbot/steampipe-plugin-azure"; license = lib.licenses.apsl20; longDescription = "Use SQL to instantly query Azure resources across regions and subscriptions."; - maintainers = with lib.maintainers; [ petee ]; + maintainers = with lib.maintainers; [ ]; platforms = steampipe.meta.platforms; }; } diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix index ef6720116328..caf9d5862671 100644 --- a/pkgs/tools/networking/flannel/plugin.nix +++ b/pkgs/tools/networking/flannel/plugin.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.7.1-flannel2"; + version = "1.8.0-flannel1"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-vKHkgdmfG7jf0avwcJsNNCYlERH71ULPBHI3ObtwrIM="; + sha256 = "sha256-DaE8T/c1n5Mx/MvPXw+bXO+91Ux/bcWWAdbVmNhQXIo="; }; - vendorHash = "sha256-hDodGat/aZyDSRHN6K4J8Pq9LFlclbnEmYVwxCbraKk="; + vendorHash = "sha256-x4QoAXrMhzEqSNBvWl3/9Lb4JjDgwcoV9a0xEYcwKFI="; ldflags = [ "-s" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9be2aa75960a..5f685ed79471 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -431,6 +431,7 @@ mapAliases { alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2024-10-17 alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17 amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30 + amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20 angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17 animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 @@ -507,6 +508,7 @@ mapAliases { baserow = throw "baserow has been removed, due to lack of maintenance"; # Added 2025-08-02 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 + barrier = throw "'barrier' has been removed as it is unmaintained. Consider 'deskflow' or 'input-leap' instead."; # Added 2025-09-29 bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19 bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09 bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19 @@ -580,6 +582,7 @@ mapAliases { cask = emacs.pkgs.cask; # Added 2022-11-12 catcli = throw "catcli has been superseded by gocatcli"; # Added 2025-04-19 canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 + cardboard = throw "cardboard has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 cargo-espflash = espflash; # Added 2024-02-09 cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 @@ -600,6 +603,7 @@ mapAliases { challenger = taler-challenger; # Added 2024-09-04 charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18 + chatgpt-retrieval-plugin = throw "chatgpt-retrieval-plugin has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03 check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03 check_zfs = nagiosPlugins.check_zfs; # Added 2024-05-03 @@ -733,6 +737,7 @@ mapAliases { deadpixi-sam = deadpixi-sam-unstable; debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17 deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21 + deepsea = throw "deepsea has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11 deltachat-cursed = arcanechat-tui; # added 2025-02-25 deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17 @@ -1042,11 +1047,11 @@ mapAliases { svn_all_fast_export = svn-all-fast-export; # Added 2021-01-14 topGit = top-git; # Added 2021-01-14 }; - github-copilot-cli = throw "'github-copilot-cli' has been removed because GitHub has replaced it with 'gh-copilot'."; # Added 2025-06-01 gitversion = throw "'gitversion' has been removed because it produced a broken build and was unmaintained"; # Added 2025-08-30 givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07 givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07 gkraken = throw "'gkraken' has been deprecated by upstream. Consider using the replacement 'coolercontrol' instead."; # Added 2024-11-22 + glabels = throw "'glabels' has been removed because it is no longer maintained. Consider using 'glabels-qt', which is an active fork."; # Added 2025-09-16 glaxnimate = kdePackages.glaxnimate; # Added 2025-09-17 glew-egl = lib.warnOnInstantiate "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11 glfw-wayland = glfw; # Added 2024-04-19 @@ -1251,6 +1256,7 @@ mapAliases { kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 + kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17 keepkey_agent = keepkey-agent; # added 2024-01-06 @@ -1713,6 +1719,7 @@ mapAliases { mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23 moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30 moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30 + morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26 moz-phab = mozphab; # Added 2022-08-09 mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 @@ -1743,6 +1750,7 @@ mapAliases { namazu = throw "namazu has been removed, as it was broken"; # Added 2025-08-25 nanoblogger = throw "nanoblogger has been removed as upstream stopped developement in 2013"; # Added 2025-09-10 ncdu_2 = ncdu; # Added 2022-07-22 + neardal = throw "neardal has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29 neocities-cli = neocities; # Added 2024-07-31 neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28 netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 @@ -1769,6 +1777,18 @@ mapAliases { nettools = net-tools; # Added 2025-06-11 newt-go = fosrl-newt; # Added 2025-06-24 notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25 + nextcloud30 = throw '' + Nextcloud v30 has been removed from `nixpkgs` as the support for is dropped + by upstream in 2025-09. Please upgrade to at least Nextcloud v31 by declaring + + services.nextcloud.package = pkgs.nextcloud31; + + in your NixOS config. + + WARNING: if you were on Nextcloud 29 you have to upgrade to Nextcloud 30 + first on 25.05 because Nextcloud doesn't support upgrades across multiple major versions! + ''; # Added 2025-09-25 + nextcloud30Packages = throw "Nextcloud 30 is EOL!"; # Added 2025-09-25 nextcloud29 = throw '' Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped by upstream in 2025-04. Please upgrade to at least Nextcloud v30 by declaring @@ -1865,6 +1885,7 @@ mapAliases { nomad_1_6 = throw "nomad_1_6 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 nomad_1_7 = throw "nomad_1_7 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27 nomad_1_8 = throw "nomad_1_8 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27 + norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29 noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 @@ -1985,6 +2006,7 @@ mapAliases { partition-manager = makePlasma5Throw "partitionmanager"; # Added 2024-01-08 patchelfStable = patchelf; # Added 2024-01-25 paup = paup-cli; # Added 2024-09-11 + pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23 pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29 pcsctools = pcsc-tools; # Added 2023-12-07 pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 @@ -2133,6 +2155,7 @@ mapAliases { protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18 protonup = protonup-ng; # Added 2022-11-06 protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 + proton-caller = throw "'proton-caller' has been removed from nixpkgs due to being unmaintained and lack of upstream maintenance."; # Added 2025-09-25 proton-vpn-local-agent = lib.warnOnInstantiate "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'" ( python3Packages.toPythonApplication python3Packages.proton-vpn-local-agent ); # Added 2025-04-23 @@ -2483,6 +2506,8 @@ mapAliases { tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20 thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30 + thunderbird-128 = throw "Thunderbird 128 support ended in August 2025"; + thunderbird-128-unwrapped = throw "Thunderbird 128 support ended in August 2025"; invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 ticpp = throw "'ticpp' has been removed due to being unmaintained"; # Added 2025-09-10 tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27 @@ -2701,6 +2726,7 @@ mapAliases { xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18 xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15 xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10 + xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28 xorg-autoconf = util-macros; # Added 2025-08-18 xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 @@ -2792,7 +2818,7 @@ mapAliases { openbsdCross = openbsd; # Added 2024-09-06 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: - llvmPackages_latest = llvmPackages_20; + llvmPackages_latest = llvmPackages_21; /* If these are in the scope of all-packages.nix, they cause collisions diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94d4ab7da850..bb0befcf03b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2251,10 +2251,6 @@ with pkgs; patool = with python3Packages; toPythonApplication patool; - pocket-casts = callPackage ../by-name/po/pocket-casts/package.nix { - electron = electron_35; - }; - pixcat = with python3Packages; toPythonApplication pixcat; pyznap = python3Packages.callPackage ../tools/backup/pyznap { }; @@ -3062,10 +3058,6 @@ with pkgs; haste-client = callPackage ../tools/misc/haste-client { }; - hal-hardware-analyzer = - libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer - { }; - halide = callPackage ../development/compilers/halide { llvmPackages = llvmPackages_19; }; @@ -3610,11 +3602,9 @@ with pkgs; libnma-gtk4 = libnma.override { withGtk4 = true; }; inherit (callPackages ../servers/nextcloud { }) - nextcloud30 nextcloud31 ; - nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; }; nextcloud31Packages = callPackage ../servers/nextcloud/packages { ncVersion = "31"; }; nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { }; @@ -3809,10 +3799,6 @@ with pkgs; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; - parallel = callPackage ../tools/misc/parallel { }; - - parallel-full = callPackage ../tools/misc/parallel/wrapper.nix { }; - parcellite = callPackage ../tools/misc/parcellite { }; patchutils = callPackage ../tools/text/patchutils { }; @@ -4606,7 +4592,7 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - inherit (coqPackages_8_20) compcert; + inherit (coqPackages_9_0) compcert; computecpp = wrapCCWith rec { cc = computecpp-unwrapped; @@ -4815,7 +4801,7 @@ with pkgs; isl = if !stdenv.hostPlatform.isDarwin then isl_0_20 else null; withoutTargetLibc = true; - langCC = false; + langCC = stdenv.targetPlatform.isCygwin; # can't compile libcygwin1.a without C++ libcCross = libc1; targetPackages.stdenv.cc.bintools = binutilsNoLibc; enableShared = @@ -4824,6 +4810,7 @@ with pkgs; # temporarily disabled due to breakage; # see https://github.com/NixOS/nixpkgs/pull/243249 && !stdenv.targetPlatform.isWindows + && !stdenv.targetPlatform.isCygwin && !(stdenv.targetPlatform.useLLVM or false); }; bintools = binutilsNoLibc; @@ -5193,6 +5180,7 @@ with pkgs; openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; }; openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; }; openjfx24 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "24"; }; + openjfx25 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "25"; }; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; openjdk8 = javaPackages.compiler.openjdk8; @@ -5229,6 +5217,11 @@ with pkgs; jdk24 = openjdk24; jdk24_headless = openjdk24_headless; + openjdk25 = javaPackages.compiler.openjdk25; + openjdk25_headless = javaPackages.compiler.openjdk25.headless; + jdk25 = openjdk25; + jdk25_headless = openjdk25_headless; + # default JDK jdk = jdk21; jdk_headless = jdk21_headless; @@ -5243,21 +5236,34 @@ with pkgs; jre = jdk; jre_headless = jdk_headless; - jre11_minimal = callPackage ../development/compilers/openjdk/jre.nix { - jdk = jdk11; - jdkOnBuild = buildPackages.jdk11; - }; - jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix { - jdk = jdk17; - jdkOnBuild = buildPackages.jdk17; - }; - jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix { - jdk = jdk21; - jdkOnBuild = buildPackages.jdk21; - }; - jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { - jdkOnBuild = buildPackages.jdk; - }; + inherit + ({ + jre11_minimal = callPackage ../development/compilers/openjdk/jre.nix { + jdk = jdk11; + jdkOnBuild = buildPackages.jdk11; + }; + jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix { + jdk = jdk17; + jdkOnBuild = buildPackages.jdk17; + }; + jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix { + jdk = jdk21; + jdkOnBuild = buildPackages.jdk21; + }; + jre25_minimal = callPackage ../development/compilers/openjdk/jre.nix { + jdk = jdk25; + jdkOnBuild = buildPackages.jdk25; + }; + jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { + jdkOnBuild = buildPackages.jdk; + }; + }) + jre11_minimal + jre17_minimal + jre21_minimal + jre25_minimal + jre_minimal + ; openjdk = jdk; openjdk_headless = jdk_headless; @@ -6144,6 +6150,7 @@ with pkgs; ruby_3_2 ruby_3_3 ruby_3_4 + ruby_3_5 ; ruby = ruby_3_3; @@ -6153,6 +6160,7 @@ with pkgs; rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems; rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems; rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems; + rubyPackages_3_5 = recurseIntoAttrs ruby_3_5.gems; samplebrain = libsForQt5.callPackage ../applications/audio/samplebrain { }; @@ -7284,7 +7292,6 @@ with pkgs; # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) - amdvlk intel-media-driver intel-vaapi-driver mesa @@ -7495,6 +7502,8 @@ with pkgs; windows.mingw_w64_headers or fallback else if libc == "nblibc" then netbsd.headers + else if libc == "cygwin" then + cygwin.newlib-cygwin-headers else null; @@ -7531,6 +7540,8 @@ with pkgs; if stdenv.hostPlatform.isMinGW then windows.mingw_w64 else windows.sdk else if libc == "ucrt" then if stdenv.hostPlatform.isMinGW then windows.mingw_w64 else windows.sdk + else if libc == "cygwin" then + cygwin.newlib-cygwin-nobin else if libc == "libSystem" then if stdenv.hostPlatform.useiOSPrebuilt then darwin.iosSdkPkgs.libraries else darwin.libSystem else if libc == "fblibc" then @@ -9913,7 +9924,6 @@ with pkgs; callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; prometheus-mongodb-exporter = callPackage ../servers/monitoring/prometheus/mongodb-exporter.nix { }; - prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix @@ -10630,6 +10640,8 @@ with pkgs; windows = recurseIntoAttrs (callPackages ../os-specific/windows { }); + cygwin = recurseIntoAttrs (callPackages ../os-specific/cygwin { }); + wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; @@ -10984,8 +10996,6 @@ with pkgs; backintime = backintime-qt; - barrier = libsForQt5.callPackage ../applications/misc/barrier { }; - bespokesynth-with-vst2 = bespokesynth.override { enableVST2 = true; }; @@ -11588,8 +11598,6 @@ with pkgs; huggle = libsForQt5.callPackage ../applications/misc/huggle { }; - hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { }; - hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; jackline = callPackage ../applications/networking/instant-messengers/jackline { @@ -11855,10 +11863,6 @@ with pkgs; callPackage ../applications/networking/cluster/kubectl-view-allocations { }; - kubelogin-oidc = callPackage ../by-name/ku/kubelogin-oidc/package.nix { - buildGoModule = buildGo124Module; - }; - kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; @@ -12851,9 +12855,6 @@ with pkgs; thunderbird-esr-unwrapped = thunderbirdPackages.thunderbird-esr; thunderbird-esr = wrapThunderbird thunderbird-esr-unwrapped { }; - thunderbird-128-unwrapped = thunderbirdPackages.thunderbird-128; - thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { }; - thunderbird-140-unwrapped = thunderbirdPackages.thunderbird-140; thunderbird-140 = wrapThunderbird thunderbirdPackages.thunderbird-140 { }; @@ -13906,18 +13907,6 @@ with pkgs; warsow = callPackage ../games/warsow { }; - wesnoth = callPackage ../games/wesnoth { - boost = boost186; - # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234 - lua = lua5_4.override { - postConfigure = '' - makeFlagsArray+=("CC=$CXX") - ''; - }; - }; - - wesnoth-dev = wesnoth; - inherit (callPackage ../games/xonotic { }) xonotic-data xonotic diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index c3c78e9d3e80..a9e58d9c4e3f 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -105,6 +105,40 @@ let ''; }; + gitConfig = mkOption { + type = types.attrsOf (types.attrsOf types.anything); + description = '' + The default [git configuration](https://git-scm.com/docs/git-config#_variables) for all [`pkgs.fetchgit`](#fetchgit) calls. + + Among many other potential uses, this can be used to override URLs to point to local mirrors. + + Changing this will not cause any rebuilds because `pkgs.fetchgit` produces a [fixed-output derivation](https://nix.dev/manual/nix/stable/glossary.html?highlight=fixed-output%20derivation#gloss-fixed-output-derivation). + + To set the configuration file directly, use the [`gitConfigFile`](#opt-gitConfigFile) option instead. + + To set the configuration file for individual calls, use `fetchgit { gitConfigFile = "..."; }`. + ''; + default = { }; + example = { + url."https://my-github-mirror.local".insteadOf = [ "https://github.com" ]; + }; + }; + + # A rendered version of gitConfig that can be reused by all pkgs.fetchgit calls + gitConfigFile = mkOption { + type = types.nullOr types.path; + description = '' + A path to a [git configuration](https://git-scm.com/docs/git-config#_variables) file, to be used for all [`pkgs.fetchgit`](#fetchgit) calls. + + This overrides the [`gitConfig`](#opt-gitConfig) option, see its documentation for more details. + ''; + default = + if config.gitConfig != { } then + builtins.toFile "gitconfig" (lib.generators.toGitINI config.gitConfig) + else + null; + }; + doCheckByDefault = mkMassRebuild { feature = "run `checkPhase` by default"; }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 770a29df445e..f0095f5be91b 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -50,6 +50,7 @@ with pkgs; openjdk21 = mkOpenjdk "21"; openjdk23 = mkOpenjdk "23"; openjdk24 = mkOpenjdk "24"; + openjdk25 = mkOpenjdk "25"; # Legacy aliases openjdk8-bootstrap = temurin-bin.jdk-8; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index a6ea94c70478..b401629cda1b 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -129,6 +129,8 @@ let netflix = callPackage ../applications/video/kodi/addons/netflix { }; + plex-for-kodi = callPackage ../applications/video/kodi/addons/plex-for-kodi { }; + orftvthek = callPackage ../applications/video/kodi/addons/orftvthek { }; radioparadise = callPackage ../applications/video/kodi/addons/radioparadise { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 0369355da714..1faba9a7f1b5 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -375,7 +375,11 @@ in bbswitch = callPackage ../os-specific/linux/bbswitch { }; - bcachefs = callPackage ../os-specific/linux/bcachefs-kernel-module { }; + # NOTE: The bcachefs module is called this way to facilitate + # easy overriding, as it is expected many users will want to + # pull from the upstream git repo, which may include + # unreleased changes to the module build process. + bcachefs = callPackage pkgs.bcachefs-tools.kernelModule { }; ch9344 = callPackage ../os-specific/linux/ch9344 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 868443a35ce2..9cf17237c5b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2398,6 +2398,8 @@ self: super: with self; { }; }; + catkin-pkg = callPackage ../development/python-modules/catkin-pkg { }; + catppuccin = callPackage ../development/python-modules/catppuccin { }; cattrs = callPackage ../development/python-modules/cattrs { }; @@ -2885,8 +2887,12 @@ self: super: with self; { colout = callPackage ../development/python-modules/colout { }; + comet-ml = callPackage ../development/python-modules/comet-ml { }; + cometblue-lite = callPackage ../development/python-modules/cometblue-lite { }; + cometx = callPackage ../development/python-modules/cometx { }; + comicapi = callPackage ../development/python-modules/comicapi { }; comicon = callPackage ../development/python-modules/comicon { }; @@ -4861,6 +4867,8 @@ self: super: with self; { events = callPackage ../development/python-modules/events { }; + everett = callPackage ../development/python-modules/everett { }; + evohome-async = callPackage ../development/python-modules/evohome-async { }; evolutionhttp = callPackage ../development/python-modules/evolutionhttp { }; @@ -7261,6 +7269,8 @@ self: super: with self; { irisclient = callPackage ../development/python-modules/irisclient { }; + irm-kmi-api = callPackage ../development/python-modules/irm-kmi-api { }; + isal = callPackage ../development/python-modules/isal { }; isbnlib = callPackage ../development/python-modules/isbnlib { }; @@ -9602,6 +9612,8 @@ self: super: with self; { momepy = callPackage ../development/python-modules/momepy { }; + momonga = callPackage ../development/python-modules/momonga { }; + monai = callPackage ../development/python-modules/monai { }; monai-deploy = callPackage ../development/python-modules/monai-deploy { }; @@ -11589,6 +11601,8 @@ self: super: with self; { peacasso = callPackage ../development/python-modules/peacasso { }; + peakutils = callPackage ../development/python-modules/peakutils { }; + peaqevcore = callPackage ../development/python-modules/peaqevcore { }; pebble = callPackage ../development/python-modules/pebble { }; @@ -11848,10 +11862,7 @@ self: super: with self; { piqp = callPackage ../development/python-modules/piqp { }; - pivy = callPackage ../development/python-modules/pivy { - inherit (pkgs.qt5) qtbase qmake; - inherit (pkgs.libsForQt5) soqt; - }; + pivy = callPackage ../development/python-modules/pivy { }; pixcat = callPackage ../development/python-modules/pixcat { }; @@ -13803,6 +13814,8 @@ self: super: with self; { pyporscheconnectapi = callPackage ../development/python-modules/pyporscheconnectapi { }; + pyportainer = callPackage ../development/python-modules/pyportainer { }; + pyppeteer = callPackage ../development/python-modules/pyppeteer { }; pyppmd = callPackage ../development/python-modules/pyppmd { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 6fbf6cfd6db0..c70f900e794b 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -215,8 +215,6 @@ makeScopeWithSplicing' { callPackage ../development/libraries/sailfish-access-control-plugin { }; - soqt = callPackage ../development/libraries/soqt { }; - telepathy = callPackage ../development/libraries/telepathy/qt { }; qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ec753700a532..c40423412adc 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -112,6 +112,10 @@ let windows.pthreads = nativePlatforms; }; + cygwinCommon = { + hello = nativePlatforms; + }; + wasiCommon = { gmp = nativePlatforms; boehmgc = nativePlatforms; @@ -206,6 +210,8 @@ in # Test some cross builds on 64 bit mingw-w64 crossMingwW64 = mapTestOnCross systems.examples.mingwW64 windowsCommon; + x86_64-cygwin = mapTestOnCross systems.examples.x86_64-cygwin cygwinCommon; + # Linux on mipsel fuloongminipc = mapTestOnCross systems.examples.fuloongminipc linuxCommon; ben-nanonote = mapTestOnCross systems.examples.ben-nanonote linuxCommon;